From 855b03f99067c98ebd5d2b7fa04f055a262fab3e Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 10 May 2025 06:54:51 -0600 Subject: [PATCH 001/126] Devinxi (#4111) --- .github/labeler.yml | 32 +- .gitignore | 5 +- .prettierignore | 1 - docs/router/api/file-based-routing.md | 13 - .../eslint/create-route-property-order.md | 4 +- .../api/router/createFileRouteFunction.md | 2 +- .../api/router/retainSearchParamsFunction.md | 2 +- .../api/router/stripSearchParamsFunction.md | 4 +- .../router/framework/react/decisions-on-dx.md | 2 +- .../framework/react/guide/code-splitting.md | 4 +- .../react/guide/external-data-loading.md | 6 +- .../framework/react/guide/router-context.md | 10 +- .../framework/react/guide/tanstack-start.md | 70 +- .../react/migrate-from-react-location.md | 12 +- docs/router/framework/react/overview.md | 2 +- docs/router/framework/react/quick-start.md | 8 +- .../react/routing/installation-with-rspack.md | 2 +- .../react/routing/installation-with-vite.md | 10 +- .../react/routing/routing-concepts.md | 12 +- .../react/routing/virtual-file-routes.md | 9 +- docs/router/framework/solid/quick-start.md | 8 +- .../solid/routing/file-based-routing.md | 8 +- .../solid/routing/installation-with-vite.md | 8 +- docs/start/config.json | 4 +- docs/start/framework/react/api-routes.md | 292 - .../framework/react/build-from-scratch.md | 88 +- docs/start/framework/react/hosting.md | 2 +- .../start/framework/react/learn-the-basics.md | 25 +- docs/start/framework/react/middleware.md | 142 +- docs/start/framework/react/overview.md | 4 +- docs/start/framework/react/server-routes.md | 387 + docs/start/framework/react/ssr.md | 4 +- .../framework/react/static-prerendering.md | 42 +- .../framework/solid/build-from-scratch.md | 84 +- .../start/framework/solid/learn-the-basics.md | 11 +- e2e/create-start/.gitignore | 10 - e2e/create-start/package.json | 16 - e2e/create-start/playwright.config.ts | 34 - .../tests/templates/barebones.test.ts | 38 - e2e/create-start/tsconfig.json | 11 - e2e/create-start/utils/setup.ts | 72 - .../src/routeTree.gen.ts | 165 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 4 +- .../src/routes/viewport-test.tsx | 4 +- .../src/routes/without-loader.tsx | 4 +- .../vite.config.ts | 5 +- .../basic-file-based/src/routeTree.gen.ts | 790 +- .../(another-group)/onlyrouteinside.tsx | 4 +- .../routes/(group)/_layout.insidelayout.tsx | 4 +- .../src/routes/(group)/_layout.tsx | 4 +- .../src/routes/(group)/inside.tsx | 4 +- .../src/routes/(group)/lazyinside.lazy.tsx | 8 +- .../src/routes/(group)/lazyinside.tsx | 3 +- .../src/routes/(group)/subfolder/inside.tsx | 4 +- .../basic-file-based/src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../basic-file-based/src/routes/anchor.tsx | 11 +- .../basic-file-based/src/routes/editing-a.tsx | 4 +- .../basic-file-based/src/routes/editing-b.tsx | 4 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/params-ps/index.tsx | 77 + .../src/routes/params-ps/named/$foo.tsx | 13 + .../src/routes/params-ps/named/index.tsx | 7 + .../routes/params-ps/named/prefix{$foo}.tsx | 13 + .../routes/params-ps/named/{$foo}suffix.tsx | 13 + .../src/routes/params-ps/wildcard/$.tsx | 13 + .../src/routes/params-ps/wildcard/index.tsx | 7 + .../routes/params-ps/wildcard/prefix{$}.tsx | 13 + .../routes/params-ps/wildcard/{$}suffix.tsx | 13 + .../src/routes/params.single.$value.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 3 +- .../basic-file-based/src/routes/posts.tsx | 4 +- .../src/routes/posts_.$postId.edit.tsx | 4 +- .../src/routes/redirect/$target.tsx | 4 +- .../src/routes/redirect/$target/index.tsx | 4 +- .../redirect/$target/via-beforeLoad.tsx | 7 +- .../routes/redirect/$target/via-loader.tsx | 4 +- .../src/routes/redirect/index.tsx | 4 +- .../src/routes/redirect/preload/first.tsx | 4 +- .../src/routes/redirect/preload/second.tsx | 4 +- .../src/routes/redirect/preload/third.tsx | 4 +- .../routes/structural-sharing.$enabled.tsx | 9 +- .../basic-file-based/tests/params.spec.ts | 148 + .../src/routeTree.gen.ts | 135 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 8 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 4 +- .../src/routeTree.gen.ts | 201 +- .../basic-virtual-file-based/src/routes/a.tsx | 4 +- .../basic-virtual-file-based/src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 4 +- .../basic-virtual-file-based/vite.config.ts | 5 +- .../src/routes/a.tsx | 4 +- .../src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 4 +- .../vite.config.ts | 5 +- e2e/react-router/basic/src/main.tsx | 207 + e2e/react-router/basic/tests/params.spec.ts | 149 + .../generator-cli-only/src/routeTree.gen.ts | 63 +- .../src/routes/_pathlessLayout.tsx | 3 +- .../routes/_pathlessLayout/_nested-layout.tsx | 3 +- .../_nested-layout/route-a.tsx | 1 - .../_nested-layout/route-b.tsx | 1 - .../generator-cli-only/src/routes/index.tsx | 2 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 2 +- .../src/routes/posts.route.tsx | 3 +- .../js-only-file-based/src/routeTree.gen.js | 37 +- .../src/routes/_pathlessLayout.jsx | 4 +- .../routes/_pathlessLayout/_nested-layout.jsx | 4 +- .../_nested-layout/route-a.jsx | 10 +- .../_nested-layout/route-b.jsx | 10 +- .../js-only-file-based/src/routes/index.jsx | 3 +- .../src/routes/posts.$postId.jsx | 4 +- .../src/routes/posts.index.jsx | 3 +- .../src/routes/posts.route.jsx | 4 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 4 +- .../src/routes/a.tsx | 4 +- .../src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 4 +- .../src/routeTree.gen.ts | 102 +- .../src/routes/(tests)/lazy-page.lazy.tsx | 4 +- .../src/routes/(tests)/lazy-page.tsx | 4 +- .../(tests)/lazy-with-loader-page.lazy.tsx | 3 +- .../routes/(tests)/lazy-with-loader-page.tsx | 3 +- .../src/routes/(tests)/normal-page.tsx | 4 +- .../src/routes/(tests)/page-with-search.tsx | 3 +- .../src/routes/(tests)/virtual-page.lazy.tsx | 4 +- .../src/routes/index.tsx | 4 +- e2e/react-start/basic-auth/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 70 + e2e/react-start/basic-auth/app.config.ts | 15 - e2e/react-start/basic-auth/package.json | 14 +- .../basic-auth/playwright.config.ts | 2 +- e2e/react-start/basic-auth/src/client.tsx | 8 - .../basic-auth/src/routeTree.gen.ts | 131 +- .../basic-auth/src/routes/_authed.tsx | 3 +- .../src/routes/_authed/posts.$postId.tsx | 4 +- .../src/routes/_authed/posts.index.tsx | 4 +- .../basic-auth/src/routes/_authed/posts.tsx | 4 +- .../basic-auth/src/routes/index.tsx | 4 +- .../basic-auth/src/routes/login.tsx | 4 +- .../basic-auth/src/routes/logout.tsx | 4 +- .../basic-auth/src/routes/signup.tsx | 4 +- .../basic-auth/src/tanstack-start.d.ts | 1 + e2e/react-start/basic-auth/vite.config.ts | 12 + e2e/react-start/basic-react-query/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 155 + .../basic-react-query/app.config.ts | 15 - .../basic-react-query/package.json | 16 +- .../basic-react-query/playwright.config.ts | 2 +- e2e/react-start/basic-react-query/src/api.ts | 6 - .../basic-react-query/src/client.tsx | 8 - .../basic-react-query/src/routeTree.gen.ts | 229 +- .../basic-react-query/src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../basic-react-query/src/routes/api.users.ts | 3 +- .../src/routes/api/users.$id.ts | 3 +- .../basic-react-query/src/routes/deferred.tsx | 4 +- .../basic-react-query/src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 6 +- .../src/routes/posts.index.tsx | 4 +- .../basic-react-query/src/routes/posts.tsx | 4 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../basic-react-query/src/routes/redirect.tsx | 4 +- .../src/routes/users.$userId.tsx | 4 +- .../src/routes/users.index.tsx | 4 +- .../basic-react-query/src/routes/users.tsx | 4 +- .../basic-react-query/src/tanstack-start.d.ts | 1 + .../basic-react-query/tsconfig.json | 1 + .../basic-react-query/vite.config.ts | 12 + e2e/react-start/basic-rsc/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + e2e/react-start/basic-rsc/app.config.ts | 15 - e2e/react-start/basic-rsc/package.json | 12 +- e2e/react-start/basic-rsc/src/client.tsx | 8 - .../basic-rsc/src/routeTree.gen.ts | 150 +- .../basic-rsc/src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../basic-rsc/src/routes/index.tsx | 4 +- .../basic-rsc/src/routes/posts.$postId.tsx | 4 +- .../basic-rsc/src/routes/posts.index.tsx | 4 +- .../basic-rsc/src/routes/posts.tsx | 3 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../basic-rsc/src/tanstack-start.d.ts | 1 + e2e/react-start/basic-rsc/tsconfig.json | 3 +- e2e/react-start/basic-rsc/vite.config.ts | 12 + e2e/react-start/basic-tsr-config/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../basic-tsr-config/app.config.ts | 8 - e2e/react-start/basic-tsr-config/package.json | 12 +- .../basic-tsr-config/playwright.config.ts | 2 +- .../basic-tsr-config/src/app/client.tsx | 8 - .../basic-tsr-config/src/app/routeTree.gen.ts | 20 +- .../basic-tsr-config/src/app/routes/index.tsx | 4 +- .../src/app/tanstack-start.d.ts | 1 + .../basic-tsr-config/vite.config.ts | 15 + e2e/react-start/basic/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 155 + e2e/react-start/basic/app.config.ts | 15 - e2e/react-start/basic/package.json | 13 +- e2e/react-start/basic/playwright.config.ts | 2 +- e2e/react-start/basic/src/api.ts | 6 - e2e/react-start/basic/src/client.tsx | 8 - .../basic/src/components/RedirectOnClick.tsx | 2 +- .../basic/src/components/throwRedirect.ts | 7 +- e2e/react-start/basic/src/routeTree.gen.ts | 489 +- e2e/react-start/basic/src/routes/_layout.tsx | 4 +- .../basic/src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- e2e/react-start/basic/src/routes/api.users.ts | 5 +- .../basic/src/routes/api/users.$id.ts | 6 +- e2e/react-start/basic/src/routes/deferred.tsx | 6 +- e2e/react-start/basic/src/routes/index.tsx | 3 +- e2e/react-start/basic/src/routes/links.tsx | 4 +- .../basic/src/routes/not-found/index.tsx | 4 +- .../basic/src/routes/not-found/route.tsx | 3 +- .../src/routes/not-found/via-beforeLoad.tsx | 4 +- .../basic/src/routes/not-found/via-loader.tsx | 4 +- .../basic/src/routes/posts.$postId.tsx | 6 +- .../basic/src/routes/posts.index.tsx | 4 +- e2e/react-start/basic/src/routes/posts.tsx | 4 +- .../basic/src/routes/posts_.$postId.deep.tsx | 4 +- .../basic/src/routes/redirect/$target.tsx | 4 +- .../src/routes/redirect/$target/index.tsx | 4 +- .../redirect/$target/serverFn/index.tsx | 4 +- .../$target/serverFn/via-beforeLoad.tsx | 5 +- .../redirect/$target/serverFn/via-loader.tsx | 3 +- .../$target/serverFn/via-useServerFn.tsx | 5 +- .../redirect/$target/via-beforeLoad.tsx | 4 +- .../routes/redirect/$target/via-loader.tsx | 4 +- .../basic/src/routes/redirect/index.tsx | 4 +- e2e/react-start/basic/src/routes/scripts.tsx | 4 +- .../basic/src/routes/search-params.tsx | 4 +- e2e/react-start/basic/src/routes/stream.tsx | 4 +- .../basic/src/routes/users.$userId.tsx | 9 +- .../basic/src/routes/users.index.tsx | 4 +- e2e/react-start/basic/src/routes/users.tsx | 6 +- e2e/react-start/basic/src/ssr.tsx | 12 - e2e/react-start/basic/src/tanstack-start.d.ts | 1 + e2e/react-start/basic/src/utils/posts.tsx | 2 +- e2e/react-start/basic/src/utils/users.tsx | 3 +- e2e/react-start/basic/vite.config.ts | 15 + e2e/react-start/clerk-basic/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + e2e/react-start/clerk-basic/app.config.ts | 15 - .../{package.json => package.disabled.json} | 14 +- .../clerk-basic/playwright.config.ts | 2 +- e2e/react-start/clerk-basic/src/client.tsx | 8 - .../clerk-basic/src/routeTree.gen.ts | 103 +- e2e/react-start/clerk-basic/src/router.tsx | 1 + .../clerk-basic/src/routes/__root.tsx | 1 - .../clerk-basic/src/routes/_authed.tsx | 3 +- .../src/routes/_authed/posts.$postId.tsx | 4 +- .../src/routes/_authed/posts.index.tsx | 4 +- .../clerk-basic/src/routes/_authed/posts.tsx | 4 +- .../src/routes/_authed/profile.$.tsx | 4 +- .../clerk-basic/src/routes/index.tsx | 4 +- e2e/react-start/clerk-basic/src/server.tsx | 18 + .../clerk-basic/src/tanstack-start.d.ts | 1 + e2e/react-start/clerk-basic/vite.config.ts | 12 + e2e/react-start/scroll-restoration/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../scroll-restoration/app.config.ts | 15 - .../scroll-restoration/package.json | 12 +- .../scroll-restoration/playwright.config.ts | 2 +- e2e/react-start/scroll-restoration/src/api.ts | 6 - .../scroll-restoration/src/client.tsx | 8 - .../scroll-restoration/src/routeTree.gen.ts | 65 +- .../src/routes/(tests)/normal-page.tsx | 3 +- .../src/routes/(tests)/with-loader.tsx | 3 +- .../src/routes/(tests)/with-search.tsx | 3 +- .../scroll-restoration/src/routes/__root.tsx | 6 +- .../scroll-restoration/src/routes/index.tsx | 4 +- .../src/tanstack-start.d.ts | 1 + .../scroll-restoration/tsconfig.json | 1 + .../scroll-restoration/vite.config.ts | 7 + e2e/react-start/server-functions/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../server-functions/app.config.ts | 15 - e2e/react-start/server-functions/package.json | 12 +- .../server-functions/playwright.config.ts | 2 +- .../server-functions/src/client.tsx | 8 - .../server-functions/src/routeTree.gen.ts | 230 +- .../src/routes/abort-signal.tsx | 3 +- .../src/routes/consistent.tsx | 3 +- .../src/routes/cookies/index.tsx | 4 +- .../src/routes/cookies/set.tsx | 3 +- .../src/routes/dead-code-preserve.tsx | 3 +- .../server-functions/src/routes/env-only.tsx | 3 +- .../server-functions/src/routes/headers.tsx | 19 +- .../server-functions/src/routes/index.tsx | 4 +- .../src/routes/isomorphic-fns.tsx | 3 +- .../server-functions/src/routes/multipart.tsx | 3 +- .../src/routes/raw-response.tsx | 4 +- .../src/routes/return-null.tsx | 3 +- .../src/routes/serialize-form-data.tsx | 4 +- .../server-functions/src/routes/status.tsx | 3 +- .../src/routes/submit-post-formdata.tsx | 3 +- .../server-functions/src/tanstack-start.d.ts | 1 + .../tests/server-functions.spec.ts | 50 +- .../server-functions/tsconfig.json | 3 +- .../server-functions/vite.config.ts | 12 + e2e/react-start/website/.gitignore | 8 +- .../server-routes/routeTree.gen.ts | 112 + e2e/react-start/website/app.config.ts | 15 - e2e/react-start/website/package.json | 14 +- e2e/react-start/website/playwright.config.ts | 2 +- e2e/react-start/website/src/client.tsx | 8 - e2e/react-start/website/src/routeTree.gen.ts | 172 +- e2e/react-start/website/src/router.tsx | 1 + ...t.$version.docs.framework.$framework.$.tsx | 12 +- ...n.docs.framework.$framework.examples.$.tsx | 5 +- ...ersion.docs.framework.$framework.index.tsx | 8 +- ...ect.$version.docs.framework.$framework.tsx | 11 +- ...ion.docs.framework.$framework.{$}[.]md.tsx | 23 + .../routes/$project.$version.docs.index.tsx | 6 +- .../website/src/routes/$project.index.tsx | 4 +- e2e/react-start/website/src/routes/__root.tsx | 4 +- .../_library.$project.$version.index.tsx | 10 +- .../website/src/routes/_library.$project.tsx | 4 +- .../website/src/routes/_library.index.tsx | 4 +- .../website/src/routes/_library.tsx | 9 +- e2e/react-start/website/src/ssr.tsx | 13 - .../website/src/tanstack-start.d.ts | 1 + e2e/react-start/website/tests/app.spec.ts | 14 + e2e/react-start/website/vite.config.ts | 15 + .../src/routeTree.gen.ts | 228 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 4 +- .../src/routes/posts.tsx | 4 +- .../src/routes/viewport-test.tsx | 4 +- .../src/routes/without-loader.tsx | 4 +- .../vite.config.ts | 5 +- .../basic-file-based/src/routeTree.gen.ts | 449 +- .../(another-group)/onlyrouteinside.tsx | 4 +- .../routes/(group)/_layout.insidelayout.tsx | 4 +- .../src/routes/(group)/_layout.tsx | 4 +- .../src/routes/(group)/inside.tsx | 4 +- .../src/routes/(group)/lazyinside.lazy.tsx | 8 +- .../src/routes/(group)/lazyinside.tsx | 3 +- .../src/routes/(group)/subfolder/inside.tsx | 4 +- .../basic-file-based/src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../basic-file-based/src/routes/anchor.tsx | 9 +- .../basic-file-based/src/routes/editing-a.tsx | 4 +- .../basic-file-based/src/routes/editing-b.tsx | 4 +- .../basic-file-based/src/routes/index.tsx | 4 +- .../src/routes/params.single.$value.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 4 +- .../basic-file-based/src/routes/posts.tsx | 4 +- .../src/routes/posts_.$postId.edit.tsx | 4 +- .../src/routes/redirect/$target.tsx | 4 +- .../src/routes/redirect/$target/index.tsx | 4 +- .../redirect/$target/via-beforeLoad.tsx | 4 +- .../routes/redirect/$target/via-loader.tsx | 4 +- .../src/routes/redirect/index.tsx | 4 +- .../src/routes/redirect/preload/first.tsx | 4 +- .../src/routes/redirect/preload/second.tsx | 4 +- .../src/routes/redirect/preload/third.tsx | 4 +- .../src/routeTree.gen.ts | 135 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 8 +- .../src/routes/posts.index.tsx | 4 +- .../src/routes/posts.tsx | 4 +- .../src/routeTree.gen.ts | 277 +- .../basic-virtual-file-based/src/routes/a.tsx | 4 +- .../basic-virtual-file-based/src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 4 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 4 +- .../src/routes/posts/posts.tsx | 4 +- .../basic-virtual-file-based/vite.config.ts | 5 +- .../src/routes/a.tsx | 4 +- .../src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 4 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 4 +- .../src/routes/posts/posts.tsx | 4 +- .../vite.config.ts | 5 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 4 +- .../src/routes/posts.tsx | 4 +- .../src/routes/a.tsx | 4 +- .../src/routes/b.tsx | 4 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 4 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 4 +- .../src/routes/posts/posts.tsx | 4 +- .../src/routeTree.gen.ts | 102 +- .../src/routes/(tests)/lazy-page.lazy.tsx | 3 +- .../src/routes/(tests)/lazy-page.tsx | 4 +- .../(tests)/lazy-with-loader-page.lazy.tsx | 3 +- .../routes/(tests)/lazy-with-loader-page.tsx | 3 +- .../src/routes/(tests)/normal-page.tsx | 3 +- .../src/routes/(tests)/page-with-search.tsx | 3 +- .../src/routes/(tests)/virtual-page.lazy.tsx | 3 +- .../src/routes/index.tsx | 4 +- e2e/solid-start/basic-tsr-config/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 70 + .../basic-tsr-config/app.config.ts | 8 - e2e/solid-start/basic-tsr-config/package.json | 14 +- .../basic-tsr-config/playwright.config.ts | 3 +- .../basic-tsr-config/src/app/client.tsx | 8 - .../basic-tsr-config/src/app/routeTree.gen.ts | 20 +- .../basic-tsr-config/src/app/routes/index.tsx | 4 +- .../basic-tsr-config/src/app/ssr.tsx | 13 - .../src/app/tanstack-start.d.ts | 1 + .../basic-tsr-config/src/app/vite-env.d.ts | 4 + .../basic-tsr-config/vite.config.ts | 19 + e2e/solid-start/basic/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 155 + e2e/solid-start/basic/app.config.ts | 15 - e2e/solid-start/basic/package.json | 9 +- e2e/solid-start/basic/playwright.config.ts | 2 +- e2e/solid-start/basic/src/api.ts | 6 - e2e/solid-start/basic/src/client.tsx | 8 - e2e/solid-start/basic/src/routeTree.gen.ts | 489 +- e2e/solid-start/basic/src/routes/__root.tsx | 2 +- e2e/solid-start/basic/src/routes/_layout.tsx | 4 +- .../basic/src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- e2e/solid-start/basic/src/routes/api.users.ts | 18 - .../basic/src/routes/api/users.$id.ts | 25 - .../basic/src/routes/api/users.$userId.ts | 27 + e2e/solid-start/basic/src/routes/api/users.ts | 58 + e2e/solid-start/basic/src/routes/deferred.tsx | 4 +- e2e/solid-start/basic/src/routes/index.tsx | 3 +- e2e/solid-start/basic/src/routes/links.tsx | 4 +- .../basic/src/routes/not-found/index.tsx | 4 +- .../basic/src/routes/not-found/route.tsx | 3 +- .../src/routes/not-found/via-beforeLoad.tsx | 4 +- .../basic/src/routes/not-found/via-loader.tsx | 4 +- .../basic/src/routes/posts.$postId.tsx | 4 +- .../basic/src/routes/posts.index.tsx | 4 +- e2e/solid-start/basic/src/routes/posts.tsx | 4 +- .../basic/src/routes/posts_.$postId.deep.tsx | 4 +- .../basic/src/routes/redirect/$target.tsx | 4 +- .../src/routes/redirect/$target/index.tsx | 4 +- .../redirect/$target/serverFn/index.tsx | 4 +- .../$target/serverFn/via-beforeLoad.tsx | 5 +- .../redirect/$target/serverFn/via-loader.tsx | 3 +- .../$target/serverFn/via-useServerFn.tsx | 5 +- .../redirect/$target/via-beforeLoad.tsx | 4 +- .../routes/redirect/$target/via-loader.tsx | 4 +- .../basic/src/routes/redirect/index.tsx | 4 +- e2e/solid-start/basic/src/routes/scripts.tsx | 4 +- .../basic/src/routes/search-params.tsx | 4 +- e2e/solid-start/basic/src/routes/stream.tsx | 4 +- .../basic/src/routes/users.$userId.tsx | 7 +- .../basic/src/routes/users.index.tsx | 4 +- e2e/solid-start/basic/src/routes/users.tsx | 7 +- e2e/solid-start/basic/src/ssr.tsx | 12 - e2e/solid-start/basic/src/tanstack-start.d.ts | 1 + e2e/solid-start/basic/src/utils/users.tsx | 3 +- e2e/solid-start/basic/src/vite-env.d.ts | 4 + e2e/solid-start/basic/vite.config.ts | 15 + e2e/solid-start/scroll-restoration/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 70 + .../scroll-restoration/app.config.ts | 15 - .../scroll-restoration/package.json | 9 +- .../scroll-restoration/playwright.config.ts | 2 +- e2e/solid-start/scroll-restoration/src/api.ts | 6 - .../scroll-restoration/src/client.tsx | 8 - .../scroll-restoration/src/routeTree.gen.ts | 65 +- .../src/routes/(tests)/normal-page.tsx | 4 +- .../src/routes/(tests)/with-loader.tsx | 5 +- .../src/routes/(tests)/with-search.tsx | 3 +- .../scroll-restoration/src/routes/__root.tsx | 8 +- .../scroll-restoration/src/routes/index.tsx | 4 +- .../scroll-restoration/src/ssr.tsx | 12 - .../src/tanstack-start.d.ts | 1 + .../scroll-restoration/src/utils/users.tsx | 3 +- .../scroll-restoration/src/vite-env.d.ts | 4 + .../scroll-restoration/vite.config.ts | 15 + e2e/solid-start/server-functions/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 70 + .../server-functions/app.config.ts | 15 - e2e/solid-start/server-functions/package.json | 9 +- .../server-functions/playwright.config.ts | 2 +- .../server-functions/src/client.tsx | 8 - .../server-functions/src/routeTree.gen.ts | 230 +- .../server-functions/src/routes/__root.tsx | 3 +- .../src/routes/abort-signal.tsx | 3 +- .../src/routes/consistent.tsx | 3 +- .../src/routes/cookies/index.tsx | 4 +- .../src/routes/cookies/set.tsx | 3 +- .../src/routes/dead-code-preserve.tsx | 4 +- .../server-functions/src/routes/env-only.tsx | 3 +- .../server-functions/src/routes/headers.tsx | 19 +- .../server-functions/src/routes/index.tsx | 4 +- .../src/routes/isomorphic-fns.tsx | 3 +- .../server-functions/src/routes/multipart.tsx | 3 +- .../src/routes/raw-response.tsx | 4 +- .../src/routes/return-null.tsx | 3 +- .../src/routes/serialize-form-data.tsx | 4 +- .../server-functions/src/routes/status.tsx | 3 +- .../src/routes/submit-post-formdata.tsx | 3 +- e2e/solid-start/server-functions/src/ssr.tsx | 12 - .../server-functions/src/tanstack-start.d.ts | 1 + .../server-functions/src/vite-env.d.ts | 4 + .../tests/server-functions.spec.ts | 50 +- .../server-functions/vite.config.ts | 15 + e2e/solid-start/website/.gitignore | 2 - .../server-routes/routeTree.gen.ts | 70 + e2e/solid-start/website/app.config.ts | 15 - e2e/solid-start/website/package.json | 9 +- e2e/solid-start/website/playwright.config.ts | 3 +- e2e/solid-start/website/src/client.tsx | 8 - e2e/solid-start/website/src/routeTree.gen.ts | 172 +- ...t.$version.docs.framework.$framework.$.tsx | 6 +- ...n.docs.framework.$framework.examples.$.tsx | 5 +- ...ersion.docs.framework.$framework.index.tsx | 8 +- ...ect.$version.docs.framework.$framework.tsx | 11 +- .../routes/$project.$version.docs.index.tsx | 6 +- .../website/src/routes/$project.index.tsx | 4 +- e2e/solid-start/website/src/routes/__root.tsx | 2 +- .../_library.$project.$version.index.tsx | 6 +- .../website/src/routes/_library.$project.tsx | 4 +- .../website/src/routes/_library.index.tsx | 4 +- .../website/src/routes/_library.tsx | 9 +- e2e/solid-start/website/src/ssr.tsx | 13 - .../website/src/tanstack-start.d.ts | 1 + e2e/solid-start/website/src/vite-env.d.ts | 4 + e2e/solid-start/website/tests/app.spec.ts | 14 + e2e/solid-start/website/vite.config.ts | 15 + .../src/routeTree.gen.ts | 118 +- .../src/routes/_auth.dashboard.tsx | 3 +- .../src/routes/_auth.invoices.$invoiceId.tsx | 4 +- .../src/routes/_auth.invoices.index.tsx | 3 +- .../src/routes/_auth.invoices.tsx | 4 +- .../src/routes/_auth.tsx | 10 +- .../src/routes/index.tsx | 4 +- .../src/routes/login.tsx | 9 +- .../authenticated-routes/src/routeTree.gen.ts | 118 +- .../src/routes/_auth.dashboard.tsx | 3 +- .../src/routes/_auth.invoices.$invoiceId.tsx | 4 +- .../src/routes/_auth.invoices.index.tsx | 3 +- .../src/routes/_auth.invoices.tsx | 4 +- .../authenticated-routes/src/routes/_auth.tsx | 10 +- .../authenticated-routes/src/routes/index.tsx | 4 +- .../authenticated-routes/src/routes/login.tsx | 9 +- .../basic-file-based/src/routeTree.gen.ts | 155 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../basic-file-based/src/routes/anchor.tsx | 11 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 4 +- .../src/routeTree.gen.ts | 140 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 8 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 4 +- .../{package.json => package.disabled.json} | 0 .../basic-ssr-file-based/src/routeTree.gen.ts | 86 +- .../basic-ssr-file-based/src/routes/error.tsx | 3 +- .../basic-ssr-file-based/src/routes/index.tsx | 3 +- .../src/routes/posts/$postId.tsx | 3 +- .../src/routes/posts/index.tsx | 4 +- .../src/routes/posts/route.tsx | 4 +- .../{package.json => package.disabled.json} | 0 .../src/routeTree.gen.ts | 86 +- .../src/routes/error.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts/$postId.tsx | 4 +- .../src/routes/posts/index.tsx | 3 +- .../src/routes/posts/route.tsx | 4 +- .../src/routeTree.gen.ts | 209 +- .../basic-virtual-file-based/src/routes/a.tsx | 6 +- .../basic-virtual-file-based/src/routes/b.tsx | 6 +- .../routes/file-based-subtree/hello/index.tsx | 4 +- .../routes/file-based-subtree/hello/route.tsx | 4 +- .../file-based-subtree/hello/universe.tsx | 4 +- .../routes/file-based-subtree/hello/world.tsx | 4 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 4 +- .../src/routes/layout/second-layout.tsx | 4 +- .../src/routes/posts/posts-detail.tsx | 4 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 4 +- .../basic-virtual-file-based/vite.config.ts | 5 +- .../src/routeTree.gen.ts | 169 +- .../src/routes/_layout.tsx | 4 +- .../src/routes/_layout/_layout-2.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 4 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 4 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.tsx | 4 +- .../src/routes/posts/details.tsx | 4 +- .../src/routes/posts/home.tsx | 3 +- .../src/routes/posts/lets-go/deeper/home.tsx | 4 +- .../src/routes/posts/lets-go/index.tsx | 4 +- .../vite.config.ts | 8 +- .../src/routeTree.gen.ts | 285 +- .../route-group.tsx | 5 +- .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 4 +- .../src/routes/_pathlessLayout.route-a.tsx | 3 +- .../src/routes/_pathlessLayout.route-b.tsx | 3 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../src/routes/dashboard.index.tsx | 4 +- .../routes/dashboard.invoices.$invoiceId.tsx | 9 +- .../src/routes/dashboard.invoices.index.tsx | 4 +- .../src/routes/dashboard.invoices.route.tsx | 9 +- .../src/routes/dashboard.route.tsx | 9 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 4 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/index.tsx | 4 +- .../src/routes/login.tsx | 4 +- .../src/routeTree.gen.ts | 285 +- .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 4 +- .../src/routes/_pathlessLayout.route-a.tsx | 3 +- .../src/routes/_pathlessLayout.route-b.tsx | 3 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../src/routes/dashboard.index.tsx | 4 +- .../routes/dashboard.invoices.$invoiceId.tsx | 4 +- .../src/routes/dashboard.invoices.index.tsx | 4 +- .../src/routes/dashboard.invoices.route.tsx | 9 +- .../src/routes/dashboard.route.tsx | 4 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 4 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/foo/bar.tsx | 3 +- .../src/routes/index.tsx | 4 +- .../src/routes/login.tsx | 4 +- examples/react/kitchen-sink/src/main.tsx | 22 +- .../large-file-based/src/routeTree.gen.ts | 129 +- .../large-file-based/src/routes/absolute.tsx | 4 +- .../large-file-based/src/routes/index.tsx | 3 +- .../large-file-based/src/routes/linkProps.tsx | 4 +- .../src/routes/params/$paramsPlaceholder.tsx | 4 +- .../src/routes/params/route.tsx | 3 +- .../large-file-based/src/routes/relative.tsx | 4 +- .../src/routes/search/route.tsx | 4 +- .../src/routes/search/searchPlaceholder.tsx | 4 +- .../src/routeTree.gen.ts | 35 +- .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routeTree.gen.ts | 35 +- .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routeTree.gen.ts | 35 +- .../src/routes/about.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../packages/router/src/routeTree.gen.ts | 35 +- .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../packages/router/vite.config.ts | 4 +- .../packages/router/src/routeTree.gen.ts | 35 +- .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../packages/router/vite.config.ts | 4 +- .../packages/router/src/routeTree.gen.ts | 35 +- .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../packages/router/vite.config.ts | 4 +- .../src/routeTree.gen.ts | 65 +- .../src/routes/index.tsx | 4 +- .../src/routes/users/arktype.index.tsx | 4 +- .../src/routes/users/valibot.index.tsx | 4 +- .../src/routes/users/zod.index.tsx | 4 +- .../search-validator-adapters/vite.config.ts | 8 +- .../server-routes/routeTree.gen.ts | 70 + examples/react/start-bare/app.config.ts | 17 - examples/react/start-bare/package.json | 7 +- examples/react/start-bare/src/api.ts | 6 - examples/react/start-bare/src/client.tsx | 8 - .../react/start-bare/src/routeTree.gen.ts | 35 +- .../react/start-bare/src/routes/about.tsx | 4 +- .../react/start-bare/src/routes/index.tsx | 3 +- .../react/start-bare/src/tanstack-start.d.ts | 1 + examples/react/start-bare/vite.config.ts | 15 + examples/react/start-basic-auth/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + examples/react/start-basic-auth/app.config.ts | 15 - examples/react/start-basic-auth/package.json | 9 +- .../react/start-basic-auth/src/client.tsx | 8 - .../start-basic-auth/src/routeTree.gen.ts | 131 +- .../start-basic-auth/src/routes/_authed.tsx | 3 +- .../src/routes/_authed/posts.$postId.tsx | 4 +- .../src/routes/_authed/posts.index.tsx | 4 +- .../src/routes/_authed/posts.route.tsx | 4 +- .../start-basic-auth/src/routes/index.tsx | 4 +- .../start-basic-auth/src/routes/login.tsx | 3 +- .../start-basic-auth/src/routes/logout.tsx | 4 +- .../start-basic-auth/src/routes/signup.tsx | 4 +- .../react/start-basic-auth/src/server.ts | 0 examples/react/start-basic-auth/src/ssr.tsx | 13 - .../start-basic-auth/src/tanstack-start.d.ts | 1 + .../react/start-basic-auth/vite.config.ts | 15 + .../react/start-basic-react-query/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../start-basic-react-query/app.config.ts | 15 - .../start-basic-react-query/package.json | 9 +- .../start-basic-react-query/src/client.tsx | 8 - .../src/routeTree.gen.ts | 234 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../src/routes/deferred.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 6 +- .../src/routes/posts.index.tsx | 4 +- .../src/routes/posts.route.tsx | 4 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../src/routes/redirect.tsx | 4 +- .../src/routes/users.$userId.tsx | 4 +- .../src/routes/users.index.tsx | 4 +- .../src/routes/users.route.tsx | 4 +- .../start-basic-react-query/src/server.ts | 0 .../react/start-basic-react-query/src/ssr.tsx | 13 - .../src/tanstack-start.d.ts | 1 + .../start-basic-react-query/vite.config.ts | 15 + examples/react/start-basic-rsc/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + examples/react/start-basic-rsc/app.config.ts | 15 - examples/react/start-basic-rsc/package.json | 9 +- examples/react/start-basic-rsc/src/client.tsx | 8 - .../start-basic-rsc/src/routeTree.gen.ts | 155 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../start-basic-rsc/src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 4 +- .../start-basic-rsc/src/routes/posts.tsx | 3 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../react/start-basic-rsc/src/server.ts | 0 examples/react/start-basic-rsc/src/ssr.tsx | 13 - .../start-basic-rsc/src/tanstack-start.d.ts | 1 + examples/react/start-basic-rsc/vite.config.ts | 15 + examples/react/start-basic-static/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../react/start-basic-static/app.config.ts | 22 - .../react/start-basic-static/package.json | 9 +- .../react/start-basic-static/src/client.tsx | 8 - .../start-basic-static/src/routeTree.gen.ts | 234 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../src/routes/deferred.tsx | 4 +- .../start-basic-static/src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 6 +- .../src/routes/posts.index.tsx | 4 +- .../start-basic-static/src/routes/posts.tsx | 4 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../src/routes/redirect.tsx | 4 +- .../src/routes/users.$userId.tsx | 4 +- .../src/routes/users.index.tsx | 4 +- .../start-basic-static/src/routes/users.tsx | 4 +- .../react/start-basic-static/src/server.ts | 0 examples/react/start-basic-static/src/ssr.tsx | 13 - .../src/tanstack-start.d.ts | 1 + .../src/utils/loggingMiddleware.tsx | 4 +- .../react/start-basic-static/vite.config.ts | 19 + examples/react/start-basic/.gitignore | 8 +- .../server-routes/routeTree.gen.ts | 187 + examples/react/start-basic/app.config.ts | 15 - examples/react/start-basic/package.json | 9 +- examples/react/start-basic/src/api.ts | 6 - examples/react/start-basic/src/client.tsx | 8 - .../start-basic/src/global-middleware.ts | 6 - .../react/start-basic/src/routeTree.gen.ts | 374 +- .../react/start-basic/src/routes/__root.tsx | 6 + .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../api/{users.$id.ts => users.$userId.ts} | 11 +- .../react/start-basic/src/routes/api/users.ts | 69 +- .../src/routes/customScript[.]js.ts | 9 + .../react/start-basic/src/routes/deferred.tsx | 4 +- .../react/start-basic/src/routes/index.tsx | 4 +- .../start-basic/src/routes/posts.$postId.tsx | 6 +- .../start-basic/src/routes/posts.index.tsx | 4 +- .../src/routes/{posts.route.tsx => posts.tsx} | 8 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../react/start-basic/src/routes/redirect.tsx | 4 +- .../start-basic/src/routes/users.$userId.tsx | 21 +- .../start-basic/src/routes/users.index.tsx | 16 +- .../src/routes/{users.route.tsx => users.tsx} | 26 +- examples/react/start-basic/src/ssr.tsx | 13 - .../react/start-basic/src/tanstack-start.d.ts | 1 + .../src/utils/loggingMiddleware.tsx | 6 +- .../react/start-basic/src/utils/posts.tsx | 22 +- .../react/start-basic/src/utils/users.tsx | 2 - examples/react/start-basic/vite.config.ts | 15 + examples/react/start-clerk-basic/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../react/start-clerk-basic/app.config.ts | 15 - examples/react/start-clerk-basic/package.json | 9 +- .../react/start-clerk-basic/src/client.tsx | 8 - .../start-clerk-basic/src/routeTree.gen.ts | 103 +- .../start-clerk-basic/src/routes/_authed.tsx | 3 +- .../src/routes/_authed/posts.$postId.tsx | 4 +- .../src/routes/_authed/posts.index.tsx | 4 +- .../src/routes/_authed/posts.tsx | 4 +- .../src/routes/_authed/profile.$.tsx | 4 +- .../start-clerk-basic/src/routes/index.tsx | 4 +- .../react/start-clerk-basic/src/server.ts | 0 examples/react/start-clerk-basic/src/ssr.tsx | 17 - .../start-clerk-basic/src/tanstack-start.d.ts | 1 + .../react/start-clerk-basic/vite.config.ts | 15 + .../react/start-convex-trellaux/.gitignore | 6 +- .../react/start-convex-trellaux/.stackblitzrc | 2 +- .../server-routes/routeTree.gen.ts | 70 + .../react/start-convex-trellaux/app.config.ts | 15 - .../react/start-convex-trellaux/package.json | 7 +- .../start-convex-trellaux/src/client.tsx | 8 - .../src/routeTree.gen.ts | 35 +- .../src/routes/boards.$boardId.tsx | 3 +- .../src/routes/index.tsx | 4 +- .../react/start-convex-trellaux/src/server.ts | 0 .../react/start-convex-trellaux/src/ssr.tsx | 13 - .../src/tanstack-start.d.ts | 1 + .../start-convex-trellaux/vite.config.ts | 15 + examples/react/start-counter/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + examples/react/start-counter/app.config.ts | 8 - examples/react/start-counter/package.json | 9 +- examples/react/start-counter/src/client.tsx | 8 - .../react/start-counter/src/routeTree.gen.ts | 20 +- .../react/start-counter/src/routes/index.tsx | 4 +- .../ssr.tsx => start-counter/src/server.ts} | 0 examples/react/start-counter/src/ssr.tsx | 13 - .../start-counter/src/tanstack-start.d.ts | 1 + examples/react/start-counter/vite.config.ts | 9 + examples/react/start-large/.gitignore | 5 +- .../server-routes/routeTree.gen.ts | 3614 ++++ examples/react/start-large/app.config.ts | 15 - examples/react/start-large/package.json | 9 +- examples/react/start-large/src/client.tsx | 9 - .../react/start-large/src/routeTree.gen.ts | 14811 +++++++++++++++- .../react/start-large/src/routes/__root.tsx | 3 +- .../react/start-large/src/routes/absolute.tsx | 4 +- .../react/start-large/src/routes/index.tsx | 3 +- .../start-large/src/routes/linkProps.tsx | 4 +- .../src/routes/params/$paramsPlaceholder.tsx | 6 +- .../start-large/src/routes/params/route.tsx | 3 +- .../react/start-large/src/routes/relative.tsx | 4 +- .../start-large/src/routes/search/route.tsx | 3 +- .../src/routes/search/searchPlaceholder.tsx | 24 +- examples/react/start-large/src/ssr.tsx | 14 - .../react/start-large/src/tanstack-start.d.ts | 1 + examples/react/start-large/vite.config.ts | 15 + .../server-routes/routeTree.gen.ts | 70 + .../react/start-material-ui/app.config.ts | 19 - examples/react/start-material-ui/package.json | 7 +- .../react/start-material-ui/src/client.tsx | 1 - .../start-material-ui/src/routeTree.gen.ts | 35 +- .../start-material-ui/src/routes/about.tsx | 3 +- .../start-material-ui/src/routes/index.tsx | 3 +- .../start-material-ui/src/tanstack-start.d.ts | 1 + .../react/start-material-ui/vite.config.ts | 15 + .../react/start-supabase-basic/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + .../react/start-supabase-basic/app.config.ts | 15 - .../react/start-supabase-basic/package.json | 9 +- .../react/start-supabase-basic/src/client.tsx | 9 - .../start-supabase-basic/src/routeTree.gen.ts | 131 +- .../src/routes/_authed.tsx | 3 +- .../src/routes/_authed/posts.$postId.tsx | 4 +- .../src/routes/_authed/posts.index.tsx | 4 +- .../src/routes/_authed/posts.tsx | 4 +- .../start-supabase-basic/src/routes/index.tsx | 4 +- .../start-supabase-basic/src/routes/login.tsx | 3 +- .../src/routes/logout.tsx | 4 +- .../src/routes/signup.tsx | 4 +- .../react/start-supabase-basic/src/ssr.tsx | 14 - .../src/tanstack-start.d.ts | 1 + .../react/start-supabase-basic/vite.config.ts | 15 + examples/react/start-trellaux/.gitignore | 6 +- .../server-routes/routeTree.gen.ts | 70 + examples/react/start-trellaux/app.config.ts | 15 - examples/react/start-trellaux/package.json | 7 +- examples/react/start-trellaux/src/client.tsx | 8 - .../react/start-trellaux/src/routeTree.gen.ts | 35 +- .../src/routes/boards.$boardId.tsx | 3 +- .../react/start-trellaux/src/routes/index.tsx | 4 +- .../react/start-trellaux/src/server.ts | 1 - examples/react/start-trellaux/src/ssr.tsx | 13 - .../start-trellaux/src/tanstack-start.d.ts | 1 + examples/react/start-trellaux/vite.config.ts | 15 + examples/react/start-workos/.gitignore | 2 - examples/react/start-workos/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 62 + examples/react/start-workos/app.config.ts | 15 - examples/react/start-workos/package.json | 10 +- .../react/start-workos/src/routeTree.gen.ts | 67 +- .../src/routes/_authenticated.tsx | 4 +- .../src/routes/_authenticated/account.tsx | 4 +- .../react/start-workos/src/routes/index.tsx | 4 +- .../react/start-workos/src/routes/logout.tsx | 3 +- .../start-workos/src/tanstack-start.d.ts | 1 + examples/react/start-workos/vite.config.ts | 15 + .../view-transitions/src/routeTree.gen.ts | 99 +- .../view-transitions/src/routes/explore.tsx | 4 +- .../src/routes/how-it-works.tsx | 4 +- .../view-transitions/src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 4 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 4 +- .../react/with-trpc-react-query/.gitignore | 6 +- .../react/with-trpc-react-query/app.config.js | 6 +- .../react/with-trpc-react-query/package.json | 7 +- .../react/with-trpc-react-query/src/main.tsx | 2 - .../with-trpc-react-query/src/router.tsx | 2 +- examples/react/with-trpc/.gitignore | 6 +- examples/react/with-trpc/app.config.js | 6 +- examples/react/with-trpc/package.json | 7 +- examples/react/with-trpc/src/main.tsx | 2 - examples/react/with-trpc/src/trpc.ts | 2 +- .../basic-file-based/src/routeTree.gen.ts | 140 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../basic-file-based/src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 4 +- .../basic-file-based/src/routes/posts.tsx | 4 +- .../src/routeTree.gen.ts | 140 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../src/routes/index.tsx | 4 +- .../src/routes/posts.$postId.tsx | 8 +- .../src/routes/posts.index.tsx | 4 +- .../src/routes/posts.tsx | 4 +- .../src/routeTree.gen.ts | 285 +- .../route-group.tsx | 5 +- .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 4 +- .../src/routes/_pathlessLayout.route-a.tsx | 4 +- .../src/routes/_pathlessLayout.route-b.tsx | 4 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../src/routes/dashboard.index.tsx | 4 +- .../routes/dashboard.invoices.$invoiceId.tsx | 9 +- .../src/routes/dashboard.invoices.index.tsx | 4 +- .../src/routes/dashboard.invoices.route.tsx | 9 +- .../src/routes/dashboard.route.tsx | 9 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 4 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/index.tsx | 4 +- .../src/routes/login.tsx | 4 +- .../src/routeTree.gen.ts | 35 +- .../src/routes/about.tsx | 4 +- .../src/routes/index.tsx | 4 +- .../server-routes/routeTree.gen.ts | 70 + examples/solid/start-bare/app.config.ts | 17 - examples/solid/start-bare/package.json | 8 +- examples/solid/start-bare/src/client.tsx | 8 - .../solid/start-bare/src/routeTree.gen.ts | 35 +- .../solid/start-bare/src/routes/about.tsx | 4 +- .../solid/start-bare/src/routes/index.tsx | 3 +- examples/solid/start-bare/src/ssr.tsx | 12 - .../solid/start-bare/src/tanstack-start.d.ts | 1 + examples/solid/start-bare/vite.config.ts | 17 + .../server-routes/routeTree.gen.ts | 155 + examples/solid/start-basic/app.config.ts | 15 - examples/solid/start-basic/package.json | 9 +- examples/solid/start-basic/src/api.ts | 6 - examples/solid/start-basic/src/client.tsx | 8 - .../src/components/DefaultCatchBoundary.tsx | 2 +- .../solid/start-basic/src/routeTree.gen.ts | 234 +- .../solid/start-basic/src/routes/__root.tsx | 47 +- .../src/routes/_pathlessLayout.tsx | 4 +- .../routes/_pathlessLayout/_nested-layout.tsx | 4 +- .../_nested-layout/route-a.tsx | 10 +- .../_nested-layout/route-b.tsx | 10 +- .../start-basic/src/routes/api/users.$id.ts | 24 - .../src/routes/api/users.$userId.ts | 27 + .../solid/start-basic/src/routes/api/users.ts | 69 +- .../solid/start-basic/src/routes/deferred.tsx | 6 +- .../solid/start-basic/src/routes/index.tsx | 4 +- .../start-basic/src/routes/posts.$postId.tsx | 4 +- .../start-basic/src/routes/posts.index.tsx | 4 +- .../solid/start-basic/src/routes/posts.tsx | 4 +- .../src/routes/posts_.$postId.deep.tsx | 4 +- .../solid/start-basic/src/routes/redirect.tsx | 4 +- .../start-basic/src/routes/users.$userId.tsx | 36 +- .../start-basic/src/routes/users.index.tsx | 13 +- .../solid/start-basic/src/routes/users.tsx | 21 +- examples/solid/start-basic/src/ssr.tsx | 12 - .../solid/start-basic/src/tanstack-start.d.ts | 1 + .../src/utils/loggingMiddleware.tsx | 4 +- .../solid/start-basic/src/utils/posts.tsx | 19 +- .../solid/start-basic/src/utils/users.tsx | 2 - examples/solid/start-basic/vite.config.ts | 15 + package.json | 4 +- .../src/compilers.ts | 4 + .../directive-functions-plugin/src/index.ts | 146 +- .../tests/compiler.test.ts | 2 - .../react-router-with-query/src/index.tsx | 16 +- packages/react-router/src/HeadContent.tsx | 29 +- packages/react-router/src/RouterProvider.tsx | 20 +- packages/react-router/src/Scripts.tsx | 1 + packages/react-router/src/fileRoute.ts | 30 +- packages/react-router/src/index.tsx | 2 + packages/react-router/src/router.ts | 9 + packages/react-router/src/useBlocker.tsx | 5 +- .../react-router/tests/ClientOnly.test.tsx | 39 +- packages/react-router/tests/Scripts.test.tsx | 43 +- packages/react-router/tests/blocker.test.tsx | 14 +- .../tests/errorComponent.test.tsx | 23 +- packages/react-router/tests/index.test.tsx | 564 - packages/react-router/tests/link.test.tsx | 161 +- packages/react-router/tests/loaders.test.tsx | 24 +- packages/react-router/tests/redirect.test.tsx | 61 +- packages/react-router/tests/route.test.tsx | 28 +- .../react-router/tests/routeContext.test.tsx | 3 +- packages/react-router/tests/router.test.tsx | 42 +- .../tests/searchMiddleware.test.tsx | 17 +- .../react-router/tests/useBlocker.test.tsx | 20 +- packages/react-router/tests/useMatch.test.tsx | 2 + .../react-router/tests/useNavigate.test.tsx | 25 +- packages/react-start-client/README.md | 32 +- packages/react-start-client/package.json | 3 +- packages/react-start-client/src/index.tsx | 73 +- packages/react-start-client/src/renderRSC.tsx | 2 - .../react-start-client/src/useServerFn.ts | 8 +- packages/react-start-config/README.md | 33 - packages/react-start-config/eslint.config.js | 31 - packages/react-start-config/package.json | 73 - packages/react-start-config/src/index.ts | 663 - packages/react-start-config/src/schema.ts | 198 - .../src/vinxi-file-router.ts | 87 - packages/react-start-config/tsconfig.json | 10 - packages/react-start-plugin/README.md | 8 +- packages/react-start-plugin/package.json | 24 +- packages/react-start-plugin/src/compilers.ts | 584 - packages/react-start-plugin/src/index.ts | 237 +- packages/react-start-plugin/src/schema.ts | 31 + packages/react-start-plugin/tsconfig.json | 4 +- packages/react-start-plugin/vite.config.ts | 1 + .../react-start-router-manifest/README.md | 33 - .../eslint.config.js | 31 - .../react-start-router-manifest/package.json | 68 - .../react-start-router-manifest/src/index.ts | 88 - .../react-start-router-manifest/tsconfig.json | 10 - .../vite.config.ts | 22 - packages/react-start-server/README.md | 32 +- packages/react-start-server/package.json | 1 + packages/react-start-server/tsconfig.json | 2 +- packages/react-start-server/vite.config.ts | 1 + packages/react-start/README.md | 43 +- packages/react-start/package.json | 58 +- packages/react-start/src/api.tsx | 1 - packages/react-start/src/config.tsx | 1 - packages/react-start/src/plugin-vite.ts | 1 + packages/react-start/src/router-manifest.tsx | 1 - .../src/server-functions-handler.tsx | 1 - .../react-start/src/server-functions-ssr.tsx | 1 - packages/react-start/vite.config.ts | 10 +- packages/router-core/src/fileRoute.ts | 91 +- packages/router-core/src/index.ts | 16 +- packages/router-core/src/link.ts | 5 + packages/router-core/src/path.ts | 197 +- packages/router-core/src/redirect.ts | 59 +- packages/router-core/src/route.ts | 112 +- packages/router-core/src/router.ts | 535 +- packages/router-core/src/typePrimitives.ts | 4 +- packages/router-core/src/utils.ts | 14 + packages/router-core/tests/path.test.ts | 788 +- packages/router-generator/src/config.ts | 25 +- .../src/filesystem/physical/getRouteNodes.ts | 27 +- .../src/filesystem/virtual/getRouteNodes.ts | 21 +- packages/router-generator/src/generator.ts | 455 +- packages/router-generator/src/index.ts | 39 +- packages/router-generator/src/template.ts | 19 +- packages/router-generator/src/types.ts | 1 - packages/router-generator/src/utils.ts | 89 +- .../router-generator/tests/generator.test.ts | 7 +- .../append-and-prepend/routeTree.snapshot.ts | 20 +- .../append-and-prepend/routes/index.tsx | 3 +- .../custom-scaffolding/routeTree.snapshot.ts | 70 +- .../custom-scaffolding/routes/api/bar.tsx | 13 +- .../custom-scaffolding/routes/index.tsx | 3 +- .../custom-scaffolding/snapshot/api/bar.tsx | 13 +- .../custom-scaffolding/snapshot/index.tsx | 3 +- .../custom-tokens/routeTree.snapshot.ts | 135 +- .../generator/custom-tokens/routes/_1nd3x.tsx | 4 +- .../custom-tokens/routes/blog/$slug.tsx | 4 +- .../custom-tokens/routes/blog/_1nd3x.tsx | 4 +- .../custom-tokens/routes/blog/_r0ut3_.tsx | 4 +- .../routes/posts/$postId/_1nd3x.tsx | 4 +- .../routes/posts/$postId/deep.tsx | 4 +- .../custom-tokens/routes/posts/_1nd3x.tsx | 4 +- .../custom-tokens/routes/posts/_r0ut3_.tsx | 4 +- .../dot-escaped/routeTree.snapshot.ts | 226 + .../generator/dot-escaped/routes/__root.tsx | 1 + .../routes/nested[.]js.double[.]ext[.]js.tsx | 2 + .../routes/nested[.]js.script[.]js.tsx | 2 + .../dot-escaped/routes/nested[.]js.tsx | 2 + .../dot-escaped/routes/script[.]js.tsx | 2 + .../duplicate-fullPath/routes/_auth/index.tsx | 4 +- .../duplicate-fullPath/routes/index.tsx | 4 +- .../file-modification/post.$postId.tsx | 2 +- .../file-modification/routeTree.snapshot.ts | 69 +- .../file-modification/snapshot/bar.lazy.tsx | 5 +- .../file-modification/snapshot/foo.tsx | 5 +- .../snapshot/initiallyEmpty.lazy.tsx | 5 +- .../snapshot/initiallyEmpty.tsx | 5 +- .../snapshot/initiallyLazy.tsx | 5 +- .../file-modification/template.lazy.tsx | 2 +- .../generator/file-modification/template.tsx | 5 +- .../generator/flat/routeTree.snapshot.ts | 150 +- .../tests/generator/flat/routes/__root.tsx | 3 +- .../flat/routes/blog.$slug.index.tsx | 3 +- .../generator/flat/routes/blog.index.tsx | 3 +- .../generator/flat/routes/blog.route.tsx | 3 +- .../generator/flat/routes/blog_.stats.tsx | 3 +- .../tests/generator/flat/routes/index.tsx | 3 +- .../flat/routes/posts.$postId.deep.tsx | 3 +- .../flat/routes/posts.$postId.index.tsx | 3 +- .../generator/flat/routes/posts.index.tsx | 3 +- .../generator/flat/routes/posts.route.tsx | 3 +- .../nested-layouts/routeTree.snapshot.ts | 413 +- .../routes/(folder)/in-folder.tsx | 3 +- .../nested-layouts/routes/__root.tsx | 3 +- .../nested-layouts/routes/_layout-a1.tsx | 3 +- .../nested-layouts/routes/_layout-a1/foo.tsx | 3 +- .../nested-layouts/routes/_layout-a2.tsx | 3 +- .../nested-layouts/routes/_layout-a2/bar.tsx | 3 +- .../routes/foo/_layout-b5/$id.tsx | 3 +- .../routes/foo/_layout-b5/index.tsx | 3 +- .../routes/foo/_layout-b5/route.tsx | 3 +- .../nested-layouts/routes/foo/bar.tsx | 3 +- .../generator/nested-layouts/routes/index.tsx | 3 +- .../routes/jested/_layout-b3.tsx | 3 +- .../routes/jested/_layout-b3/_layout-c2.tsx | 3 +- .../jested/_layout-b3/_layout-c2/bar.tsx | 3 +- .../routes/jested/_layout-b3/index.tsx | 3 +- .../routes/jested/_layout-b4.tsx | 3 +- .../routes/jested/_layout-b4/foo.tsx | 3 +- .../nested-layouts/routes/jested/route.tsx | 3 +- .../routes/nested/_layout-b1.tsx | 3 +- .../routes/nested/_layout-b1/_layout-c1.tsx | 3 +- .../nested/_layout-b1/_layout-c1/bar.tsx | 3 +- .../routes/nested/_layout-b1/index.tsx | 3 +- .../routes/nested/_layout-b2.tsx | 3 +- .../routes/nested/_layout-b2/foo.tsx | 3 +- .../routeTree.snapshot.ts | 137 +- .../routes/(group-a)/_layout-a.tsx | 4 +- .../routes/(group-a)/_layout-a/login.tsx | 4 +- .../routes/(group-a)/_layout-a/signup.tsx | 4 +- .../routes/(group-b)/_layout-b.tsx | 4 +- .../routes/(group-b)/_layout-b/dashboard.tsx | 4 +- .../routes/(group-c)/_layout-c.tsx | 4 +- .../routes/(group-c)/_layout-c/index.tsx | 4 +- .../generator/nested/routeTree.snapshot.ts | 150 +- .../generator/nested/routes/blog/$slug.tsx | 4 +- .../generator/nested/routes/blog/index.tsx | 4 +- .../generator/nested/routes/blog/route.tsx | 4 +- .../generator/nested/routes/blog_/stats.tsx | 4 +- .../tests/generator/nested/routes/index.tsx | 4 +- .../nested/routes/posts/$postId/deep.tsx | 4 +- .../nested/routes/posts/$postId/index.tsx | 4 +- .../generator/nested/routes/posts/index.tsx | 4 +- .../generator/nested/routes/posts/route.tsx | 4 +- .../routeTree.snapshot.ts | 42 +- .../routes/__root.tsx | 3 +- .../routes/foo/_layout/index.tsx | 3 +- .../routes/foo/_layout/route.tsx | 3 +- .../routeTree.snapshot.ts | 50 +- .../no-formatted-route-tree/routes/__root.tsx | 3 +- .../no-formatted-route-tree/routes/index.tsx | 3 +- .../routes/nested/child.tsx | 3 +- .../routes/nested/index.tsx | 3 +- .../no-manifest/routeTree.snapshot.ts | 20 +- .../generator/no-manifest/routes/__root.tsx | 3 +- .../generator/no-manifest/routes/index.tsx | 3 +- .../numbers-in-path/routeTree.snapshot.ts | 80 +- .../routes/01-example/index.tsx | 4 +- .../numbers-in-path/routes/02.index.tsx | 4 +- .../generator/numbers-in-path/routes/03.tsx | 4 +- .../numbers-in-path/routes/about.tsx | 4 +- .../numbers-in-path/routes/index.tsx | 4 +- .../generator/only-root/routeTree.snapshot.ts | 2 + .../prefix-suffix/routeTree.snapshot.ts | 214 + .../generator/prefix-suffix/routes/__root.tsx | 15 + .../generator/prefix-suffix/routes/index.tsx | 1 + .../prefix-suffix/routes/wildcard/$.tsx | 7 + .../routes/wildcard/prefix{$}.tsx | 7 + .../routes/wildcard/{$}[.]suffix.tsx | 7 + .../routes/wildcard/{$}suffix.tsx | 7 + .../route-groups/routeTree.snapshot.ts | 137 +- .../asdf/(another-group)/_layout.baz.tsx | 10 +- .../(foo)/asdf/(another-group)/_layout.tsx | 4 +- .../routes/(foo)/asdf/(bar)/$id.tsx | 4 +- .../routes/(foo)/asdf/(bar)/_layout.about.tsx | 4 +- .../(foo)/asdf/(bar)/_layout.xyz.lazy.tsx | 4 +- .../routes/(foo)/asdf/_layout.foo.tsx | 4 +- .../routes/(foo)/asdf/_layout.tsx | 4 +- .../single-level/routeTree.snapshot.ts | 35 +- .../generator/single-level/routes/__root.tsx | 3 +- .../generator/single-level/routes/index.tsx | 3 +- .../generator/single-level/routes/posts.tsx | 3 +- .../types-disabled/routeTree.snapshot.js | 16 +- .../generator/types-disabled/routes/index.tsx | 3 +- .../generator/types-disabled/routes/posts.tsx | 3 +- .../types-disabled/routes/posts/$postId.tsx | 3 +- .../types-disabled/routes/users.$userId.tsx | 3 +- .../routeTree.snapshot.ts | 194 +- .../routes/db/dashboard-index.tsx | 4 +- .../routes/db/dashboard-invoices.tsx | 4 +- .../routes/db/dashboard.tsx | 4 +- .../routes/db/invoice-detail.tsx | 4 +- .../routes/db/invoices-index.tsx | 4 +- .../routes/index.tsx | 4 +- .../routes/layout.tsx | 4 +- .../routes/pages.tsx | 3 +- .../routes/subtree/foo/$id.tsx | 4 +- .../routes/subtree/foo/index.tsx | 4 +- .../routes/subtree/index.tsx | 4 +- .../routeTree.snapshot.ts | 194 +- .../routes/db/dashboard-index.tsx | 4 +- .../routes/db/dashboard-invoices.tsx | 4 +- .../routes/db/dashboard.tsx | 4 +- .../routes/db/invoice-detail.tsx | 4 +- .../routes/db/invoices-index.tsx | 4 +- .../routes/index.tsx | 4 +- .../routes/layout.tsx | 4 +- .../routes/pages.tsx | 3 +- .../routes/subtree/foo/$id.tsx | 4 +- .../routes/subtree/foo/index.tsx | 4 +- .../routes/subtree/index.tsx | 4 +- .../routeTree.snapshot.ts | 69 +- .../virtual-inside-nested/routes/foo/bar.tsx | 4 +- .../routes/foo/bar/details.tsx | 4 +- .../routes/foo/bar/home.tsx | 4 +- .../virtual-inside-nested/routes/index.tsx | 4 +- .../generator/virtual/routeTree.snapshot.ts | 194 +- .../virtual/routes/db/dashboard-index.tsx | 4 +- .../virtual/routes/db/dashboard-invoices.tsx | 4 +- .../generator/virtual/routes/db/dashboard.tsx | 4 +- .../virtual/routes/db/invoice-detail.tsx | 4 +- .../virtual/routes/db/invoices-index.tsx | 4 +- .../tests/generator/virtual/routes/index.tsx | 4 +- .../tests/generator/virtual/routes/layout.tsx | 4 +- .../tests/generator/virtual/routes/pages.tsx | 3 +- .../virtual/routes/subtree/foo/$id.tsx | 4 +- .../virtual/routes/subtree/foo/index.tsx | 4 +- .../virtual/routes/subtree/index.tsx | 4 +- .../src/core/code-splitter/compilers.ts | 81 +- .../core/code-splitter/framework-options.ts | 6 - .../src/core/route-autoimport-plugin.ts | 102 + .../src/core/route-hmr-statement.ts | 13 + .../src/core/router-code-splitter-plugin.ts | 26 +- .../src/core/router-composed-plugin.ts | 30 +- .../src/core/router-generator-plugin.ts | 13 +- .../src/core/router-hmr-plugin.ts | 65 + packages/router-plugin/src/core/utils.ts | 18 + packages/router-plugin/src/vite.ts | 3 + .../router-plugin/tests/code-splitter.test.ts | 3 +- .../1-default/development/arrow-function.tsx | 8 +- .../react/1-default/development/chinese.tsx | 8 +- .../development/conditional-properties.tsx | 8 +- ...ructured-react-memo-imported-component.tsx | 8 +- ...-default-component-and-normal-notFound.tsx | 8 +- .../development/function-declaration.tsx | 8 +- .../1-default/development/importAttribute.tsx | 8 +- ...-default-component-destructured-loader.tsx | 8 +- .../imported-default-component.tsx | 8 +- .../development/imported-errorComponent.tsx | 15 +- .../imported-notFoundComponent.tsx | 15 +- .../development/imported-pendingComponent.tsx | 8 +- .../react/1-default/development/imported.tsx | 8 +- .../react/1-default/development/inline.tsx | 8 +- .../1-default/development/random-number.tsx | 8 +- .../development/react-memo-component.tsx | 8 +- .../react-memo-imported-component.tsx | 8 +- .../development/retain-exports-loader.tsx | 8 +- .../development/useStateDestructure.tsx | 6 +- .../production/useStateDestructure.tsx | 6 +- .../development/arrow-function.tsx | 8 +- .../development/chinese.tsx | 8 +- .../development/conditional-properties.tsx | 8 +- ...ructured-react-memo-imported-component.tsx | 8 +- ...-default-component-and-normal-notFound.tsx | 8 +- .../development/function-declaration.tsx | 8 +- .../development/importAttribute.tsx | 8 +- ...-default-component-destructured-loader.tsx | 8 +- .../imported-default-component.tsx | 8 +- .../development/imported-errorComponent.tsx | 15 +- .../imported-notFoundComponent.tsx | 15 +- .../development/imported-pendingComponent.tsx | 15 +- .../development/imported.tsx | 8 +- .../development/inline.tsx | 8 +- .../development/random-number.tsx | 8 +- .../development/react-memo-component.tsx | 8 +- .../react-memo-imported-component.tsx | 8 +- .../development/retain-exports-loader.tsx | 8 +- .../development/useStateDestructure.tsx | 6 +- .../production/useStateDestructure.tsx | 6 +- .../development/arrow-function.tsx | 8 +- .../development/chinese.tsx | 8 +- .../development/conditional-properties.tsx | 8 +- ...ructured-react-memo-imported-component.tsx | 8 +- ...-default-component-and-normal-notFound.tsx | 8 +- .../development/function-declaration.tsx | 8 +- .../development/importAttribute.tsx | 8 +- ...-default-component-destructured-loader.tsx | 8 +- .../imported-default-component.tsx | 8 +- .../development/imported-errorComponent.tsx | 15 +- .../imported-notFoundComponent.tsx | 15 +- .../development/imported-pendingComponent.tsx | 15 +- .../development/imported.tsx | 8 +- .../development/inline.tsx | 8 +- .../development/random-number.tsx | 8 +- .../development/react-memo-component.tsx | 8 +- .../react-memo-imported-component.tsx | 8 +- .../development/retain-exports-loader.tsx | 8 +- .../development/useStateDestructure.tsx | 6 +- .../production/useStateDestructure.tsx | 6 +- .../1-default/development/arrow-function.tsx | 8 +- .../development/arrow-function.tsx | 8 +- .../development/arrow-function.tsx | 8 +- .../test-files/react/useStateDestructure.tsx | 6 +- .../detect-route-codesplit-groupings.test.ts | 6 +- packages/router-utils/src/ast.ts | 22 +- packages/server-functions-plugin/README.md | 4 +- packages/server-functions-plugin/src/index.ts | 180 +- packages/solid-router/src/HeadContent.tsx | 26 +- packages/solid-router/src/fileRoute.ts | 30 +- packages/solid-router/src/index.tsx | 2 + packages/solid-router/src/router.ts | 9 + packages/solid-router/src/useBlocker.tsx | 5 +- packages/solid-router/tests/redirect.test.tsx | 125 +- packages/solid-start-client/README.md | 32 +- packages/solid-start-client/package.json | 3 +- packages/solid-start-client/src/index.tsx | 73 +- packages/solid-start-client/src/renderRSC.tsx | 2 +- .../solid-start-client/src/routesManifest.ts | 0 .../solid-start-client/src/useServerFn.ts | 8 +- packages/solid-start-config/README.md | 33 - packages/solid-start-config/eslint.config.js | 31 - packages/solid-start-config/package.json | 72 - packages/solid-start-config/src/index.ts | 670 - packages/solid-start-config/src/schema.ts | 198 - .../src/vinxi-file-router.ts | 87 - packages/solid-start-config/tsconfig.json | 10 - packages/solid-start-plugin/README.md | 8 +- packages/solid-start-plugin/package.json | 24 +- packages/solid-start-plugin/src/compilers.ts | 584 - packages/solid-start-plugin/src/index.ts | 217 +- packages/solid-start-plugin/src/schema.ts | 31 + .../createIsomorphicFn.test.ts | 94 - .../client/createIsomorphicFnDestructured.tsx | 16 - .../createIsomorphicFnDestructuredRename.tsx | 16 - .../client/createIsomorphicFnStarImport.tsx | 16 - .../server/createIsomorphicFnDestructured.tsx | 16 - .../createIsomorphicFnDestructuredRename.tsx | 16 - .../server/createIsomorphicFnStarImport.tsx | 16 - .../createIsomorphicFnDestructured.tsx | 35 - .../createIsomorphicFnDestructuredRename.tsx | 35 - .../createIsomorphicFnStarImport.tsx | 37 - .../client/createMiddlewareDestructured.tsx | 24 - .../createMiddlewareDestructuredRename.tsx | 24 - .../client/createMiddlewareStarImport.tsx | 24 - .../client/createMiddlewareValidator.tsx | 5 - .../server/createMiddlewareDestructured.tsx | 36 - .../createMiddlewareDestructuredRename.tsx | 36 - .../server/createMiddlewareStarImport.tsx | 38 - .../server/createMiddlewareValidator.tsx | 7 - .../createMiddlewareDestructured.tsx | 51 - .../createMiddlewareDestructuredRename.tsx | 51 - .../test-files/createMiddlewareStarImport.tsx | 52 - .../test-files/createMiddlewareValidator.tsx | 8 - .../createServerFn/createServerFn.test.ts | 176 - .../client/createServerFnDestructured.tsx | 56 - .../createServerFnDestructuredRename.tsx | 35 - .../client/createServerFnStarImport.tsx | 35 - .../client/createServerFnValidator.tsx | 9 - .../server/createServerFnDestructured.tsx | 77 - .../createServerFnDestructuredRename.tsx | 52 - .../server/createServerFnStarImport.tsx | 54 - .../server/createServerFnValidator.tsx | 11 - .../test-files/createServerFnDestructured.tsx | 67 - .../createServerFnDestructuredRename.tsx | 51 - .../test-files/createServerFnStarImport.tsx | 52 - .../test-files/createServerFnValidator.tsx | 8 - .../tests/envOnly/envOnly.test.ts | 61 - .../snapshots/client/envOnlyDestructured.tsx | 5 - .../client/envOnlyDestructuredRename.tsx | 5 - .../snapshots/client/envOnlyStarImport.tsx | 5 - .../snapshots/server/envOnlyDestructured.tsx | 5 - .../server/envOnlyDestructuredRename.tsx | 5 - .../snapshots/server/envOnlyStarImport.tsx | 5 - .../test-files/envOnlyDestructured.tsx | 5 - .../test-files/envOnlyDestructuredRename.tsx | 8 - .../envOnly/test-files/envOnlyStarImport.tsx | 5 - packages/solid-start-plugin/tsconfig.json | 4 +- packages/solid-start-plugin/vite.config.ts | 1 + .../solid-start-router-manifest/README.md | 33 - .../eslint.config.js | 31 - .../solid-start-router-manifest/package.json | 68 - .../solid-start-router-manifest/src/index.ts | 83 - .../solid-start-router-manifest/tsconfig.json | 10 - .../vite.config.ts | 22 - packages/solid-start-server/README.md | 32 +- packages/solid-start-server/src/index.tsx | 1 + packages/solid-start-server/vite.config.ts | 1 + packages/solid-start/README.md | 43 +- packages/solid-start/package.json | 60 +- packages/solid-start/src/api.tsx | 1 - packages/solid-start/src/config.tsx | 1 - packages/solid-start/src/plugin-vite.ts | 1 + packages/solid-start/src/router-manifest.tsx | 1 - .../src/server-functions-handler.tsx | 1 - .../solid-start/src/server-functions-ssr.tsx | 1 - packages/solid-start/vite.config.ts | 10 +- packages/start-api-routes/README.md | 33 - packages/start-api-routes/eslint.config.js | 31 - packages/start-api-routes/src/index.ts | 369 - packages/start-api-routes/tsconfig.json | 8 - packages/start-api-routes/vite.config.ts | 21 - packages/start-client-core/README.md | 33 +- .../start-client-core/src/createMiddleware.ts | 837 +- .../start-client-core/src/createServerFn.ts | 47 +- packages/start-client-core/src/index.tsx | 43 +- .../src/registerGlobalMiddleware.ts | 6 +- .../src/tests/createServerFn.test-d.ts | 33 +- .../tests/createServerMiddleware.test-d.ts | 259 +- packages/start-client-core/vite.config.ts | 1 + packages/start-config/README.md | 33 - packages/start-config/eslint.config.js | 31 - packages/start-config/package.json | 73 - packages/start-config/src/index.ts | 663 - packages/start-config/src/schema.ts | 198 - .../start-config/src/vinxi-file-router.ts | 87 - packages/start-config/tsconfig.json | 10 - packages/start-plugin-core/README.md | 12 + packages/start-plugin-core/eslint.config.js | 5 + .../package.json | 35 +- packages/start-plugin-core/src/compilers.ts | 759 + .../src/extractHtmlScripts.ts | 19 + packages/start-plugin-core/src/index.ts | 15 + .../src/nitro/build-nitro.ts | 27 + .../src/nitro/build-sitemap.ts | 79 + .../src/nitro/dev-server-plugin.ts | 159 + .../src/nitro/nitro-plugin.ts | 161 + packages/start-plugin-core/src/plugin.ts | 145 + packages/start-plugin-core/src/prerender.ts | 245 + packages/start-plugin-core/src/queue.ts | 153 + .../src/routesManifestPlugin.ts | 216 + packages/start-plugin-core/src/schema.ts | 193 + .../src/start-compiler-plugin.ts | 111 + .../src/start-server-routes-plugin/config.ts | 8 + .../src/start-server-routes-plugin/plugin.ts | 890 + .../start-server-routes-plugin/template.ts | 164 + .../createIsomorphicFn.test.ts | 8 +- .../client/createIsomorphicFnDestructured.tsx | 0 .../createIsomorphicFnDestructuredRename.tsx | 0 .../client/createIsomorphicFnStarImport.tsx | 0 .../server/createIsomorphicFnDestructured.tsx | 0 .../createIsomorphicFnDestructuredRename.tsx | 0 .../server/createIsomorphicFnStarImport.tsx | 0 .../createIsomorphicFnDestructured.tsx | 0 .../createIsomorphicFnDestructuredRename.tsx | 0 .../createIsomorphicFnStarImport.tsx | 0 .../createMiddleware/createMiddleware.test.ts | 5 +- .../client/createMiddlewareDestructured.tsx | 0 .../createMiddlewareDestructuredRename.tsx | 0 .../client/createMiddlewareStarImport.tsx | 0 .../client/createMiddlewareValidator.tsx | 0 .../server/createMiddlewareDestructured.tsx | 0 .../createMiddlewareDestructuredRename.tsx | 0 .../server/createMiddlewareStarImport.tsx | 0 .../server/createMiddlewareValidator.tsx | 0 .../createMiddlewareDestructured.tsx | 0 .../createMiddlewareDestructuredRename.tsx | 0 .../test-files/createMiddlewareStarImport.tsx | 0 .../test-files/createMiddlewareValidator.tsx | 0 .../createServerFn/createServerFn.test.ts | 11 +- .../client/createServerFnDestructured.tsx | 0 .../createServerFnDestructuredRename.tsx | 0 .../client/createServerFnStarImport.tsx | 0 .../client/createServerFnValidator.tsx | 0 .../server/createServerFnDestructured.tsx | 0 .../createServerFnDestructuredRename.tsx | 0 .../server/createServerFnStarImport.tsx | 0 .../server/createServerFnValidator.tsx | 0 .../test-files/createServerFnDestructured.tsx | 0 .../createServerFnDestructuredRename.tsx | 0 .../test-files/createServerFnStarImport.tsx | 0 .../test-files/createServerFnValidator.tsx | 0 .../createServerRoute.test.ts} | 7 +- .../snapshots/client/nonImported.tsx} | 0 .../snapshots/server/nonImported.tsx | 11 + .../test-files/nonImported.tsx | 10 + .../tests/envOnly/envOnly.test.ts | 7 +- .../snapshots/client/envOnlyDestructured.tsx | 0 .../client/envOnlyDestructuredRename.tsx | 0 .../snapshots/client/envOnlyStarImport.tsx | 0 .../snapshots/server/envOnlyDestructured.tsx | 0 .../server/envOnlyDestructuredRename.tsx | 0 .../snapshots/server/envOnlyStarImport.tsx | 0 .../test-files/envOnlyDestructured.tsx | 0 .../test-files/envOnlyDestructuredRename.tsx | 0 .../envOnly/test-files/envOnlyStarImport.tsx | 0 packages/start-plugin-core/tsconfig.json | 9 + .../vite.config.ts | 6 +- packages/start-server-core/README.md | 33 +- packages/start-server-core/package.json | 9 +- .../src/createRequestHandler.ts | 4 +- .../src/createStartHandler.ts | 360 +- packages/start-server-core/src/h3.ts | 149 +- .../start-server-core/src/handlerCallback.ts | 17 +- packages/start-server-core/src/index.tsx | 14 +- .../start-server-core/src/router-manifest.ts | 79 + .../src/server-functions-handler.ts} | 86 +- packages/start-server-core/src/serverRoute.ts | 661 + .../start-server-core/src/tanstack-start.d.ts | 5 + packages/start-server-core/src/undici.ts | 60 + .../tests/serverRoute.test-d.ts | 286 + packages/start-server-core/vite.config.ts | 5 + .../start-server-functions-client/README.md | 33 +- .../start-server-functions-fetcher/README.md | 33 +- .../package.json | 3 +- .../src/index.ts | 101 +- .../start-server-functions-handler/README.md | 33 - .../eslint.config.js | 20 - .../package.json | 73 - .../tsconfig.json | 7 - .../vite.config.ts | 22 - .../start-server-functions-server/README.md | 33 +- .../package.json | 3 +- packages/start-server-functions-ssr/README.md | 33 - .../eslint.config.js | 20 - .../start-server-functions-ssr/package.json | 73 - .../start-server-functions-ssr/src/index.ts | 37 - .../start-server-functions-ssr/tsconfig.json | 8 - .../tsconfigs/config.tsconfig.json | 10 - .../tsconfigs/router-manifest.tsconfig.json | 10 - packages/start/README.md | 33 - packages/start/eslint.config.js | 31 - packages/start/package.json | 156 - packages/start/src/api.tsx | 4 - packages/start/src/client.tsx | 4 - packages/start/src/config.tsx | 4 - packages/start/src/router-manifest.tsx | 4 - .../start/src/server-functions-client.tsx | 4 - .../start/src/server-functions-handler.tsx | 4 - .../start/src/server-functions-server.tsx | 4 - packages/start/src/server-functions-ssr.tsx | 4 - packages/start/src/server.tsx | 4 - packages/start/tsconfig.json | 8 - packages/start/vite.config.ts | 38 - pnpm-lock.yaml | 3288 +--- scripts/generateLabelerConfig.mjs | 5 +- scripts/publish.js | 40 +- 1660 files changed, 45248 insertions(+), 20445 deletions(-) delete mode 100644 docs/start/framework/react/api-routes.md create mode 100644 docs/start/framework/react/server-routes.md delete mode 100644 e2e/create-start/.gitignore delete mode 100644 e2e/create-start/package.json delete mode 100644 e2e/create-start/playwright.config.ts delete mode 100644 e2e/create-start/tests/templates/barebones.test.ts delete mode 100644 e2e/create-start/tsconfig.json delete mode 100644 e2e/create-start/utils/setup.ts create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx create mode 100644 e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx create mode 100644 e2e/react-router/basic/tests/params.spec.ts create mode 100644 e2e/react-start/basic-auth/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/basic-auth/app.config.ts delete mode 100644 e2e/react-start/basic-auth/src/client.tsx create mode 100644 e2e/react-start/basic-auth/src/tanstack-start.d.ts create mode 100644 e2e/react-start/basic-auth/vite.config.ts create mode 100644 e2e/react-start/basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/basic-react-query/app.config.ts delete mode 100644 e2e/react-start/basic-react-query/src/api.ts delete mode 100644 e2e/react-start/basic-react-query/src/client.tsx create mode 100644 e2e/react-start/basic-react-query/src/tanstack-start.d.ts create mode 100644 e2e/react-start/basic-react-query/vite.config.ts create mode 100644 e2e/react-start/basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/basic-rsc/app.config.ts delete mode 100644 e2e/react-start/basic-rsc/src/client.tsx create mode 100644 e2e/react-start/basic-rsc/src/tanstack-start.d.ts create mode 100644 e2e/react-start/basic-rsc/vite.config.ts create mode 100644 e2e/react-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/basic-tsr-config/app.config.ts delete mode 100644 e2e/react-start/basic-tsr-config/src/app/client.tsx create mode 100644 e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts create mode 100644 e2e/react-start/basic-tsr-config/vite.config.ts create mode 100644 e2e/react-start/basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/basic/app.config.ts delete mode 100644 e2e/react-start/basic/src/api.ts delete mode 100644 e2e/react-start/basic/src/client.tsx delete mode 100644 e2e/react-start/basic/src/ssr.tsx create mode 100644 e2e/react-start/basic/src/tanstack-start.d.ts create mode 100644 e2e/react-start/basic/vite.config.ts create mode 100644 e2e/react-start/clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/clerk-basic/app.config.ts rename e2e/react-start/clerk-basic/{package.json => package.disabled.json} (80%) delete mode 100644 e2e/react-start/clerk-basic/src/client.tsx create mode 100644 e2e/react-start/clerk-basic/src/server.tsx create mode 100644 e2e/react-start/clerk-basic/src/tanstack-start.d.ts create mode 100644 e2e/react-start/clerk-basic/vite.config.ts create mode 100644 e2e/react-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/scroll-restoration/app.config.ts delete mode 100644 e2e/react-start/scroll-restoration/src/api.ts delete mode 100644 e2e/react-start/scroll-restoration/src/client.tsx create mode 100644 e2e/react-start/scroll-restoration/src/tanstack-start.d.ts create mode 100644 e2e/react-start/scroll-restoration/vite.config.ts create mode 100644 e2e/react-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/server-functions/app.config.ts delete mode 100644 e2e/react-start/server-functions/src/client.tsx create mode 100644 e2e/react-start/server-functions/src/tanstack-start.d.ts create mode 100644 e2e/react-start/server-functions/vite.config.ts create mode 100644 e2e/react-start/website/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/react-start/website/app.config.ts delete mode 100644 e2e/react-start/website/src/client.tsx create mode 100644 e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx delete mode 100644 e2e/react-start/website/src/ssr.tsx create mode 100644 e2e/react-start/website/src/tanstack-start.d.ts create mode 100644 e2e/react-start/website/vite.config.ts create mode 100644 e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/solid-start/basic-tsr-config/app.config.ts delete mode 100644 e2e/solid-start/basic-tsr-config/src/app/client.tsx delete mode 100644 e2e/solid-start/basic-tsr-config/src/app/ssr.tsx create mode 100644 e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts create mode 100644 e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts create mode 100644 e2e/solid-start/basic-tsr-config/vite.config.ts create mode 100644 e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/solid-start/basic/app.config.ts delete mode 100644 e2e/solid-start/basic/src/api.ts delete mode 100644 e2e/solid-start/basic/src/client.tsx delete mode 100644 e2e/solid-start/basic/src/routes/api.users.ts delete mode 100644 e2e/solid-start/basic/src/routes/api/users.$id.ts create mode 100644 e2e/solid-start/basic/src/routes/api/users.$userId.ts create mode 100644 e2e/solid-start/basic/src/routes/api/users.ts delete mode 100644 e2e/solid-start/basic/src/ssr.tsx create mode 100644 e2e/solid-start/basic/src/tanstack-start.d.ts create mode 100644 e2e/solid-start/basic/src/vite-env.d.ts create mode 100644 e2e/solid-start/basic/vite.config.ts create mode 100644 e2e/solid-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/solid-start/scroll-restoration/app.config.ts delete mode 100644 e2e/solid-start/scroll-restoration/src/api.ts delete mode 100644 e2e/solid-start/scroll-restoration/src/client.tsx delete mode 100644 e2e/solid-start/scroll-restoration/src/ssr.tsx create mode 100644 e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts create mode 100644 e2e/solid-start/scroll-restoration/src/vite-env.d.ts create mode 100644 e2e/solid-start/scroll-restoration/vite.config.ts create mode 100644 e2e/solid-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/solid-start/server-functions/app.config.ts delete mode 100644 e2e/solid-start/server-functions/src/client.tsx delete mode 100644 e2e/solid-start/server-functions/src/ssr.tsx create mode 100644 e2e/solid-start/server-functions/src/tanstack-start.d.ts create mode 100644 e2e/solid-start/server-functions/src/vite-env.d.ts create mode 100644 e2e/solid-start/server-functions/vite.config.ts create mode 100644 e2e/solid-start/website/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 e2e/solid-start/website/app.config.ts delete mode 100644 e2e/solid-start/website/src/client.tsx delete mode 100644 e2e/solid-start/website/src/ssr.tsx create mode 100644 e2e/solid-start/website/src/tanstack-start.d.ts create mode 100644 e2e/solid-start/website/src/vite-env.d.ts create mode 100644 e2e/solid-start/website/vite.config.ts rename examples/react/basic-ssr-file-based/{package.json => package.disabled.json} (100%) rename examples/react/basic-ssr-streaming-file-based/{package.json => package.disabled.json} (100%) create mode 100644 examples/react/start-bare/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-bare/app.config.ts delete mode 100644 examples/react/start-bare/src/api.ts delete mode 100644 examples/react/start-bare/src/client.tsx create mode 100644 examples/react/start-bare/src/tanstack-start.d.ts create mode 100644 examples/react/start-bare/vite.config.ts create mode 100644 examples/react/start-basic-auth/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-basic-auth/app.config.ts delete mode 100644 examples/react/start-basic-auth/src/client.tsx rename e2e/react-start/basic-auth/src/ssr.tsx => examples/react/start-basic-auth/src/server.ts (100%) delete mode 100644 examples/react/start-basic-auth/src/ssr.tsx create mode 100644 examples/react/start-basic-auth/src/tanstack-start.d.ts create mode 100644 examples/react/start-basic-auth/vite.config.ts create mode 100644 examples/react/start-basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-basic-react-query/app.config.ts delete mode 100644 examples/react/start-basic-react-query/src/client.tsx rename e2e/react-start/basic-react-query/src/ssr.tsx => examples/react/start-basic-react-query/src/server.ts (100%) delete mode 100644 examples/react/start-basic-react-query/src/ssr.tsx create mode 100644 examples/react/start-basic-react-query/src/tanstack-start.d.ts create mode 100644 examples/react/start-basic-react-query/vite.config.ts create mode 100644 examples/react/start-basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-basic-rsc/app.config.ts delete mode 100644 examples/react/start-basic-rsc/src/client.tsx rename e2e/react-start/basic-rsc/src/ssr.tsx => examples/react/start-basic-rsc/src/server.ts (100%) delete mode 100644 examples/react/start-basic-rsc/src/ssr.tsx create mode 100644 examples/react/start-basic-rsc/src/tanstack-start.d.ts create mode 100644 examples/react/start-basic-rsc/vite.config.ts create mode 100644 examples/react/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-basic-static/app.config.ts delete mode 100644 examples/react/start-basic-static/src/client.tsx rename e2e/react-start/scroll-restoration/src/ssr.tsx => examples/react/start-basic-static/src/server.ts (100%) delete mode 100644 examples/react/start-basic-static/src/ssr.tsx create mode 100644 examples/react/start-basic-static/src/tanstack-start.d.ts create mode 100644 examples/react/start-basic-static/vite.config.ts create mode 100644 examples/react/start-basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-basic/app.config.ts delete mode 100644 examples/react/start-basic/src/api.ts delete mode 100644 examples/react/start-basic/src/client.tsx delete mode 100644 examples/react/start-basic/src/global-middleware.ts rename examples/react/start-basic/src/routes/api/{users.$id.ts => users.$userId.ts} (55%) create mode 100644 examples/react/start-basic/src/routes/customScript[.]js.ts rename examples/react/start-basic/src/routes/{posts.route.tsx => posts.tsx} (82%) rename examples/react/start-basic/src/routes/{users.route.tsx => users.tsx} (63%) delete mode 100644 examples/react/start-basic/src/ssr.tsx create mode 100644 examples/react/start-basic/src/tanstack-start.d.ts create mode 100644 examples/react/start-basic/vite.config.ts create mode 100644 examples/react/start-clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-clerk-basic/app.config.ts delete mode 100644 examples/react/start-clerk-basic/src/client.tsx rename e2e/react-start/clerk-basic/src/ssr.tsx => examples/react/start-clerk-basic/src/server.ts (100%) delete mode 100644 examples/react/start-clerk-basic/src/ssr.tsx create mode 100644 examples/react/start-clerk-basic/src/tanstack-start.d.ts create mode 100644 examples/react/start-clerk-basic/vite.config.ts create mode 100644 examples/react/start-convex-trellaux/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-convex-trellaux/app.config.ts delete mode 100644 examples/react/start-convex-trellaux/src/client.tsx rename e2e/react-start/server-functions/src/ssr.tsx => examples/react/start-convex-trellaux/src/server.ts (100%) delete mode 100644 examples/react/start-convex-trellaux/src/ssr.tsx create mode 100644 examples/react/start-convex-trellaux/src/tanstack-start.d.ts create mode 100644 examples/react/start-convex-trellaux/vite.config.ts create mode 100644 examples/react/start-counter/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-counter/app.config.ts delete mode 100644 examples/react/start-counter/src/client.tsx rename examples/react/{start-bare/src/ssr.tsx => start-counter/src/server.ts} (100%) delete mode 100644 examples/react/start-counter/src/ssr.tsx create mode 100644 examples/react/start-counter/src/tanstack-start.d.ts create mode 100644 examples/react/start-counter/vite.config.ts create mode 100644 examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-large/app.config.ts delete mode 100644 examples/react/start-large/src/client.tsx delete mode 100644 examples/react/start-large/src/ssr.tsx create mode 100644 examples/react/start-large/src/tanstack-start.d.ts create mode 100644 examples/react/start-large/vite.config.ts create mode 100644 examples/react/start-material-ui/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-material-ui/app.config.ts create mode 100644 examples/react/start-material-ui/src/tanstack-start.d.ts create mode 100644 examples/react/start-material-ui/vite.config.ts create mode 100644 examples/react/start-supabase-basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-supabase-basic/app.config.ts delete mode 100644 examples/react/start-supabase-basic/src/client.tsx delete mode 100644 examples/react/start-supabase-basic/src/ssr.tsx create mode 100644 examples/react/start-supabase-basic/src/tanstack-start.d.ts create mode 100644 examples/react/start-supabase-basic/vite.config.ts create mode 100644 examples/react/start-trellaux/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-trellaux/app.config.ts delete mode 100644 examples/react/start-trellaux/src/client.tsx rename e2e/react-start/basic-tsr-config/src/app/ssr.tsx => examples/react/start-trellaux/src/server.ts (87%) delete mode 100644 examples/react/start-trellaux/src/ssr.tsx create mode 100644 examples/react/start-trellaux/src/tanstack-start.d.ts create mode 100644 examples/react/start-trellaux/vite.config.ts create mode 100644 examples/react/start-workos/.prettierignore create mode 100644 examples/react/start-workos/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/react/start-workos/app.config.ts create mode 100644 examples/react/start-workos/src/tanstack-start.d.ts create mode 100644 examples/react/start-workos/vite.config.ts create mode 100644 examples/solid/start-bare/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/solid/start-bare/app.config.ts delete mode 100644 examples/solid/start-bare/src/client.tsx delete mode 100644 examples/solid/start-bare/src/ssr.tsx create mode 100644 examples/solid/start-bare/src/tanstack-start.d.ts create mode 100644 examples/solid/start-bare/vite.config.ts create mode 100644 examples/solid/start-basic/.tanstack-start/server-routes/routeTree.gen.ts delete mode 100644 examples/solid/start-basic/app.config.ts delete mode 100644 examples/solid/start-basic/src/api.ts delete mode 100644 examples/solid/start-basic/src/client.tsx delete mode 100644 examples/solid/start-basic/src/routes/api/users.$id.ts create mode 100644 examples/solid/start-basic/src/routes/api/users.$userId.ts delete mode 100644 examples/solid/start-basic/src/ssr.tsx create mode 100644 examples/solid/start-basic/src/tanstack-start.d.ts create mode 100644 examples/solid/start-basic/vite.config.ts delete mode 100644 packages/react-router/tests/index.test.tsx delete mode 100644 packages/react-start-config/README.md delete mode 100644 packages/react-start-config/eslint.config.js delete mode 100644 packages/react-start-config/package.json delete mode 100644 packages/react-start-config/src/index.ts delete mode 100644 packages/react-start-config/src/schema.ts delete mode 100644 packages/react-start-config/src/vinxi-file-router.ts delete mode 100644 packages/react-start-config/tsconfig.json delete mode 100644 packages/react-start-plugin/src/compilers.ts create mode 100644 packages/react-start-plugin/src/schema.ts delete mode 100644 packages/react-start-router-manifest/README.md delete mode 100644 packages/react-start-router-manifest/eslint.config.js delete mode 100644 packages/react-start-router-manifest/package.json delete mode 100644 packages/react-start-router-manifest/src/index.ts delete mode 100644 packages/react-start-router-manifest/tsconfig.json delete mode 100644 packages/react-start-router-manifest/vite.config.ts delete mode 100644 packages/react-start/src/api.tsx delete mode 100644 packages/react-start/src/config.tsx create mode 100644 packages/react-start/src/plugin-vite.ts delete mode 100644 packages/react-start/src/router-manifest.tsx delete mode 100644 packages/react-start/src/server-functions-handler.tsx delete mode 100644 packages/react-start/src/server-functions-ssr.tsx create mode 100644 packages/router-generator/tests/generator/dot-escaped/routeTree.snapshot.ts create mode 100644 packages/router-generator/tests/generator/dot-escaped/routes/__root.tsx create mode 100644 packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.double[.]ext[.]js.tsx create mode 100644 packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.script[.]js.tsx create mode 100644 packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.tsx create mode 100644 packages/router-generator/tests/generator/dot-escaped/routes/script[.]js.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routeTree.snapshot.ts create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/__root.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/index.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/$.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/prefix{$}.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}[.]suffix.tsx create mode 100644 packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}suffix.tsx create mode 100644 packages/router-plugin/src/core/route-autoimport-plugin.ts create mode 100644 packages/router-plugin/src/core/route-hmr-statement.ts create mode 100644 packages/router-plugin/src/core/router-hmr-plugin.ts create mode 100644 packages/router-plugin/src/core/utils.ts delete mode 100644 packages/solid-start-client/src/routesManifest.ts delete mode 100644 packages/solid-start-config/README.md delete mode 100644 packages/solid-start-config/eslint.config.js delete mode 100644 packages/solid-start-config/package.json delete mode 100644 packages/solid-start-config/src/index.ts delete mode 100644 packages/solid-start-config/src/schema.ts delete mode 100644 packages/solid-start-config/src/vinxi-file-router.ts delete mode 100644 packages/solid-start-config/tsconfig.json delete mode 100644 packages/solid-start-plugin/src/compilers.ts create mode 100644 packages/solid-start-plugin/src/schema.ts delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/createServerFn.test.ts delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/envOnly.test.ts delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx delete mode 100644 packages/solid-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx delete mode 100644 packages/solid-start-router-manifest/README.md delete mode 100644 packages/solid-start-router-manifest/eslint.config.js delete mode 100644 packages/solid-start-router-manifest/package.json delete mode 100644 packages/solid-start-router-manifest/src/index.ts delete mode 100644 packages/solid-start-router-manifest/tsconfig.json delete mode 100644 packages/solid-start-router-manifest/vite.config.ts delete mode 100644 packages/solid-start/src/api.tsx delete mode 100644 packages/solid-start/src/config.tsx create mode 100644 packages/solid-start/src/plugin-vite.ts delete mode 100644 packages/solid-start/src/router-manifest.tsx delete mode 100644 packages/solid-start/src/server-functions-handler.tsx delete mode 100644 packages/solid-start/src/server-functions-ssr.tsx delete mode 100644 packages/start-api-routes/README.md delete mode 100644 packages/start-api-routes/eslint.config.js delete mode 100644 packages/start-api-routes/src/index.ts delete mode 100644 packages/start-api-routes/tsconfig.json delete mode 100644 packages/start-api-routes/vite.config.ts delete mode 100644 packages/start-config/README.md delete mode 100644 packages/start-config/eslint.config.js delete mode 100644 packages/start-config/package.json delete mode 100644 packages/start-config/src/index.ts delete mode 100644 packages/start-config/src/schema.ts delete mode 100644 packages/start-config/src/vinxi-file-router.ts delete mode 100644 packages/start-config/tsconfig.json create mode 100644 packages/start-plugin-core/README.md create mode 100644 packages/start-plugin-core/eslint.config.js rename packages/{start-api-routes => start-plugin-core}/package.json (66%) create mode 100644 packages/start-plugin-core/src/compilers.ts create mode 100644 packages/start-plugin-core/src/extractHtmlScripts.ts create mode 100644 packages/start-plugin-core/src/index.ts create mode 100644 packages/start-plugin-core/src/nitro/build-nitro.ts create mode 100644 packages/start-plugin-core/src/nitro/build-sitemap.ts create mode 100644 packages/start-plugin-core/src/nitro/dev-server-plugin.ts create mode 100644 packages/start-plugin-core/src/nitro/nitro-plugin.ts create mode 100644 packages/start-plugin-core/src/plugin.ts create mode 100644 packages/start-plugin-core/src/prerender.ts create mode 100644 packages/start-plugin-core/src/queue.ts create mode 100644 packages/start-plugin-core/src/routesManifestPlugin.ts create mode 100644 packages/start-plugin-core/src/schema.ts create mode 100644 packages/start-plugin-core/src/start-compiler-plugin.ts create mode 100644 packages/start-plugin-core/src/start-server-routes-plugin/config.ts create mode 100644 packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts create mode 100644 packages/start-plugin-core/src/start-server-routes-plugin/template.ts rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/createIsomorphicFn.test.ts (93%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/createMiddleware.test.ts (88%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createMiddleware/test-files/createMiddlewareValidator.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/createServerFn.test.ts (95%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/client/createServerFnValidator.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/snapshots/server/createServerFnValidator.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/test-files/createServerFnDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/test-files/createServerFnStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/createServerFn/test-files/createServerFnValidator.tsx (100%) rename packages/{solid-start-plugin/tests/createMiddleware/createMiddleware.test.ts => start-plugin-core/tests/createServerRoute/createServerRoute.test.ts} (86%) rename packages/{react-start-client/src/routesManifest.ts => start-plugin-core/tests/createServerRoute/snapshots/client/nonImported.tsx} (100%) create mode 100644 packages/start-plugin-core/tests/createServerRoute/snapshots/server/nonImported.tsx create mode 100644 packages/start-plugin-core/tests/createServerRoute/test-files/nonImported.tsx rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/envOnly.test.ts (91%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/client/envOnlyDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/client/envOnlyStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/server/envOnlyDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/snapshots/server/envOnlyStarImport.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/test-files/envOnlyDestructured.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/test-files/envOnlyDestructuredRename.tsx (100%) rename packages/{react-start-plugin => start-plugin-core}/tests/envOnly/test-files/envOnlyStarImport.tsx (100%) create mode 100644 packages/start-plugin-core/tsconfig.json rename packages/{start-server-functions-ssr => start-plugin-core}/vite.config.ts (75%) create mode 100644 packages/start-server-core/src/router-manifest.ts rename packages/{start-server-functions-handler/src/index.ts => start-server-core/src/server-functions-handler.ts} (76%) create mode 100644 packages/start-server-core/src/serverRoute.ts create mode 100644 packages/start-server-core/src/tanstack-start.d.ts create mode 100644 packages/start-server-core/src/undici.ts create mode 100644 packages/start-server-core/tests/serverRoute.test-d.ts delete mode 100644 packages/start-server-functions-handler/README.md delete mode 100644 packages/start-server-functions-handler/eslint.config.js delete mode 100644 packages/start-server-functions-handler/package.json delete mode 100644 packages/start-server-functions-handler/tsconfig.json delete mode 100644 packages/start-server-functions-handler/vite.config.ts delete mode 100644 packages/start-server-functions-ssr/README.md delete mode 100644 packages/start-server-functions-ssr/eslint.config.js delete mode 100644 packages/start-server-functions-ssr/package.json delete mode 100644 packages/start-server-functions-ssr/src/index.ts delete mode 100644 packages/start-server-functions-ssr/tsconfig.json delete mode 100644 packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json delete mode 100644 packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json delete mode 100644 packages/start/README.md delete mode 100644 packages/start/eslint.config.js delete mode 100644 packages/start/package.json delete mode 100644 packages/start/src/api.tsx delete mode 100644 packages/start/src/client.tsx delete mode 100644 packages/start/src/config.tsx delete mode 100644 packages/start/src/router-manifest.tsx delete mode 100644 packages/start/src/server-functions-client.tsx delete mode 100644 packages/start/src/server-functions-handler.tsx delete mode 100644 packages/start/src/server-functions-server.tsx delete mode 100644 packages/start/src/server-functions-ssr.tsx delete mode 100644 packages/start/src/server.tsx delete mode 100644 packages/start/tsconfig.json delete mode 100644 packages/start/vite.config.ts diff --git a/.github/labeler.yml b/.github/labeler.yml index 16ac3b06ef..fe89bd8c8d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -14,26 +14,12 @@ - 'packages/react-router-with-query/**/*' 'package: react-start': - 'packages/react-start/**/*' -'package: start-api-routes': - - 'packages/start-api-routes/**/*' 'package: react-start-client': - 'packages/react-start-client/**/*' -'package: react-start-config': - - 'packages/react-start-config/**/*' 'package: react-start-plugin': - 'packages/react-start-plugin/**/*' -'package: react-start-router-manifest': - - 'packages/react-start-router-manifest/**/*' 'package: react-start-server': - 'packages/react-start-server/**/*' -'package: start-server-functions-client': - - 'packages/start-server-functions-client/**/*' -'package: start-server-functions-fetcher': - - 'packages/start-server-functions-fetcher/**/*' -'package: start-server-functions-handler': - - 'packages/start-server-functions-handler/**/*' -'package: start-server-functions-ssr': - - 'packages/start-server-functions-ssr/**/*' 'package: router-cli': - 'packages/router-cli/**/*' 'package: router-core': @@ -60,18 +46,20 @@ - 'packages/solid-start/**/*' 'package: solid-start-client': - 'packages/solid-start-client/**/*' -'package: solid-start-config': - - 'packages/solid-start-config/**/*' 'package: solid-start-plugin': - 'packages/solid-start-plugin/**/*' -'package: solid-start-router-manifest': - - 'packages/solid-start-router-manifest/**/*' 'package: solid-start-server': - 'packages/solid-start-server/**/*' -'package: start': - - 'packages/start/**/*' -'package: start-config': - - 'packages/start-config/**/*' +'package: start-client-core': + - 'packages/start-client-core/**/*' +'package: start-plugin-core': + - 'packages/start-plugin-core/**/*' +'package: start-server-core': + - 'packages/start-server-core/**/*' +'package: start-server-functions-client': + - 'packages/start-server-functions-client/**/*' +'package: start-server-functions-fetcher': + - 'packages/start-server-functions-fetcher/**/*' 'package: start-server-functions-server': - 'packages/start-server-functions-server/**/*' 'package: valibot-adapter': diff --git a/.gitignore b/.gitignore index 5cc3e94113..d2b926625e 100644 --- a/.gitignore +++ b/.gitignore @@ -61,12 +61,14 @@ nx-cloud.env gpt/db.json app.config.timestamp-* +vite.config.timestamp-* vite.config.js.timestamp-* vite.config.ts.timestamp-* app.config.js.timestamp-* app.config.ts.timestamp-* app.config.timestamp_* +vite.config.timestamp_* vite.config.js.timestamp_* vite.config.ts.timestamp_* app.config.js.timestamp_* @@ -76,4 +78,5 @@ app.config.ts.timestamp_* # Handling VSCode settings /.vscode/ -!/examples/react/**/.vscode/settings.json \ No newline at end of file +!/examples/react/**/.vscode/settings.json +**/.tanstack-start/build \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index d285f8937d..25c93015ed 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,7 +7,6 @@ pnpm-lock.yaml **/snapshots **/.vercel -**/.vinxi **/.output **/node_modules node_modules diff --git a/docs/router/api/file-based-routing.md b/docs/router/api/file-based-routing.md index 0e165665c0..777d9f3116 100644 --- a/docs/router/api/file-based-routing.md +++ b/docs/router/api/file-based-routing.md @@ -132,19 +132,6 @@ By default, this value is set to `false`. > [!TIP] > You should ignore the path of your generated route tree file from your linter and formatter to avoid conflicts. -### `apiBase` - -As a framework, [TanStack Start](/start) supports the concept of API routes. This option configures the base path for API routes. - -By default, this value is set to `/api`. - -This means that all API routes will be prefixed with `/api`. - -This configuration value is only useful if you are using TanStack Start. - -> [!IMPORTANT] -> This default value may conflict with your own project's routing if you planned on having a normal route with the same base path. You can change this value to avoid conflicts. - ### `autoCodeSplitting` This feature is only available is you are using the TanStack Router Bundler Plugin. diff --git a/docs/router/eslint/create-route-property-order.md b/docs/router/eslint/create-route-property-order.md index 3ce5102013..c0fee218d2 100644 --- a/docs/router/eslint/create-route-property-order.md +++ b/docs/router/eslint/create-route-property-order.md @@ -29,7 +29,7 @@ Examples of **incorrect** code for this rule: /* eslint "@tanstack/router/create-route-property-order": "warn" */ import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/foo/bar/$id')({ +export const Route = createFileRoute({ loader: async ({context}) => { await context.queryClient.ensureQueryData(getQueryOptions(context.hello)), }, @@ -43,7 +43,7 @@ Examples of **correct** code for this rule: /* eslint "@tanstack/router/create-route-property-order": "warn" */ import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/foo/bar/$id')({ +export const Route = createFileRoute({ beforeLoad: () => ({hello: 'world'}), loader: async ({context}) => { await context.queryClient.ensureQueryData(getQueryOptions(context.hello)), diff --git a/docs/router/framework/react/api/router/createFileRouteFunction.md b/docs/router/framework/react/api/router/createFileRouteFunction.md index 945e713075..0986d6ccff 100644 --- a/docs/router/framework/react/api/router/createFileRouteFunction.md +++ b/docs/router/framework/react/api/router/createFileRouteFunction.md @@ -26,7 +26,7 @@ A new function that accepts a single argument of type [`RouteOptions`](./RouteOp ```tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ loader: () => { return 'Hello World' }, diff --git a/docs/router/framework/react/api/router/retainSearchParamsFunction.md b/docs/router/framework/react/api/router/retainSearchParamsFunction.md index 97e411b29c..d4bc185203 100644 --- a/docs/router/framework/react/api/router/retainSearchParamsFunction.md +++ b/docs/router/framework/react/api/router/retainSearchParamsFunction.md @@ -39,7 +39,7 @@ const searchSchema = z.object({ two: z.string().optional(), }) -export const Route = createFileRoute('/hello')({ +export const Route = createFileRoute({ validateSearch: zodValidator(searchSchema), search: { middlewares: [retainSearchParams(true)], diff --git a/docs/router/framework/react/api/router/stripSearchParamsFunction.md b/docs/router/framework/react/api/router/stripSearchParamsFunction.md index 05b9b02e7f..439a1796d2 100644 --- a/docs/router/framework/react/api/router/stripSearchParamsFunction.md +++ b/docs/router/framework/react/api/router/stripSearchParamsFunction.md @@ -30,7 +30,7 @@ const searchSchema = z.object({ two: z.string().default(defaultValues.two), }) -export const Route = createFileRoute('/hello')({ +export const Route = createFileRoute({ validateSearch: zodValidator(searchSchema), search: { // strip default values @@ -68,7 +68,7 @@ const searchSchema = z.object({ two: z.string().default('xyz'), }) -export const Route = createFileRoute('/hello')({ +export const Route = createFileRoute({ validateSearch: zodValidator(searchSchema), search: { // remove all search params diff --git a/docs/router/framework/react/decisions-on-dx.md b/docs/router/framework/react/decisions-on-dx.md index 405db4c6eb..a38716f624 100644 --- a/docs/router/framework/react/decisions-on-dx.md +++ b/docs/router/framework/react/decisions-on-dx.md @@ -225,7 +225,7 @@ Let's take a look at how the route configuration for the previous example would // src/routes/posts/index.ts import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: () => 'Posts index component goes here!!!', }) ``` diff --git a/docs/router/framework/react/guide/code-splitting.md b/docs/router/framework/react/guide/code-splitting.md index e2646e402c..e57c7d7fe0 100644 --- a/docs/router/framework/react/guide/code-splitting.md +++ b/docs/router/framework/react/guide/code-splitting.md @@ -81,11 +81,11 @@ To enable automatic code-splitting, you just need to add the following to the co // vite.config.ts import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ // ... autoCodeSplitting: true, }), diff --git a/docs/router/framework/react/guide/external-data-loading.md b/docs/router/framework/react/guide/external-data-loading.md index e2d0e1eb53..2b1ebf78f1 100644 --- a/docs/router/framework/react/guide/external-data-loading.md +++ b/docs/router/framework/react/guide/external-data-loading.md @@ -48,7 +48,7 @@ Here is a naive illustration (don't do this) of using a Route's `loader` option // src/routes/posts.tsx let postsCache = [] -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => { postsCache = await fetchPosts() }, @@ -80,7 +80,7 @@ const postsQueryOptions = queryOptions({ queryFn: () => fetchPosts(), }) -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ // Use the `loader` option to ensure that the data is loaded loader: () => queryClient.ensureQueryData(postsQueryOptions), component: () => { @@ -105,7 +105,7 @@ export const Route = createFileRoute('/posts')({ When an error occurs while using `suspense` with `Tanstack Query`, you'll need to let queries know that you want to try again when re-rendering. This can be done by using the `reset` function provided by the `useQueryErrorResetBoundary` hook. We can invoke this function in an effect as soon as the error component mounts. This will make sure that the query is reset and will try to fetch data again when the route component is rendered again. This will also cover cases where users navigate away from our route instead of clicking the `retry` button. ```tsx -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: () => queryClient.ensureQueryData(postsQueryOptions), errorComponent: ({ error, reset }) => { const router = useRouter() diff --git a/docs/router/framework/react/guide/router-context.md b/docs/router/framework/react/guide/router-context.md index 561b1e2f00..f54e7a7b23 100644 --- a/docs/router/framework/react/guide/router-context.md +++ b/docs/router/framework/react/guide/router-context.md @@ -92,7 +92,7 @@ Once you have defined the router context type, you can use it in your route defi ```tsx // src/routes/todos.tsx -export const Route = createFileRoute('/todos')({ +export const Route = createFileRoute({ component: Todos, loader: ({ context }) => fetchTodosByUserId(context.user.id), }) @@ -122,7 +122,7 @@ Then, in your route: ```tsx // src/routes/todos.tsx -export const Route = createFileRoute('/todos')({ +export const Route = createFileRoute({ component: Todos, loader: ({ context }) => context.fetchTodosByUserId(context.userId), }) @@ -158,7 +158,7 @@ Then, in your route: ```tsx // src/routes/todos.tsx -export const Route = createFileRoute('/todos')({ +export const Route = createFileRoute({ component: Todos, loader: async ({ context }) => { await context.queryClient.ensureQueryData({ @@ -234,7 +234,7 @@ So, now in our route's `loader` function, we can access the `networkStrength` ho ```tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: Posts, loader: ({ context }) => { if (context.networkStrength === 'STRONG') { @@ -282,7 +282,7 @@ const router = createRouter({ ```tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/todos')({ +export const Route = createFileRoute({ component: Todos, beforeLoad: () => { return { diff --git a/docs/router/framework/react/guide/tanstack-start.md b/docs/router/framework/react/guide/tanstack-start.md index 9704d721c4..a56a204e28 100644 --- a/docs/router/framework/react/guide/tanstack-start.md +++ b/docs/router/framework/react/guide/tanstack-start.md @@ -47,15 +47,12 @@ TanStack Start is powered by the following packages and need to be installed as - [@tanstack/start](https://github.com/tanstack/start) - [@tanstack/react-router](https://tanstack.com/router) -- [Vinxi](https://vinxi.vercel.app/) - -> [!NOTE] -> Vinxi is a temporary dependency that will be replaced by a simple vite plugin or a dedicated Start CLI. +- [Vite](https://vite.dev/) To install them, run: ```shell -npm i @tanstack/react-start @tanstack/react-router vinxi +npm i @tanstack/react-start @tanstack/react-router vite ``` You'll also need React and the Vite React plugin, so install their dependencies as well: @@ -72,16 +69,16 @@ npm i -D typescript @types/react @types/react-dom # Update Configuration Files -We'll then update our `package.json` to use Vinxi's CLI and set `"type": "module"`: +We'll then update our `package.json` to use Vite's CLI and set `"type": "module"`: ```jsonc { // ... "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", + "dev": "vite dev", + "build": "vite build", + "start": "vite start", }, } ``` @@ -97,12 +94,10 @@ export default defineConfig({}) # Add the Basic Templating -There are four required files for TanStack Start usage: +There are 2 required files for TanStack Start usage: 1. The router configuration -2. The server entry point -3. The client entry point -4. The root of your application +2. The root of your application Once configuration is done, we'll have a file tree that looks like the following: @@ -111,10 +106,8 @@ Once configuration is done, we'll have a file tree that looks like the following ├── app/ │ ├── routes/ │ │ └── `__root.tsx` -│ ├── `client.tsx` │ ├── `router.tsx` │ ├── `routeTree.gen.ts` -│ └── `ssr.tsx` ├── `.gitignore` ├── `app.config.ts` ├── `package.json` @@ -123,7 +116,7 @@ Once configuration is done, we'll have a file tree that looks like the following ## The Router Configuration -This is the file that will dictate the behavior of TanStack Router used within Start. Here, you can configure everything +This is the file that will dictate the behavior of TanStack Router used within Start for both the server and the client. Here, you can configure everything from the default [preloading functionality](./preloading.md) to [caching staleness](./data-loading.md). ```tsx @@ -149,52 +142,9 @@ declare module '@tanstack/react-router' { > `routeTree.gen.ts` is not a file you're expected to have at this point. > It will be generated when you run TanStack Start (via `npm run dev` or `npm run start`) for the first time. -## The Server Entry Point - -As TanStack Start is an [SSR](https://unicorn-utterances.com/posts/what-is-ssr-and-ssg) framework, we need to pipe this router -information to our server entry point: - -```tsx -// app/ssr.tsx -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) -``` - -This allows us to know what routes and loaders we need to execute when the user hits a given route. - -## The Client Entry Point - -Now we need a way to hydrate our client-side JavaScript once the route resolves to the client. We do this by piping the same -router information to our client entry point: - -```tsx -// app/client.tsx -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter({ - scrollRestoration: true, -}) - -hydrateRoot(document!, ) -``` - -This enables us to kick off client-side routing once the user's initial server request has fulfilled. - ## The Root of Your Application -Finally, we need to create the root of our application. This is the entry point for all other routes. The code in this file will wrap all other routes in the application. +Finally, we need to create the root of our application. This is the entry point for all application routes. The code in this file will wrap all other routes in the application. ```tsx // app/routes/__root.tsx diff --git a/docs/router/framework/react/migrate-from-react-location.md b/docs/router/framework/react/migrate-from-react-location.md index 100d614cae..ed5914b41f 100644 --- a/docs/router/framework/react/migrate-from-react-location.md +++ b/docs/router/framework/react/migrate-from-react-location.md @@ -49,11 +49,11 @@ And add it to your `vite.config.js`: ```js import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' export default defineConfig({ // ... - plugins: [TanStackRouterVite(), react()], + plugins: [tanstackRouter(), react()], }) ``` @@ -112,7 +112,7 @@ export const Route = createRootRoute({ // src/routes/index.tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Index, }) ``` @@ -125,7 +125,7 @@ export const Route = createFileRoute('/')({ // src/routes/posts.tsx import { createFileRoute, Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: Posts, loader: async () => { const posts = await fetchPosts() @@ -164,7 +164,7 @@ function Posts() { // src/routes/posts.index.tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndex, }) ``` @@ -177,7 +177,7 @@ export const Route = createFileRoute('/posts/')({ // src/routes/posts.$postId.tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ component: PostsId, loader: async ({ params: { postId } }) => { const post = await fetchPost(postId) diff --git a/docs/router/framework/react/overview.md b/docs/router/framework/react/overview.md index be83513a79..9e064cf0a1 100644 --- a/docs/router/framework/react/overview.md +++ b/docs/router/framework/react/overview.md @@ -42,7 +42,7 @@ It's probably no surprise at this point that picking a router is so important th **Does this mean that TanStack Router is a framework?** -TanStack Router itself is not a "framework" in the traditional sense, since it doesn't address a few other common full-stack concerns. However TanStack Router has been designed to be upgradable to a full-stack framework when used in conjunction with other tools that address bundling, deployments, and server-side-specific functionality. This is why we are currently developing [TanStack Start](https://tanstack.com/start), a full-stack framework that is built on top of TanStack Router and tools like Nitro, and Vite. +TanStack Router itself is not a "framework" in the traditional sense, since it doesn't address a few other common full-stack concerns. However TanStack Router has been designed to be upgradable to a full-stack framework when used in conjunction with other tools that address bundling, deployments, and server-side-specific functionality. This is why we are currently developing [TanStack Start](https://tanstack.com/start), a full-stack framework that is built on top of TanStack Router and Vite. For a deeper dive on the history of TanStack Router, feel free to read [TanStack Router's History](./decisions-on-dx.md#tanstack-routers-origin-story). diff --git a/docs/router/framework/react/quick-start.md b/docs/router/framework/react/quick-start.md index b9264f8742..83a36555e2 100644 --- a/docs/router/framework/react/quick-start.md +++ b/docs/router/framework/react/quick-start.md @@ -44,13 +44,17 @@ deno add npm:@tanstack/react-router npm:@tanstack/router-plugin npm:@tanstack/re // vite.config.ts import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ // Please make sure that '@tanstack/router-plugin' is passed before '@vitejs/plugin-react' - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), react(), // ..., ], diff --git a/docs/router/framework/react/routing/installation-with-rspack.md b/docs/router/framework/react/routing/installation-with-rspack.md index b118773f86..820254384d 100644 --- a/docs/router/framework/react/routing/installation-with-rspack.md +++ b/docs/router/framework/react/routing/installation-with-rspack.md @@ -80,6 +80,6 @@ When using the TanStack Router Plugin with Rspack (or Rsbuild) for File-based ro } ``` -If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `TanStackRouterVite` function. +If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-vite.md b/docs/router/framework/react/routing/installation-with-vite.md index 00dc2e37d8..a860279372 100644 --- a/docs/router/framework/react/routing/installation-with-vite.md +++ b/docs/router/framework/react/routing/installation-with-vite.md @@ -16,13 +16,17 @@ Once installed, you'll need to add the plugin to your Vite configuration. // vite.config.ts import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ // Please make sure that '@tanstack/router-plugin' is passed before '@vitejs/plugin-react' - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), react(), // ... ], @@ -82,6 +86,6 @@ When using the TanStack Router Plugin with Vite for File-based routing, it comes } ``` -If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `TanStackRouterVite` function. +If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/routing-concepts.md b/docs/router/framework/react/routing/routing-concepts.md index 38d9ae5cd9..8ba6969379 100644 --- a/docs/router/framework/react/routing/routing-concepts.md +++ b/docs/router/framework/react/routing/routing-concepts.md @@ -13,7 +13,7 @@ All other routes, other than the [Root Route](#the-root-route), are configured u ```tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: PostsComponent, }) ``` @@ -71,7 +71,7 @@ Let's take a look at an `/about` route: // about.tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: AboutComponent, }) @@ -93,7 +93,7 @@ Let's take a look at an index route for a `/posts` URL: import { createFileRoute } from '@tanstack/react-router' // Note the trailing slash, which is used to target index routes -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) @@ -113,7 +113,7 @@ These params are then usable in your route's configuration and components! Let's ```tsx import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ // In a loader loader: ({ params }) => fetchPost(params.postId), // Or in a component @@ -172,7 +172,7 @@ This tree structure is used to wrap the child routes with a layout component: ```tsx import { Outlet, createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/app')({ +export const Route = createFileRoute({ component: AppLayoutComponent, }) @@ -243,7 +243,7 @@ The `_pathlessLayout.tsx` route is used to wrap the child routes with a Pathless ```tsx import { Outlet, createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/docs/router/framework/react/routing/virtual-file-routes.md b/docs/router/framework/react/routing/virtual-file-routes.md index d7721989d8..f56fb87891 100644 --- a/docs/router/framework/react/routing/virtual-file-routes.md +++ b/docs/router/framework/react/routing/virtual-file-routes.md @@ -53,12 +53,13 @@ If you're using the `TanStackRouter` plugin for Vite/Rspack/Webpack, you can con // vite.config.ts import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', + verboseFileRoutes: false, virtualRouteConfig: './routes.ts', }), react(), @@ -72,7 +73,7 @@ Or, you choose to define the virtual routes directly in the configuration: // vite.config.ts import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import { rootRoute } from '@tanstack/virtual-file-routes' const routes = rootRoute('root.tsx', [ @@ -80,7 +81,7 @@ const routes = rootRoute('root.tsx', [ ]) export default defineConfig({ - plugins: [TanStackRouterVite({ virtualRouteConfig: routes }), react()], + plugins: [tanstackRouter({ virtualRouteConfig: routes }), react()], }) ``` diff --git a/docs/router/framework/solid/quick-start.md b/docs/router/framework/solid/quick-start.md index a831b6de1d..4dd822540d 100644 --- a/docs/router/framework/solid/quick-start.md +++ b/docs/router/framework/solid/quick-start.md @@ -44,12 +44,16 @@ deno add npm:@tanstack/solid-router npm:@tanstack/router-plugin npm:@tanstack/so // vite.config.ts import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ + target: 'solid', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), solid(), // ..., ], diff --git a/docs/router/framework/solid/routing/file-based-routing.md b/docs/router/framework/solid/routing/file-based-routing.md index ffdebc1893..6c15db448e 100644 --- a/docs/router/framework/solid/routing/file-based-routing.md +++ b/docs/router/framework/solid/routing/file-based-routing.md @@ -24,12 +24,16 @@ Once installed, you'll need to add the plugin to your Vite configuration. // vite.config.ts import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ + target: 'solid', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), solid(), // ... ], diff --git a/docs/router/framework/solid/routing/installation-with-vite.md b/docs/router/framework/solid/routing/installation-with-vite.md index 7c05aaf581..7da230cf16 100644 --- a/docs/router/framework/solid/routing/installation-with-vite.md +++ b/docs/router/framework/solid/routing/installation-with-vite.md @@ -16,12 +16,16 @@ Once installed, you'll need to add the plugin to your Vite configuration. // vite.config.ts import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ + target: 'solid', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), solid(), // ... ], diff --git a/docs/start/config.json b/docs/start/config.json index 76cae14ab8..49ae01b516 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -46,8 +46,8 @@ "to": "framework/react/middleware" }, { - "label": "API Routes", - "to": "framework/react/api-routes" + "label": "Server Routes", + "to": "framework/react/server-routes" }, { "label": "SSR", diff --git a/docs/start/framework/react/api-routes.md b/docs/start/framework/react/api-routes.md deleted file mode 100644 index 87032c5bcd..0000000000 --- a/docs/start/framework/react/api-routes.md +++ /dev/null @@ -1,292 +0,0 @@ ---- -id: api-routes -title: API Routes ---- - -API Routes are a powerful feature of TanStack Start that allow you to create server-side endpoints in your application without the need for a separate server. API Routes are useful for handling form submissions, user authentication, and more. - -By default, API Routes are defined in your `./app/routes/api` directory of your project and are automatically handled by the TanStack Start server. - -> 🧠 This means that by default, your API Routes will be prefixed with `/api` and will be served from the same server as your application. You can customize this base path by changing the `tsr.apiBase` in your TanStack Start config. - -## File Route Conventions - -API Routes in TanStack Start, follow the same file-based routing conventions as TanStack Router. This means that each file in your `routes` directory that is prefixed with `api` (which can be configured) will be treated as an API route. Here are a few examples: - -- `routes/api.users.ts` will create an API route at `/api/users` -- `routes/api/users.ts` will **also** create an API route at `/api/users` -- `routes/api/users.index.ts` will **also** create an API route at `/api/users` -- `routes/api/users/$id.ts` will create an API route at `/api/users/$id` -- `routes/api/users/$id/posts.ts` will create an API route at `/api/users/$id/posts` -- `routes/api.users.$id.posts.ts` will **also** create an API route at `/api/users/$id/posts` -- `routes/api/file/$.ts` will create an API route at `/api/file/$` - -Your route files that are prefixed with `api`, can be thought of as the handlers for the given API route path. - -It's important to remember that each route can only have a single handler file associated with it. So, if you have a file named `routes/api/users.ts` which'd equal the request path of `/api/users`, you cannot have other files that'd also resolve to the same route, like: - -- `routes/api/users.index.ts` -- `routes/api.users.ts`. -- `routes/api.users.index.ts`. - -❗ One more thing, API Routes do not have the concept of pathless layout routes or parallel routes. So, a file named: - -- `routes/api/_pathlessLayout/users.ts` would resolve to `/api/_pathlessLayout/users` and **NOT** `/api/users`. - -## Nested Directories vs File-names - -In the examples above, you may have noticed that the file naming conventions are flexible and allow you to mix and match directories and file names. This is intentional and allows you to organize your API Routes in a way that makes sense for your application. You can read more about this in the [TanStack Router File-based Routing Guide](/router/latest/docs/framework/react/routing/file-based-routing#s-or-s). - -## Setting up the entry handler - -Before you can create your API routes, you need to set up the entry handler for your TanStack Start project. This entry handler, similar to `client` and `ssr`, handles the API incoming requests and routes them to the appropriate API route handler. The API entry handler is defined in the `app/api.ts` file in your project. - -Here's an example implementation: - -```ts -// app/api.ts -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/react-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) -``` - -This file is responsible for creating the API handler that will be used to route incoming requests to the appropriate API route handler. The `defaultAPIFileRouteHandler` is a helper function that will automatically load and execute the appropriate API route handler based on the incoming request. - -## Defining an API Route - -API Routes export an APIRoute instance by calling the `createAPIFileRoute` function. Similar to other file-based routes in TanStack Router, the first argument to this function is the path of the route. The function returned is called again with an object that defines the route handlers for each HTTP method. - -> [!TIP] -> If you've already got the dev server running, when you create a new API route, it'll automatically have the initial handler set up for you. From there on, you can customize the handler as needed. - -> [!NOTE] -> The export variable must be named `APIRoute` or the resulting response will be a `404 not found`. - -```ts -// routes/api/hello.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/api/hello')({ - GET: async ({ request }) => { - return new Response('Hello, World! from ' + request.url) - }, -}) -``` - -Each HTTP method handler receives an object with the following properties: - -- `request`: The incoming request object. You can read more about the `Request` object in the [MDN Web Docs](https://developer.mozilla.org/en-US/docs/Web/API/Request). -- `params`: An object containing the dynamic path parameters of the route. For example, if the route path is `/users/$id`, and the request is made to `/users/123`, then `params` will be `{ id: '123' }`. We'll cover dynamic path parameters and wildcard parameters later in this guide. - -Once you've processed the request, you need to return a `Response` object or `Promise`. This can be done by creating a new `Response` object and returning it from the handler. You can read more about the `Response` object in the [MDN Web Docs](https://developer.mozilla.org/en-US/docs/Web/API/Response). - -## Dynamic Path Params - -API Routes support dynamic path parameters, which are denoted by a `$` followed by the parameter name. For example, a file named `routes/api/users/$id.ts` will create an API route at `/api/users/$id` that accepts a dynamic `id` parameter. - -```ts -// routes/api/users/$id.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/users/$id')({ - GET: async ({ params }) => { - const { id } = params - return new Response(`User ID: ${id}`) - }, -}) - -// Visit /api/users/123 to see the response -// User ID: 123 -``` - -You can also have multiple dynamic path parameters in a single route. For example, a file named `routes/api/users/$id/posts/$postId.ts` will create an API route at `/api/users/$id/posts/$postId` that accepts two dynamic parameters. - -```ts -// routes/api/users/$id/posts/$postId.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/users/$id/posts/$postId')({ - GET: async ({ params }) => { - const { id, postId } = params - return new Response(`User ID: ${id}, Post ID: ${postId}`) - }, -}) - -// Visit /api/users/123/posts/456 to see the response -// User ID: 123, Post ID: 456 -``` - -## Wildcard/Splat Param - -API Routes also support wildcard parameters at the end of the path, which are denoted by a `$` followed by nothing. For example, a file named `routes/api/file/$.ts` will create an API route at `/api/file/$` that accepts a wildcard parameter. - -```ts -// routes/api/file/$.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/file/$')({ - GET: async ({ params }) => { - const { _splat } = params - return new Response(`File: ${_splat}`) - }, -}) - -// Visit /api/file/hello.txt to see the response -// File: hello.txt -``` - -## Handling requests with a body - -To handle POST requests,you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. - -```ts -// routes/api/hello.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/api/hello')({ - POST: async ({ request }) => { - const body = await request.json() - return new Response(`Hello, ${body.name}!`) - }, -}) - -// Send a POST request to /api/hello with a JSON body like { "name": "Tanner" } -// Hello, Tanner! -``` - -This also applies to other HTTP methods like `PUT`, `PATCH`, and `DELETE`. You can add handlers for these methods in the route object and access the request body using the appropriate method. - -It's important to remember that the `request.json()` method returns a `Promise` that resolves to the parsed JSON body of the request. You need to `await` the result to access the body. - -This is a common pattern for handling POST requests in API Routes. You can also use other methods like `request.text()` or `request.formData()` to access the body of the request. - -## Responding with JSON - -When returning JSON using a Response object, this is a common pattern: - -```ts -// routes/api/hello.ts -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/api/hello')({ - GET: async ({ request }) => { - return new Response(JSON.stringify({ message: 'Hello, World!' }), { - headers: { - 'Content-Type': 'application/json', - }, - }) - }, -}) - -// Visit /api/hello to see the response -// {"message":"Hello, World!"} -``` - -## Using the `json` helper function - -Or you can use the `json` helper function to automatically set the `Content-Type` header to `application/json` and serialize the JSON object for you. - -```ts -// routes/api/hello.ts -import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' - -export const APIRoute = createAPIFileRoute('/api/hello')({ - GET: async ({ request }) => { - return json({ message: 'Hello, World!' }) - }, -}) - -// Visit /api/hello to see the response -// {"message":"Hello, World!"} -``` - -## Responding with a status code - -You can set the status code of the response by either: - -- Passing it as a property of the second argument to the `Response` constructor - - ```ts - // routes/api/hello.ts - import { json } from '@tanstack/react-start' - import { createAPIFileRoute } from '@tanstack/react-start/api' - - export const APIRoute = createAPIFileRoute('/users/$id')({ - GET: async ({ request, params }) => { - const user = await findUser(params.id) - if (!user) { - return new Response('User not found', { - status: 404, - }) - } - return json(user) - }, - }) - ``` - -- Using the `setResponseStatus` helper function from `@tanstack/react-start/server` - - ```ts - // routes/api/hello.ts - import { json } from '@tanstack/react-start' - import { createAPIFileRoute } from '@tanstack/react-start/api' - import { setResponseStatus } from '@tanstack/react-start/server' - - export const APIRoute = createAPIFileRoute('/users/$id')({ - GET: async ({ request, params }) => { - const user = await findUser(params.id) - if (!user) { - setResponseStatus(404) - return new Response('User not found') - } - return json(user) - }, - }) - ``` - -In this example, we're returning a `404` status code if the user is not found. You can set any valid HTTP status code using this method. - -## Setting headers in the response - -Sometimes you may need to set headers in the response. You can do this by either: - -- Passing an object as the second argument to the `Response` constructor. - - ```ts - // routes/api/hello.ts - import { createAPIFileRoute } from '@tanstack/react-start/api' - - export const APIRoute = createAPIFileRoute('/api/hello')({ - GET: async ({ request }) => { - return new Response('Hello, World!', { - headers: { - 'Content-Type': 'text/plain', - }, - }) - }, - }) - - // Visit /api/hello to see the response - // Hello, World! - ``` - -- Or using the `setHeaders` helper function from `@tanstack/react-start/server`. - - ```ts - // routes/api/hello.ts - import { createAPIFileRoute } from '@tanstack/react-start/api' - import { setHeaders } from '@tanstack/react-start/server' - - export const APIRoute = createAPIFileRoute('/api/hello')({ - GET: async ({ request }) => { - setHeaders({ - 'Content-Type': 'text/plain', - }) - return new Response('Hello, World!') - }, - }) - ``` diff --git a/docs/start/framework/react/build-from-scratch.md b/docs/start/framework/react/build-from-scratch.md index 055526d7f8..d17357e486 100644 --- a/docs/start/framework/react/build-from-scratch.md +++ b/docs/start/framework/react/build-from-scratch.md @@ -4,7 +4,7 @@ title: Build a Project from Scratch --- > [!NOTE] -> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](../learn-the-basics) guide. +> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](./learn-the-basics.md) guide. _So you want to build a TanStack Start project from scratch?_ @@ -47,14 +47,12 @@ We highly recommend using TypeScript with TanStack Start. Create a `tsconfig.jso ## Install Dependencies -TanStack Start is (currently\*) powered by [Vinxi](https://vinxi.vercel.app/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. - -> [!NOTE] > \*Vinxi will be removed before version 1.0.0 is released and TanStack will rely only on Vite and Nitro. The commands and APIs that use Vinxi will likely be replaced with a Vite plugin or dedicated TanStack Start CLI. +TanStack Start is (currently\*) powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. To install them, run: ```shell -npm i @tanstack/react-start @tanstack/react-router vinxi +npm i @tanstack/react-start @tanstack/react-router vite ``` You'll also need React and the Vite React plugin, so install them too: @@ -72,46 +70,42 @@ npm i -D typescript @types/react @types/react-dom ## Update Configuration Files -We'll then update our `package.json` to use Vinxi's CLI and set `"type": "module"`: +We'll then update our `package.json` to set `"type": "module"`: ```json { // ... "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" } } ``` -Then configure TanStack Start's `app.config.ts` file: +Then configure TanStack Start's `vite.config.ts` file: -```typescript -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' +```ts +// vite.config.ts +import { defineConfig } from 'vite' import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' export default defineConfig({ - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], + server: { + port: 3000, }, + plugins: [tsConfigPaths(), tanstackStart()], }) ``` ## Add the Basic Templating -There are four required files for TanStack Start usage: +There are 2 required files for TanStack Start usage: 1. The router configuration -2. The server entry point -3. The client entry point -4. The root of your application +2. The root of your application Once configuration is done, we'll have a file tree that looks like the following: @@ -120,10 +114,8 @@ Once configuration is done, we'll have a file tree that looks like the following ├── app/ │ ├── routes/ │ │ └── `__root.tsx` -│ ├── `client.tsx` │ ├── `router.tsx` │ ├── `routeTree.gen.ts` -│ └── `ssr.tsx` ├── `.gitignore` ├── `app.config.ts` ├── `package.json` @@ -159,48 +151,6 @@ declare module '@tanstack/react-router' { } ``` -## The Server Entry Point - -As TanStack Start is an [SSR](https://unicorn-utterances.com/posts/what-is-ssr-and-ssg) framework, we need to pipe this router -information to our server entry point: - -```tsx -// app/ssr.tsx -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) -``` - -This allows us to know what routes and loaders we need to execute when the user hits a given route. - -## The Client Entry Point - -Now we need a way to hydrate our client-side JavaScript once the route resolves to the client. We do this by piping the same -router information to our client entry point: - -```tsx -// app/client.tsx -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) -``` - -This enables us to kick off client-side routing once the user's initial server request has fulfilled. - ## The Root of Your Application Finally, we need to create the root of our application. This is the entry point for all other routes. The code in this file will wrap all other routes in the application. @@ -263,7 +213,7 @@ Now that we have the basic templating setup, we can write our first route. This ```tsx // app/routes/index.tsx import * as fs from 'node:fs' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' const filePath = 'count.txt' @@ -287,7 +237,7 @@ const updateCount = createServerFn({ method: 'POST' }) await fs.promises.writeFile(filePath, `${count + data}`) }) -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async () => await getCount(), }) diff --git a/docs/start/framework/react/hosting.md b/docs/start/framework/react/hosting.md index 5241494e80..18cf42f713 100644 --- a/docs/start/framework/react/hosting.md +++ b/docs/start/framework/react/hosting.md @@ -3,7 +3,7 @@ id: hosting title: Hosting --- -Hosting is the process of deploying your application to the internet so that users can access it. This is a critical part of any web development project, ensuring your application is available to the world. TanStack Start is built on [Nitro](https://nitro.unjs.io/), a powerful server toolkit for deploying web applications anywhere. Nitro allows TanStack Start to provide a unified API for SSR, streaming, and hydration on any hosting provider. +Hosting is the process of deploying your application to the internet so that users can access it. This is a critical part of any web development project, ensuring your application is available to the world. TanStack Start is built on Vite, a powerful dev/build platform that allows us to make it possible to deploy your application to any hosting provider. ## What should I use? diff --git a/docs/start/framework/react/learn-the-basics.md b/docs/start/framework/react/learn-the-basics.md index cc00141883..dc4b55dcbc 100644 --- a/docs/start/framework/react/learn-the-basics.md +++ b/docs/start/framework/react/learn-the-basics.md @@ -7,13 +7,10 @@ This guide will help you learn the basics behind how TanStack Start works, regar ## Dependencies -TanStack Start is (currently\*) powered by [Vinxi](https://vinxi.vercel.app/), [Nitro](https://nitro.unjs.io/) and [TanStack Router](https://tanstack.com/router). +TanStack Start is powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router). - **TanStack Router**: A router for building web applications. -- **Nitro**: A framework for building server applications. -- **Vinxi**: A server framework for building web applications. - -> [!NOTE] Vinxi will be removed before version 1.0.0 is released and TanStack will rely only on Vite and Nitro. The commands and APIs that use Vinxi will likely be replaced with a Vite plugin. +- **Vite**: A build tool for bundling your application. ## It all "Starts" with the Router @@ -47,14 +44,15 @@ declare module '@tanstack/react-router' { The `routeTree.gen.ts` file is generated when you run TanStack Start (via `npm run dev` or `npm run start`) for the first time. This file contains the generated route tree and a handful of TS utilities that make TanStack Start fully type-safe. -## The Server Entry Point +## The Server Entry Point (Optional) -Although TanStack Start is designed with client-first APIs, it is by and large, a full-stack framework. This means that all use cases, including both dynamic and static rely on a server or build-time entry to render our application's initial HTML payload. +> [!NOTE] +> The server entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the server entry point for you using the below as a default. -This is done via the `app/ssr.tsx` file: +This is done via the `src/server.tsx` file: ```tsx -// app/ssr.tsx +// src/server.tsx import { createStartHandler, defaultStreamHandler, @@ -69,13 +67,16 @@ export default createStartHandler({ })(defaultStreamHandler) ``` -Whether we are statically generating our app or serving it dynamically, the `ssr.tsx` file is the entry point for doing all SSR-related work. +Whether we are statically generating our app or serving it dynamically, the `server.tsx` file is the entry point for doing all SSR-related work. - It's important that a new router is created for each request. This ensures that any data handled by the router is unique to the request. - The `getRouterManifest` function is used to generate the router manifest, which is used to determine many aspects of asset management and preloading for our application. - The `defaultStreamHandler` function is used to render our application to a stream, allowing us to take advantage of streaming HTML to the client. (This is the default handler, but you can also use other handlers like `defaultRenderHandler`, or even build your own) -## The Client Entry Point +## The Client Entry Point (Optional) + +> [!NOTE] +> The client entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the client entry point for you using the below as a default. Getting our html to the client is only half the battle. Once there, we need to hydrate our client-side JavaScript once the route resolves to the client. We do this by hydrating the root of our application with the `StartClient` component: @@ -94,7 +95,7 @@ This enables us to kick off client-side routing once the user's initial server r ## The Root of Your Application -Other than the client entry point, the `__root` route of your application is the entry point for your application. The code in this file will wrap all other routes in the app, including your home page. It behaves like a pathless layout route for your whole application. +Other than the client entry point (which is optional by default), the `__root` route of your application is the entry point for your application. The code in this file will wrap all other routes in the app, including your home page. It behaves like a pathless layout route for your whole application. Because it is **always rendered**, it is the perfect place to construct your application shell and take care of any global logic. diff --git a/docs/start/framework/react/middleware.md b/docs/start/framework/react/middleware.md index 7eb75ba032..9877da95fd 100644 --- a/docs/start/framework/react/middleware.md +++ b/docs/start/framework/react/middleware.md @@ -24,12 +24,14 @@ Middleware is defined using the `createMiddleware` function. This function retur ```tsx import { createMiddleware } from '@tanstack/react-start' -const loggingMiddleware = createMiddleware().server(async ({ next, data }) => { - console.log('Request received:', data) - const result = await next() - console.log('Response processed:', result) - return result -}) +const loggingMiddleware = createMiddleware({ type: 'function' }).server( + async ({ next, data }) => { + console.log('Request received:', data) + const result = await next() + console.log('Response processed:', result) + return result + }, +) ``` ## Using Middleware in Your Server Functions @@ -63,7 +65,7 @@ The `middleware` method is used to dependency middleware to the chain that will ```tsx import { createMiddleware } from '@tanstack/react-start' -const loggingMiddleware = createMiddleware().middleware([ +const loggingMiddleware = createMiddleware({ type: 'function' }).middleware([ authMiddleware, loggingMiddleware, ]) @@ -84,7 +86,7 @@ const mySchema = z.object({ workspaceId: z.string(), }) -const workspaceMiddleware = createMiddleware() +const workspaceMiddleware = createMiddleware({ type: 'function' }) .validator(zodValidator(mySchema)) .server(({ next, data }) => { console.log('Workspace ID:', data.workspaceId) @@ -107,12 +109,14 @@ The `next` function is used to execute the next middleware in the chain. **You m ```tsx import { createMiddleware } from '@tanstack/react-start' -const loggingMiddleware = createMiddleware().server(async ({ next }) => { - console.log('Request received') - const result = await next() - console.log('Response processed') - return result -}) +const loggingMiddleware = createMiddleware({ type: 'function' }).server( + async ({ next }) => { + console.log('Request received') + const result = await next() + console.log('Response processed') + return result + }, +) ``` ## Providing context to the next middleware via `next` @@ -122,15 +126,17 @@ The `next` function can be optionally called with an object that has a `context` ```tsx import { createMiddleware } from '@tanstack/react-start' -const awesomeMiddleware = createMiddleware().server(({ next }) => { - return next({ - context: { - isAwesome: Math.random() > 0.5, - }, - }) -}) +const awesomeMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ + context: { + isAwesome: Math.random() > 0.5, + }, + }) + }, +) -const loggingMiddleware = createMiddleware().server( +const loggingMiddleware = createMiddleware({ type: 'function' }).server( async ({ next, context }) => { console.log('Is awesome?', context.isAwesome) return next() @@ -180,12 +186,14 @@ Similar to the `server` function, it also receives an object with the following - `context`: An object that stores data from parent middleware. It can be extended with additional data that will be passed to child middleware. ```tsx -const loggingMiddleware = createMiddleware().client(async ({ next }) => { - console.log('Request sent') - const result = await next() - console.log('Response received') - return result -}) +const loggingMiddleware = createMiddleware({ type: 'function' }).client( + async ({ next }) => { + console.log('Request sent') + const result = await next() + console.log('Response received') + return result + }, +) ``` ## Sending client context to the server @@ -193,7 +201,7 @@ const loggingMiddleware = createMiddleware().client(async ({ next }) => { **Client context is NOT sent to the server by default since this could end up unintentionally sending large payloads to the server.** If you need to send client context to the server, you must call the `next` function with a `sendContext` property and object to transmit any data to the server. Any properties passed to `sendContext` will be merged, serialized and sent to the server along with the data and will be available on the normal context object of any nested server middleware. ```tsx -const requestLogger = createMiddleware() +const requestLogger = createMiddleware({ type: 'function' }) .client(async ({ next, context }) => { return next({ sendContext: { @@ -217,7 +225,7 @@ You may have noticed that in the example above that while client-sent context is import { zodValidator } from '@tanstack/zod-adapter' import { z } from 'zod' -const requestLogger = createMiddleware() +const requestLogger = createMiddleware({ type: 'function' }) .client(async ({ next, context }) => { return next({ sendContext: { @@ -241,16 +249,18 @@ Similar to sending client context to the server, you can also send server contex > The return type of `next` in `client` can only be inferred from middleware known in the current middleware chain. Therefore the most accurate return type of `next` is in middleware at the end of the middleware chain ```tsx -const serverTimer = createMiddleware().server(async ({ next }) => { - return next({ - sendContext: { - // Send the current time to the client - timeFromServer: new Date(), - }, - }) -}) +const serverTimer = createMiddleware({ type: 'function' }).server( + async ({ next }) => { + return next({ + sendContext: { + // Send the current time to the client + timeFromServer: new Date(), + }, + }) + }, +) -const requestLogger = createMiddleware() +const requestLogger = createMiddleware({ type: 'function' }) .middleware([serverTimer]) .client(async ({ next }) => { const result = await next() @@ -276,13 +286,15 @@ Here's an example of adding an `Authorization` header any request using this mid ```tsx import { getToken } from 'my-auth-library' -const authMiddleware = createMiddleware().client(async ({ next }) => { - return next({ - headers: { - Authorization: `Bearer ${getToken()}`, - }, - }) -}) +const authMiddleware = createMiddleware({ type: 'function' }).client( + async ({ next }) => { + return next({ + headers: { + Authorization: `Bearer ${getToken()}`, + }, + }) + }, +) ``` ## Using Middleware @@ -323,10 +335,12 @@ registerGlobalMiddleware({ ```tsx // authMiddleware.ts -const authMiddleware = createMiddleware().server(({ next, context }) => { - console.log(context.user) // <-- This will not be typed! - // ... -}) +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next, context }) => { + console.log(context.user) // <-- This will not be typed! + // ... + }, +) ``` To solve this, add the global middleware you are trying to reference to the server function's middleware array. **The global middleware will be deduped to a single entry (the global instance), and your server function will receive the correct types.** @@ -356,40 +370,44 @@ Middleware is executed dependency-first, starting with global middleware, follow - `d` ```tsx -const globalMiddleware1 = createMiddleware().server(async ({ next }) => { - console.log('globalMiddleware1') - return next() -}) +const globalMiddleware1 = createMiddleware({ type: 'function' }).server( + async ({ next }) => { + console.log('globalMiddleware1') + return next() + }, +) -const globalMiddleware2 = createMiddleware().server(async ({ next }) => { - console.log('globalMiddleware2') - return next() -}) +const globalMiddleware2 = createMiddleware({ type: 'function' }).server( + async ({ next }) => { + console.log('globalMiddleware2') + return next() + }, +) registerGlobalMiddleware({ middleware: [globalMiddleware1, globalMiddleware2], }) -const a = createMiddleware().server(async ({ next }) => { +const a = createMiddleware({ type: 'function' }).server(async ({ next }) => { console.log('a') return next() }) -const b = createMiddleware() +const b = createMiddleware({ type: 'function' }) .middleware([a]) .server(async ({ next }) => { console.log('b') return next() }) -const c = createMiddleware() +const c = createMiddleware({ type: 'function' }) .middleware() .server(async ({ next }) => { console.log('c') return next() }) -const d = createMiddleware() +const d = createMiddleware({ type: 'function' }) .middleware([b, c]) .server(async () => { console.log('d') diff --git a/docs/start/framework/react/overview.md b/docs/start/framework/react/overview.md index ca4bbac835..5fa9088845 100644 --- a/docs/start/framework/react/overview.md +++ b/docs/start/framework/react/overview.md @@ -3,7 +3,7 @@ id: overview title: TanStack Start Overview --- -TanStack Start is a full-stack React framework powered by TanStack Router. It provides a full-document SSR, streaming, server functions, bundling, and more using tools like [Nitro](https://nitro.unjs.io/) and [Vite](https://vitejs.dev/). It is ready to deploy to your favorite hosting provider! +TanStack Start is a full-stack React framework powered by TanStack Router. It provides a full-document SSR, streaming, server functions, bundling, and more. Thanks to [Vite](https://vite.dev/), it's ready to develop and deploy to any hosting provider or runtime you want! ## Router or Start? @@ -39,7 +39,7 @@ What you get with TanStack Start: ## How does it work? -TanStack Start uses [Nitro](https://nitro.unjs.io/) and [Vite](https://vitejs.dev/) to bundle and deploy your application. In fact, these are the same tools that power Solid Start! With these tools, we can do a few things we couldn't do before: +TanStack Start uses [Vite](https://vitejs.dev/) to bundle and deploy your application and empowers amazing features like: - Provide a unified API for SSR, streaming, and hydration - Extract server-only code from your client-side code (e.g. server functions) diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md new file mode 100644 index 0000000000..f712a29f8f --- /dev/null +++ b/docs/start/framework/react/server-routes.md @@ -0,0 +1,387 @@ +--- +id: server-routes +title: Server Routes +--- + +// TODO: Add redirect from api-routes to server-routes + +Server routes are a powerful feature of TanStack Start that allow you to create server-side endpoints in your application and are useful for handling raw HTTP requests, form submissions, user authentication, and much more. + +Server routes can be defined in your `./app/routes` directory of your project **right alongside your TanStack Router routes** and are automatically handled by the TanStack Start server. + +Here's what a simple server route looks like: + +```ts +// routes/hello.ts + +export const ServerRoute = createServerRoute({ + GET: async ({ request }) => { + return new Response('Hello, World!') + }, +}) +``` + +## Server Routes and App Routes + +Because server routes can be defined in the same directory as your app routes, you can even use the same file for both! + +```tsx +// routes/hello.ts + +export const ServerRoute = createServerRoute().methods({ + POST: async ({ request }) => { + const body = await request.json() + return new Response(JSON.stringify({ message: `Hello, ${body.name}!` })) + }, +}) + +export const Route = createFileRoute({ + component: HelloComponent, +}) + +function HelloComponent() { + const [reply, setReply] = useState('') + + return ( +
+ +
+ ) +} +``` + +## File Route Conventions + +Server routes in TanStack Start, follow the same file-based routing conventions as TanStack Router. This means that each file in your `routes` directory with a `ServerRoute` export will be treated as an API route. Here are a few examples: + +- `/routes/users.ts` will create an API route at `/users` +- `/routes/users.index.ts` will **also** create an API route at `/users` (but will error if duplicate methods are defined) +- `/routes/users/$id.ts` will create an API route at `/users/$id` +- `/routes/users/$id/posts.ts` will create an API route at `/users/$id/posts` +- `/routes/users.$id.posts.ts` will create an API route at `/users/$id/posts` +- `/routes/file/$.ts` will create an API route at `/api/file/$` +- `/routes/my-script[.]js.ts` will create an API route at `/my-script.js` + +## Unique Route Paths + +Each route can only have a single handler file associated with it. So, if you have a file named `routes/users.ts` which'd equal the request path of `/api/users`, you cannot have other files that'd also resolve to the same route. For example, the following files would all resolve to the same route and would error: + +- `/routes/users.index.ts` +- `/routes/users.ts` +- `/routes/users.index.ts` + +## Escaped Matching + +Just as with normal routes, server routes can match on escaped characters. For example, a file named `routes/users[.]ts` will create an API route at `/api/users[.]`. + +## Pathless Layout Routes and Break-out Routes + +Because of the unified routing system, pathless layout routes and break-out routes are supported for similar functionality around server route middleware. + +- Pathless layout routes can be used to add middleware to a group of routes +- Break-out routes can be used to "break out" of parent middleware + +## Nested Directories vs File-names + +In the examples above, you may have noticed that the file naming conventions are flexible and allow you to mix and match directories and file names. This is intentional and allows you to organize your Server routes in a way that makes sense for your application. You can read more about this in the [TanStack Router File-based Routing Guide](/router/latest/docs/framework/react/routing/file-based-routing#s-or-s). + +## Handling Server Route Requests + +Server route requests are handled by Start's `createStartHandler` in your `server.ts` entry file. + +```tsx +// server.ts +import { createStartHandler } from '@tanstack/react-start/server' + +export default createStartHandler({ + createRouter, + getRouterManifest, +})(defaultStreamHandler) +``` + +The start handler is responsible for matching an incoming request to a server route and executing the appropriate middleware, validators and handler. + +Remember, if you need to customize the server handler, you can do so by creating a custom handler and then passing the event to the start handler: + +```tsx +// server.ts +import { createStartHandler } from '@tanstack/react-start/server' + +export default defineHandler((event) => { + const startHandler = createStartHandler({ + createRouter, + getRouterManifest, + })(defaultStreamHandler) + + return startHandler(event) +}) +``` + +## Defining an Server Route + +Server routes are created by exporting a `ServerRoute` from a route file. The `ServerRoute` export should be created by calling the `createServerFileRoute` function. The resulting builder object can then be used to: + +- Add route-level middleware +- Define handlers for each HTTP method +- Add middleware and validators to specific HTTP methods + +```ts +// routes/hello.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return new Response('Hello, World! from ' + request.url) + }, +}) +``` + +## Defining a Server Route Handler + +There are two ways to define a handler for a server route. + +- Provide a handler function directly to the method +- By calling the `handler` method on the method builder object for more advanced use cases + +### Providing a handler function directly to the method + +For simple use cases, you can provide a handler function directly to the method. + +```ts +// routes/hello.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return new Response('Hello, World! from ' + request.url) + }, +}) +``` + +### Providing a handler function via the method builder object + +For more complex use cases, you can provide a handler function via the method builder object. This allows you to: + +- Add middleware to the method +- Add a validator to the method + +```tsx +// routes/hello.ts +export const ServerRoute = createServerFileRoute().methods((api) => ({ + GET: api + .middleware([loggerMiddleware]) + .validator(z.object({ name: z.string() })) + .handler(async ({ request }) => { + return new Response('Hello, World! from ' + request.url) + }), +})) +``` + +## Handler Context + +Each HTTP method handler receives an object with the following properties: + +- `request`: The incoming request object. You can read more about the `Request` object in the [MDN Web Docs](https://developer.mozilla.org/en-US/docs/Web/API/Request). +- `params`: An object containing the dynamic path parameters of the route. For example, if the route path is `/users/$id`, and the request is made to `/users/123`, then `params` will be `{ id: '123' }`. We'll cover dynamic path parameters and wildcard parameters later in this guide. +- `context`: An object containing the context of the request. This is useful for passing data between middleware. + +Once you've processed the request, you can return a `Response` object or `Promise` or even use any of the helpers from `@tanstack/react-start` to manipulate the response. + +## Dynamic Path Params + +Server routes support dynamic path parameters in the same way as TanStack Router. For example, a file named `routes/users/$id.ts` will create an API route at `/users/$id` that accepts a dynamic `id` parameter. + +```ts +// routes/users/$id.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params }) => { + const { id } = params + return new Response(`User ID: ${id}`) + }, +}) + +// Visit /api/users/123 to see the response +// User ID: 123 +``` + +You can also have multiple dynamic path parameters in a single route. For example, a file named `routes/users/$id/posts/$postId.ts` will create an API route at `/api/users/$id/posts/$postId` that accepts two dynamic parameters. + +```ts +// routes/users/$id/posts/$postId.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params }) => { + const { id, postId } = params + return new Response(`User ID: ${id}, Post ID: ${postId}`) + }, +}) + +// Visit /api/users/123/posts/456 to see the response +// User ID: 123, Post ID: 456 +``` + +## Wildcard/Splat Param + +Server routes also support wildcard parameters at the end of the path, which are denoted by a `$` followed by nothing. For example, a file named `routes/file/$.ts` will create an API route at `/api/file/$` that accepts a wildcard parameter. + +```ts +// routes/file/$.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params }) => { + const { _splat } = params + return new Response(`File: ${_splat}`) + }, +}) + +// Visit /api/file/hello.txt to see the response +// File: hello.txt +``` + +## Handling requests with a body + +To handle POST requests,you can add a `POST` handler to the route object. The handler will receive the request object as the first argument, and you can access the request body using the `request.json()` method. + +```ts +// routes/hello.ts +export const ServerRoute = createServerFileRoute().methods({ + POST: async ({ request }) => { + const body = await request.json() + return new Response(`Hello, ${body.name}!`) + }, +}) + +// Send a POST request to /api/hello with a JSON body like { "name": "Tanner" } +// Hello, Tanner! +``` + +This also applies to other HTTP methods like `PUT`, `PATCH`, and `DELETE`. You can add handlers for these methods in the route object and access the request body using the appropriate method. + +It's important to remember that the `request.json()` method returns a `Promise` that resolves to the parsed JSON body of the request. You need to `await` the result to access the body. + +This is a common pattern for handling POST requests in Server routes/ You can also use other methods like `request.text()` or `request.formData()` to access the body of the request. + +## Responding with JSON + +When returning JSON using a Response object, this is a common pattern: + +```ts +// routes/hello.ts +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return new Response(JSON.stringify({ message: 'Hello, World!' }), { + headers: { + 'Content-Type': 'application/json', + }, + }) + }, +}) + +// Visit /api/hello to see the response +// {"message":"Hello, World!"} +``` + +## Using the `json` helper function + +Or you can use the `json` helper function to automatically set the `Content-Type` header to `application/json` and serialize the JSON object for you. + +```ts +// routes/hello.ts +import { json } from '@tanstack/react-start' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return json({ message: 'Hello, World!' }) + }, +}) + +// Visit /api/hello to see the response +// {"message":"Hello, World!"} +``` + +## Responding with a status code + +You can set the status code of the response by either: + +- Passing it as a property of the second argument to the `Response` constructor + + ```ts + // routes/hello.ts + import { json } from '@tanstack/react-start' + + export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request, params }) => { + const user = await findUser(params.id) + if (!user) { + return new Response('User not found', { + status: 404, + }) + } + return json(user) + }, + }) + ``` + +- Using the `setResponseStatus` helper function from `@tanstack/react-start/server` + + ```ts + // routes/hello.ts + import { json } from '@tanstack/react-start' + import { setResponseStatus } from '@tanstack/react-start/server' + + export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request, params }) => { + const user = await findUser(params.id) + if (!user) { + setResponseStatus(404) + return new Response('User not found') + } + return json(user) + }, + }) + ``` + +In this example, we're returning a `404` status code if the user is not found. You can set any valid HTTP status code using this method. + +## Setting headers in the response + +Sometimes you may need to set headers in the response. You can do this by either: + +- Passing an object as the second argument to the `Response` constructor. + + ```ts + // routes/hello.ts + export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return new Response('Hello, World!', { + headers: { + 'Content-Type': 'text/plain', + }, + }) + }, + }) + + // Visit /api/hello to see the response + // Hello, World! + ``` + +- Or using the `setHeaders` helper function from `@tanstack/react-start/server`. + + ```ts + // routes/hello.ts + import { setHeaders } from '@tanstack/react-start/server' + + export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + setHeaders({ + 'Content-Type': 'text/plain', + }) + return new Response('Hello, World!') + }, + }) + ``` diff --git a/docs/start/framework/react/ssr.md b/docs/start/framework/react/ssr.md index f509d47f72..b932548555 100644 --- a/docs/start/framework/react/ssr.md +++ b/docs/start/framework/react/ssr.md @@ -7,10 +7,10 @@ Server-side rendering (SSR) is the process of rendering your application on the ## SSR Basics -TanStack Start supports server-side rendering out of the box. To enable server-side rendering, create an `app/ssr.tsx` file in your project: +TanStack Start supports server-side rendering out of the box. To enable server-side rendering, create an `src/server.tsx` file in your project: ```tsx -// app/ssr.tsx +// src/server.tsx import { createStartHandler, diff --git a/docs/start/framework/react/static-prerendering.md b/docs/start/framework/react/static-prerendering.md index 768e11d539..30111f24fb 100644 --- a/docs/start/framework/react/static-prerendering.md +++ b/docs/start/framework/react/static-prerendering.md @@ -3,13 +3,11 @@ id: static-prerendering title: Static Prerendering --- -> Static Prerendering is a feature of Nitro, and while it is available in TanStack Start, we are still exploring the best practices for using it. Tread lightly! - Static prerendering is the process of generating static HTML files for your application. This can be useful for either improving the performance of your application, as it allows you to serve pre-rendered HTML files to users without having to generate them on the fly or for deploying static sites to platforms that do not support server-side rendering. -## Prerendering, powered by Nitro +## Prerendering -TanStack Start is built on Nitro, which means we can take advantage of Nitro's prerendering capabilities. Nitro can prerender your application to static HTML files, which can then be served to users without having to generate them on the fly. To prerender your application, you can add the `server.prerender` option to your `app.config.js` file: +TanStack Start can prerender your application to static HTML files, which can then be served to users without having to generate them on the fly. To prerender your application, you can add the `server.prerender` option to your `app.config.js` file: ```js // app.config.js @@ -25,39 +23,3 @@ export default defineConfig({ }, }) ``` - -Many of the options available for prerendering are documented in the [Nitro config prerender documentation](https://nitro.unjs.io/config#prerender). - -## Prerendering dynamic routes with Nitro - -Nitro ships with some prebuilt hooks that let you customize the prerendering process among other things. One of these hooks is the `prerender:routes` hook. This hook allows you to fetch async data and add routes to a `Set` of routes to be prerendered. - -For this example, let's pretend we have a blog with a list of posts. We want to prerender each post page. Our post route looks like `/posts/$postId`. We can use the `prerender:routes` hook to fetch the all of our posts and add each post path to the routes set. - -```ts -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' - -export default defineConfig({ - server: { - hooks: { - 'prerender:routes': async (routes) => { - // fetch the pages you want to render - const posts = await fetch('https://api.example.com/posts') - const postsData = await posts.json() - - // add each post path to the routes set - postsData.forEach((post) => { - routes.add(`/posts/${post.id}`) - }) - }, - }, - prerender: { - routes: ['/'], - crawlLinks: true, - }, - }, -}) -``` - -As of writing, the [Nitro hooks documentation](https://nitro.build/config#hooks) does not include any information on the provided hooks. diff --git a/docs/start/framework/solid/build-from-scratch.md b/docs/start/framework/solid/build-from-scratch.md index c5fcdb3563..92d41fb237 100644 --- a/docs/start/framework/solid/build-from-scratch.md +++ b/docs/start/framework/solid/build-from-scratch.md @@ -4,7 +4,7 @@ title: Build a Project from Scratch --- > [!NOTE] -> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](../learn-the-basics) guide. +> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](./learn-the-basics.md) guide. _So you want to build a TanStack Start project from scratch?_ @@ -48,14 +48,16 @@ We highly recommend using TypeScript with TanStack Start. Create a `tsconfig.jso ## Install Dependencies -TanStack Start is (currently\*) powered by [Vinxi](https://vinxi.vercel.app/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. +TanStack Start is powered by: -> [!NOTE] > \*Vinxi will be removed before version 1.0.0 is released and TanStack will rely only on Vite and Nitro. The commands and APIs that use Vinxi will likely be replaced with a Vite plugin or dedicated TanStack Start CLI. +- [**TanStack Router**](https://tanstack.com/router) - A router for building web applications. +- [**Vite**](https://vite.dev/) - A build tool for building web applications. +- [**Nitro**](https://nitro.unjs.io/) - A framework for building server applications. To install them, run: ```shell -npm i @tanstack/solid-start @tanstack/solid-router vinxi +npm i @tanstack/solid-start @tanstack/solid-router vite ``` You'll also need Solid and the Vite Solid plugin, so install them too: @@ -73,35 +75,33 @@ npm i -D typescript ## Update Configuration Files -We'll then update our `package.json` to use Vinxi's CLI and set `"type": "module"`: +We'll then update our `package.json` to use Vite's CLI and set `"type": "module"`: ```json { // ... "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" } } ``` -Then configure TanStack Start's `app.config.ts` file: +Then configure TanStack Start's Vite plugin in `vite.config.ts`: -```typescript -// app.config.ts -import { defineConfig } from '@tanstack/solid-start/config' +```ts +// vite.config.ts +import { defineConfig } from 'vite' import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' export default defineConfig({ - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], + server: { + port: 3000, }, + plugins: [tsConfigPaths(), tanstackStart()], }) ``` @@ -124,7 +124,6 @@ Once configuration is done, we'll have a file tree that looks like the following │ ├── `client.tsx` │ ├── `router.tsx` │ ├── `routeTree.gen.ts` -│ └── `ssr.tsx` ├── `.gitignore` ├── `app.config.ts` ├── `package.json` @@ -160,47 +159,8 @@ declare module '@tanstack/solid-router' { } ``` -## The Server Entry Point - -As TanStack Start is an [SSR](https://unicorn-utterances.com/posts/what-is-ssr-and-ssg) framework, we need to pipe this router -information to our server entry point: - -```tsx -// app/ssr.tsx -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) -``` - -This allows us to know what routes and loaders we need to execute when the user hits a given route. - -## The Client Entry Point - -Now we need a way to hydrate our client-side JavaScript once the route resolves to the client. We do this by piping the same -router information to our client entry point: - -```tsx -// app/client.tsx -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) -``` - -This enables us to kick off client-side routing once the user's initial server request has fulfilled. +> [!NOTE] +> TanStack Start provides **default server and client entry points** to handle requests and client-entry + hydration. You can customize these entry points by adding a `server.ts` and/or `client.tsx` file in the root of your project, but for now, we'll use the defaults. ## The Root of Your Application @@ -245,7 +205,7 @@ Now that we have the basic templating setup, we can write our first route. This ```tsx // app/routes/index.tsx import * as fs from 'node:fs' -import { createFileRoute, useRouter } from '@tanstack/solid-router' +import { useRouter } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' const filePath = 'count.txt' @@ -269,7 +229,7 @@ const updateCount = createServerFn({ method: 'POST' }) await fs.promises.writeFile(filePath, `${count + data}`) }) -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async () => await getCount(), }) diff --git a/docs/start/framework/solid/learn-the-basics.md b/docs/start/framework/solid/learn-the-basics.md index 094b965623..f9a5220d38 100644 --- a/docs/start/framework/solid/learn-the-basics.md +++ b/docs/start/framework/solid/learn-the-basics.md @@ -7,13 +7,11 @@ This guide will help you learn the basics behind how TanStack Start works, regar ## Dependencies -TanStack Start is (currently\*) powered by [Vinxi](https://vinxi.vercel.app/), [Nitro](https://nitro.unjs.io/) and [TanStack Router](https://tanstack.com/router). +TanStack Start is powered by: -- **TanStack Router**: A router for building web applications. -- **Nitro**: A framework for building server applications. -- **Vinxi**: A server framework for building web applications. - -> [!NOTE] Vinxi will be removed before version 1.0.0 is released and TanStack will rely only on Vite and Nitro. The commands and APIs that use Vinxi will likely be replaced with a Vite plugin. +- [**TanStack Router**](https://tanstack.com/router): A router for building web applications. +- [**Vite**](https://vite.dev/): A build tool for building web applications. +- [**Nitro**](https://nitro.unjs.io/): A framework for building server applications. ## It all "Starts" with the Router @@ -81,7 +79,6 @@ Getting our html to the client is only half the battle. Once there, we need to h ```tsx // app/client.tsx -/// import { hydrate } from 'solid-js/web' import { StartClient } from '@tanstack/solid-start' import { createRouter } from './router' diff --git a/e2e/create-start/.gitignore b/e2e/create-start/.gitignore deleted file mode 100644 index 8354e4d50d..0000000000 --- a/e2e/create-start/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -node_modules -.DS_Store -dist -dist-ssr -*.local - -/test-results/ -/playwright-report/ -/blob-report/ -/playwright/.cache/ \ No newline at end of file diff --git a/e2e/create-start/package.json b/e2e/create-start/package.json deleted file mode 100644 index 1c46410866..0000000000 --- a/e2e/create-start/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "create-start-e2e", - "private": true, - "type": "module", - "scripts": { - "test:e2e": "playwright test --project=chromium" - }, - "devDependencies": { - "@playwright/test": "^1.50.1", - "@tanstack/create-start": "workspace:^", - "get-port-please": "^3.1.2", - "tempy": "^3.1.0", - "terminate": "^2.8.0", - "wait-port": "^1.1.0" - } -} diff --git a/e2e/create-start/playwright.config.ts b/e2e/create-start/playwright.config.ts deleted file mode 100644 index b07c8b268b..0000000000 --- a/e2e/create-start/playwright.config.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' - -/** - * See https://playwright.dev/docs/test-configuration. - */ -export default defineConfig({ - testDir: './tests', - - reporter: [['line']], - timeout: 60000, - use: { - trace: 'on-first-retry', - }, - workers: 1, - - // use: { - // /* Base URL to use in actions like `await page.goto('/')`. */ - // baseURL: 'http://localhost:3001/', - // }, - - // webServer: { - // command: 'pnpm run dev', - // url: 'http://localhost:3001', - // reuseExistingServer: !process.env.CI, - // stdout: 'pipe', - // }, - - projects: [ - { - name: 'chromium', - use: { ...devices['Desktop Chrome'] }, - }, - ], -}) diff --git a/e2e/create-start/tests/templates/barebones.test.ts b/e2e/create-start/tests/templates/barebones.test.ts deleted file mode 100644 index 8778ef37d7..0000000000 --- a/e2e/create-start/tests/templates/barebones.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { temporaryDirectory } from 'tempy' -import { getRandomPort } from 'get-port-please' -import { unstable_scaffoldTemplate } from '@tanstack/create-start' -import { test } from '../../utils/setup' - -// Before running any tests - create the project in the temporary directory -const projectPath = temporaryDirectory() -await unstable_scaffoldTemplate({ - cfg: { - packageManager: { - installDeps: true, - packageManager: 'pnpm', - }, - git: { - setupGit: false, - }, - packageJson: { - type: 'new', - name: 'barebones-test', - }, - ide: { - ide: 'vscode', - }, - }, - targetPath: projectPath, - templateId: 'barebones', -}) - -const PORT = await getRandomPort() -test.use({ projectPath }) -test.use({ port: PORT }) -test.use({ baseURL: `http://localhost:${PORT}` }) - -test.describe('barebones template e2e', () => { - test('Navigating to index page', async ({ page }) => { - await page.goto('/') - }) -}) diff --git a/e2e/create-start/tsconfig.json b/e2e/create-start/tsconfig.json deleted file mode 100644 index 44c53edd67..0000000000 --- a/e2e/create-start/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "jsx": "react-jsx", - "target": "ESNext", - "moduleResolution": "Bundler", - "module": "ESNext", - "skipLibCheck": true - } -} diff --git a/e2e/create-start/utils/setup.ts b/e2e/create-start/utils/setup.ts deleted file mode 100644 index bfb4c1fd53..0000000000 --- a/e2e/create-start/utils/setup.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { exec, execSync } from 'node:child_process' -import { test as baseTest } from '@playwright/test' -import terminate from 'terminate/promise' -import waitPort from 'wait-port' - -async function _setup( - projectPath: string, - port: number, -): Promise<{ - PID: number - ADDR: string - killProcess: () => Promise - deleteTempDir: () => void -}> { - const ADDR = `http://localhost:${port}` - - const childProcess = exec( - `VITE_SERVER_PORT=${port} pnpm vinxi dev --port ${port}`, - { - cwd: projectPath, - }, - ) - - childProcess.stdout?.on('data', (data) => { - const message = data.toString() - console.log('Stdout:', message) - }) - - childProcess.stderr?.on('data', (data) => { - console.error('Stderr:', data.toString()) - }) - - try { - await waitPort({ port, timeout: 30000 }) // Added timeout - } catch (err) { - console.error('Failed to start server:', err) - throw err - } - - const PID = childProcess.pid! - const killProcess = async () => { - console.log('Killing process') - try { - await terminate(PID) - } catch (err) { - console.error('Failed to kill process:', err) - } - } - const deleteTempDir = () => execSync(`rm -rf ${projectPath}`) - - return { PID, ADDR, killProcess, deleteTempDir } -} - -type SetupApp = Awaited> - -export const test = baseTest.extend<{ - setupApp: SetupApp - projectPath: string - port: number - ensureServer: void -}>({ - projectPath: ['', { option: true }], - port: [0, { option: true }], - ensureServer: [ - async ({ projectPath, port }, use) => { - const setup = await _setup(projectPath, port) - await use() - await setup.killProcess() - }, - { auto: true }, - ], -}) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routeTree.gen.ts b/e2e/react-router/basic-file-based-code-splitting/src/routeTree.gen.ts index 12e3efedb5..4ff69b1e7d 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routeTree.gen.ts +++ b/e2e/react-router/basic-file-based-code-splitting/src/routeTree.gen.ts @@ -8,75 +8,77 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as WithoutLoaderImport } from './routes/without-loader' -import { Route as ViewportTestImport } from './routes/viewport-test' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as WithoutLoaderRouteImport } from './routes/without-loader' +import { Route as ViewportTestRouteImport } from './routes/viewport-test' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const WithoutLoaderRoute = WithoutLoaderImport.update({ +const WithoutLoaderRoute = WithoutLoaderRouteImport.update({ id: '/without-loader', path: '/without-loader', getParentRoute: () => rootRoute, } as any) -const ViewportTestRoute = ViewportTestImport.update({ +const ViewportTestRoute = ViewportTestRouteImport.update({ id: '/viewport-test', path: '/viewport-test', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -90,75 +92,168 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/viewport-test': { id: '/viewport-test' path: '/viewport-test' fullPath: '/viewport-test' - preLoaderRoute: typeof ViewportTestImport + preLoaderRoute: typeof ViewportTestRouteImport parentRoute: typeof rootRoute } '/without-loader': { id: '/without-loader' path: '/without-loader' fullPath: '/without-loader' - preLoaderRoute: typeof WithoutLoaderImport + preLoaderRoute: typeof WithoutLoaderRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/viewport-test' { + const createFileRoute: CreateFileRoute< + '/viewport-test', + FileRoutesByPath['/viewport-test']['parentRoute'], + FileRoutesByPath['/viewport-test']['id'], + FileRoutesByPath['/viewport-test']['path'], + FileRoutesByPath['/viewport-test']['fullPath'] + > +} +declare module './routes/without-loader' { + const createFileRoute: CreateFileRoute< + '/without-loader', + FileRoutesByPath['/without-loader']['parentRoute'], + FileRoutesByPath['/without-loader']['id'], + FileRoutesByPath['/without-loader']['path'], + FileRoutesByPath['/without-loader']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/index.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/index.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx index 47d1148be2..805fa37ed3 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.index.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.index.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.tsx index c7a09ed7f8..4469b2216a 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx index d60bf062d3..b182feb7b1 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/viewport-test')({ +export const Route = createFileRoute({ component: () =>
Hello /viewport-test!
, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/src/routes/without-loader.tsx b/e2e/react-router/basic-file-based-code-splitting/src/routes/without-loader.tsx index 9dddcfe5f4..af692bdaca 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/routes/without-loader.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/routes/without-loader.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/without-loader')({ +export const Route = createFileRoute({ component: () =>
Hello /without-loader!
, }) diff --git a/e2e/react-router/basic-file-based-code-splitting/vite.config.ts b/e2e/react-router/basic-file-based-code-splitting/vite.config.ts index 3b36b81fe1..dfe060a574 100644 --- a/e2e/react-router/basic-file-based-code-splitting/vite.config.ts +++ b/e2e/react-router/basic-file-based-code-splitting/vite.config.ts @@ -1,13 +1,14 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, + verboseFileRoutes: false, codeSplittingOptions: { splitBehavior: ({ routeId }) => { if (routeId === '/posts') { diff --git a/e2e/react-router/basic-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-file-based/src/routeTree.gen.ts index 0cc7397492..7263a2c8b1 100644 --- a/e2e/react-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/react-router/basic-file-based/src/routeTree.gen.ts @@ -9,121 +9,138 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as EditingBImport } from './routes/editing-b' -import { Route as EditingAImport } from './routes/editing-a' -import { Route as AnchorImport } from './routes/anchor' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as RedirectIndexImport } from './routes/redirect/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as StructuralSharingEnabledImport } from './routes/structural-sharing.$enabled' -import { Route as RedirectTargetImport } from './routes/redirect/$target' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as groupLazyinsideImport } from './routes/(group)/lazyinside' -import { Route as groupInsideImport } from './routes/(group)/inside' -import { Route as groupLayoutImport } from './routes/(group)/_layout' -import { Route as anotherGroupOnlyrouteinsideImport } from './routes/(another-group)/onlyrouteinside' -import { Route as RedirectTargetIndexImport } from './routes/redirect/$target/index' -import { Route as RedirectPreloadThirdImport } from './routes/redirect/preload/third' -import { Route as RedirectPreloadSecondImport } from './routes/redirect/preload/second' -import { Route as RedirectPreloadFirstImport } from './routes/redirect/preload/first' -import { Route as RedirectTargetViaLoaderImport } from './routes/redirect/$target/via-loader' -import { Route as RedirectTargetViaBeforeLoadImport } from './routes/redirect/$target/via-beforeLoad' -import { Route as PostsPostIdEditImport } from './routes/posts_.$postId.edit' -import { Route as ParamsSingleValueImport } from './routes/params.single.$value' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' -import { Route as groupSubfolderInsideImport } from './routes/(group)/subfolder/inside' -import { Route as groupLayoutInsidelayoutImport } from './routes/(group)/_layout.insidelayout' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as EditingBRouteImport } from './routes/editing-b' +import { Route as EditingARouteImport } from './routes/editing-a' +import { Route as AnchorRouteImport } from './routes/anchor' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as RedirectIndexRouteImport } from './routes/redirect/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as ParamsPsIndexRouteImport } from './routes/params-ps/index' +import { Route as StructuralSharingEnabledRouteImport } from './routes/structural-sharing.$enabled' +import { Route as RedirectTargetRouteImport } from './routes/redirect/$target' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as groupLazyinsideRouteImport } from './routes/(group)/lazyinside' +import { Route as groupInsideRouteImport } from './routes/(group)/inside' +import { Route as groupLayoutRouteImport } from './routes/(group)/_layout' +import { Route as anotherGroupOnlyrouteinsideRouteImport } from './routes/(another-group)/onlyrouteinside' +import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index' +import { Route as ParamsPsWildcardIndexRouteImport } from './routes/params-ps/wildcard/index' +import { Route as ParamsPsNamedIndexRouteImport } from './routes/params-ps/named/index' +import { Route as RedirectPreloadThirdRouteImport } from './routes/redirect/preload/third' +import { Route as RedirectPreloadSecondRouteImport } from './routes/redirect/preload/second' +import { Route as RedirectPreloadFirstRouteImport } from './routes/redirect/preload/first' +import { Route as RedirectTargetViaLoaderRouteImport } from './routes/redirect/$target/via-loader' +import { Route as RedirectTargetViaBeforeLoadRouteImport } from './routes/redirect/$target/via-beforeLoad' +import { Route as PostsPostIdEditRouteImport } from './routes/posts_.$postId.edit' +import { Route as ParamsSingleValueRouteImport } from './routes/params.single.$value' +import { Route as ParamsPsWildcardChar123Char125suffixRouteImport } from './routes/params-ps/wildcard/{$}suffix' +import { Route as ParamsPsWildcardPrefixChar123Char125RouteImport } from './routes/params-ps/wildcard/prefix{$}' +import { Route as ParamsPsWildcardSplatRouteImport } from './routes/params-ps/wildcard/$' +import { Route as ParamsPsNamedChar123fooChar125suffixRouteImport } from './routes/params-ps/named/{$foo}suffix' +import { Route as ParamsPsNamedPrefixChar123fooChar125RouteImport } from './routes/params-ps/named/prefix{$foo}' +import { Route as ParamsPsNamedFooRouteImport } from './routes/params-ps/named/$foo' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' +import { Route as groupSubfolderInsideRouteImport } from './routes/(group)/subfolder/inside' +import { Route as groupLayoutInsidelayoutRouteImport } from './routes/(group)/_layout.insidelayout' // Create Virtual Routes -const groupImport = createFileRoute('/(group)')() +const groupRouteImport = createFileRoute('/(group)')() // Create/Update Routes -const groupRoute = groupImport.update({ +const groupRoute = groupRouteImport.update({ id: '/(group)', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const EditingBRoute = EditingBImport.update({ +const EditingBRoute = EditingBRouteImport.update({ id: '/editing-b', path: '/editing-b', getParentRoute: () => rootRoute, } as any) -const EditingARoute = EditingAImport.update({ +const EditingARoute = EditingARouteImport.update({ id: '/editing-a', path: '/editing-a', getParentRoute: () => rootRoute, } as any) -const AnchorRoute = AnchorImport.update({ +const AnchorRoute = AnchorRouteImport.update({ id: '/anchor', path: '/anchor', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const RedirectIndexRoute = RedirectIndexImport.update({ +const RedirectIndexRoute = RedirectIndexRouteImport.update({ id: '/redirect/', path: '/redirect/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const StructuralSharingEnabledRoute = StructuralSharingEnabledImport.update({ - id: '/structural-sharing/$enabled', - path: '/structural-sharing/$enabled', +const ParamsPsIndexRoute = ParamsPsIndexRouteImport.update({ + id: '/params-ps/', + path: '/params-ps/', getParentRoute: () => rootRoute, } as any) -const RedirectTargetRoute = RedirectTargetImport.update({ +const StructuralSharingEnabledRoute = + StructuralSharingEnabledRouteImport.update({ + id: '/structural-sharing/$enabled', + path: '/structural-sharing/$enabled', + getParentRoute: () => rootRoute, + } as any) + +const RedirectTargetRoute = RedirectTargetRouteImport.update({ id: '/redirect/$target', path: '/redirect/$target', getParentRoute: () => rootRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const groupLazyinsideRoute = groupLazyinsideImport +const groupLazyinsideRoute = groupLazyinsideRouteImport .update({ id: '/lazyinside', path: '/lazyinside', @@ -131,92 +148,144 @@ const groupLazyinsideRoute = groupLazyinsideImport } as any) .lazy(() => import('./routes/(group)/lazyinside.lazy').then((d) => d.Route)) -const groupInsideRoute = groupInsideImport.update({ +const groupInsideRoute = groupInsideRouteImport.update({ id: '/inside', path: '/inside', getParentRoute: () => groupRoute, } as any) -const groupLayoutRoute = groupLayoutImport.update({ +const groupLayoutRoute = groupLayoutRouteImport.update({ id: '/_layout', getParentRoute: () => groupRoute, } as any) const anotherGroupOnlyrouteinsideRoute = - anotherGroupOnlyrouteinsideImport.update({ + anotherGroupOnlyrouteinsideRouteImport.update({ id: '/(another-group)/onlyrouteinside', path: '/onlyrouteinside', getParentRoute: () => rootRoute, } as any) -const RedirectTargetIndexRoute = RedirectTargetIndexImport.update({ +const RedirectTargetIndexRoute = RedirectTargetIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => RedirectTargetRoute, } as any) -const RedirectPreloadThirdRoute = RedirectPreloadThirdImport.update({ +const ParamsPsWildcardIndexRoute = ParamsPsWildcardIndexRouteImport.update({ + id: '/params-ps/wildcard/', + path: '/params-ps/wildcard/', + getParentRoute: () => rootRoute, +} as any) + +const ParamsPsNamedIndexRoute = ParamsPsNamedIndexRouteImport.update({ + id: '/params-ps/named/', + path: '/params-ps/named/', + getParentRoute: () => rootRoute, +} as any) + +const RedirectPreloadThirdRoute = RedirectPreloadThirdRouteImport.update({ id: '/redirect/preload/third', path: '/redirect/preload/third', getParentRoute: () => rootRoute, } as any) -const RedirectPreloadSecondRoute = RedirectPreloadSecondImport.update({ +const RedirectPreloadSecondRoute = RedirectPreloadSecondRouteImport.update({ id: '/redirect/preload/second', path: '/redirect/preload/second', getParentRoute: () => rootRoute, } as any) -const RedirectPreloadFirstRoute = RedirectPreloadFirstImport.update({ +const RedirectPreloadFirstRoute = RedirectPreloadFirstRouteImport.update({ id: '/redirect/preload/first', path: '/redirect/preload/first', getParentRoute: () => rootRoute, } as any) -const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderImport.update({ +const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetViaBeforeLoadRoute = - RedirectTargetViaBeforeLoadImport.update({ + RedirectTargetViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, } as any) -const PostsPostIdEditRoute = PostsPostIdEditImport.update({ +const PostsPostIdEditRoute = PostsPostIdEditRouteImport.update({ id: '/posts_/$postId/edit', path: '/posts/$postId/edit', getParentRoute: () => rootRoute, } as any) -const ParamsSingleValueRoute = ParamsSingleValueImport.update({ +const ParamsSingleValueRoute = ParamsSingleValueRouteImport.update({ id: '/params/single/$value', path: '/params/single/$value', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const ParamsPsWildcardChar123Char125suffixRoute = + ParamsPsWildcardChar123Char125suffixRouteImport.update({ + id: '/params-ps/wildcard/{$}suffix', + path: '/params-ps/wildcard/{$}suffix', + getParentRoute: () => rootRoute, + } as any) + +const ParamsPsWildcardPrefixChar123Char125Route = + ParamsPsWildcardPrefixChar123Char125RouteImport.update({ + id: '/params-ps/wildcard/prefix{$}', + path: '/params-ps/wildcard/prefix{$}', + getParentRoute: () => rootRoute, + } as any) + +const ParamsPsWildcardSplatRoute = ParamsPsWildcardSplatRouteImport.update({ + id: '/params-ps/wildcard/$', + path: '/params-ps/wildcard/$', + getParentRoute: () => rootRoute, +} as any) + +const ParamsPsNamedChar123fooChar125suffixRoute = + ParamsPsNamedChar123fooChar125suffixRouteImport.update({ + id: '/params-ps/named/{$foo}suffix', + path: '/params-ps/named/{$foo}suffix', + getParentRoute: () => rootRoute, + } as any) + +const ParamsPsNamedPrefixChar123fooChar125Route = + ParamsPsNamedPrefixChar123fooChar125RouteImport.update({ + id: '/params-ps/named/prefix{$foo}', + path: '/params-ps/named/prefix{$foo}', + getParentRoute: () => rootRoute, + } as any) + +const ParamsPsNamedFooRoute = ParamsPsNamedFooRouteImport.update({ + id: '/params-ps/named/$foo', + path: '/params-ps/named/$foo', + getParentRoute: () => rootRoute, +} as any) + +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, } as any) -const groupSubfolderInsideRoute = groupSubfolderInsideImport.update({ +const groupSubfolderInsideRoute = groupSubfolderInsideRouteImport.update({ id: '/subfolder/inside', path: '/subfolder/inside', getParentRoute: () => groupRoute, } as any) -const groupLayoutInsidelayoutRoute = groupLayoutInsidelayoutImport.update({ +const groupLayoutInsidelayoutRoute = groupLayoutInsidelayoutRouteImport.update({ id: '/insidelayout', path: '/insidelayout', getParentRoute: () => groupLayoutRoute, @@ -230,208 +299,613 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/anchor': { id: '/anchor' path: '/anchor' fullPath: '/anchor' - preLoaderRoute: typeof AnchorImport + preLoaderRoute: typeof AnchorRouteImport parentRoute: typeof rootRoute } '/editing-a': { id: '/editing-a' path: '/editing-a' fullPath: '/editing-a' - preLoaderRoute: typeof EditingAImport + preLoaderRoute: typeof EditingARouteImport parentRoute: typeof rootRoute } '/editing-b': { id: '/editing-b' path: '/editing-b' fullPath: '/editing-b' - preLoaderRoute: typeof EditingBImport + preLoaderRoute: typeof EditingBRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/(another-group)/onlyrouteinside': { id: '/(another-group)/onlyrouteinside' path: '/onlyrouteinside' fullPath: '/onlyrouteinside' - preLoaderRoute: typeof anotherGroupOnlyrouteinsideImport + preLoaderRoute: typeof anotherGroupOnlyrouteinsideRouteImport parentRoute: typeof rootRoute } '/(group)': { id: '/(group)' path: '/' fullPath: '/' - preLoaderRoute: typeof groupImport + preLoaderRoute: typeof groupRouteImport parentRoute: typeof rootRoute } '/(group)/_layout': { id: '/(group)/_layout' path: '/' fullPath: '/' - preLoaderRoute: typeof groupLayoutImport + preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof groupRoute } '/(group)/inside': { id: '/(group)/inside' path: '/inside' fullPath: '/inside' - preLoaderRoute: typeof groupInsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupInsideRouteImport + parentRoute: typeof groupRouteImport } '/(group)/lazyinside': { id: '/(group)/lazyinside' path: '/lazyinside' fullPath: '/lazyinside' - preLoaderRoute: typeof groupLazyinsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupLazyinsideRouteImport + parentRoute: typeof groupRouteImport } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/$target': { id: '/redirect/$target' path: '/redirect/$target' fullPath: '/redirect/$target' - preLoaderRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetRouteImport parentRoute: typeof rootRoute } '/structural-sharing/$enabled': { id: '/structural-sharing/$enabled' path: '/structural-sharing/$enabled' fullPath: '/structural-sharing/$enabled' - preLoaderRoute: typeof StructuralSharingEnabledImport + preLoaderRoute: typeof StructuralSharingEnabledRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/': { + id: '/params-ps/' + path: '/params-ps' + fullPath: '/params-ps' + preLoaderRoute: typeof ParamsPsIndexRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/': { id: '/redirect/' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectIndexImport + preLoaderRoute: typeof RedirectIndexRouteImport parentRoute: typeof rootRoute } '/(group)/_layout/insidelayout': { id: '/(group)/_layout/insidelayout' path: '/insidelayout' fullPath: '/insidelayout' - preLoaderRoute: typeof groupLayoutInsidelayoutImport - parentRoute: typeof groupLayoutImport + preLoaderRoute: typeof groupLayoutInsidelayoutRouteImport + parentRoute: typeof groupLayoutRouteImport } '/(group)/subfolder/inside': { id: '/(group)/subfolder/inside' path: '/subfolder/inside' fullPath: '/subfolder/inside' - preLoaderRoute: typeof groupSubfolderInsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupSubfolderInsideRouteImport + parentRoute: typeof groupRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport + } + '/params-ps/named/$foo': { + id: '/params-ps/named/$foo' + path: '/params-ps/named/$foo' + fullPath: '/params-ps/named/$foo' + preLoaderRoute: typeof ParamsPsNamedFooRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/named/prefix{$foo}': { + id: '/params-ps/named/prefix{$foo}' + path: '/params-ps/named/prefix{$foo}' + fullPath: '/params-ps/named/prefix{$foo}' + preLoaderRoute: typeof ParamsPsNamedPrefixChar123fooChar125RouteImport + parentRoute: typeof rootRoute + } + '/params-ps/named/{$foo}suffix': { + id: '/params-ps/named/{$foo}suffix' + path: '/params-ps/named/{$foo}suffix' + fullPath: '/params-ps/named/{$foo}suffix' + preLoaderRoute: typeof ParamsPsNamedChar123fooChar125suffixRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/wildcard/$': { + id: '/params-ps/wildcard/$' + path: '/params-ps/wildcard/$' + fullPath: '/params-ps/wildcard/$' + preLoaderRoute: typeof ParamsPsWildcardSplatRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/wildcard/prefix{$}': { + id: '/params-ps/wildcard/prefix{$}' + path: '/params-ps/wildcard/prefix{$}' + fullPath: '/params-ps/wildcard/prefix{$}' + preLoaderRoute: typeof ParamsPsWildcardPrefixChar123Char125RouteImport + parentRoute: typeof rootRoute + } + '/params-ps/wildcard/{$}suffix': { + id: '/params-ps/wildcard/{$}suffix' + path: '/params-ps/wildcard/{$}suffix' + fullPath: '/params-ps/wildcard/{$}suffix' + preLoaderRoute: typeof ParamsPsWildcardChar123Char125suffixRouteImport + parentRoute: typeof rootRoute } '/params/single/$value': { id: '/params/single/$value' path: '/params/single/$value' fullPath: '/params/single/$value' - preLoaderRoute: typeof ParamsSingleValueImport + preLoaderRoute: typeof ParamsSingleValueRouteImport parentRoute: typeof rootRoute } '/posts_/$postId/edit': { id: '/posts_/$postId/edit' path: '/posts/$postId/edit' fullPath: '/posts/$postId/edit' - preLoaderRoute: typeof PostsPostIdEditImport + preLoaderRoute: typeof PostsPostIdEditRouteImport parentRoute: typeof rootRoute } '/redirect/$target/via-beforeLoad': { id: '/redirect/$target/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/redirect/$target/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/via-loader': { id: '/redirect/$target/via-loader' path: '/via-loader' fullPath: '/redirect/$target/via-loader' - preLoaderRoute: typeof RedirectTargetViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/preload/first': { id: '/redirect/preload/first' path: '/redirect/preload/first' fullPath: '/redirect/preload/first' - preLoaderRoute: typeof RedirectPreloadFirstImport + preLoaderRoute: typeof RedirectPreloadFirstRouteImport parentRoute: typeof rootRoute } '/redirect/preload/second': { id: '/redirect/preload/second' path: '/redirect/preload/second' fullPath: '/redirect/preload/second' - preLoaderRoute: typeof RedirectPreloadSecondImport + preLoaderRoute: typeof RedirectPreloadSecondRouteImport parentRoute: typeof rootRoute } '/redirect/preload/third': { id: '/redirect/preload/third' path: '/redirect/preload/third' fullPath: '/redirect/preload/third' - preLoaderRoute: typeof RedirectPreloadThirdImport + preLoaderRoute: typeof RedirectPreloadThirdRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/named/': { + id: '/params-ps/named/' + path: '/params-ps/named' + fullPath: '/params-ps/named' + preLoaderRoute: typeof ParamsPsNamedIndexRouteImport + parentRoute: typeof rootRoute + } + '/params-ps/wildcard/': { + id: '/params-ps/wildcard/' + path: '/params-ps/wildcard' + fullPath: '/params-ps/wildcard' + preLoaderRoute: typeof ParamsPsWildcardIndexRouteImport parentRoute: typeof rootRoute } '/redirect/$target/': { id: '/redirect/$target/' path: '/' fullPath: '/redirect/$target/' - preLoaderRoute: typeof RedirectTargetIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/anchor' { + const createFileRoute: CreateFileRoute< + '/anchor', + FileRoutesByPath['/anchor']['parentRoute'], + FileRoutesByPath['/anchor']['id'], + FileRoutesByPath['/anchor']['path'], + FileRoutesByPath['/anchor']['fullPath'] + > +} +declare module './routes/editing-a' { + const createFileRoute: CreateFileRoute< + '/editing-a', + FileRoutesByPath['/editing-a']['parentRoute'], + FileRoutesByPath['/editing-a']['id'], + FileRoutesByPath['/editing-a']['path'], + FileRoutesByPath['/editing-a']['fullPath'] + > +} +declare module './routes/editing-b' { + const createFileRoute: CreateFileRoute< + '/editing-b', + FileRoutesByPath['/editing-b']['parentRoute'], + FileRoutesByPath['/editing-b']['id'], + FileRoutesByPath['/editing-b']['path'], + FileRoutesByPath['/editing-b']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/(another-group)/onlyrouteinside' { + const createFileRoute: CreateFileRoute< + '/(another-group)/onlyrouteinside', + FileRoutesByPath['/(another-group)/onlyrouteinside']['parentRoute'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['id'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['path'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['fullPath'] + > +} + +declare module './routes/(group)/_layout' { + const createFileRoute: CreateFileRoute< + '/(group)/_layout', + FileRoutesByPath['/(group)/_layout']['parentRoute'], + FileRoutesByPath['/(group)/_layout']['id'], + FileRoutesByPath['/(group)/_layout']['path'], + FileRoutesByPath['/(group)/_layout']['fullPath'] + > +} +declare module './routes/(group)/inside' { + const createFileRoute: CreateFileRoute< + '/(group)/inside', + FileRoutesByPath['/(group)/inside']['parentRoute'], + FileRoutesByPath['/(group)/inside']['id'], + FileRoutesByPath['/(group)/inside']['path'], + FileRoutesByPath['/(group)/inside']['fullPath'] + > +} +declare module './routes/(group)/lazyinside' { + const createFileRoute: CreateFileRoute< + '/(group)/lazyinside', + FileRoutesByPath['/(group)/lazyinside']['parentRoute'], + FileRoutesByPath['/(group)/lazyinside']['id'], + FileRoutesByPath['/(group)/lazyinside']['path'], + FileRoutesByPath['/(group)/lazyinside']['fullPath'] + > +} +declare module './routes/(group)/lazyinside.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(group)/lazyinside']['preLoaderRoute'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/redirect/$target' { + const createFileRoute: CreateFileRoute< + '/redirect/$target', + FileRoutesByPath['/redirect/$target']['parentRoute'], + FileRoutesByPath['/redirect/$target']['id'], + FileRoutesByPath['/redirect/$target']['path'], + FileRoutesByPath['/redirect/$target']['fullPath'] + > +} +declare module './routes/structural-sharing.$enabled' { + const createFileRoute: CreateFileRoute< + '/structural-sharing/$enabled', + FileRoutesByPath['/structural-sharing/$enabled']['parentRoute'], + FileRoutesByPath['/structural-sharing/$enabled']['id'], + FileRoutesByPath['/structural-sharing/$enabled']['path'], + FileRoutesByPath['/structural-sharing/$enabled']['fullPath'] + > +} +declare module './routes/params-ps/index' { + const createFileRoute: CreateFileRoute< + '/params-ps/', + FileRoutesByPath['/params-ps/']['parentRoute'], + FileRoutesByPath['/params-ps/']['id'], + FileRoutesByPath['/params-ps/']['path'], + FileRoutesByPath['/params-ps/']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/redirect/index' { + const createFileRoute: CreateFileRoute< + '/redirect/', + FileRoutesByPath['/redirect/']['parentRoute'], + FileRoutesByPath['/redirect/']['id'], + FileRoutesByPath['/redirect/']['path'], + FileRoutesByPath['/redirect/']['fullPath'] + > +} +declare module './routes/(group)/_layout.insidelayout' { + const createFileRoute: CreateFileRoute< + '/(group)/_layout/insidelayout', + FileRoutesByPath['/(group)/_layout/insidelayout']['parentRoute'], + FileRoutesByPath['/(group)/_layout/insidelayout']['id'], + FileRoutesByPath['/(group)/_layout/insidelayout']['path'], + FileRoutesByPath['/(group)/_layout/insidelayout']['fullPath'] + > +} +declare module './routes/(group)/subfolder/inside' { + const createFileRoute: CreateFileRoute< + '/(group)/subfolder/inside', + FileRoutesByPath['/(group)/subfolder/inside']['parentRoute'], + FileRoutesByPath['/(group)/subfolder/inside']['id'], + FileRoutesByPath['/(group)/subfolder/inside']['path'], + FileRoutesByPath['/(group)/subfolder/inside']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/params-ps/named/$foo' { + const createFileRoute: CreateFileRoute< + '/params-ps/named/$foo', + FileRoutesByPath['/params-ps/named/$foo']['parentRoute'], + FileRoutesByPath['/params-ps/named/$foo']['id'], + FileRoutesByPath['/params-ps/named/$foo']['path'], + FileRoutesByPath['/params-ps/named/$foo']['fullPath'] + > +} +declare module './routes/params-ps/named/prefix{$foo}' { + const createFileRoute: CreateFileRoute< + '/params-ps/named/prefix{$foo}', + FileRoutesByPath['/params-ps/named/prefix{$foo}']['parentRoute'], + FileRoutesByPath['/params-ps/named/prefix{$foo}']['id'], + FileRoutesByPath['/params-ps/named/prefix{$foo}']['path'], + FileRoutesByPath['/params-ps/named/prefix{$foo}']['fullPath'] + > +} +declare module './routes/params-ps/named/{$foo}suffix' { + const createFileRoute: CreateFileRoute< + '/params-ps/named/{$foo}suffix', + FileRoutesByPath['/params-ps/named/{$foo}suffix']['parentRoute'], + FileRoutesByPath['/params-ps/named/{$foo}suffix']['id'], + FileRoutesByPath['/params-ps/named/{$foo}suffix']['path'], + FileRoutesByPath['/params-ps/named/{$foo}suffix']['fullPath'] + > +} +declare module './routes/params-ps/wildcard/$' { + const createFileRoute: CreateFileRoute< + '/params-ps/wildcard/$', + FileRoutesByPath['/params-ps/wildcard/$']['parentRoute'], + FileRoutesByPath['/params-ps/wildcard/$']['id'], + FileRoutesByPath['/params-ps/wildcard/$']['path'], + FileRoutesByPath['/params-ps/wildcard/$']['fullPath'] + > +} +declare module './routes/params-ps/wildcard/prefix{$}' { + const createFileRoute: CreateFileRoute< + '/params-ps/wildcard/prefix{$}', + FileRoutesByPath['/params-ps/wildcard/prefix{$}']['parentRoute'], + FileRoutesByPath['/params-ps/wildcard/prefix{$}']['id'], + FileRoutesByPath['/params-ps/wildcard/prefix{$}']['path'], + FileRoutesByPath['/params-ps/wildcard/prefix{$}']['fullPath'] + > +} +declare module './routes/params-ps/wildcard/{$}suffix' { + const createFileRoute: CreateFileRoute< + '/params-ps/wildcard/{$}suffix', + FileRoutesByPath['/params-ps/wildcard/{$}suffix']['parentRoute'], + FileRoutesByPath['/params-ps/wildcard/{$}suffix']['id'], + FileRoutesByPath['/params-ps/wildcard/{$}suffix']['path'], + FileRoutesByPath['/params-ps/wildcard/{$}suffix']['fullPath'] + > +} +declare module './routes/params.single.$value' { + const createFileRoute: CreateFileRoute< + '/params/single/$value', + FileRoutesByPath['/params/single/$value']['parentRoute'], + FileRoutesByPath['/params/single/$value']['id'], + FileRoutesByPath['/params/single/$value']['path'], + FileRoutesByPath['/params/single/$value']['fullPath'] + > +} +declare module './routes/posts_.$postId.edit' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/edit', + FileRoutesByPath['/posts_/$postId/edit']['parentRoute'], + FileRoutesByPath['/posts_/$postId/edit']['id'], + FileRoutesByPath['/posts_/$postId/edit']['path'], + FileRoutesByPath['/posts_/$postId/edit']['fullPath'] + > +} +declare module './routes/redirect/$target/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-beforeLoad', + FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-loader', + FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-loader']['id'], + FileRoutesByPath['/redirect/$target/via-loader']['path'], + FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] + > +} +declare module './routes/redirect/preload/first' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/first', + FileRoutesByPath['/redirect/preload/first']['parentRoute'], + FileRoutesByPath['/redirect/preload/first']['id'], + FileRoutesByPath['/redirect/preload/first']['path'], + FileRoutesByPath['/redirect/preload/first']['fullPath'] + > +} +declare module './routes/redirect/preload/second' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/second', + FileRoutesByPath['/redirect/preload/second']['parentRoute'], + FileRoutesByPath['/redirect/preload/second']['id'], + FileRoutesByPath['/redirect/preload/second']['path'], + FileRoutesByPath['/redirect/preload/second']['fullPath'] + > +} +declare module './routes/redirect/preload/third' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/third', + FileRoutesByPath['/redirect/preload/third']['parentRoute'], + FileRoutesByPath['/redirect/preload/third']['id'], + FileRoutesByPath['/redirect/preload/third']['path'], + FileRoutesByPath['/redirect/preload/third']['fullPath'] + > +} +declare module './routes/params-ps/named/index' { + const createFileRoute: CreateFileRoute< + '/params-ps/named/', + FileRoutesByPath['/params-ps/named/']['parentRoute'], + FileRoutesByPath['/params-ps/named/']['id'], + FileRoutesByPath['/params-ps/named/']['path'], + FileRoutesByPath['/params-ps/named/']['fullPath'] + > +} +declare module './routes/params-ps/wildcard/index' { + const createFileRoute: CreateFileRoute< + '/params-ps/wildcard/', + FileRoutesByPath['/params-ps/wildcard/']['parentRoute'], + FileRoutesByPath['/params-ps/wildcard/']['id'], + FileRoutesByPath['/params-ps/wildcard/']['path'], + FileRoutesByPath['/params-ps/wildcard/']['fullPath'] + > +} +declare module './routes/redirect/$target/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/', + FileRoutesByPath['/redirect/$target/']['parentRoute'], + FileRoutesByPath['/redirect/$target/']['id'], + FileRoutesByPath['/redirect/$target/']['path'], + FileRoutesByPath['/redirect/$target/']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { @@ -528,12 +1002,19 @@ export interface FileRoutesByFullPath { '/posts/$postId': typeof PostsPostIdRoute '/redirect/$target': typeof RedirectTargetRouteWithChildren '/structural-sharing/$enabled': typeof StructuralSharingEnabledRoute + '/params-ps': typeof ParamsPsIndexRoute '/posts/': typeof PostsIndexRoute '/redirect': typeof RedirectIndexRoute '/insidelayout': typeof groupLayoutInsidelayoutRoute '/subfolder/inside': typeof groupSubfolderInsideRoute '/layout-a': typeof LayoutLayout2LayoutARoute '/layout-b': typeof LayoutLayout2LayoutBRoute + '/params-ps/named/$foo': typeof ParamsPsNamedFooRoute + '/params-ps/named/prefix{$foo}': typeof ParamsPsNamedPrefixChar123fooChar125Route + '/params-ps/named/{$foo}suffix': typeof ParamsPsNamedChar123fooChar125suffixRoute + '/params-ps/wildcard/$': typeof ParamsPsWildcardSplatRoute + '/params-ps/wildcard/prefix{$}': typeof ParamsPsWildcardPrefixChar123Char125Route + '/params-ps/wildcard/{$}suffix': typeof ParamsPsWildcardChar123Char125suffixRoute '/params/single/$value': typeof ParamsSingleValueRoute '/posts/$postId/edit': typeof PostsPostIdEditRoute '/redirect/$target/via-beforeLoad': typeof RedirectTargetViaBeforeLoadRoute @@ -541,6 +1022,8 @@ export interface FileRoutesByFullPath { '/redirect/preload/first': typeof RedirectPreloadFirstRoute '/redirect/preload/second': typeof RedirectPreloadSecondRoute '/redirect/preload/third': typeof RedirectPreloadThirdRoute + '/params-ps/named': typeof ParamsPsNamedIndexRoute + '/params-ps/wildcard': typeof ParamsPsWildcardIndexRoute '/redirect/$target/': typeof RedirectTargetIndexRoute } @@ -555,12 +1038,19 @@ export interface FileRoutesByTo { '/lazyinside': typeof groupLazyinsideRoute '/posts/$postId': typeof PostsPostIdRoute '/structural-sharing/$enabled': typeof StructuralSharingEnabledRoute + '/params-ps': typeof ParamsPsIndexRoute '/posts': typeof PostsIndexRoute '/redirect': typeof RedirectIndexRoute '/insidelayout': typeof groupLayoutInsidelayoutRoute '/subfolder/inside': typeof groupSubfolderInsideRoute '/layout-a': typeof LayoutLayout2LayoutARoute '/layout-b': typeof LayoutLayout2LayoutBRoute + '/params-ps/named/$foo': typeof ParamsPsNamedFooRoute + '/params-ps/named/prefix{$foo}': typeof ParamsPsNamedPrefixChar123fooChar125Route + '/params-ps/named/{$foo}suffix': typeof ParamsPsNamedChar123fooChar125suffixRoute + '/params-ps/wildcard/$': typeof ParamsPsWildcardSplatRoute + '/params-ps/wildcard/prefix{$}': typeof ParamsPsWildcardPrefixChar123Char125Route + '/params-ps/wildcard/{$}suffix': typeof ParamsPsWildcardChar123Char125suffixRoute '/params/single/$value': typeof ParamsSingleValueRoute '/posts/$postId/edit': typeof PostsPostIdEditRoute '/redirect/$target/via-beforeLoad': typeof RedirectTargetViaBeforeLoadRoute @@ -568,6 +1058,8 @@ export interface FileRoutesByTo { '/redirect/preload/first': typeof RedirectPreloadFirstRoute '/redirect/preload/second': typeof RedirectPreloadSecondRoute '/redirect/preload/third': typeof RedirectPreloadThirdRoute + '/params-ps/named': typeof ParamsPsNamedIndexRoute + '/params-ps/wildcard': typeof ParamsPsWildcardIndexRoute '/redirect/$target': typeof RedirectTargetIndexRoute } @@ -588,12 +1080,19 @@ export interface FileRoutesById { '/posts/$postId': typeof PostsPostIdRoute '/redirect/$target': typeof RedirectTargetRouteWithChildren '/structural-sharing/$enabled': typeof StructuralSharingEnabledRoute + '/params-ps/': typeof ParamsPsIndexRoute '/posts/': typeof PostsIndexRoute '/redirect/': typeof RedirectIndexRoute '/(group)/_layout/insidelayout': typeof groupLayoutInsidelayoutRoute '/(group)/subfolder/inside': typeof groupSubfolderInsideRoute '/_layout/_layout-2/layout-a': typeof LayoutLayout2LayoutARoute '/_layout/_layout-2/layout-b': typeof LayoutLayout2LayoutBRoute + '/params-ps/named/$foo': typeof ParamsPsNamedFooRoute + '/params-ps/named/prefix{$foo}': typeof ParamsPsNamedPrefixChar123fooChar125Route + '/params-ps/named/{$foo}suffix': typeof ParamsPsNamedChar123fooChar125suffixRoute + '/params-ps/wildcard/$': typeof ParamsPsWildcardSplatRoute + '/params-ps/wildcard/prefix{$}': typeof ParamsPsWildcardPrefixChar123Char125Route + '/params-ps/wildcard/{$}suffix': typeof ParamsPsWildcardChar123Char125suffixRoute '/params/single/$value': typeof ParamsSingleValueRoute '/posts_/$postId/edit': typeof PostsPostIdEditRoute '/redirect/$target/via-beforeLoad': typeof RedirectTargetViaBeforeLoadRoute @@ -601,6 +1100,8 @@ export interface FileRoutesById { '/redirect/preload/first': typeof RedirectPreloadFirstRoute '/redirect/preload/second': typeof RedirectPreloadSecondRoute '/redirect/preload/third': typeof RedirectPreloadThirdRoute + '/params-ps/named/': typeof ParamsPsNamedIndexRoute + '/params-ps/wildcard/': typeof ParamsPsWildcardIndexRoute '/redirect/$target/': typeof RedirectTargetIndexRoute } @@ -619,12 +1120,19 @@ export interface FileRouteTypes { | '/posts/$postId' | '/redirect/$target' | '/structural-sharing/$enabled' + | '/params-ps' | '/posts/' | '/redirect' | '/insidelayout' | '/subfolder/inside' | '/layout-a' | '/layout-b' + | '/params-ps/named/$foo' + | '/params-ps/named/prefix{$foo}' + | '/params-ps/named/{$foo}suffix' + | '/params-ps/wildcard/$' + | '/params-ps/wildcard/prefix{$}' + | '/params-ps/wildcard/{$}suffix' | '/params/single/$value' | '/posts/$postId/edit' | '/redirect/$target/via-beforeLoad' @@ -632,6 +1140,8 @@ export interface FileRouteTypes { | '/redirect/preload/first' | '/redirect/preload/second' | '/redirect/preload/third' + | '/params-ps/named' + | '/params-ps/wildcard' | '/redirect/$target/' fileRoutesByTo: FileRoutesByTo to: @@ -645,12 +1155,19 @@ export interface FileRouteTypes { | '/lazyinside' | '/posts/$postId' | '/structural-sharing/$enabled' + | '/params-ps' | '/posts' | '/redirect' | '/insidelayout' | '/subfolder/inside' | '/layout-a' | '/layout-b' + | '/params-ps/named/$foo' + | '/params-ps/named/prefix{$foo}' + | '/params-ps/named/{$foo}suffix' + | '/params-ps/wildcard/$' + | '/params-ps/wildcard/prefix{$}' + | '/params-ps/wildcard/{$}suffix' | '/params/single/$value' | '/posts/$postId/edit' | '/redirect/$target/via-beforeLoad' @@ -658,6 +1175,8 @@ export interface FileRouteTypes { | '/redirect/preload/first' | '/redirect/preload/second' | '/redirect/preload/third' + | '/params-ps/named' + | '/params-ps/wildcard' | '/redirect/$target' id: | '__root__' @@ -676,12 +1195,19 @@ export interface FileRouteTypes { | '/posts/$postId' | '/redirect/$target' | '/structural-sharing/$enabled' + | '/params-ps/' | '/posts/' | '/redirect/' | '/(group)/_layout/insidelayout' | '/(group)/subfolder/inside' | '/_layout/_layout-2/layout-a' | '/_layout/_layout-2/layout-b' + | '/params-ps/named/$foo' + | '/params-ps/named/prefix{$foo}' + | '/params-ps/named/{$foo}suffix' + | '/params-ps/wildcard/$' + | '/params-ps/wildcard/prefix{$}' + | '/params-ps/wildcard/{$}suffix' | '/params/single/$value' | '/posts_/$postId/edit' | '/redirect/$target/via-beforeLoad' @@ -689,6 +1215,8 @@ export interface FileRouteTypes { | '/redirect/preload/first' | '/redirect/preload/second' | '/redirect/preload/third' + | '/params-ps/named/' + | '/params-ps/wildcard/' | '/redirect/$target/' fileRoutesById: FileRoutesById } @@ -704,12 +1232,21 @@ export interface RootRouteChildren { groupRoute: typeof groupRouteWithChildren RedirectTargetRoute: typeof RedirectTargetRouteWithChildren StructuralSharingEnabledRoute: typeof StructuralSharingEnabledRoute + ParamsPsIndexRoute: typeof ParamsPsIndexRoute RedirectIndexRoute: typeof RedirectIndexRoute + ParamsPsNamedFooRoute: typeof ParamsPsNamedFooRoute + ParamsPsNamedPrefixChar123fooChar125Route: typeof ParamsPsNamedPrefixChar123fooChar125Route + ParamsPsNamedChar123fooChar125suffixRoute: typeof ParamsPsNamedChar123fooChar125suffixRoute + ParamsPsWildcardSplatRoute: typeof ParamsPsWildcardSplatRoute + ParamsPsWildcardPrefixChar123Char125Route: typeof ParamsPsWildcardPrefixChar123Char125Route + ParamsPsWildcardChar123Char125suffixRoute: typeof ParamsPsWildcardChar123Char125suffixRoute ParamsSingleValueRoute: typeof ParamsSingleValueRoute PostsPostIdEditRoute: typeof PostsPostIdEditRoute RedirectPreloadFirstRoute: typeof RedirectPreloadFirstRoute RedirectPreloadSecondRoute: typeof RedirectPreloadSecondRoute RedirectPreloadThirdRoute: typeof RedirectPreloadThirdRoute + ParamsPsNamedIndexRoute: typeof ParamsPsNamedIndexRoute + ParamsPsWildcardIndexRoute: typeof ParamsPsWildcardIndexRoute } const rootRouteChildren: RootRouteChildren = { @@ -723,12 +1260,25 @@ const rootRouteChildren: RootRouteChildren = { groupRoute: groupRouteWithChildren, RedirectTargetRoute: RedirectTargetRouteWithChildren, StructuralSharingEnabledRoute: StructuralSharingEnabledRoute, + ParamsPsIndexRoute: ParamsPsIndexRoute, RedirectIndexRoute: RedirectIndexRoute, + ParamsPsNamedFooRoute: ParamsPsNamedFooRoute, + ParamsPsNamedPrefixChar123fooChar125Route: + ParamsPsNamedPrefixChar123fooChar125Route, + ParamsPsNamedChar123fooChar125suffixRoute: + ParamsPsNamedChar123fooChar125suffixRoute, + ParamsPsWildcardSplatRoute: ParamsPsWildcardSplatRoute, + ParamsPsWildcardPrefixChar123Char125Route: + ParamsPsWildcardPrefixChar123Char125Route, + ParamsPsWildcardChar123Char125suffixRoute: + ParamsPsWildcardChar123Char125suffixRoute, ParamsSingleValueRoute: ParamsSingleValueRoute, PostsPostIdEditRoute: PostsPostIdEditRoute, RedirectPreloadFirstRoute: RedirectPreloadFirstRoute, RedirectPreloadSecondRoute: RedirectPreloadSecondRoute, RedirectPreloadThirdRoute: RedirectPreloadThirdRoute, + ParamsPsNamedIndexRoute: ParamsPsNamedIndexRoute, + ParamsPsWildcardIndexRoute: ParamsPsWildcardIndexRoute, } export const routeTree = rootRoute @@ -751,12 +1301,21 @@ export const routeTree = rootRoute "/(group)", "/redirect/$target", "/structural-sharing/$enabled", + "/params-ps/", "/redirect/", + "/params-ps/named/$foo", + "/params-ps/named/prefix{$foo}", + "/params-ps/named/{$foo}suffix", + "/params-ps/wildcard/$", + "/params-ps/wildcard/prefix{$}", + "/params-ps/wildcard/{$}suffix", "/params/single/$value", "/posts_/$postId/edit", "/redirect/preload/first", "/redirect/preload/second", - "/redirect/preload/third" + "/redirect/preload/third", + "/params-ps/named/", + "/params-ps/wildcard/" ] }, "/": { @@ -834,6 +1393,9 @@ export const routeTree = rootRoute "/structural-sharing/$enabled": { "filePath": "structural-sharing.$enabled.tsx" }, + "/params-ps/": { + "filePath": "params-ps/index.tsx" + }, "/posts/": { "filePath": "posts.index.tsx", "parent": "/posts" @@ -857,6 +1419,24 @@ export const routeTree = rootRoute "filePath": "_layout/_layout-2/layout-b.tsx", "parent": "/_layout/_layout-2" }, + "/params-ps/named/$foo": { + "filePath": "params-ps/named/$foo.tsx" + }, + "/params-ps/named/prefix{$foo}": { + "filePath": "params-ps/named/prefix{$foo}.tsx" + }, + "/params-ps/named/{$foo}suffix": { + "filePath": "params-ps/named/{$foo}suffix.tsx" + }, + "/params-ps/wildcard/$": { + "filePath": "params-ps/wildcard/$.tsx" + }, + "/params-ps/wildcard/prefix{$}": { + "filePath": "params-ps/wildcard/prefix{$}.tsx" + }, + "/params-ps/wildcard/{$}suffix": { + "filePath": "params-ps/wildcard/{$}suffix.tsx" + }, "/params/single/$value": { "filePath": "params.single.$value.tsx" }, @@ -880,6 +1460,12 @@ export const routeTree = rootRoute "/redirect/preload/third": { "filePath": "redirect/preload/third.tsx" }, + "/params-ps/named/": { + "filePath": "params-ps/named/index.tsx" + }, + "/params-ps/wildcard/": { + "filePath": "params-ps/wildcard/index.tsx" + }, "/redirect/$target/": { "filePath": "redirect/$target/index.tsx", "parent": "/redirect/$target" diff --git a/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx index bbd1eedb6f..62a41d2cf2 100644 --- a/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/react-router' +import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(another-group)/onlyrouteinside') -export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx index 2975baedc9..0672b308e9 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/react-router' +import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/_layout/insidelayout') -export const Route = createFileRoute('/(group)/_layout/insidelayout')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx index 4b755791c0..7806ad35db 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/(group)/_layout')({ +export const Route = createFileRoute({ component: () => ( <>
/(group)/_layout!
diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx index 356ff96003..146dfb8c01 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/react-router' +import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/inside') -export const Route = createFileRoute('/(group)/inside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/inside' }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx index 527be4f520..dc10d92fae 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx @@ -1,12 +1,8 @@ -import { - createLazyFileRoute, - getRouteApi, - useSearch, -} from '@tanstack/react-router' +import { getRouteApi, useSearch } from '@tanstack/react-router' const routeApi = getRouteApi('/(group)/lazyinside') -export const Route = createLazyFileRoute('/(group)/lazyinside')({ +export const Route = createLazyFileRoute({ component: () => { const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) const searchViaRouteHook = Route.useSearch() diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx index 0f52a40d98..c11aef8fd1 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' -export const Route = createFileRoute('/(group)/lazyinside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx index 3a4a051e8a..31830d399e 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/react-router' +import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/subfolder/inside') -export const Route = createFileRoute('/(group)/subfolder/inside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout.tsx b/e2e/react-router/basic-file-based/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/anchor.tsx b/e2e/react-router/basic-file-based/src/routes/anchor.tsx index 93975ba621..26d02d6b2c 100644 --- a/e2e/react-router/basic-file-based/src/routes/anchor.tsx +++ b/e2e/react-router/basic-file-based/src/routes/anchor.tsx @@ -1,12 +1,7 @@ import { useLayoutEffect, useRef, useState } from 'react' -import { - Link, - createFileRoute, - useLocation, - useNavigate, -} from '@tanstack/react-router' - -export const Route = createFileRoute('/anchor')({ +import { Link, useLocation, useNavigate } from '@tanstack/react-router' + +export const Route = createFileRoute({ component: AnchorComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/editing-a.tsx b/e2e/react-router/basic-file-based/src/routes/editing-a.tsx index cecd0dfed1..62a2dadeb4 100644 --- a/e2e/react-router/basic-file-based/src/routes/editing-a.tsx +++ b/e2e/react-router/basic-file-based/src/routes/editing-a.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { createFileRoute, useBlocker } from '@tanstack/react-router' +import { useBlocker } from '@tanstack/react-router' -export const Route = createFileRoute('/editing-a')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/editing-b.tsx b/e2e/react-router/basic-file-based/src/routes/editing-b.tsx index 1a85e72e26..5afd5c8863 100644 --- a/e2e/react-router/basic-file-based/src/routes/editing-b.tsx +++ b/e2e/react-router/basic-file-based/src/routes/editing-b.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { createFileRoute, useBlocker } from '@tanstack/react-router' +import { useBlocker } from '@tanstack/react-router' -export const Route = createFileRoute('/editing-b')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/index.tsx b/e2e/react-router/basic-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/basic-file-based/src/routes/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx new file mode 100644 index 0000000000..8bfb406f4f --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx @@ -0,0 +1,77 @@ +import { Link } from '@tanstack/react-router' + +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + return ( +
+

Named path params

+
    +
  • + + /params-ps/named/$foo + +
    • +
  • + + /params-ps/named/{'prefix{$foo}'} + +
    • +
  • + + /params-ps/named/{'{$foo}suffix'} + +
    • +
+
+

Wildcard path params

+
    +
  • + + /params-ps/wildcard/$ + +
    • +
  • + + /params-ps/wildcard/{'prefix{$}'} + +
    • +
  • + + /params-ps/wildcard/{'{$}suffix'} + +
    • +
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx new file mode 100644 index 0000000000..59186ab217 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsNamedFoo

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx new file mode 100644 index 0000000000..114137f3b4 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx @@ -0,0 +1,7 @@ +import { redirect } from '@tanstack/react-router' + +export const Route = createFileRoute({ + beforeLoad: () => { + throw redirect({ to: '/params-ps' }) + }, +}) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx new file mode 100644 index 0000000000..8febd60160 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsNamedFooPrefix

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx new file mode 100644 index 0000000000..c5598bffcf --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsNamedFooSuffix

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx new file mode 100644 index 0000000000..d82806aef2 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsWildcardSplat

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx new file mode 100644 index 0000000000..114137f3b4 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx @@ -0,0 +1,7 @@ +import { redirect } from '@tanstack/react-router' + +export const Route = createFileRoute({ + beforeLoad: () => { + throw redirect({ to: '/params-ps' }) + }, +}) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx new file mode 100644 index 0000000000..42865fafc1 --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsWildcardSplatPrefix

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx new file mode 100644 index 0000000000..db9ecbbbca --- /dev/null +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx @@ -0,0 +1,13 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + const p = Route.useParams() + return ( +
+

ParamsWildcardSplatSuffix

+
{JSON.stringify(p)}
+
+ ) +} diff --git a/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx b/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx index b5761e839e..b7d7ed81db 100644 --- a/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/params/single/$value')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx index df51873ddf..13708e04a2 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/basic-file-based/src/routes/posts.index.tsx b/e2e/react-router/basic-file-based/src/routes/posts.index.tsx index ab89fb5a62..ab5f3c2ff3 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/posts.tsx b/e2e/react-router/basic-file-based/src/routes/posts.tsx index 9eabdd5b33..839bf039d6 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ head: () => ({ meta: [ { diff --git a/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx b/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx index 44a62b0004..827d546135 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, getRouteApi, useParams } from '@tanstack/react-router' +import { getRouteApi, useParams } from '@tanstack/react-router' -export const Route = createFileRoute('/posts_/$postId/edit')({ +export const Route = createFileRoute({ component: PostEditPage, }) diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx index 686f1c7056..099a7ab0be 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, retainSearchParams } from '@tanstack/react-router' +import { retainSearchParams } from '@tanstack/react-router' import z from 'zod' -export const Route = createFileRoute('/redirect/$target')({ +export const Route = createFileRoute({ params: { parse: (p) => z diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx index 57760cec88..29df874863 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx index 14a2492331..e5192d1cd7 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, @@ -9,8 +9,7 @@ export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ case 'internal': throw redirect({ to: '/posts', reloadDocument }) case 'external': - const href = externalHost ?? 'http://example.com' - throw redirect({ href }) + throw redirect({ href: externalHost ?? 'http://example.com' }) } }, component: () =>
{Route.fullPath}
, diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx index 9e6a3fc9db..022d5c1f8c 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx index c0b26a1df4..a400e552ab 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/')({ +export const Route = createFileRoute({ component: () => (
{ await new Promise((r) => setTimeout(r, 1000)) throw redirect({ from: Route.fullPath, to: '../third' }) diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx index e882d29e69..cc162b05d9 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/redirect/preload/third')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx b/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx index 4a477f7ccd..da4ff770a1 100644 --- a/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx +++ b/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx @@ -1,9 +1,4 @@ -import { - Link, - createFileRoute, - getRouteApi, - useSearch, -} from '@tanstack/react-router' +import { Link, getRouteApi, useSearch } from '@tanstack/react-router' import React from 'react' import { z } from 'zod' @@ -17,7 +12,7 @@ const enabledSchema = { }, z.boolean()), } -export const Route = createFileRoute('/structural-sharing/$enabled')({ +export const Route = createFileRoute({ component: RouteComponent, params: { parse: (p) => z.object(enabledSchema).parse(p), diff --git a/e2e/react-router/basic-file-based/tests/params.spec.ts b/e2e/react-router/basic-file-based/tests/params.spec.ts index e95bc56c59..5d4c6111b7 100644 --- a/e2e/react-router/basic-file-based/tests/params.spec.ts +++ b/e2e/react-router/basic-file-based/tests/params.spec.ts @@ -54,3 +54,151 @@ test.describe('ensure single params have been parsed correctly whilst being stab }) } }) + +test.describe('params operations + prefix/suffix', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/params-ps') + }) + + test.describe('named params', () => { + const NAMED_PARAMS_PAIRS = [ + // Test ID | Expected href + { + id: 'l-to-named-foo', + pathname: '/params-ps/named/foo', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFoo', + }, + { + id: 'l-to-named-prefixfoo', + pathname: '/params-ps/named/prefixfoo', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFooPrefix', + }, + { + id: 'l-to-named-foosuffix', + pathname: '/params-ps/named/foosuffix', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFooSuffix', + }, + ] satisfies Array<{ + id: string + pathname: string + params: Record + destHeadingId: string + }> + + test.describe('Link', () => { + NAMED_PARAMS_PAIRS.forEach(({ id, pathname }) => { + test(`interpolation for testid="${id}" has href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await expect(link).toHaveAttribute('href', pathname) + }) + }) + + NAMED_PARAMS_PAIRS.forEach(({ id, pathname }) => { + test(`navigation for testid="${id}" succeeds to href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await link.click() + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + }) + }) + }) + + NAMED_PARAMS_PAIRS.forEach(({ pathname, params, destHeadingId }) => { + test(`on first-load to "${pathname}" has correct params`, async ({ + page, + }) => { + await page.goto(pathname) + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + + const headingEl = page.getByRole('heading', { name: destHeadingId }) + await expect(headingEl).toBeVisible() + + const paramsEl = page.getByTestId('params-output') + const paramsText = await paramsEl.innerText() + const paramsObj = JSON.parse(paramsText) + expect(paramsObj).toEqual(params) + }) + }) + }) + + test.describe('wildcard param', () => { + const WILDCARD_PARAM_PAIRS = [ + // Test ID | Expected href + { + id: 'l-to-wildcard-foo', + pathname: '/params-ps/wildcard/foo', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplat', + }, + { + id: 'l-to-wildcard-prefixfoo', + pathname: '/params-ps/wildcard/prefixfoo', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplatPrefix', + }, + { + id: 'l-to-wildcard-foosuffix', + pathname: '/params-ps/wildcard/foosuffix', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplatSuffix', + }, + ] satisfies Array<{ + id: string + pathname: string + params: Record + destHeadingId: string + }> + + test.describe('Link', () => { + WILDCARD_PARAM_PAIRS.forEach(({ id, pathname }) => { + test(`interpolation for testid="${id}" has href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await expect(link).toHaveAttribute('href', pathname) + }) + }) + + WILDCARD_PARAM_PAIRS.forEach(({ id, pathname }) => { + test(`navigation for testid="${id}" succeeds to href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await link.click() + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + }) + }) + }) + + WILDCARD_PARAM_PAIRS.forEach(({ pathname, params, destHeadingId }) => { + test(`on first-load to "${pathname}" has correct params`, async ({ + page, + }) => { + await page.goto(pathname) + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + + const headingEl = page.getByRole('heading', { name: destHeadingId }) + await expect(headingEl).toBeVisible() + + const paramsEl = page.getByTestId('params-output') + const paramsText = await paramsEl.innerText() + const paramsObj = JSON.parse(paramsText) + expect(paramsObj).toEqual(params) + }) + }) + }) +}) diff --git a/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts index 375fe8dc91..c829a6d688 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts +++ b/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts @@ -8,61 +8,63 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -76,61 +78,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx index 4cf6beca88..c3ae5dc441 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,5 @@ import * as React from 'react' -import { - ErrorComponent, - createFileRoute, - useRouter, -} from '@tanstack/react-router' +import { ErrorComponent, useRouter } from '@tanstack/react-router' import { useQueryErrorResetBoundary, useSuspenseQuery, @@ -12,7 +8,7 @@ import { PostNotFoundError } from '../posts' import { postQueryOptions } from '../postQueryOptions' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx index 86701f982c..f74a7d923f 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/e2e/react-router/basic-virtual-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-virtual-file-based/src/routeTree.gen.ts index 01132459aa..d7f7c489f7 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routeTree.gen.ts +++ b/e2e/react-router/basic-virtual-file-based/src/routeTree.gen.ts @@ -8,89 +8,91 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as postsPostsImport } from './routes/posts/posts' -import { Route as layoutFirstLayoutImport } from './routes/layout/first-layout' -import { Route as homeImport } from './routes/home' -import { Route as postsPostsDetailImport } from './routes/posts/posts-detail' -import { Route as layoutSecondLayoutImport } from './routes/layout/second-layout' -import { Route as postsPostsHomeImport } from './routes/posts/posts-home' -import { Route as ClassicHelloRouteImport } from './routes/file-based-subtree/hello/route' -import { Route as ClassicHelloIndexImport } from './routes/file-based-subtree/hello/index' -import { Route as ClassicHelloWorldImport } from './routes/file-based-subtree/hello/world' -import { Route as ClassicHelloUniverseImport } from './routes/file-based-subtree/hello/universe' -import { Route as bImport } from './routes/b' -import { Route as aImport } from './routes/a' +import { Route as postsPostsRouteImport } from './routes/posts/posts' +import { Route as layoutFirstLayoutRouteImport } from './routes/layout/first-layout' +import { Route as homeRouteImport } from './routes/home' +import { Route as postsPostsDetailRouteImport } from './routes/posts/posts-detail' +import { Route as layoutSecondLayoutRouteImport } from './routes/layout/second-layout' +import { Route as postsPostsHomeRouteImport } from './routes/posts/posts-home' +import { Route as ClassicHelloRouteRouteImport } from './routes/file-based-subtree/hello/route' +import { Route as ClassicHelloIndexRouteImport } from './routes/file-based-subtree/hello/index' +import { Route as ClassicHelloWorldRouteImport } from './routes/file-based-subtree/hello/world' +import { Route as ClassicHelloUniverseRouteImport } from './routes/file-based-subtree/hello/universe' +import { Route as bRouteImport } from './routes/b' +import { Route as aRouteImport } from './routes/a' // Create/Update Routes -const postsPostsRoute = postsPostsImport.update({ +const postsPostsRoute = postsPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const layoutFirstLayoutRoute = layoutFirstLayoutImport.update({ +const layoutFirstLayoutRoute = layoutFirstLayoutRouteImport.update({ id: '/_first', getParentRoute: () => rootRoute, } as any) -const homeRoute = homeImport.update({ +const homeRoute = homeRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const postsPostsDetailRoute = postsPostsDetailImport.update({ +const postsPostsDetailRoute = postsPostsDetailRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => postsPostsRoute, } as any) -const layoutSecondLayoutRoute = layoutSecondLayoutImport.update({ +const layoutSecondLayoutRoute = layoutSecondLayoutRouteImport.update({ id: '/_second', getParentRoute: () => layoutFirstLayoutRoute, } as any) -const postsPostsHomeRoute = postsPostsHomeImport.update({ +const postsPostsHomeRoute = postsPostsHomeRouteImport.update({ id: '/', path: '/', getParentRoute: () => postsPostsRoute, } as any) -const ClassicHelloRouteRoute = ClassicHelloRouteImport.update({ +const ClassicHelloRouteRoute = ClassicHelloRouteRouteImport.update({ id: '/classic/hello', path: '/classic/hello', getParentRoute: () => rootRoute, } as any) -const ClassicHelloIndexRoute = ClassicHelloIndexImport.update({ +const ClassicHelloIndexRoute = ClassicHelloIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloWorldRoute = ClassicHelloWorldImport.update({ +const ClassicHelloWorldRoute = ClassicHelloWorldRouteImport.update({ id: '/world', path: '/world', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloUniverseRoute = ClassicHelloUniverseImport.update({ +const ClassicHelloUniverseRoute = ClassicHelloUniverseRouteImport.update({ id: '/universe', path: '/universe', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const bRoute = bImport.update({ +const bRoute = bRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => layoutSecondLayoutRoute, } as any) -const aRoute = aImport.update({ +const aRoute = aRouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => layoutSecondLayoutRoute, @@ -104,89 +106,200 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof homeImport + preLoaderRoute: typeof homeRouteImport parentRoute: typeof rootRoute } '/_first': { id: '/_first' path: '' fullPath: '' - preLoaderRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutFirstLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsRouteImport parentRoute: typeof rootRoute } '/classic/hello': { id: '/classic/hello' path: '/classic/hello' fullPath: '/classic/hello' - preLoaderRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloRouteRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof postsPostsHomeImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsHomeRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second': { id: '/_first/_second' path: '' fullPath: '' - preLoaderRoute: typeof layoutSecondLayoutImport - parentRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutSecondLayoutRouteImport + parentRoute: typeof layoutFirstLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof postsPostsDetailImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsDetailRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second/layout-a': { id: '/_first/_second/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof aImport - parentRoute: typeof layoutSecondLayoutImport + preLoaderRoute: typeof aRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport } '/_first/_second/layout-b': { id: '/_first/_second/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof bImport - parentRoute: typeof layoutSecondLayoutImport + preLoaderRoute: typeof bRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport } '/classic/hello/universe': { id: '/classic/hello/universe' path: '/universe' fullPath: '/classic/hello/universe' - preLoaderRoute: typeof ClassicHelloUniverseImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloUniverseRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/world': { id: '/classic/hello/world' path: '/world' fullPath: '/classic/hello/world' - preLoaderRoute: typeof ClassicHelloWorldImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloWorldRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/': { id: '/classic/hello/' path: '/' fullPath: '/classic/hello/' - preLoaderRoute: typeof ClassicHelloIndexImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloIndexRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/home' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/layout/first-layout' { + const createFileRoute: CreateFileRoute< + '/_first', + FileRoutesByPath['/_first']['parentRoute'], + FileRoutesByPath['/_first']['id'], + FileRoutesByPath['/_first']['path'], + FileRoutesByPath['/_first']['fullPath'] + > +} +declare module './routes/posts/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/route' { + const createFileRoute: CreateFileRoute< + '/classic/hello', + FileRoutesByPath['/classic/hello']['parentRoute'], + FileRoutesByPath['/classic/hello']['id'], + FileRoutesByPath['/classic/hello']['path'], + FileRoutesByPath['/classic/hello']['fullPath'] + > +} +declare module './routes/posts/posts-home' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/layout/second-layout' { + const createFileRoute: CreateFileRoute< + '/_first/_second', + FileRoutesByPath['/_first/_second']['parentRoute'], + FileRoutesByPath['/_first/_second']['id'], + FileRoutesByPath['/_first/_second']['path'], + FileRoutesByPath['/_first/_second']['fullPath'] + > +} +declare module './routes/posts/posts-detail' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/a' { + const createFileRoute: CreateFileRoute< + '/_first/_second/layout-a', + FileRoutesByPath['/_first/_second/layout-a']['parentRoute'], + FileRoutesByPath['/_first/_second/layout-a']['id'], + FileRoutesByPath['/_first/_second/layout-a']['path'], + FileRoutesByPath['/_first/_second/layout-a']['fullPath'] + > +} +declare module './routes/b' { + const createFileRoute: CreateFileRoute< + '/_first/_second/layout-b', + FileRoutesByPath['/_first/_second/layout-b']['parentRoute'], + FileRoutesByPath['/_first/_second/layout-b']['id'], + FileRoutesByPath['/_first/_second/layout-b']['path'], + FileRoutesByPath['/_first/_second/layout-b']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/universe' { + const createFileRoute: CreateFileRoute< + '/classic/hello/universe', + FileRoutesByPath['/classic/hello/universe']['parentRoute'], + FileRoutesByPath['/classic/hello/universe']['id'], + FileRoutesByPath['/classic/hello/universe']['path'], + FileRoutesByPath['/classic/hello/universe']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/world' { + const createFileRoute: CreateFileRoute< + '/classic/hello/world', + FileRoutesByPath['/classic/hello/world']['parentRoute'], + FileRoutesByPath['/classic/hello/world']['id'], + FileRoutesByPath['/classic/hello/world']['path'], + FileRoutesByPath['/classic/hello/world']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/index' { + const createFileRoute: CreateFileRoute< + '/classic/hello/', + FileRoutesByPath['/classic/hello/']['parentRoute'], + FileRoutesByPath['/classic/hello/']['id'], + FileRoutesByPath['/classic/hello/']['path'], + FileRoutesByPath['/classic/hello/']['fullPath'] + > +} + // Create and export the route tree interface layoutSecondLayoutRouteChildren { diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/a.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/a.tsx index 6cccd02950..a190b24202 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/a.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/b.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/b.tsx index 98bb842612..505f8f6fbf 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/b.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx index c7417e5eeb..f86335e291 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx index 566efc8777..620dd2b76b 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx index e00c47d74b..20b07c41cc 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx index 9783557342..4af11357a2 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/home.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/home.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/home.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx index d39e206f2d..5c4a461d8d 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx index ef178a6e16..483b910862 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx index 948d52d6d6..654f3cfd18 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts.tsx b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts.tsx index a2ab1ee388..f92c37f537 100644 --- a/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/routes/posts/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/basic-virtual-file-based/vite.config.ts b/e2e/react-router/basic-virtual-file-based/vite.config.ts index 937f1f853c..8a28af1709 100644 --- a/e2e/react-router/basic-virtual-file-based/vite.config.ts +++ b/e2e/react-router/basic-virtual-file-based/vite.config.ts @@ -1,14 +1,15 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import { routes } from './routes' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, + verboseFileRoutes: false, virtualRouteConfig: routes, }), react(), diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx index 6cccd02950..a190b24202 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx index 98bb842612..505f8f6fbf 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index c7417e5eeb..f86335e291 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index 566efc8777..620dd2b76b 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index e00c47d74b..20b07c41cc 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 9783557342..4af11357a2 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index d39e206f2d..5c4a461d8d 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index ef178a6e16..483b910862 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 948d52d6d6..654f3cfd18 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index a2ab1ee388..f92c37f537 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/vite.config.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/vite.config.ts index a04fbc2dcb..ea7fb55e88 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/vite.config.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/vite.config.ts @@ -1,13 +1,14 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, + verboseFileRoutes: false, virtualRouteConfig: './routes.ts', }), react(), diff --git a/e2e/react-router/basic/src/main.tsx b/e2e/react-router/basic/src/main.tsx index 2ffee37679..24e89eb47a 100644 --- a/e2e/react-router/basic/src/main.tsx +++ b/e2e/react-router/basic/src/main.tsx @@ -7,6 +7,7 @@ import { createRootRoute, createRoute, createRouter, + redirect, } from '@tanstack/react-router' import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import { NotFoundError, fetchPost, fetchPosts } from './posts' @@ -205,11 +206,217 @@ function LayoutBComponent() { return
I'm layout B!
} +const paramsPsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/params-ps', +}) + +const paramsPsIndexRoute = createRoute({ + getParentRoute: () => paramsPsRoute, + path: '/', + component: function ParamsIndex() { + return ( +
+

Named path params

+
    +
  • + + /params-ps/named/$foo + +
    • +
  • + + /params-ps/named/{'prefix{$foo}'} + +
    • +
  • + + /params-ps/named/{'{$foo}suffix'} + +
    • +
+
+

Wildcard path params

+
    +
  • + + /params-ps/wildcard/$ + +
    • +
  • + + /params-ps/wildcard/{'prefix{$}'} + +
    • +
  • + + /params-ps/wildcard/{'{$}suffix'} + +
    • +
+
+ ) + }, +}) + +const paramsPsNamedRoute = createRoute({ + getParentRoute: () => paramsPsRoute, + path: '/named', +}) + +const paramsPsNamedIndexRoute = createRoute({ + getParentRoute: () => paramsPsNamedRoute, + path: '/', + beforeLoad: () => { + throw redirect({ to: '/params-ps' }) + }, +}) + +const paramsPsNamedFooRoute = createRoute({ + getParentRoute: () => paramsPsNamedRoute, + path: '/$foo', + component: function ParamsNamedFoo() { + const p = paramsPsNamedFooRoute.useParams() + return ( +
+

ParamsNamedFoo

+
{JSON.stringify(p)}
+
+ ) + }, +}) + +const paramsPsNamedFooPrefixRoute = createRoute({ + getParentRoute: () => paramsPsNamedRoute, + path: '/prefix{$foo}', + component: function ParamsNamedFooMarkdown() { + const p = paramsPsNamedFooPrefixRoute.useParams() + return ( +
+

ParamsNamedFooPrefix

+
{JSON.stringify(p)}
+
+ ) + }, +}) + +const paramsPsNamedFooSuffixRoute = createRoute({ + getParentRoute: () => paramsPsNamedRoute, + path: '/{$foo}suffix', + component: function ParamsNamedFooSuffix() { + const p = paramsPsNamedFooSuffixRoute.useParams() + return ( +
+

ParamsNamedFooSuffix

+
{JSON.stringify(p)}
+
+ ) + }, +}) + +const paramsPsWildcardRoute = createRoute({ + getParentRoute: () => paramsPsRoute, + path: '/wildcard', +}) + +const paramsPsWildcardIndexRoute = createRoute({ + getParentRoute: () => paramsPsWildcardRoute, + path: '/', + beforeLoad: () => { + throw redirect({ to: '/params-ps' }) + }, +}) + +const paramsPsWildcardSplatRoute = createRoute({ + getParentRoute: () => paramsPsWildcardRoute, + path: '$', + component: function ParamsWildcardSplat() { + const p = paramsPsWildcardSplatRoute.useParams() + return ( +
+

ParamsWildcardSplat

+
{JSON.stringify(p)}
+
+ ) + }, +}) + +const paramsPsWildcardSplatPrefixRoute = createRoute({ + getParentRoute: () => paramsPsWildcardRoute, + path: 'prefix{$}', + component: function ParamsWildcardSplatPrefix() { + const p = paramsPsWildcardSplatPrefixRoute.useParams() + return ( +
+

ParamsWildcardSplatPrefix

+
{JSON.stringify(p)}
+
+ ) + }, +}) + +const paramsPsWildcardSplatSuffixRoute = createRoute({ + getParentRoute: () => paramsPsWildcardRoute, + path: '{$}suffix', + component: function ParamsWildcardSplatSuffix() { + const p = paramsPsWildcardSplatSuffixRoute.useParams() + return ( +
+

ParamsWildcardSplatSuffix

+
{JSON.stringify(p)}
+
+ ) + }, +}) + const routeTree = rootRoute.addChildren([ postsRoute.addChildren([postRoute, postsIndexRoute]), layoutRoute.addChildren([ layout2Route.addChildren([layoutARoute, layoutBRoute]), ]), + paramsPsRoute.addChildren([ + paramsPsNamedRoute.addChildren([ + paramsPsNamedFooPrefixRoute, + paramsPsNamedFooSuffixRoute, + paramsPsNamedFooRoute, + paramsPsNamedIndexRoute, + ]), + paramsPsWildcardRoute.addChildren([ + paramsPsWildcardSplatRoute, + paramsPsWildcardSplatPrefixRoute, + paramsPsWildcardSplatSuffixRoute, + paramsPsWildcardIndexRoute, + ]), + paramsPsIndexRoute, + ]), indexRoute, ]) diff --git a/e2e/react-router/basic/tests/params.spec.ts b/e2e/react-router/basic/tests/params.spec.ts new file mode 100644 index 0000000000..ac18f39864 --- /dev/null +++ b/e2e/react-router/basic/tests/params.spec.ts @@ -0,0 +1,149 @@ +import { expect, test } from '@playwright/test' + +test.describe('params operations + prefix/suffix', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/params-ps') + }) + + test.describe('named params', () => { + const NAMED_PARAMS_PAIRS = [ + // Test ID | Expected href + { + id: 'l-to-named-foo', + pathname: '/params-ps/named/foo', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFoo', + }, + { + id: 'l-to-named-prefixfoo', + pathname: '/params-ps/named/prefixfoo', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFooPrefix', + }, + { + id: 'l-to-named-foosuffix', + pathname: '/params-ps/named/foosuffix', + params: { foo: 'foo' }, + destHeadingId: 'ParamsNamedFooSuffix', + }, + ] satisfies Array<{ + id: string + pathname: string + params: Record + destHeadingId: string + }> + + test.describe('Link', () => { + NAMED_PARAMS_PAIRS.forEach(({ id, pathname }) => { + test(`interpolation for testid="${id}" has href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await expect(link).toHaveAttribute('href', pathname) + }) + }) + + NAMED_PARAMS_PAIRS.forEach(({ id, pathname }) => { + test(`navigation for testid="${id}" succeeds to href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await link.click() + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + }) + }) + }) + + NAMED_PARAMS_PAIRS.forEach(({ pathname, params, destHeadingId }) => { + test(`on first-load to "${pathname}" has correct params`, async ({ + page, + }) => { + await page.goto(pathname) + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + + const headingEl = page.getByRole('heading', { name: destHeadingId }) + await expect(headingEl).toBeVisible() + + const paramsEl = page.getByTestId('params-output') + const paramsText = await paramsEl.innerText() + const paramsObj = JSON.parse(paramsText) + expect(paramsObj).toEqual(params) + }) + }) + }) + + test.describe('wildcard param', () => { + const WILDCARD_PARAM_PAIRS = [ + // Test ID | Expected href + { + id: 'l-to-wildcard-foo', + pathname: '/params-ps/wildcard/foo', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplat', + }, + { + id: 'l-to-wildcard-prefixfoo', + pathname: '/params-ps/wildcard/prefixfoo', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplatPrefix', + }, + { + id: 'l-to-wildcard-foosuffix', + pathname: '/params-ps/wildcard/foosuffix', + params: { '*': 'foo', _splat: 'foo' }, + destHeadingId: 'ParamsWildcardSplatSuffix', + }, + ] satisfies Array<{ + id: string + pathname: string + params: Record + destHeadingId: string + }> + + test.describe('Link', () => { + WILDCARD_PARAM_PAIRS.forEach(({ id, pathname }) => { + test(`interpolation for testid="${id}" has href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await expect(link).toHaveAttribute('href', pathname) + }) + }) + + WILDCARD_PARAM_PAIRS.forEach(({ id, pathname }) => { + test(`navigation for testid="${id}" succeeds to href="${pathname}"`, async ({ + page, + }) => { + const link = page.getByTestId(id) + await link.click() + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + }) + }) + }) + + WILDCARD_PARAM_PAIRS.forEach(({ pathname, params, destHeadingId }) => { + test(`on first-load to "${pathname}" has correct params`, async ({ + page, + }) => { + await page.goto(pathname) + await page.waitForLoadState('networkidle') + const pagePathname = new URL(page.url()).pathname + expect(pagePathname).toBe(pathname) + + const headingEl = page.getByRole('heading', { name: destHeadingId }) + await expect(headingEl).toBeVisible() + + const paramsEl = page.getByTestId('params-output') + const paramsText = await paramsEl.innerText() + const paramsObj = JSON.parse(paramsText) + expect(paramsObj).toEqual(params) + }) + }) + }) +}) diff --git a/e2e/react-router/generator-cli-only/src/routeTree.gen.ts b/e2e/react-router/generator-cli-only/src/routeTree.gen.ts index 1ecbd67da9..b1a2b0fa0a 100644 --- a/e2e/react-router/generator-cli-only/src/routeTree.gen.ts +++ b/e2e/react-router/generator-cli-only/src/routeTree.gen.ts @@ -11,62 +11,61 @@ // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -80,57 +79,57 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } } } diff --git a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout.tsx b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout.tsx index 202070f1ff..1e1ef2ebe1 100644 --- a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout.tsx @@ -1,4 +1,5 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, diff --git a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout.tsx b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout.tsx index c5bcffd5a4..9c345694ab 100644 --- a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,4 +1,5 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: LayoutComponent, diff --git a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 5649f77d8e..6b59dbc46f 100644 --- a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( { component: LayoutAComponent, diff --git a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 742e48bfb4..50f864f617 100644 --- a/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( { component: LayoutBComponent, diff --git a/e2e/react-router/generator-cli-only/src/routes/index.tsx b/e2e/react-router/generator-cli-only/src/routes/index.tsx index eac82a9174..0a5b7572ba 100644 --- a/e2e/react-router/generator-cli-only/src/routes/index.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/index.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import { createFileRoute } from '@tanstack/react-router' +import * as React from 'react' export const Route = createFileRoute('/')({ component: Home, diff --git a/e2e/react-router/generator-cli-only/src/routes/posts.$postId.tsx b/e2e/react-router/generator-cli-only/src/routes/posts.$postId.tsx index cded91ef96..956ca50ecd 100644 --- a/e2e/react-router/generator-cli-only/src/routes/posts.$postId.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/posts.$postId.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' diff --git a/e2e/react-router/generator-cli-only/src/routes/posts.index.tsx b/e2e/react-router/generator-cli-only/src/routes/posts.index.tsx index 056433ca0a..c6b65f1892 100644 --- a/e2e/react-router/generator-cli-only/src/routes/posts.index.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/posts.index.tsx @@ -1,5 +1,5 @@ -import * as React from 'react' import { createFileRoute } from '@tanstack/react-router' +import * as React from 'react' export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, diff --git a/e2e/react-router/generator-cli-only/src/routes/posts.route.tsx b/e2e/react-router/generator-cli-only/src/routes/posts.route.tsx index 0115fc8063..ab5c2ac99f 100644 --- a/e2e/react-router/generator-cli-only/src/routes/posts.route.tsx +++ b/e2e/react-router/generator-cli-only/src/routes/posts.route.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ diff --git a/e2e/react-router/js-only-file-based/src/routeTree.gen.js b/e2e/react-router/js-only-file-based/src/routeTree.gen.js index c98d6e89eb..d730c68ee9 100644 --- a/e2e/react-router/js-only-file-based/src/routeTree.gen.js +++ b/e2e/react-router/js-only-file-based/src/routeTree.gen.js @@ -11,62 +11,61 @@ // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, }) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, }) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, }) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, }) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, }) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - }, -) + }) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, }) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx index 202070f1ff..fd83a0eaa0 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx index c5bcffd5a4..abd82a2bf6 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx index 5649f77d8e..a190b24202 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm layout A!
diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx index 742e48bfb4..505f8f6fbf 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm layout B!
diff --git a/e2e/react-router/js-only-file-based/src/routes/index.jsx b/e2e/react-router/js-only-file-based/src/routes/index.jsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/js-only-file-based/src/routes/index.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/index.jsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx index d26d271b9d..c010a465e6 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx index 0115fc8063..0aca21ad57 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx index cded91ef96..0578182ecb 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx index c7a09ed7f8..4469b2216a 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx index 6cccd02950..a190b24202 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx index 98bb842612..505f8f6fbf 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index c7417e5eeb..f86335e291 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index 566efc8777..620dd2b76b 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index e00c47d74b..20b07c41cc 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 9783557342..4af11357a2 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx index eac82a9174..b23956ae17 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index d39e206f2d..5c4a461d8d 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index ef178a6e16..483b910862 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 948d52d6d6..654f3cfd18 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index 056433ca0a..fdbe5865e5 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index a2ab1ee388..f92c37f537 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts b/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts index ae605007e3..6b76b8cb25 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts @@ -9,29 +9,32 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as testsPageWithSearchImport } from './routes/(tests)/page-with-search' -import { Route as testsNormalPageImport } from './routes/(tests)/normal-page' -import { Route as testsLazyWithLoaderPageImport } from './routes/(tests)/lazy-with-loader-page' -import { Route as testsLazyPageImport } from './routes/(tests)/lazy-page' +import { Route as IndexRouteImport } from './routes/index' +import { Route as testsPageWithSearchRouteImport } from './routes/(tests)/page-with-search' +import { Route as testsNormalPageRouteImport } from './routes/(tests)/normal-page' +import { Route as testsLazyWithLoaderPageRouteImport } from './routes/(tests)/lazy-with-loader-page' +import { Route as testsLazyPageRouteImport } from './routes/(tests)/lazy-page' // Create Virtual Routes -const testsVirtualPageLazyImport = createFileRoute('/(tests)/virtual-page')() +const testsVirtualPageLazyRouteImport = createFileRoute( + '/(tests)/virtual-page', +)() // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const testsVirtualPageLazyRoute = testsVirtualPageLazyImport +const testsVirtualPageLazyRoute = testsVirtualPageLazyRouteImport .update({ id: '/(tests)/virtual-page', path: '/virtual-page', @@ -39,19 +42,19 @@ const testsVirtualPageLazyRoute = testsVirtualPageLazyImport } as any) .lazy(() => import('./routes/(tests)/virtual-page.lazy').then((d) => d.Route)) -const testsPageWithSearchRoute = testsPageWithSearchImport.update({ +const testsPageWithSearchRoute = testsPageWithSearchRouteImport.update({ id: '/(tests)/page-with-search', path: '/page-with-search', getParentRoute: () => rootRoute, } as any) -const testsNormalPageRoute = testsNormalPageImport.update({ +const testsNormalPageRoute = testsNormalPageRouteImport.update({ id: '/(tests)/normal-page', path: '/normal-page', getParentRoute: () => rootRoute, } as any) -const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport +const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageRouteImport .update({ id: '/(tests)/lazy-with-loader-page', path: '/lazy-with-loader-page', @@ -61,7 +64,7 @@ const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport import('./routes/(tests)/lazy-with-loader-page.lazy').then((d) => d.Route), ) -const testsLazyPageRoute = testsLazyPageImport +const testsLazyPageRoute = testsLazyPageRouteImport .update({ id: '/(tests)/lazy-page', path: '/lazy-page', @@ -77,47 +80,110 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/(tests)/lazy-page': { id: '/(tests)/lazy-page' path: '/lazy-page' fullPath: '/lazy-page' - preLoaderRoute: typeof testsLazyPageImport + preLoaderRoute: typeof testsLazyPageRouteImport parentRoute: typeof rootRoute } '/(tests)/lazy-with-loader-page': { id: '/(tests)/lazy-with-loader-page' path: '/lazy-with-loader-page' fullPath: '/lazy-with-loader-page' - preLoaderRoute: typeof testsLazyWithLoaderPageImport + preLoaderRoute: typeof testsLazyWithLoaderPageRouteImport parentRoute: typeof rootRoute } '/(tests)/normal-page': { id: '/(tests)/normal-page' path: '/normal-page' fullPath: '/normal-page' - preLoaderRoute: typeof testsNormalPageImport + preLoaderRoute: typeof testsNormalPageRouteImport parentRoute: typeof rootRoute } '/(tests)/page-with-search': { id: '/(tests)/page-with-search' path: '/page-with-search' fullPath: '/page-with-search' - preLoaderRoute: typeof testsPageWithSearchImport + preLoaderRoute: typeof testsPageWithSearchRouteImport parentRoute: typeof rootRoute } '/(tests)/virtual-page': { id: '/(tests)/virtual-page' path: '/virtual-page' fullPath: '/virtual-page' - preLoaderRoute: typeof testsVirtualPageLazyImport + preLoaderRoute: typeof testsVirtualPageLazyRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/(tests)/lazy-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/lazy-page', + FileRoutesByPath['/(tests)/lazy-page']['parentRoute'], + FileRoutesByPath['/(tests)/lazy-page']['id'], + FileRoutesByPath['/(tests)/lazy-page']['path'], + FileRoutesByPath['/(tests)/lazy-page']['fullPath'] + > +} +declare module './routes/(tests)/lazy-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/lazy-page']['preLoaderRoute'] + > +} +declare module './routes/(tests)/lazy-with-loader-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/lazy-with-loader-page', + FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath'] + > +} +declare module './routes/(tests)/lazy-with-loader-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/lazy-with-loader-page']['preLoaderRoute'] + > +} +declare module './routes/(tests)/normal-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/normal-page', + FileRoutesByPath['/(tests)/normal-page']['parentRoute'], + FileRoutesByPath['/(tests)/normal-page']['id'], + FileRoutesByPath['/(tests)/normal-page']['path'], + FileRoutesByPath['/(tests)/normal-page']['fullPath'] + > +} +declare module './routes/(tests)/page-with-search' { + const createFileRoute: CreateFileRoute< + '/(tests)/page-with-search', + FileRoutesByPath['/(tests)/page-with-search']['parentRoute'], + FileRoutesByPath['/(tests)/page-with-search']['id'], + FileRoutesByPath['/(tests)/page-with-search']['path'], + FileRoutesByPath['/(tests)/page-with-search']['fullPath'] + > +} +declare module './routes/(tests)/virtual-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/virtual-page']['preLoaderRoute'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx index d774a43935..dfe060ac82 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createLazyFileRoute } from '@tanstack/react-router' + import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/lazy-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx index 9c59a0d1f1..79405e27e7 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx @@ -1,3 +1 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(tests)/lazy-page')({}) +export const Route = createFileRoute({}) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx index 8311f36f45..c56fefa910 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx @@ -1,7 +1,6 @@ -import { createLazyFileRoute } from '@tanstack/react-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/lazy-with-loader-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx index 3fdc078569..5463a153af 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { sleep } from '../../posts' -export const Route = createFileRoute('/(tests)/lazy-with-loader-page')({ +export const Route = createFileRoute({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx index 95fb7e119e..1d897c8e5d 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/normal-page')({ +export const Route = createFileRoute({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx index d9591671f5..21e7635e29 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/page-with-search')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx index aa446121f4..ca3bf045e9 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createLazyFileRoute } from '@tanstack/react-router' + import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/virtual-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx index 49f6d4bff0..843919d994 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute, linkOptions } from '@tanstack/react-router' +import { Link, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/e2e/react-start/basic-auth/.gitignore b/e2e/react-start/basic-auth/.gitignore index b15fed94e2..75a469e80c 100644 --- a/e2e/react-start/basic-auth/.gitignore +++ b/e2e/react-start/basic-auth/.gitignore @@ -7,13 +7,11 @@ yarn.lock .cache .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/react-start/basic-auth/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/basic-auth/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/basic-auth/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/basic-auth/app.config.ts b/e2e/react-start/basic-auth/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/basic-auth/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json index bb04401e02..9a711281a1 100644 --- a/e2e/react-start/basic-auth/package.json +++ b/e2e/react-start/basic-auth/package.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-basic-auth", + "name": "tanstack-react-start-e2e-basic-auth", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs", "prisma-generate": "prisma generate", "test:e2e": "exit 0; pnpm run prisma-generate && playwright test --project=chromium" }, @@ -21,7 +21,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@playwright/test": "^1.50.1", @@ -30,8 +30,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", "vite-tsconfig-paths": "^5.1.4" diff --git a/e2e/react-start/basic-auth/playwright.config.ts b/e2e/react-start/basic-auth/playwright.config.ts index bb77d0cf70..9806e0c136 100644 --- a/e2e/react-start/basic-auth/playwright.config.ts +++ b/e2e/react-start/basic-auth/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/basic-auth/src/client.tsx b/e2e/react-start/basic-auth/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/e2e/react-start/basic-auth/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/e2e/react-start/basic-auth/src/routeTree.gen.ts b/e2e/react-start/basic-auth/src/routeTree.gen.ts index a37809fd07..664daacd0d 100644 --- a/e2e/react-start/basic-auth/src/routeTree.gen.ts +++ b/e2e/react-start/basic-auth/src/routeTree.gen.ts @@ -8,62 +8,64 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as SignupImport } from './routes/signup' -import { Route as LogoutImport } from './routes/logout' -import { Route as LoginImport } from './routes/login' -import { Route as AuthedImport } from './routes/_authed' -import { Route as IndexImport } from './routes/index' -import { Route as AuthedPostsImport } from './routes/_authed/posts' -import { Route as AuthedPostsIndexImport } from './routes/_authed/posts.index' -import { Route as AuthedPostsPostIdImport } from './routes/_authed/posts.$postId' +import { Route as SignupRouteImport } from './routes/signup' +import { Route as LogoutRouteImport } from './routes/logout' +import { Route as LoginRouteImport } from './routes/login' +import { Route as AuthedRouteImport } from './routes/_authed' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthedPostsRouteImport } from './routes/_authed/posts' +import { Route as AuthedPostsIndexRouteImport } from './routes/_authed/posts.index' +import { Route as AuthedPostsPostIdRouteImport } from './routes/_authed/posts.$postId' // Create/Update Routes -const SignupRoute = SignupImport.update({ +const SignupRoute = SignupRouteImport.update({ id: '/signup', path: '/signup', getParentRoute: () => rootRoute, } as any) -const LogoutRoute = LogoutImport.update({ +const LogoutRoute = LogoutRouteImport.update({ id: '/logout', path: '/logout', getParentRoute: () => rootRoute, } as any) -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const AuthedRoute = AuthedImport.update({ +const AuthedRoute = AuthedRouteImport.update({ id: '/_authed', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthedPostsRoute = AuthedPostsImport.update({ +const AuthedPostsRoute = AuthedPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsIndexRoute = AuthedPostsIndexImport.update({ +const AuthedPostsIndexRoute = AuthedPostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthedPostsRoute, } as any) -const AuthedPostsPostIdRoute = AuthedPostsPostIdImport.update({ +const AuthedPostsPostIdRoute = AuthedPostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => AuthedPostsRoute, @@ -77,61 +79,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_authed': { id: '/_authed' path: '' fullPath: '' - preLoaderRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/logout': { id: '/logout' path: '/logout' fullPath: '/logout' - preLoaderRoute: typeof LogoutImport + preLoaderRoute: typeof LogoutRouteImport parentRoute: typeof rootRoute } '/signup': { id: '/signup' path: '/signup' fullPath: '/signup' - preLoaderRoute: typeof SignupImport + preLoaderRoute: typeof SignupRouteImport parentRoute: typeof rootRoute } '/_authed/posts': { id: '/_authed/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof AuthedPostsImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedPostsRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/$postId': { id: '/_authed/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof AuthedPostsPostIdImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsPostIdRouteImport + parentRoute: typeof AuthedPostsRouteImport } '/_authed/posts/': { id: '/_authed/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof AuthedPostsIndexImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsIndexRouteImport + parentRoute: typeof AuthedPostsRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_authed' { + const createFileRoute: CreateFileRoute< + '/_authed', + FileRoutesByPath['/_authed']['parentRoute'], + FileRoutesByPath['/_authed']['id'], + FileRoutesByPath['/_authed']['path'], + FileRoutesByPath['/_authed']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/logout' { + const createFileRoute: CreateFileRoute< + '/logout', + FileRoutesByPath['/logout']['parentRoute'], + FileRoutesByPath['/logout']['id'], + FileRoutesByPath['/logout']['path'], + FileRoutesByPath['/logout']['fullPath'] + > +} +declare module './routes/signup' { + const createFileRoute: CreateFileRoute< + '/signup', + FileRoutesByPath['/signup']['parentRoute'], + FileRoutesByPath['/signup']['id'], + FileRoutesByPath['/signup']['path'], + FileRoutesByPath['/signup']['fullPath'] + > +} +declare module './routes/_authed/posts' { + const createFileRoute: CreateFileRoute< + '/_authed/posts', + FileRoutesByPath['/_authed/posts']['parentRoute'], + FileRoutesByPath['/_authed/posts']['id'], + FileRoutesByPath['/_authed/posts']['path'], + FileRoutesByPath['/_authed/posts']['fullPath'] + > +} +declare module './routes/_authed/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/$postId', + FileRoutesByPath['/_authed/posts/$postId']['parentRoute'], + FileRoutesByPath['/_authed/posts/$postId']['id'], + FileRoutesByPath['/_authed/posts/$postId']['path'], + FileRoutesByPath['/_authed/posts/$postId']['fullPath'] + > +} +declare module './routes/_authed/posts.index' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/', + FileRoutesByPath['/_authed/posts/']['parentRoute'], + FileRoutesByPath['/_authed/posts/']['id'], + FileRoutesByPath['/_authed/posts/']['path'], + FileRoutesByPath['/_authed/posts/']['fullPath'] + > +} + // Create and export the route tree interface AuthedPostsRouteChildren { diff --git a/e2e/react-start/basic-auth/src/routes/_authed.tsx b/e2e/react-start/basic-auth/src/routes/_authed.tsx index c457cf5e57..10c620a9ae 100644 --- a/e2e/react-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/react-start/basic-auth/src/routes/_authed.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' @@ -45,7 +44,7 @@ export const loginFn = createServerFn({ }) }) -export const Route = createFileRoute('/_authed')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { if (!context.user) { throw new Error('Not authenticated') diff --git a/e2e/react-start/basic-auth/src/routes/_authed/posts.$postId.tsx b/e2e/react-start/basic-auth/src/routes/_authed/posts.$postId.tsx index 27296b9658..49cad9b374 100644 --- a/e2e/react-start/basic-auth/src/routes/_authed/posts.$postId.tsx +++ b/e2e/react-start/basic-auth/src/routes/_authed/posts.$postId.tsx @@ -1,10 +1,10 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound.js' import { fetchPost } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/e2e/react-start/basic-auth/src/routes/_authed/posts.index.tsx b/e2e/react-start/basic-auth/src/routes/_authed/posts.index.tsx index ea9e667e54..13529228bb 100644 --- a/e2e/react-start/basic-auth/src/routes/_authed/posts.index.tsx +++ b/e2e/react-start/basic-auth/src/routes/_authed/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_authed/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-start/basic-auth/src/routes/_authed/posts.tsx b/e2e/react-start/basic-auth/src/routes/_authed/posts.tsx index c01f12c49a..6c37957e8c 100644 --- a/e2e/react-start/basic-auth/src/routes/_authed/posts.tsx +++ b/e2e/react-start/basic-auth/src/routes/_authed/posts.tsx @@ -1,8 +1,8 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/e2e/react-start/basic-auth/src/routes/index.tsx b/e2e/react-start/basic-auth/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/e2e/react-start/basic-auth/src/routes/index.tsx +++ b/e2e/react-start/basic-auth/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/basic-auth/src/routes/login.tsx b/e2e/react-start/basic-auth/src/routes/login.tsx index 19dc34a439..269ca5e816 100644 --- a/e2e/react-start/basic-auth/src/routes/login.tsx +++ b/e2e/react-start/basic-auth/src/routes/login.tsx @@ -1,8 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - import { Login } from '~/components/Login' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ component: LoginComp, }) diff --git a/e2e/react-start/basic-auth/src/routes/logout.tsx b/e2e/react-start/basic-auth/src/routes/logout.tsx index 43a14fa39a..43553a6290 100644 --- a/e2e/react-start/basic-auth/src/routes/logout.tsx +++ b/e2e/react-start/basic-auth/src/routes/logout.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { useAppSession } from '~/utils/session' @@ -13,7 +13,7 @@ const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { }) }) -export const Route = createFileRoute('/logout')({ +export const Route = createFileRoute({ preload: false, loader: () => logoutFn(), }) diff --git a/e2e/react-start/basic-auth/src/routes/signup.tsx b/e2e/react-start/basic-auth/src/routes/signup.tsx index 5edbb4993f..e852b267e2 100644 --- a/e2e/react-start/basic-auth/src/routes/signup.tsx +++ b/e2e/react-start/basic-auth/src/routes/signup.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' @@ -65,7 +65,7 @@ export const signupFn = createServerFn({ }) }) -export const Route = createFileRoute('/signup')({ +export const Route = createFileRoute({ component: SignupComp, }) diff --git a/e2e/react-start/basic-auth/src/tanstack-start.d.ts b/e2e/react-start/basic-auth/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/basic-auth/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-auth/vite.config.ts b/e2e/react-start/basic-auth/vite.config.ts new file mode 100644 index 0000000000..1df337cd40 --- /dev/null +++ b/e2e/react-start/basic-auth/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/basic-react-query/.gitignore b/e2e/react-start/basic-react-query/.gitignore index be342025da..ca63f49885 100644 --- a/e2e/react-start/basic-react-query/.gitignore +++ b/e2e/react-start/basic-react-query/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/e2e/react-start/basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..87c0856e21 --- /dev/null +++ b/e2e/react-start/basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api.users' +import { ServerRoute as ApiUsersIdRouteImport } from './../../src/routes/api/users.$id' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersIdRoute = ApiUsersIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$id': { + id: '/api/users/$id' + path: '/$id' + fullPath: '/api/users/$id' + preLoaderRoute: typeof ApiUsersIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api.users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$id' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$id']['parentRoute'], + FileRoutesByPath['/api/users/$id']['id'], + FileRoutesByPath['/api/users/$id']['path'], + FileRoutesByPath['/api/users/$id']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersIdRoute: typeof ApiUsersIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersIdRoute: ApiUsersIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$id' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$id' + id: '__root__' | '/api/users' | '/api/users/$id' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api.users.ts", + "children": [ + "/api/users/$id" + ] + }, + "/api/users/$id": { + "filePath": "api/users.$id.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/basic-react-query/app.config.ts b/e2e/react-start/basic-react-query/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/basic-react-query/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json index 4cc7162526..ff79fb9cf3 100644 --- a/e2e/react-start/basic-react-query/package.json +++ b/e2e/react-start/basic-react-query/package.json @@ -1,27 +1,27 @@ { - "name": "tanstack-start-e2e-basic-react-query", + "name": "tanstack-react-start-e2e-basic-react-query", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "workspace:^", - "@tanstack/react-router-with-query": "workspace:^", "@tanstack/react-router-devtools": "workspace:^", + "@tanstack/react-router-with-query": "workspace:^", "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@playwright/test": "^1.50.1", @@ -30,8 +30,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", "vite-tsconfig-paths": "^5.1.4" diff --git a/e2e/react-start/basic-react-query/playwright.config.ts b/e2e/react-start/basic-react-query/playwright.config.ts index bb77d0cf70..9806e0c136 100644 --- a/e2e/react-start/basic-react-query/playwright.config.ts +++ b/e2e/react-start/basic-react-query/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/basic-react-query/src/api.ts b/e2e/react-start/basic-react-query/src/api.ts deleted file mode 100644 index 8b9fef1667..0000000000 --- a/e2e/react-start/basic-react-query/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/react-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/react-start/basic-react-query/src/client.tsx b/e2e/react-start/basic-react-query/src/client.tsx deleted file mode 100644 index 31385f57f1..0000000000 --- a/e2e/react-start/basic-react-query/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document!, ) diff --git a/e2e/react-start/basic-react-query/src/routeTree.gen.ts b/e2e/react-start/basic-react-query/src/routeTree.gen.ts index 9f7ab8107b..63730586d0 100644 --- a/e2e/react-start/basic-react-query/src/routeTree.gen.ts +++ b/e2e/react-start/basic-react-query/src/routeTree.gen.ts @@ -8,103 +8,105 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as UsersImport } from './routes/users' -import { Route as RedirectImport } from './routes/redirect' -import { Route as PostsImport } from './routes/posts' -import { Route as DeferredImport } from './routes/deferred' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as UsersRouteImport } from './routes/users' +import { Route as RedirectRouteImport } from './routes/redirect' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const UsersRoute = UsersImport.update({ +const UsersRoute = UsersRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => rootRoute, } as any) -const RedirectRoute = RedirectImport.update({ +const RedirectRoute = RedirectRouteImport.update({ id: '/redirect', path: '/redirect', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -118,103 +120,232 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/redirect': { id: '/redirect' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectImport + preLoaderRoute: typeof RedirectRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersImport + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-start/basic-react-query/src/routes/_layout.tsx b/e2e/react-start/basic-react-query/src/routes/_layout.tsx index af5585728e..810465a9ba 100644 --- a/e2e/react-start/basic-react-query/src/routes/_layout.tsx +++ b/e2e/react-start/basic-react-query/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2.tsx b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2.tsx index 2167ce27ce..a1ed146002 100644 --- a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-a.tsx index bb8d3d277d..a0bd5240b7 100644 --- a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-b.tsx index 69f6158958..2864ec1f28 100644 --- a/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-start/basic-react-query/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/api.users.ts b/e2e/react-start/basic-react-query/src/routes/api.users.ts index 481085ef3f..3a37e5691a 100644 --- a/e2e/react-start/basic-react-query/src/routes/api.users.ts +++ b/e2e/react-start/basic-react-query/src/routes/api.users.ts @@ -1,9 +1,8 @@ import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '../utils/users' -export const APIRoute = createAPIFileRoute('/api/users')({ +export const ServerRoute = createServerFileRoute().methods({ GET: async ({ request }) => { console.info('Fetching users... @', request.url) const res = await axios.get>( diff --git a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts index b1797e7917..81494c2e93 100644 --- a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts @@ -1,9 +1,8 @@ import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '../../utils/users' -export const APIRoute = createAPIFileRoute('/api/users/$id')({ +export const ServerRoute = createServerFileRoute().methods({ GET: async ({ request, params }) => { console.info(`Fetching users by id=${params.id}... @`, request.url) try { diff --git a/e2e/react-start/basic-react-query/src/routes/deferred.tsx b/e2e/react-start/basic-react-query/src/routes/deferred.tsx index 666ae26e49..16a9f72593 100644 --- a/e2e/react-start/basic-react-query/src/routes/deferred.tsx +++ b/e2e/react-start/basic-react-query/src/routes/deferred.tsx @@ -1,5 +1,5 @@ import { queryOptions, useSuspenseQuery } from '@tanstack/react-query' -import { createFileRoute } from '@tanstack/react-router' +import {} from '@tanstack/react-router' import { Suspense, useState } from 'react' const deferredQueryOptions = () => @@ -15,7 +15,7 @@ const deferredQueryOptions = () => }, }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: ({ context }) => { // Kick off loading as early as possible! context.queryClient.prefetchQuery(deferredQueryOptions()) diff --git a/e2e/react-start/basic-react-query/src/routes/index.tsx b/e2e/react-start/basic-react-query/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/e2e/react-start/basic-react-query/src/routes/index.tsx +++ b/e2e/react-start/basic-react-query/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/basic-react-query/src/routes/posts.$postId.tsx b/e2e/react-start/basic-react-query/src/routes/posts.$postId.tsx index 16a6bf29aa..f3aa0e7201 100644 --- a/e2e/react-start/basic-react-query/src/routes/posts.$postId.tsx +++ b/e2e/react-start/basic-react-query/src/routes/posts.$postId.tsx @@ -1,11 +1,11 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import type { ErrorComponentProps } from '@tanstack/react-router' import { postQueryOptions } from '~/utils/posts' import { NotFound } from '~/components/NotFound' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId }, context }) => { const data = await context.queryClient.ensureQueryData( postQueryOptions(postId), @@ -43,7 +43,7 @@ function PostComponent() { postId: postQuery.data.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/e2e/react-start/basic-react-query/src/routes/posts.index.tsx b/e2e/react-start/basic-react-query/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/e2e/react-start/basic-react-query/src/routes/posts.index.tsx +++ b/e2e/react-start/basic-react-query/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/posts.tsx b/e2e/react-start/basic-react-query/src/routes/posts.tsx index 3f678ed1f1..00d91fd049 100644 --- a/e2e/react-start/basic-react-query/src/routes/posts.tsx +++ b/e2e/react-start/basic-react-query/src/routes/posts.tsx @@ -1,9 +1,9 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { postsQueryOptions } from '~/utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async ({ context }) => { await context.queryClient.ensureQueryData(postsQueryOptions()) }, diff --git a/e2e/react-start/basic-react-query/src/routes/posts_.$postId.deep.tsx b/e2e/react-start/basic-react-query/src/routes/posts_.$postId.deep.tsx index 33f6475a55..4d91776273 100644 --- a/e2e/react-start/basic-react-query/src/routes/posts_.$postId.deep.tsx +++ b/e2e/react-start/basic-react-query/src/routes/posts_.$postId.deep.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postQueryOptions } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId }, context }) => { const data = await context.queryClient.ensureQueryData( postQueryOptions(postId), diff --git a/e2e/react-start/basic-react-query/src/routes/redirect.tsx b/e2e/react-start/basic-react-query/src/routes/redirect.tsx index c9286de13d..68a98d5683 100644 --- a/e2e/react-start/basic-react-query/src/routes/redirect.tsx +++ b/e2e/react-start/basic-react-query/src/routes/redirect.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect')({ +export const Route = createFileRoute({ beforeLoad: async () => { throw redirect({ to: '/posts', diff --git a/e2e/react-start/basic-react-query/src/routes/users.$userId.tsx b/e2e/react-start/basic-react-query/src/routes/users.$userId.tsx index 656fb6dbb8..7f8bab0e1d 100644 --- a/e2e/react-start/basic-react-query/src/routes/users.$userId.tsx +++ b/e2e/react-start/basic-react-query/src/routes/users.$userId.tsx @@ -1,11 +1,11 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' import { userQueryOptions } from '~/utils/users' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ context, params: { userId } }) => { await context.queryClient.ensureQueryData(userQueryOptions(userId)) }, diff --git a/e2e/react-start/basic-react-query/src/routes/users.index.tsx b/e2e/react-start/basic-react-query/src/routes/users.index.tsx index b6b0ee67fb..662e8b6c68 100644 --- a/e2e/react-start/basic-react-query/src/routes/users.index.tsx +++ b/e2e/react-start/basic-react-query/src/routes/users.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/e2e/react-start/basic-react-query/src/routes/users.tsx b/e2e/react-start/basic-react-query/src/routes/users.tsx index 1b56bb9890..8a90dd8412 100644 --- a/e2e/react-start/basic-react-query/src/routes/users.tsx +++ b/e2e/react-start/basic-react-query/src/routes/users.tsx @@ -1,9 +1,9 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { usersQueryOptions } from '~/utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async ({ context }) => { await context.queryClient.ensureQueryData(usersQueryOptions()) }, diff --git a/e2e/react-start/basic-react-query/src/tanstack-start.d.ts b/e2e/react-start/basic-react-query/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/basic-react-query/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-react-query/tsconfig.json b/e2e/react-start/basic-react-query/tsconfig.json index 3a9fb7cd71..bb7f28fe27 100644 --- a/e2e/react-start/basic-react-query/tsconfig.json +++ b/e2e/react-start/basic-react-query/tsconfig.json @@ -17,6 +17,7 @@ "paths": { "~/*": ["./src/*"] }, + "types": ["vite/client"], "noEmit": true } } diff --git a/e2e/react-start/basic-react-query/vite.config.ts b/e2e/react-start/basic-react-query/vite.config.ts new file mode 100644 index 0000000000..1df337cd40 --- /dev/null +++ b/e2e/react-start/basic-react-query/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/basic-rsc/.gitignore b/e2e/react-start/basic-rsc/.gitignore index d3387e00cd..3c8e6870b3 100644 --- a/e2e/react-start/basic-rsc/.gitignore +++ b/e2e/react-start/basic-rsc/.gitignore @@ -7,12 +7,8 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin diff --git a/e2e/react-start/basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/basic-rsc/app.config.ts b/e2e/react-start/basic-rsc/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/basic-rsc/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/basic-rsc/package.json b/e2e/react-start/basic-rsc/package.json index c93361fa88..1c53ef7a42 100644 --- a/e2e/react-start/basic-rsc/package.json +++ b/e2e/react-start/basic-rsc/package.json @@ -1,12 +1,12 @@ { - "name": "tanstack-start-e2e-basic-rsc", + "name": "tanstack-react-start-e2e-basic-rsc", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs" }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", @@ -17,14 +17,14 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", "vite-tsconfig-paths": "^5.1.4" diff --git a/e2e/react-start/basic-rsc/src/client.tsx b/e2e/react-start/basic-rsc/src/client.tsx deleted file mode 100644 index 31385f57f1..0000000000 --- a/e2e/react-start/basic-rsc/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document!, ) diff --git a/e2e/react-start/basic-rsc/src/routeTree.gen.ts b/e2e/react-start/basic-rsc/src/routeTree.gen.ts index 1918b25c80..54e0311d56 100644 --- a/e2e/react-start/basic-rsc/src/routeTree.gen.ts +++ b/e2e/react-start/basic-rsc/src/routeTree.gen.ts @@ -8,68 +8,70 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -83,68 +85,152 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-start/basic-rsc/src/routes/_layout.tsx b/e2e/react-start/basic-rsc/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-start/basic-rsc/src/routes/_layout.tsx +++ b/e2e/react-start/basic-rsc/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2.tsx b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-start/basic-rsc/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/index.tsx b/e2e/react-start/basic-rsc/src/routes/index.tsx index b7b6138529..a693dcbf14 100644 --- a/e2e/react-start/basic-rsc/src/routes/index.tsx +++ b/e2e/react-start/basic-rsc/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/basic-rsc/src/routes/posts.$postId.tsx b/e2e/react-start/basic-rsc/src/routes/posts.$postId.tsx index 7dd63a2cd0..43f780f6fe 100644 --- a/e2e/react-start/basic-rsc/src/routes/posts.$postId.tsx +++ b/e2e/react-start/basic-rsc/src/routes/posts.$postId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import type { ErrorComponentProps } from '@tanstack/react-router' @@ -28,7 +28,7 @@ const renderPost = createServerFn({ method: 'GET' }) ) }) -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => renderPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/e2e/react-start/basic-rsc/src/routes/posts.index.tsx b/e2e/react-start/basic-rsc/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/e2e/react-start/basic-rsc/src/routes/posts.index.tsx +++ b/e2e/react-start/basic-rsc/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/posts.tsx b/e2e/react-start/basic-rsc/src/routes/posts.tsx index a3ef2a2e20..131cec4b9b 100644 --- a/e2e/react-start/basic-rsc/src/routes/posts.tsx +++ b/e2e/react-start/basic-rsc/src/routes/posts.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn, renderRsc } from '@tanstack/react-start' import { renderPosts } from '~/utils/renderPosts' @@ -6,7 +5,7 @@ export const serverRenderPosts = createServerFn({ method: 'GET' }).handler( renderPosts, ) -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => serverRenderPosts(), component: PostsComponent, }) diff --git a/e2e/react-start/basic-rsc/src/routes/posts_.$postId.deep.tsx b/e2e/react-start/basic-rsc/src/routes/posts_.$postId.deep.tsx index 13d368cf9c..bf2edef3c9 100644 --- a/e2e/react-start/basic-rsc/src/routes/posts_.$postId.deep.tsx +++ b/e2e/react-start/basic-rsc/src/routes/posts_.$postId.deep.tsx @@ -1,8 +1,8 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, component: PostDeepComponent, diff --git a/e2e/react-start/basic-rsc/src/tanstack-start.d.ts b/e2e/react-start/basic-rsc/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/basic-rsc/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-rsc/tsconfig.json b/e2e/react-start/basic-rsc/tsconfig.json index 3a9fb7cd71..a07911fe5f 100644 --- a/e2e/react-start/basic-rsc/tsconfig.json +++ b/e2e/react-start/basic-rsc/tsconfig.json @@ -17,6 +17,7 @@ "paths": { "~/*": ["./src/*"] }, - "noEmit": true + "noEmit": true, + "types": ["vite/client"] } } diff --git a/e2e/react-start/basic-rsc/vite.config.ts b/e2e/react-start/basic-rsc/vite.config.ts new file mode 100644 index 0000000000..1df337cd40 --- /dev/null +++ b/e2e/react-start/basic-rsc/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/basic-tsr-config/.gitignore b/e2e/react-start/basic-tsr-config/.gitignore index 2b76174be5..08eba9e706 100644 --- a/e2e/react-start/basic-tsr-config/.gitignore +++ b/e2e/react-start/basic-tsr-config/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/e2e/react-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/basic-tsr-config/app.config.ts b/e2e/react-start/basic-tsr-config/app.config.ts deleted file mode 100644 index 8989703df9..0000000000 --- a/e2e/react-start/basic-tsr-config/app.config.ts +++ /dev/null @@ -1,8 +0,0 @@ -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' - -export default defineConfig({ - tsr: { - appDirectory: './src/app', - }, -}) diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json index cd697d2bfb..f05595eecf 100644 --- a/e2e/react-start/basic-tsr-config/package.json +++ b/e2e/react-start/basic-tsr-config/package.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-basic-tsr-config", + "name": "tanstack-react-start-e2e-basic-tsr-config", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "rimraf ./count.txt && vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "rimraf ./count.txt && vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -15,7 +15,7 @@ "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/react-start/basic-tsr-config/playwright.config.ts b/e2e/react-start/basic-tsr-config/playwright.config.ts index bb77d0cf70..9806e0c136 100644 --- a/e2e/react-start/basic-tsr-config/playwright.config.ts +++ b/e2e/react-start/basic-tsr-config/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/basic-tsr-config/src/app/client.tsx b/e2e/react-start/basic-tsr-config/src/app/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/e2e/react-start/basic-tsr-config/src/app/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/e2e/react-start/basic-tsr-config/src/app/routeTree.gen.ts b/e2e/react-start/basic-tsr-config/src/app/routeTree.gen.ts index 5e682936ba..dd5eda94a9 100644 --- a/e2e/react-start/basic-tsr-config/src/app/routeTree.gen.ts +++ b/e2e/react-start/basic-tsr-config/src/app/routeTree.gen.ts @@ -8,14 +8,16 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -29,12 +31,24 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/react-start/basic-tsr-config/src/app/routes/index.tsx b/e2e/react-start/basic-tsr-config/src/app/routes/index.tsx index aaa4bdfdb3..3c1ef4b5d8 100644 --- a/e2e/react-start/basic-tsr-config/src/app/routes/index.tsx +++ b/e2e/react-start/basic-tsr-config/src/app/routes/index.tsx @@ -1,5 +1,5 @@ import fs from 'node:fs' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' const filePath = 'count.txt' @@ -17,7 +17,7 @@ const updateCount = createServerFn({ method: 'POST' }) const count = await getCount() await fs.promises.writeFile(filePath, `${count + data}`) }) -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async () => await getCount(), }) diff --git a/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts b/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts new file mode 100644 index 0000000000..6b848b9bb7 --- /dev/null +++ b/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-tsr-config/vite.config.ts b/e2e/react-start/basic-tsr-config/vite.config.ts new file mode 100644 index 0000000000..69045b5a44 --- /dev/null +++ b/e2e/react-start/basic-tsr-config/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tanstackStart({ + tsr: { + srcDirectory: './src/app', + }, + }), + ], +}) diff --git a/e2e/react-start/basic/.gitignore b/e2e/react-start/basic/.gitignore index be342025da..a79d5cf129 100644 --- a/e2e/react-start/basic/.gitignore +++ b/e2e/react-start/basic/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/react-start/basic/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..87c0856e21 --- /dev/null +++ b/e2e/react-start/basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api.users' +import { ServerRoute as ApiUsersIdRouteImport } from './../../src/routes/api/users.$id' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersIdRoute = ApiUsersIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$id': { + id: '/api/users/$id' + path: '/$id' + fullPath: '/api/users/$id' + preLoaderRoute: typeof ApiUsersIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api.users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$id' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$id']['parentRoute'], + FileRoutesByPath['/api/users/$id']['id'], + FileRoutesByPath['/api/users/$id']['path'], + FileRoutesByPath['/api/users/$id']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersIdRoute: typeof ApiUsersIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersIdRoute: ApiUsersIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$id' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$id' + id: '__root__' | '/api/users' | '/api/users/$id' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api.users.ts", + "children": [ + "/api/users/$id" + ] + }, + "/api/users/$id": { + "filePath": "api/users.$id.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/basic/app.config.ts b/e2e/react-start/basic/app.config.ts deleted file mode 100644 index 421aeca7b0..0000000000 --- a/e2e/react-start/basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index 2046e82f17..fa77d55739 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -1,24 +1,23 @@ { - "name": "tanstack-start-e2e-basic", + "name": "tanstack-react-start-e2e-basic", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/react-router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index 95d043d48b..e834d88cf4 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/basic/src/api.ts b/e2e/react-start/basic/src/api.ts deleted file mode 100644 index 0caf78bb9d..0000000000 --- a/e2e/react-start/basic/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/react-start/basic/src/client.tsx b/e2e/react-start/basic/src/client.tsx deleted file mode 100644 index b14d8aac68..0000000000 --- a/e2e/react-start/basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/e2e/react-start/basic/src/components/RedirectOnClick.tsx b/e2e/react-start/basic/src/components/RedirectOnClick.tsx index ec7445df5a..37b434c2e7 100644 --- a/e2e/react-start/basic/src/components/RedirectOnClick.tsx +++ b/e2e/react-start/basic/src/components/RedirectOnClick.tsx @@ -1,4 +1,4 @@ -import { useServerFn } from '@tanstack/start' +import { useServerFn } from '@tanstack/react-start' import { throwRedirect } from './throwRedirect' interface RedirectOnClickProps { diff --git a/e2e/react-start/basic/src/components/throwRedirect.ts b/e2e/react-start/basic/src/components/throwRedirect.ts index 9cef423d23..6a7a011912 100644 --- a/e2e/react-start/basic/src/components/throwRedirect.ts +++ b/e2e/react-start/basic/src/components/throwRedirect.ts @@ -1,5 +1,5 @@ import { redirect } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' export const throwRedirect = createServerFn() .validator( @@ -11,7 +11,10 @@ export const throwRedirect = createServerFn() ) .handler((ctx) => { if (ctx.data.target === 'internal') { - throw redirect({ to: '/posts', reloadDocument: ctx.data.reloadDocument }) + throw redirect({ + to: '/posts', + reloadDocument: ctx.data.reloadDocument, + }) } const href = ctx.data.externalHost ?? 'http://example.com' throw redirect({ diff --git a/e2e/react-start/basic/src/routeTree.gen.ts b/e2e/react-start/basic/src/routeTree.gen.ts index 1335898845..967443401e 100644 --- a/e2e/react-start/basic/src/routeTree.gen.ts +++ b/e2e/react-start/basic/src/routeTree.gen.ts @@ -8,220 +8,222 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as UsersImport } from './routes/users' -import { Route as StreamImport } from './routes/stream' -import { Route as SearchParamsImport } from './routes/search-params' -import { Route as ScriptsImport } from './routes/scripts' -import { Route as PostsImport } from './routes/posts' -import { Route as LinksImport } from './routes/links' -import { Route as DeferredImport } from './routes/deferred' -import { Route as LayoutImport } from './routes/_layout' -import { Route as NotFoundRouteImport } from './routes/not-found/route' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as RedirectIndexImport } from './routes/redirect/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as NotFoundIndexImport } from './routes/not-found/index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as RedirectTargetImport } from './routes/redirect/$target' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as NotFoundViaLoaderImport } from './routes/not-found/via-loader' -import { Route as NotFoundViaBeforeLoadImport } from './routes/not-found/via-beforeLoad' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as RedirectTargetIndexImport } from './routes/redirect/$target/index' -import { Route as RedirectTargetViaLoaderImport } from './routes/redirect/$target/via-loader' -import { Route as RedirectTargetViaBeforeLoadImport } from './routes/redirect/$target/via-beforeLoad' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' -import { Route as RedirectTargetServerFnIndexImport } from './routes/redirect/$target/serverFn/index' -import { Route as RedirectTargetServerFnViaUseServerFnImport } from './routes/redirect/$target/serverFn/via-useServerFn' -import { Route as RedirectTargetServerFnViaLoaderImport } from './routes/redirect/$target/serverFn/via-loader' -import { Route as RedirectTargetServerFnViaBeforeLoadImport } from './routes/redirect/$target/serverFn/via-beforeLoad' +import { Route as UsersRouteImport } from './routes/users' +import { Route as StreamRouteImport } from './routes/stream' +import { Route as SearchParamsRouteImport } from './routes/search-params' +import { Route as ScriptsRouteImport } from './routes/scripts' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LinksRouteImport } from './routes/links' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as NotFoundRouteRouteImport } from './routes/not-found/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as RedirectIndexRouteImport } from './routes/redirect/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as NotFoundIndexRouteImport } from './routes/not-found/index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as RedirectTargetRouteImport } from './routes/redirect/$target' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader' +import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index' +import { Route as RedirectTargetViaLoaderRouteImport } from './routes/redirect/$target/via-loader' +import { Route as RedirectTargetViaBeforeLoadRouteImport } from './routes/redirect/$target/via-beforeLoad' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' +import { Route as RedirectTargetServerFnIndexRouteImport } from './routes/redirect/$target/serverFn/index' +import { Route as RedirectTargetServerFnViaUseServerFnRouteImport } from './routes/redirect/$target/serverFn/via-useServerFn' +import { Route as RedirectTargetServerFnViaLoaderRouteImport } from './routes/redirect/$target/serverFn/via-loader' +import { Route as RedirectTargetServerFnViaBeforeLoadRouteImport } from './routes/redirect/$target/serverFn/via-beforeLoad' // Create/Update Routes -const UsersRoute = UsersImport.update({ +const UsersRoute = UsersRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => rootRoute, } as any) -const StreamRoute = StreamImport.update({ +const StreamRoute = StreamRouteImport.update({ id: '/stream', path: '/stream', getParentRoute: () => rootRoute, } as any) -const SearchParamsRoute = SearchParamsImport.update({ +const SearchParamsRoute = SearchParamsRouteImport.update({ id: '/search-params', path: '/search-params', getParentRoute: () => rootRoute, } as any) -const ScriptsRoute = ScriptsImport.update({ +const ScriptsRoute = ScriptsRouteImport.update({ id: '/scripts', path: '/scripts', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LinksRoute = LinksImport.update({ +const LinksRoute = LinksRouteImport.update({ id: '/links', path: '/links', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const NotFoundRouteRoute = NotFoundRouteImport.update({ +const NotFoundRouteRoute = NotFoundRouteRouteImport.update({ id: '/not-found', path: '/not-found', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRoute, } as any) -const RedirectIndexRoute = RedirectIndexImport.update({ +const RedirectIndexRoute = RedirectIndexRouteImport.update({ id: '/redirect/', path: '/redirect/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const NotFoundIndexRoute = NotFoundIndexImport.update({ +const NotFoundIndexRoute = NotFoundIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => NotFoundRouteRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRoute, } as any) -const RedirectTargetRoute = RedirectTargetImport.update({ +const RedirectTargetRoute = RedirectTargetRouteImport.update({ id: '/redirect/$target', path: '/redirect/$target', getParentRoute: () => rootRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const NotFoundViaLoaderRoute = NotFoundViaLoaderImport.update({ +const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => NotFoundRouteRoute, } as any) -const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadImport.update({ +const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => NotFoundRouteRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const RedirectTargetIndexRoute = RedirectTargetIndexImport.update({ +const RedirectTargetIndexRoute = RedirectTargetIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => RedirectTargetRoute, } as any) -const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderImport.update({ +const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetViaBeforeLoadRoute = - RedirectTargetViaBeforeLoadImport.update({ + RedirectTargetViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, } as any) const RedirectTargetServerFnIndexRoute = - RedirectTargetServerFnIndexImport.update({ + RedirectTargetServerFnIndexRouteImport.update({ id: '/serverFn/', path: '/serverFn/', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaUseServerFnRoute = - RedirectTargetServerFnViaUseServerFnImport.update({ + RedirectTargetServerFnViaUseServerFnRouteImport.update({ id: '/serverFn/via-useServerFn', path: '/serverFn/via-useServerFn', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaLoaderRoute = - RedirectTargetServerFnViaLoaderImport.update({ + RedirectTargetServerFnViaLoaderRouteImport.update({ id: '/serverFn/via-loader', path: '/serverFn/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaBeforeLoadRoute = - RedirectTargetServerFnViaBeforeLoadImport.update({ + RedirectTargetServerFnViaBeforeLoadRouteImport.update({ id: '/serverFn/via-beforeLoad', path: '/serverFn/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, @@ -235,215 +237,488 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/not-found': { id: '/not-found' path: '/not-found' fullPath: '/not-found' - preLoaderRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundRouteRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/links': { id: '/links' path: '/links' fullPath: '/links' - preLoaderRoute: typeof LinksImport + preLoaderRoute: typeof LinksRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/scripts': { id: '/scripts' path: '/scripts' fullPath: '/scripts' - preLoaderRoute: typeof ScriptsImport + preLoaderRoute: typeof ScriptsRouteImport parentRoute: typeof rootRoute } '/search-params': { id: '/search-params' path: '/search-params' fullPath: '/search-params' - preLoaderRoute: typeof SearchParamsImport + preLoaderRoute: typeof SearchParamsRouteImport parentRoute: typeof rootRoute } '/stream': { id: '/stream' path: '/stream' fullPath: '/stream' - preLoaderRoute: typeof StreamImport + preLoaderRoute: typeof StreamRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersImport + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/not-found/via-beforeLoad': { id: '/not-found/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/not-found/via-beforeLoad' - preLoaderRoute: typeof NotFoundViaBeforeLoadImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundViaBeforeLoadRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/not-found/via-loader': { id: '/not-found/via-loader' path: '/via-loader' fullPath: '/not-found/via-loader' - preLoaderRoute: typeof NotFoundViaLoaderImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundViaLoaderRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/$target': { id: '/redirect/$target' path: '/redirect/$target' fullPath: '/redirect/$target' - preLoaderRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetRouteImport parentRoute: typeof rootRoute } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport } '/not-found/': { id: '/not-found/' path: '/' fullPath: '/not-found/' - preLoaderRoute: typeof NotFoundIndexImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundIndexRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/': { id: '/redirect/' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectIndexImport + preLoaderRoute: typeof RedirectIndexRouteImport parentRoute: typeof rootRoute } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } '/redirect/$target/via-beforeLoad': { id: '/redirect/$target/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/redirect/$target/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/via-loader': { id: '/redirect/$target/via-loader' path: '/via-loader' fullPath: '/redirect/$target/via-loader' - preLoaderRoute: typeof RedirectTargetViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/': { id: '/redirect/$target/' path: '/' fullPath: '/redirect/$target/' - preLoaderRoute: typeof RedirectTargetIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-beforeLoad': { id: '/redirect/$target/serverFn/via-beforeLoad' path: '/serverFn/via-beforeLoad' fullPath: '/redirect/$target/serverFn/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-loader': { id: '/redirect/$target/serverFn/via-loader' path: '/serverFn/via-loader' fullPath: '/redirect/$target/serverFn/via-loader' - preLoaderRoute: typeof RedirectTargetServerFnViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-useServerFn': { id: '/redirect/$target/serverFn/via-useServerFn' path: '/serverFn/via-useServerFn' fullPath: '/redirect/$target/serverFn/via-useServerFn' - preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/': { id: '/redirect/$target/serverFn/' path: '/serverFn' fullPath: '/redirect/$target/serverFn' - preLoaderRoute: typeof RedirectTargetServerFnIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/not-found/route' { + const createFileRoute: CreateFileRoute< + '/not-found', + FileRoutesByPath['/not-found']['parentRoute'], + FileRoutesByPath['/not-found']['id'], + FileRoutesByPath['/not-found']['path'], + FileRoutesByPath['/not-found']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/links' { + const createFileRoute: CreateFileRoute< + '/links', + FileRoutesByPath['/links']['parentRoute'], + FileRoutesByPath['/links']['id'], + FileRoutesByPath['/links']['path'], + FileRoutesByPath['/links']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/scripts' { + const createFileRoute: CreateFileRoute< + '/scripts', + FileRoutesByPath['/scripts']['parentRoute'], + FileRoutesByPath['/scripts']['id'], + FileRoutesByPath['/scripts']['path'], + FileRoutesByPath['/scripts']['fullPath'] + > +} +declare module './routes/search-params' { + const createFileRoute: CreateFileRoute< + '/search-params', + FileRoutesByPath['/search-params']['parentRoute'], + FileRoutesByPath['/search-params']['id'], + FileRoutesByPath['/search-params']['path'], + FileRoutesByPath['/search-params']['fullPath'] + > +} +declare module './routes/stream' { + const createFileRoute: CreateFileRoute< + '/stream', + FileRoutesByPath['/stream']['parentRoute'], + FileRoutesByPath['/stream']['id'], + FileRoutesByPath['/stream']['path'], + FileRoutesByPath['/stream']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/not-found/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/not-found/via-beforeLoad', + FileRoutesByPath['/not-found/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/not-found/via-beforeLoad']['id'], + FileRoutesByPath['/not-found/via-beforeLoad']['path'], + FileRoutesByPath['/not-found/via-beforeLoad']['fullPath'] + > +} +declare module './routes/not-found/via-loader' { + const createFileRoute: CreateFileRoute< + '/not-found/via-loader', + FileRoutesByPath['/not-found/via-loader']['parentRoute'], + FileRoutesByPath['/not-found/via-loader']['id'], + FileRoutesByPath['/not-found/via-loader']['path'], + FileRoutesByPath['/not-found/via-loader']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/redirect/$target' { + const createFileRoute: CreateFileRoute< + '/redirect/$target', + FileRoutesByPath['/redirect/$target']['parentRoute'], + FileRoutesByPath['/redirect/$target']['id'], + FileRoutesByPath['/redirect/$target']['path'], + FileRoutesByPath['/redirect/$target']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/not-found/index' { + const createFileRoute: CreateFileRoute< + '/not-found/', + FileRoutesByPath['/not-found/']['parentRoute'], + FileRoutesByPath['/not-found/']['id'], + FileRoutesByPath['/not-found/']['path'], + FileRoutesByPath['/not-found/']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/redirect/index' { + const createFileRoute: CreateFileRoute< + '/redirect/', + FileRoutesByPath['/redirect/']['parentRoute'], + FileRoutesByPath['/redirect/']['id'], + FileRoutesByPath['/redirect/']['path'], + FileRoutesByPath['/redirect/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} +declare module './routes/redirect/$target/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-beforeLoad', + FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-loader', + FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-loader']['id'], + FileRoutesByPath['/redirect/$target/via-loader']['path'], + FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] + > +} +declare module './routes/redirect/$target/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/', + FileRoutesByPath['/redirect/$target/']['parentRoute'], + FileRoutesByPath['/redirect/$target/']['id'], + FileRoutesByPath['/redirect/$target/']['path'], + FileRoutesByPath['/redirect/$target/']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-beforeLoad', + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-loader', + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-useServerFn' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-useServerFn', + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/', + FileRoutesByPath['/redirect/$target/serverFn/']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/']['id'], + FileRoutesByPath['/redirect/$target/serverFn/']['path'], + FileRoutesByPath['/redirect/$target/serverFn/']['fullPath'] + > +} + // Create and export the route tree interface NotFoundRouteRouteChildren { diff --git a/e2e/react-start/basic/src/routes/_layout.tsx b/e2e/react-start/basic/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/e2e/react-start/basic/src/routes/_layout.tsx +++ b/e2e/react-start/basic/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic/src/routes/_layout/_layout-2.tsx b/e2e/react-start/basic/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/e2e/react-start/basic/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-start/basic/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-start/basic/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/react-start/basic/src/routes/api.users.ts b/e2e/react-start/basic/src/routes/api.users.ts index 74b4ad35ba..5d16d71aa6 100644 --- a/e2e/react-start/basic/src/routes/api.users.ts +++ b/e2e/react-start/basic/src/routes/api.users.ts @@ -1,10 +1,9 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' import axios from 'redaxios' import type { User } from '~/utils/users' -export const APIRoute = createAPIFileRoute('/api/users')({ +export const ServerRoute = createServerFileRoute().methods({ GET: async ({ request }) => { console.info('Fetching users... @', request.url) const res = await axios.get>( diff --git a/e2e/react-start/basic/src/routes/api/users.$id.ts b/e2e/react-start/basic/src/routes/api/users.$id.ts index 2cfe2322ef..3998d60611 100644 --- a/e2e/react-start/basic/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic/src/routes/api/users.$id.ts @@ -1,10 +1,8 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' import axios from 'redaxios' - import type { User } from '~/utils/users' -export const APIRoute = createAPIFileRoute('/api/users/$id')({ +export const ServerRoute = createServerFileRoute().methods({ GET: async ({ request, params }) => { console.info(`Fetching users by id=${params.id}... @`, request.url) try { diff --git a/e2e/react-start/basic/src/routes/deferred.tsx b/e2e/react-start/basic/src/routes/deferred.tsx index ae64951716..6b128efea0 100644 --- a/e2e/react-start/basic/src/routes/deferred.tsx +++ b/e2e/react-start/basic/src/routes/deferred.tsx @@ -1,5 +1,5 @@ -import { Await, createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { Await } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' import { Suspense, useState } from 'react' const personServerFn = createServerFn({ method: 'GET' }) @@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET' }) return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: async () => { return { deferredStuff: new Promise((r) => diff --git a/e2e/react-start/basic/src/routes/index.tsx b/e2e/react-start/basic/src/routes/index.tsx index 37169a78b4..f2bb5d3f32 100644 --- a/e2e/react-start/basic/src/routes/index.tsx +++ b/e2e/react-start/basic/src/routes/index.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { CustomMessage } from '~/components/CustomMessage' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/basic/src/routes/links.tsx b/e2e/react-start/basic/src/routes/links.tsx index adc8fe9c4d..81b53edfd7 100644 --- a/e2e/react-start/basic/src/routes/links.tsx +++ b/e2e/react-start/basic/src/routes/links.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/links')({ +export const Route = createFileRoute({ component: () => { const navigate = Route.useNavigate() return ( diff --git a/e2e/react-start/basic/src/routes/not-found/index.tsx b/e2e/react-start/basic/src/routes/not-found/index.tsx index e754f83c74..7abe4a389f 100644 --- a/e2e/react-start/basic/src/routes/not-found/index.tsx +++ b/e2e/react-start/basic/src/routes/not-found/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/not-found/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/react-start/basic/src/routes/not-found/route.tsx b/e2e/react-start/basic/src/routes/not-found/route.tsx index e604e098fd..b8343167f5 100644 --- a/e2e/react-start/basic/src/routes/not-found/route.tsx +++ b/e2e/react-start/basic/src/routes/not-found/route.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import z from 'zod' -export const Route = createFileRoute('/not-found')({ +export const Route = createFileRoute({ validateSearch: z.object({ preload: z.literal(false).optional(), }), diff --git a/e2e/react-start/basic/src/routes/not-found/via-beforeLoad.tsx b/e2e/react-start/basic/src/routes/not-found/via-beforeLoad.tsx index 85164dbab5..cc04e59dec 100644 --- a/e2e/react-start/basic/src/routes/not-found/via-beforeLoad.tsx +++ b/e2e/react-start/basic/src/routes/not-found/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, notFound } from '@tanstack/react-router' +import { notFound } from '@tanstack/react-router' -export const Route = createFileRoute('/not-found/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: () => { throw notFound() }, diff --git a/e2e/react-start/basic/src/routes/not-found/via-loader.tsx b/e2e/react-start/basic/src/routes/not-found/via-loader.tsx index 6174b27f77..8ca69f7bb6 100644 --- a/e2e/react-start/basic/src/routes/not-found/via-loader.tsx +++ b/e2e/react-start/basic/src/routes/not-found/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, notFound } from '@tanstack/react-router' +import { notFound } from '@tanstack/react-router' -export const Route = createFileRoute('/not-found/via-loader')({ +export const Route = createFileRoute({ loader: () => { throw notFound() }, diff --git a/e2e/react-start/basic/src/routes/posts.$postId.tsx b/e2e/react-start/basic/src/routes/posts.$postId.tsx index 005228a0fe..68c663c7e8 100644 --- a/e2e/react-start/basic/src/routes/posts.$postId.tsx +++ b/e2e/react-start/basic/src/routes/posts.$postId.tsx @@ -1,10 +1,10 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { fetchPost } from '~/utils/posts' import { NotFound } from '~/components/NotFound' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, @@ -30,7 +30,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/e2e/react-start/basic/src/routes/posts.index.tsx b/e2e/react-start/basic/src/routes/posts.index.tsx index 1bad79b0f7..07e41d1b0b 100644 --- a/e2e/react-start/basic/src/routes/posts.index.tsx +++ b/e2e/react-start/basic/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-start/basic/src/routes/posts.tsx b/e2e/react-start/basic/src/routes/posts.tsx index 0f69c18341..6fa5bfbe8b 100644 --- a/e2e/react-start/basic/src/routes/posts.tsx +++ b/e2e/react-start/basic/src/routes/posts.tsx @@ -1,8 +1,8 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ head: () => ({ meta: [ { diff --git a/e2e/react-start/basic/src/routes/posts_.$postId.deep.tsx b/e2e/react-start/basic/src/routes/posts_.$postId.deep.tsx index e8f733560b..ea326087b8 100644 --- a/e2e/react-start/basic/src/routes/posts_.$postId.deep.tsx +++ b/e2e/react-start/basic/src/routes/posts_.$postId.deep.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { PostErrorComponent } from './posts.$postId' import { fetchPost } from '~/utils/posts' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostDeepComponent, diff --git a/e2e/react-start/basic/src/routes/redirect/$target.tsx b/e2e/react-start/basic/src/routes/redirect/$target.tsx index 686f1c7056..099a7ab0be 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, retainSearchParams } from '@tanstack/react-router' +import { retainSearchParams } from '@tanstack/react-router' import z from 'zod' -export const Route = createFileRoute('/redirect/$target')({ +export const Route = createFileRoute({ params: { parse: (p) => z diff --git a/e2e/react-start/basic/src/routes/redirect/$target/index.tsx b/e2e/react-start/basic/src/routes/redirect/$target/index.tsx index f399d965cf..d4878e0990 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/index.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/index.tsx b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/index.tsx index ddb0d8e996..12118917d6 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/index.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/serverFn/')({ +export const Route = createFileRoute({ component: () => (

diff --git a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx index eed26559f3..3aad8bffa4 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx @@ -1,9 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { throwRedirect } from '~/components/throwRedirect' -export const Route = createFileRoute( - '/redirect/$target/serverFn/via-beforeLoad', -)({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx index 1db205e311..3087fa2e15 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { throwRedirect } from '~/components/throwRedirect' -export const Route = createFileRoute('/redirect/$target/serverFn/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx index 866bb19b10..98816a067a 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx @@ -1,9 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { RedirectOnClick } from '~/components/RedirectOnClick' -export const Route = createFileRoute( - '/redirect/$target/serverFn/via-useServerFn', -)({ +export const Route = createFileRoute({ component: () => { const { target } = Route.useParams() const { reloadDocument, externalHost } = Route.useSearch() diff --git a/e2e/react-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/react-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx index 14a2492331..bfda558451 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/react-start/basic/src/routes/redirect/$target/via-loader.tsx b/e2e/react-start/basic/src/routes/redirect/$target/via-loader.tsx index 9e6a3fc9db..022d5c1f8c 100644 --- a/e2e/react-start/basic/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/react-start/basic/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/$target/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/react-start/basic/src/routes/redirect/index.tsx b/e2e/react-start/basic/src/routes/redirect/index.tsx index c0b26a1df4..a400e552ab 100644 --- a/e2e/react-start/basic/src/routes/redirect/index.tsx +++ b/e2e/react-start/basic/src/routes/redirect/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect/')({ +export const Route = createFileRoute({ component: () => (
const isProd = import.meta.env.PROD -export const Route = createFileRoute('/scripts')({ +export const Route = createFileRoute({ head: () => ({ scripts: [ { diff --git a/e2e/react-start/basic/src/routes/search-params.tsx b/e2e/react-start/basic/src/routes/search-params.tsx index 8ebe45bc34..5ddddc58f0 100644 --- a/e2e/react-start/basic/src/routes/search-params.tsx +++ b/e2e/react-start/basic/src/routes/search-params.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute('/search-params')({ +export const Route = createFileRoute({ component: () => { const search = Route.useSearch() return ( diff --git a/e2e/react-start/basic/src/routes/stream.tsx b/e2e/react-start/basic/src/routes/stream.tsx index 691792ac21..a113492e1c 100644 --- a/e2e/react-start/basic/src/routes/stream.tsx +++ b/e2e/react-start/basic/src/routes/stream.tsx @@ -1,7 +1,7 @@ -import { Await, createFileRoute } from '@tanstack/react-router' +import { Await } from '@tanstack/react-router' import { useEffect, useState } from 'react' -export const Route = createFileRoute('/stream')({ +export const Route = createFileRoute({ component: Home, loader() { return { diff --git a/e2e/react-start/basic/src/routes/users.$userId.tsx b/e2e/react-start/basic/src/routes/users.$userId.tsx index 1e2921411a..87f81e0f53 100644 --- a/e2e/react-start/basic/src/routes/users.$userId.tsx +++ b/e2e/react-start/basic/src/routes/users.$userId.tsx @@ -1,15 +1,14 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import axios from 'redaxios' import type { ErrorComponentProps } from '@tanstack/react-router' import type { User } from '~/utils/users' -import { DEPLOY_URL } from '~/utils/users' import { NotFound } from '~/components/NotFound' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ params: { userId } }) => { return await axios - .get(DEPLOY_URL + '/api/users/' + userId) + .get('/api/users/' + userId) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') @@ -22,7 +21,7 @@ export const Route = createFileRoute('/users/$userId')({ }, }) -export function UserErrorComponent({ error }: ErrorComponentProps) { +function UserErrorComponent({ error }: ErrorComponentProps) { return } diff --git a/e2e/react-start/basic/src/routes/users.index.tsx b/e2e/react-start/basic/src/routes/users.index.tsx index b6b0ee67fb..662e8b6c68 100644 --- a/e2e/react-start/basic/src/routes/users.index.tsx +++ b/e2e/react-start/basic/src/routes/users.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/e2e/react-start/basic/src/routes/users.tsx b/e2e/react-start/basic/src/routes/users.tsx index 45e070657e..7a07e4e9fd 100644 --- a/e2e/react-start/basic/src/routes/users.tsx +++ b/e2e/react-start/basic/src/routes/users.tsx @@ -1,13 +1,13 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '~/utils/users' import { DEPLOY_URL } from '~/utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async () => { return await axios - .get>(DEPLOY_URL + '/api/users') + .get>('/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') diff --git a/e2e/react-start/basic/src/ssr.tsx b/e2e/react-start/basic/src/ssr.tsx deleted file mode 100644 index 62572579ac..0000000000 --- a/e2e/react-start/basic/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/react-start/basic/src/tanstack-start.d.ts b/e2e/react-start/basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic/src/utils/posts.tsx b/e2e/react-start/basic/src/utils/posts.tsx index bf139e0ac8..9fdff27673 100644 --- a/e2e/react-start/basic/src/utils/posts.tsx +++ b/e2e/react-start/basic/src/utils/posts.tsx @@ -1,5 +1,5 @@ import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/react-start/basic/src/utils/users.tsx b/e2e/react-start/basic/src/utils/users.tsx index 79b45867d5..46be4b1580 100644 --- a/e2e/react-start/basic/src/utils/users.tsx +++ b/e2e/react-start/basic/src/utils/users.tsx @@ -4,7 +4,6 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 +const PORT = process.env.VITE_SERVER_PORT || 3000 export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/basic/vite.config.ts b/e2e/react-start/basic/vite.config.ts new file mode 100644 index 0000000000..a1b3d840f5 --- /dev/null +++ b/e2e/react-start/basic/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/clerk-basic/.gitignore b/e2e/react-start/clerk-basic/.gitignore index b15fed94e2..2818549158 100644 --- a/e2e/react-start/clerk-basic/.gitignore +++ b/e2e/react-start/clerk-basic/.gitignore @@ -7,14 +7,10 @@ yarn.lock .cache .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/e2e/react-start/clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/clerk-basic/app.config.ts b/e2e/react-start/clerk-basic/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/clerk-basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/clerk-basic/package.json b/e2e/react-start/clerk-basic/package.disabled.json similarity index 80% rename from e2e/react-start/clerk-basic/package.json rename to e2e/react-start/clerk-basic/package.disabled.json index c2c2bb13fe..583f7ab6ec 100644 --- a/e2e/react-start/clerk-basic/package.json +++ b/e2e/react-start/clerk-basic/package.disabled.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-clerk-basic", + "name": "tanstack-react-start-e2e-clerk-basic", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs", "test:e2e": "exit 0; playwright test --project=chromium" }, "dependencies": { @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@playwright/test": "^1.50.1", @@ -28,8 +28,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", "vite-tsconfig-paths": "^5.1.4" diff --git a/e2e/react-start/clerk-basic/playwright.config.ts b/e2e/react-start/clerk-basic/playwright.config.ts index bb77d0cf70..9806e0c136 100644 --- a/e2e/react-start/clerk-basic/playwright.config.ts +++ b/e2e/react-start/clerk-basic/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/clerk-basic/src/client.tsx b/e2e/react-start/clerk-basic/src/client.tsx deleted file mode 100644 index 31385f57f1..0000000000 --- a/e2e/react-start/clerk-basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document!, ) diff --git a/e2e/react-start/clerk-basic/src/routeTree.gen.ts b/e2e/react-start/clerk-basic/src/routeTree.gen.ts index b4b4f459a8..00f53c8623 100644 --- a/e2e/react-start/clerk-basic/src/routeTree.gen.ts +++ b/e2e/react-start/clerk-basic/src/routeTree.gen.ts @@ -8,48 +8,50 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AuthedImport } from './routes/_authed' -import { Route as IndexImport } from './routes/index' -import { Route as AuthedPostsImport } from './routes/_authed/posts' -import { Route as AuthedPostsIndexImport } from './routes/_authed/posts.index' -import { Route as AuthedProfileSplatImport } from './routes/_authed/profile.$' -import { Route as AuthedPostsPostIdImport } from './routes/_authed/posts.$postId' +import { Route as AuthedRouteImport } from './routes/_authed' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthedPostsRouteImport } from './routes/_authed/posts' +import { Route as AuthedPostsIndexRouteImport } from './routes/_authed/posts.index' +import { Route as AuthedProfileSplatRouteImport } from './routes/_authed/profile.$' +import { Route as AuthedPostsPostIdRouteImport } from './routes/_authed/posts.$postId' // Create/Update Routes -const AuthedRoute = AuthedImport.update({ +const AuthedRoute = AuthedRouteImport.update({ id: '/_authed', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthedPostsRoute = AuthedPostsImport.update({ +const AuthedPostsRoute = AuthedPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsIndexRoute = AuthedPostsIndexImport.update({ +const AuthedPostsIndexRoute = AuthedPostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthedPostsRoute, } as any) -const AuthedProfileSplatRoute = AuthedProfileSplatImport.update({ +const AuthedProfileSplatRoute = AuthedProfileSplatRouteImport.update({ id: '/profile/$', path: '/profile/$', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsPostIdRoute = AuthedPostsPostIdImport.update({ +const AuthedPostsPostIdRoute = AuthedPostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => AuthedPostsRoute, @@ -63,47 +65,104 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_authed': { id: '/_authed' path: '' fullPath: '' - preLoaderRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedRouteImport parentRoute: typeof rootRoute } '/_authed/posts': { id: '/_authed/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof AuthedPostsImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedPostsRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/$postId': { id: '/_authed/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof AuthedPostsPostIdImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsPostIdRouteImport + parentRoute: typeof AuthedPostsRouteImport } '/_authed/profile/$': { id: '/_authed/profile/$' path: '/profile/$' fullPath: '/profile/$' - preLoaderRoute: typeof AuthedProfileSplatImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedProfileSplatRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/': { id: '/_authed/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof AuthedPostsIndexImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsIndexRouteImport + parentRoute: typeof AuthedPostsRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_authed' { + const createFileRoute: CreateFileRoute< + '/_authed', + FileRoutesByPath['/_authed']['parentRoute'], + FileRoutesByPath['/_authed']['id'], + FileRoutesByPath['/_authed']['path'], + FileRoutesByPath['/_authed']['fullPath'] + > +} +declare module './routes/_authed/posts' { + const createFileRoute: CreateFileRoute< + '/_authed/posts', + FileRoutesByPath['/_authed/posts']['parentRoute'], + FileRoutesByPath['/_authed/posts']['id'], + FileRoutesByPath['/_authed/posts']['path'], + FileRoutesByPath['/_authed/posts']['fullPath'] + > +} +declare module './routes/_authed/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/$postId', + FileRoutesByPath['/_authed/posts/$postId']['parentRoute'], + FileRoutesByPath['/_authed/posts/$postId']['id'], + FileRoutesByPath['/_authed/posts/$postId']['path'], + FileRoutesByPath['/_authed/posts/$postId']['fullPath'] + > +} +declare module './routes/_authed/profile.$' { + const createFileRoute: CreateFileRoute< + '/_authed/profile/$', + FileRoutesByPath['/_authed/profile/$']['parentRoute'], + FileRoutesByPath['/_authed/profile/$']['id'], + FileRoutesByPath['/_authed/profile/$']['path'], + FileRoutesByPath['/_authed/profile/$']['fullPath'] + > +} +declare module './routes/_authed/posts.index' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/', + FileRoutesByPath['/_authed/posts/']['parentRoute'], + FileRoutesByPath['/_authed/posts/']['id'], + FileRoutesByPath['/_authed/posts/']['path'], + FileRoutesByPath['/_authed/posts/']['fullPath'] + > +} + // Create and export the route tree interface AuthedPostsRouteChildren { diff --git a/e2e/react-start/clerk-basic/src/router.tsx b/e2e/react-start/clerk-basic/src/router.tsx index 5a1c0ad410..63444559c1 100644 --- a/e2e/react-start/clerk-basic/src/router.tsx +++ b/e2e/react-start/clerk-basic/src/router.tsx @@ -1,3 +1,4 @@ +/// import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' diff --git a/e2e/react-start/clerk-basic/src/routes/__root.tsx b/e2e/react-start/clerk-basic/src/routes/__root.tsx index 2806298d49..569979e37a 100644 --- a/e2e/react-start/clerk-basic/src/routes/__root.tsx +++ b/e2e/react-start/clerk-basic/src/routes/__root.tsx @@ -1,4 +1,3 @@ -/// import { HeadContent, Link, diff --git a/e2e/react-start/clerk-basic/src/routes/_authed.tsx b/e2e/react-start/clerk-basic/src/routes/_authed.tsx index 226ae0829f..6242975272 100644 --- a/e2e/react-start/clerk-basic/src/routes/_authed.tsx +++ b/e2e/react-start/clerk-basic/src/routes/_authed.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { SignIn } from '@clerk/tanstack-react-start' -export const Route = createFileRoute('/_authed')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { if (!context.user.userId) { throw new Error('Not authenticated') diff --git a/e2e/react-start/clerk-basic/src/routes/_authed/posts.$postId.tsx b/e2e/react-start/clerk-basic/src/routes/_authed/posts.$postId.tsx index 27296b9658..49cad9b374 100644 --- a/e2e/react-start/clerk-basic/src/routes/_authed/posts.$postId.tsx +++ b/e2e/react-start/clerk-basic/src/routes/_authed/posts.$postId.tsx @@ -1,10 +1,10 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound.js' import { fetchPost } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/e2e/react-start/clerk-basic/src/routes/_authed/posts.index.tsx b/e2e/react-start/clerk-basic/src/routes/_authed/posts.index.tsx index ea9e667e54..13529228bb 100644 --- a/e2e/react-start/clerk-basic/src/routes/_authed/posts.index.tsx +++ b/e2e/react-start/clerk-basic/src/routes/_authed/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_authed/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/react-start/clerk-basic/src/routes/_authed/posts.tsx b/e2e/react-start/clerk-basic/src/routes/_authed/posts.tsx index c01f12c49a..6c37957e8c 100644 --- a/e2e/react-start/clerk-basic/src/routes/_authed/posts.tsx +++ b/e2e/react-start/clerk-basic/src/routes/_authed/posts.tsx @@ -1,8 +1,8 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/e2e/react-start/clerk-basic/src/routes/_authed/profile.$.tsx b/e2e/react-start/clerk-basic/src/routes/_authed/profile.$.tsx index 1e5a8b1429..6c37957e8c 100644 --- a/e2e/react-start/clerk-basic/src/routes/_authed/profile.$.tsx +++ b/e2e/react-start/clerk-basic/src/routes/_authed/profile.$.tsx @@ -1,8 +1,8 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/profile/$')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/e2e/react-start/clerk-basic/src/routes/index.tsx b/e2e/react-start/clerk-basic/src/routes/index.tsx index 6ae388a178..66baf1e9f1 100644 --- a/e2e/react-start/clerk-basic/src/routes/index.tsx +++ b/e2e/react-start/clerk-basic/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/clerk-basic/src/server.tsx b/e2e/react-start/clerk-basic/src/server.tsx new file mode 100644 index 0000000000..2987216e24 --- /dev/null +++ b/e2e/react-start/clerk-basic/src/server.tsx @@ -0,0 +1,18 @@ +import { + createStartHandler, + defaultStreamHandler, + defineEventHandler, +} from '@tanstack/react-start/server' +import { createClerkHandler } from '@clerk/tanstack-react-start/server' +import { createRouter } from './router' + +export default defineEventHandler((event) => { + const startHandler = createStartHandler({ + createRouter, + }) + + const withClerkHandler = + createClerkHandler(startHandler)(defaultStreamHandler) + + return withClerkHandler(event) +}) diff --git a/e2e/react-start/clerk-basic/src/tanstack-start.d.ts b/e2e/react-start/clerk-basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/clerk-basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/clerk-basic/vite.config.ts b/e2e/react-start/clerk-basic/vite.config.ts new file mode 100644 index 0000000000..1df337cd40 --- /dev/null +++ b/e2e/react-start/clerk-basic/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/scroll-restoration/.gitignore b/e2e/react-start/scroll-restoration/.gitignore index be342025da..ca63f49885 100644 --- a/e2e/react-start/scroll-restoration/.gitignore +++ b/e2e/react-start/scroll-restoration/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/e2e/react-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/scroll-restoration/app.config.ts b/e2e/react-start/scroll-restoration/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/scroll-restoration/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json index 73a72f7300..79e062b75a 100644 --- a/e2e/react-start/scroll-restoration/package.json +++ b/e2e/react-start/scroll-restoration/package.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-basic-scroll-restoration", + "name": "tanstack-react-start-e2e-basic-scroll-restoration", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", + "vite": "6.1.4", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/react-start/scroll-restoration/playwright.config.ts b/e2e/react-start/scroll-restoration/playwright.config.ts index 95d043d48b..cf58d18adf 100644 --- a/e2e/react-start/scroll-restoration/playwright.config.ts +++ b/e2e/react-start/scroll-restoration/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/scroll-restoration/src/api.ts b/e2e/react-start/scroll-restoration/src/api.ts deleted file mode 100644 index 8b9fef1667..0000000000 --- a/e2e/react-start/scroll-restoration/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/react-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/react-start/scroll-restoration/src/client.tsx b/e2e/react-start/scroll-restoration/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/e2e/react-start/scroll-restoration/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/e2e/react-start/scroll-restoration/src/routeTree.gen.ts b/e2e/react-start/scroll-restoration/src/routeTree.gen.ts index f0a79cc008..03dc138db0 100644 --- a/e2e/react-start/scroll-restoration/src/routeTree.gen.ts +++ b/e2e/react-start/scroll-restoration/src/routeTree.gen.ts @@ -8,35 +8,37 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as testsWithSearchImport } from './routes/(tests)/with-search' -import { Route as testsWithLoaderImport } from './routes/(tests)/with-loader' -import { Route as testsNormalPageImport } from './routes/(tests)/normal-page' +import { Route as IndexRouteImport } from './routes/index' +import { Route as testsWithSearchRouteImport } from './routes/(tests)/with-search' +import { Route as testsWithLoaderRouteImport } from './routes/(tests)/with-loader' +import { Route as testsNormalPageRouteImport } from './routes/(tests)/normal-page' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const testsWithSearchRoute = testsWithSearchImport.update({ +const testsWithSearchRoute = testsWithSearchRouteImport.update({ id: '/(tests)/with-search', path: '/with-search', getParentRoute: () => rootRoute, } as any) -const testsWithLoaderRoute = testsWithLoaderImport.update({ +const testsWithLoaderRoute = testsWithLoaderRouteImport.update({ id: '/(tests)/with-loader', path: '/with-loader', getParentRoute: () => rootRoute, } as any) -const testsNormalPageRoute = testsNormalPageImport.update({ +const testsNormalPageRoute = testsNormalPageRouteImport.update({ id: '/(tests)/normal-page', path: '/normal-page', getParentRoute: () => rootRoute, @@ -50,33 +52,72 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/(tests)/normal-page': { id: '/(tests)/normal-page' path: '/normal-page' fullPath: '/normal-page' - preLoaderRoute: typeof testsNormalPageImport + preLoaderRoute: typeof testsNormalPageRouteImport parentRoute: typeof rootRoute } '/(tests)/with-loader': { id: '/(tests)/with-loader' path: '/with-loader' fullPath: '/with-loader' - preLoaderRoute: typeof testsWithLoaderImport + preLoaderRoute: typeof testsWithLoaderRouteImport parentRoute: typeof rootRoute } '/(tests)/with-search': { id: '/(tests)/with-search' path: '/with-search' fullPath: '/with-search' - preLoaderRoute: typeof testsWithSearchImport + preLoaderRoute: typeof testsWithSearchRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/(tests)/normal-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/normal-page', + FileRoutesByPath['/(tests)/normal-page']['parentRoute'], + FileRoutesByPath['/(tests)/normal-page']['id'], + FileRoutesByPath['/(tests)/normal-page']['path'], + FileRoutesByPath['/(tests)/normal-page']['fullPath'] + > +} +declare module './routes/(tests)/with-loader' { + const createFileRoute: CreateFileRoute< + '/(tests)/with-loader', + FileRoutesByPath['/(tests)/with-loader']['parentRoute'], + FileRoutesByPath['/(tests)/with-loader']['id'], + FileRoutesByPath['/(tests)/with-loader']['path'], + FileRoutesByPath['/(tests)/with-loader']['fullPath'] + > +} +declare module './routes/(tests)/with-search' { + const createFileRoute: CreateFileRoute< + '/(tests)/with-search', + FileRoutesByPath['/(tests)/with-search']['parentRoute'], + FileRoutesByPath['/(tests)/with-search']['id'], + FileRoutesByPath['/(tests)/with-search']['path'], + FileRoutesByPath['/(tests)/with-search']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/normal-page.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/normal-page.tsx index 95fb7e119e..401397d63c 100644 --- a/e2e/react-start/scroll-restoration/src/routes/(tests)/normal-page.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/normal-page.tsx @@ -1,8 +1,7 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/normal-page')({ +export const Route = createFileRoute({ component: Component, }) diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/with-loader.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/with-loader.tsx index dfd4c7bf13..a8da1a2594 100644 --- a/e2e/react-start/scroll-restoration/src/routes/(tests)/with-loader.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/with-loader.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' import { ScrollBlock } from '../-components/scroll-block' import { sleep } from '~/utils/posts' -export const Route = createFileRoute('/(tests)/with-loader')({ +export const Route = createFileRoute({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/react-start/scroll-restoration/src/routes/(tests)/with-search.tsx b/e2e/react-start/scroll-restoration/src/routes/(tests)/with-search.tsx index 7916c18f73..21e7635e29 100644 --- a/e2e/react-start/scroll-restoration/src/routes/(tests)/with-search.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/(tests)/with-search.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/with-search')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/react-start/scroll-restoration/src/routes/__root.tsx b/e2e/react-start/scroll-restoration/src/routes/__root.tsx index bf315e98ae..ac55e334cd 100644 --- a/e2e/react-start/scroll-restoration/src/routes/__root.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/__root.tsx @@ -1,12 +1,13 @@ import * as React from 'react' import { + HeadContent, Link, Outlet, + Scripts, createRootRoute, linkOptions, - HeadContent, - Scripts, } from '@tanstack/react-router' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' @@ -66,6 +67,7 @@ function RootComponent() { return ( + ) } diff --git a/e2e/react-start/scroll-restoration/src/routes/index.tsx b/e2e/react-start/scroll-restoration/src/routes/index.tsx index 79453d4967..d97ba9ef54 100644 --- a/e2e/react-start/scroll-restoration/src/routes/index.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute, linkOptions } from '@tanstack/react-router' +import { Link, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts b/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/scroll-restoration/tsconfig.json b/e2e/react-start/scroll-restoration/tsconfig.json index b3a2d67dfa..09dd95b355 100644 --- a/e2e/react-start/scroll-restoration/tsconfig.json +++ b/e2e/react-start/scroll-restoration/tsconfig.json @@ -17,6 +17,7 @@ "paths": { "~/*": ["./src/*"] }, + "types": ["vite/client"], "noEmit": true } } diff --git a/e2e/react-start/scroll-restoration/vite.config.ts b/e2e/react-start/scroll-restoration/vite.config.ts new file mode 100644 index 0000000000..5b91efb751 --- /dev/null +++ b/e2e/react-start/scroll-restoration/vite.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [tsConfigPaths({ projects: ['./tsconfig.json'] }), tanstackStart()], +}) diff --git a/e2e/react-start/server-functions/.gitignore b/e2e/react-start/server-functions/.gitignore index be342025da..ca63f49885 100644 --- a/e2e/react-start/server-functions/.gitignore +++ b/e2e/react-start/server-functions/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/e2e/react-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/e2e/react-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/server-functions/app.config.ts b/e2e/react-start/server-functions/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/server-functions/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json index 2107818357..33c03db7e6 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-server-functions", + "name": "tanstack-react-start-e2e-server-functions", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", + "vite": "6.1.4", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/react-start/server-functions/playwright.config.ts b/e2e/react-start/server-functions/playwright.config.ts index 409765549f..88ff69f92e 100644 --- a/e2e/react-start/server-functions/playwright.config.ts +++ b/e2e/react-start/server-functions/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/server-functions/src/client.tsx b/e2e/react-start/server-functions/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/e2e/react-start/server-functions/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/e2e/react-start/server-functions/src/routeTree.gen.ts b/e2e/react-start/server-functions/src/routeTree.gen.ts index 6025f04091..b767d3415b 100644 --- a/e2e/react-start/server-functions/src/routeTree.gen.ts +++ b/e2e/react-start/server-functions/src/routeTree.gen.ts @@ -8,112 +8,114 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as SubmitPostFormdataImport } from './routes/submit-post-formdata' -import { Route as StatusImport } from './routes/status' -import { Route as SerializeFormDataImport } from './routes/serialize-form-data' -import { Route as ReturnNullImport } from './routes/return-null' -import { Route as RawResponseImport } from './routes/raw-response' -import { Route as MultipartImport } from './routes/multipart' -import { Route as IsomorphicFnsImport } from './routes/isomorphic-fns' -import { Route as HeadersImport } from './routes/headers' -import { Route as EnvOnlyImport } from './routes/env-only' -import { Route as DeadCodePreserveImport } from './routes/dead-code-preserve' -import { Route as ConsistentImport } from './routes/consistent' -import { Route as AbortSignalImport } from './routes/abort-signal' -import { Route as IndexImport } from './routes/index' -import { Route as CookiesIndexImport } from './routes/cookies/index' -import { Route as CookiesSetImport } from './routes/cookies/set' +import { Route as SubmitPostFormdataRouteImport } from './routes/submit-post-formdata' +import { Route as StatusRouteImport } from './routes/status' +import { Route as SerializeFormDataRouteImport } from './routes/serialize-form-data' +import { Route as ReturnNullRouteImport } from './routes/return-null' +import { Route as RawResponseRouteImport } from './routes/raw-response' +import { Route as MultipartRouteImport } from './routes/multipart' +import { Route as IsomorphicFnsRouteImport } from './routes/isomorphic-fns' +import { Route as HeadersRouteImport } from './routes/headers' +import { Route as EnvOnlyRouteImport } from './routes/env-only' +import { Route as DeadCodePreserveRouteImport } from './routes/dead-code-preserve' +import { Route as ConsistentRouteImport } from './routes/consistent' +import { Route as AbortSignalRouteImport } from './routes/abort-signal' +import { Route as IndexRouteImport } from './routes/index' +import { Route as CookiesIndexRouteImport } from './routes/cookies/index' +import { Route as CookiesSetRouteImport } from './routes/cookies/set' // Create/Update Routes -const SubmitPostFormdataRoute = SubmitPostFormdataImport.update({ +const SubmitPostFormdataRoute = SubmitPostFormdataRouteImport.update({ id: '/submit-post-formdata', path: '/submit-post-formdata', getParentRoute: () => rootRoute, } as any) -const StatusRoute = StatusImport.update({ +const StatusRoute = StatusRouteImport.update({ id: '/status', path: '/status', getParentRoute: () => rootRoute, } as any) -const SerializeFormDataRoute = SerializeFormDataImport.update({ +const SerializeFormDataRoute = SerializeFormDataRouteImport.update({ id: '/serialize-form-data', path: '/serialize-form-data', getParentRoute: () => rootRoute, } as any) -const ReturnNullRoute = ReturnNullImport.update({ +const ReturnNullRoute = ReturnNullRouteImport.update({ id: '/return-null', path: '/return-null', getParentRoute: () => rootRoute, } as any) -const RawResponseRoute = RawResponseImport.update({ +const RawResponseRoute = RawResponseRouteImport.update({ id: '/raw-response', path: '/raw-response', getParentRoute: () => rootRoute, } as any) -const MultipartRoute = MultipartImport.update({ +const MultipartRoute = MultipartRouteImport.update({ id: '/multipart', path: '/multipart', getParentRoute: () => rootRoute, } as any) -const IsomorphicFnsRoute = IsomorphicFnsImport.update({ +const IsomorphicFnsRoute = IsomorphicFnsRouteImport.update({ id: '/isomorphic-fns', path: '/isomorphic-fns', getParentRoute: () => rootRoute, } as any) -const HeadersRoute = HeadersImport.update({ +const HeadersRoute = HeadersRouteImport.update({ id: '/headers', path: '/headers', getParentRoute: () => rootRoute, } as any) -const EnvOnlyRoute = EnvOnlyImport.update({ +const EnvOnlyRoute = EnvOnlyRouteImport.update({ id: '/env-only', path: '/env-only', getParentRoute: () => rootRoute, } as any) -const DeadCodePreserveRoute = DeadCodePreserveImport.update({ +const DeadCodePreserveRoute = DeadCodePreserveRouteImport.update({ id: '/dead-code-preserve', path: '/dead-code-preserve', getParentRoute: () => rootRoute, } as any) -const ConsistentRoute = ConsistentImport.update({ +const ConsistentRoute = ConsistentRouteImport.update({ id: '/consistent', path: '/consistent', getParentRoute: () => rootRoute, } as any) -const AbortSignalRoute = AbortSignalImport.update({ +const AbortSignalRoute = AbortSignalRouteImport.update({ id: '/abort-signal', path: '/abort-signal', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const CookiesIndexRoute = CookiesIndexImport.update({ +const CookiesIndexRoute = CookiesIndexRouteImport.update({ id: '/cookies/', path: '/cookies/', getParentRoute: () => rootRoute, } as any) -const CookiesSetRoute = CookiesSetImport.update({ +const CookiesSetRoute = CookiesSetRouteImport.update({ id: '/cookies/set', path: '/cookies/set', getParentRoute: () => rootRoute, @@ -127,110 +129,248 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/abort-signal': { id: '/abort-signal' path: '/abort-signal' fullPath: '/abort-signal' - preLoaderRoute: typeof AbortSignalImport + preLoaderRoute: typeof AbortSignalRouteImport parentRoute: typeof rootRoute } '/consistent': { id: '/consistent' path: '/consistent' fullPath: '/consistent' - preLoaderRoute: typeof ConsistentImport + preLoaderRoute: typeof ConsistentRouteImport parentRoute: typeof rootRoute } '/dead-code-preserve': { id: '/dead-code-preserve' path: '/dead-code-preserve' fullPath: '/dead-code-preserve' - preLoaderRoute: typeof DeadCodePreserveImport + preLoaderRoute: typeof DeadCodePreserveRouteImport parentRoute: typeof rootRoute } '/env-only': { id: '/env-only' path: '/env-only' fullPath: '/env-only' - preLoaderRoute: typeof EnvOnlyImport + preLoaderRoute: typeof EnvOnlyRouteImport parentRoute: typeof rootRoute } '/headers': { id: '/headers' path: '/headers' fullPath: '/headers' - preLoaderRoute: typeof HeadersImport + preLoaderRoute: typeof HeadersRouteImport parentRoute: typeof rootRoute } '/isomorphic-fns': { id: '/isomorphic-fns' path: '/isomorphic-fns' fullPath: '/isomorphic-fns' - preLoaderRoute: typeof IsomorphicFnsImport + preLoaderRoute: typeof IsomorphicFnsRouteImport parentRoute: typeof rootRoute } '/multipart': { id: '/multipart' path: '/multipart' fullPath: '/multipart' - preLoaderRoute: typeof MultipartImport + preLoaderRoute: typeof MultipartRouteImport parentRoute: typeof rootRoute } '/raw-response': { id: '/raw-response' path: '/raw-response' fullPath: '/raw-response' - preLoaderRoute: typeof RawResponseImport + preLoaderRoute: typeof RawResponseRouteImport parentRoute: typeof rootRoute } '/return-null': { id: '/return-null' path: '/return-null' fullPath: '/return-null' - preLoaderRoute: typeof ReturnNullImport + preLoaderRoute: typeof ReturnNullRouteImport parentRoute: typeof rootRoute } '/serialize-form-data': { id: '/serialize-form-data' path: '/serialize-form-data' fullPath: '/serialize-form-data' - preLoaderRoute: typeof SerializeFormDataImport + preLoaderRoute: typeof SerializeFormDataRouteImport parentRoute: typeof rootRoute } '/status': { id: '/status' path: '/status' fullPath: '/status' - preLoaderRoute: typeof StatusImport + preLoaderRoute: typeof StatusRouteImport parentRoute: typeof rootRoute } '/submit-post-formdata': { id: '/submit-post-formdata' path: '/submit-post-formdata' fullPath: '/submit-post-formdata' - preLoaderRoute: typeof SubmitPostFormdataImport + preLoaderRoute: typeof SubmitPostFormdataRouteImport parentRoute: typeof rootRoute } '/cookies/set': { id: '/cookies/set' path: '/cookies/set' fullPath: '/cookies/set' - preLoaderRoute: typeof CookiesSetImport + preLoaderRoute: typeof CookiesSetRouteImport parentRoute: typeof rootRoute } '/cookies/': { id: '/cookies/' path: '/cookies' fullPath: '/cookies' - preLoaderRoute: typeof CookiesIndexImport + preLoaderRoute: typeof CookiesIndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/abort-signal' { + const createFileRoute: CreateFileRoute< + '/abort-signal', + FileRoutesByPath['/abort-signal']['parentRoute'], + FileRoutesByPath['/abort-signal']['id'], + FileRoutesByPath['/abort-signal']['path'], + FileRoutesByPath['/abort-signal']['fullPath'] + > +} +declare module './routes/consistent' { + const createFileRoute: CreateFileRoute< + '/consistent', + FileRoutesByPath['/consistent']['parentRoute'], + FileRoutesByPath['/consistent']['id'], + FileRoutesByPath['/consistent']['path'], + FileRoutesByPath['/consistent']['fullPath'] + > +} +declare module './routes/dead-code-preserve' { + const createFileRoute: CreateFileRoute< + '/dead-code-preserve', + FileRoutesByPath['/dead-code-preserve']['parentRoute'], + FileRoutesByPath['/dead-code-preserve']['id'], + FileRoutesByPath['/dead-code-preserve']['path'], + FileRoutesByPath['/dead-code-preserve']['fullPath'] + > +} +declare module './routes/env-only' { + const createFileRoute: CreateFileRoute< + '/env-only', + FileRoutesByPath['/env-only']['parentRoute'], + FileRoutesByPath['/env-only']['id'], + FileRoutesByPath['/env-only']['path'], + FileRoutesByPath['/env-only']['fullPath'] + > +} +declare module './routes/headers' { + const createFileRoute: CreateFileRoute< + '/headers', + FileRoutesByPath['/headers']['parentRoute'], + FileRoutesByPath['/headers']['id'], + FileRoutesByPath['/headers']['path'], + FileRoutesByPath['/headers']['fullPath'] + > +} +declare module './routes/isomorphic-fns' { + const createFileRoute: CreateFileRoute< + '/isomorphic-fns', + FileRoutesByPath['/isomorphic-fns']['parentRoute'], + FileRoutesByPath['/isomorphic-fns']['id'], + FileRoutesByPath['/isomorphic-fns']['path'], + FileRoutesByPath['/isomorphic-fns']['fullPath'] + > +} +declare module './routes/multipart' { + const createFileRoute: CreateFileRoute< + '/multipart', + FileRoutesByPath['/multipart']['parentRoute'], + FileRoutesByPath['/multipart']['id'], + FileRoutesByPath['/multipart']['path'], + FileRoutesByPath['/multipart']['fullPath'] + > +} +declare module './routes/raw-response' { + const createFileRoute: CreateFileRoute< + '/raw-response', + FileRoutesByPath['/raw-response']['parentRoute'], + FileRoutesByPath['/raw-response']['id'], + FileRoutesByPath['/raw-response']['path'], + FileRoutesByPath['/raw-response']['fullPath'] + > +} +declare module './routes/return-null' { + const createFileRoute: CreateFileRoute< + '/return-null', + FileRoutesByPath['/return-null']['parentRoute'], + FileRoutesByPath['/return-null']['id'], + FileRoutesByPath['/return-null']['path'], + FileRoutesByPath['/return-null']['fullPath'] + > +} +declare module './routes/serialize-form-data' { + const createFileRoute: CreateFileRoute< + '/serialize-form-data', + FileRoutesByPath['/serialize-form-data']['parentRoute'], + FileRoutesByPath['/serialize-form-data']['id'], + FileRoutesByPath['/serialize-form-data']['path'], + FileRoutesByPath['/serialize-form-data']['fullPath'] + > +} +declare module './routes/status' { + const createFileRoute: CreateFileRoute< + '/status', + FileRoutesByPath['/status']['parentRoute'], + FileRoutesByPath['/status']['id'], + FileRoutesByPath['/status']['path'], + FileRoutesByPath['/status']['fullPath'] + > +} +declare module './routes/submit-post-formdata' { + const createFileRoute: CreateFileRoute< + '/submit-post-formdata', + FileRoutesByPath['/submit-post-formdata']['parentRoute'], + FileRoutesByPath['/submit-post-formdata']['id'], + FileRoutesByPath['/submit-post-formdata']['path'], + FileRoutesByPath['/submit-post-formdata']['fullPath'] + > +} +declare module './routes/cookies/set' { + const createFileRoute: CreateFileRoute< + '/cookies/set', + FileRoutesByPath['/cookies/set']['parentRoute'], + FileRoutesByPath['/cookies/set']['id'], + FileRoutesByPath['/cookies/set']['path'], + FileRoutesByPath['/cookies/set']['fullPath'] + > +} +declare module './routes/cookies/index' { + const createFileRoute: CreateFileRoute< + '/cookies/', + FileRoutesByPath['/cookies/']['parentRoute'], + FileRoutesByPath['/cookies/']['id'], + FileRoutesByPath['/cookies/']['path'], + FileRoutesByPath['/cookies/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/react-start/server-functions/src/routes/abort-signal.tsx b/e2e/react-start/server-functions/src/routes/abort-signal.tsx index 7de90f3143..dd899a4c10 100644 --- a/e2e/react-start/server-functions/src/routes/abort-signal.tsx +++ b/e2e/react-start/server-functions/src/routes/abort-signal.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import React from 'react' -export const Route = createFileRoute('/abort-signal')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/consistent.tsx b/e2e/react-start/server-functions/src/routes/consistent.tsx index 5908512fa2..0d07b1833c 100644 --- a/e2e/react-start/server-functions/src/routes/consistent.tsx +++ b/e2e/react-start/server-functions/src/routes/consistent.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { createServerFn } from '@tanstack/react-start' @@ -10,7 +9,7 @@ import { createServerFn } from '@tanstack/react-start' * @link https://github.com/TanStack/router/issues/2481 */ -export const Route = createFileRoute('/consistent')({ +export const Route = createFileRoute({ component: ConsistentServerFnCalls, loader: async () => { const data = await cons_serverGetFn1({ data: { username: 'TEST' } }) diff --git a/e2e/react-start/server-functions/src/routes/cookies/index.tsx b/e2e/react-start/server-functions/src/routes/cookies/index.tsx index ae42043959..01a6450bc6 100644 --- a/e2e/react-start/server-functions/src/routes/cookies/index.tsx +++ b/e2e/react-start/server-functions/src/routes/cookies/index.tsx @@ -1,10 +1,10 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { z } from 'zod' const cookieSchema = z .object({ value: z.string() }) .catch(() => ({ value: `CLIENT-${Date.now()}` })) -export const Route = createFileRoute('/cookies/')({ +export const Route = createFileRoute({ validateSearch: cookieSchema, component: RouteComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/cookies/set.tsx b/e2e/react-start/server-functions/src/routes/cookies/set.tsx index fd9e979ab9..965082750e 100644 --- a/e2e/react-start/server-functions/src/routes/cookies/set.tsx +++ b/e2e/react-start/server-functions/src/routes/cookies/set.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { setCookie } from '@tanstack/react-start/server' import { z } from 'zod' @@ -7,7 +6,7 @@ import React, { useEffect } from 'react' const cookieSchema = z.object({ value: z.string() }) -export const Route = createFileRoute('/cookies/set')({ +export const Route = createFileRoute({ validateSearch: cookieSchema, loaderDeps: ({ search }) => search, loader: async ({ deps }) => { diff --git a/e2e/react-start/server-functions/src/routes/dead-code-preserve.tsx b/e2e/react-start/server-functions/src/routes/dead-code-preserve.tsx index 46273c59e3..7c1d879272 100644 --- a/e2e/react-start/server-functions/src/routes/dead-code-preserve.tsx +++ b/e2e/react-start/server-functions/src/routes/dead-code-preserve.tsx @@ -2,9 +2,8 @@ import * as fs from 'node:fs' import { createServerFn } from '@tanstack/react-start' import { getRequestHeader } from '@tanstack/react-start/server' import { useState } from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/dead-code-preserve')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/env-only.tsx b/e2e/react-start/server-functions/src/routes/env-only.tsx index fe5ae8c1e8..52af89acc2 100644 --- a/e2e/react-start/server-functions/src/routes/env-only.tsx +++ b/e2e/react-start/server-functions/src/routes/env-only.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { clientOnly, createServerFn, serverOnly } from '@tanstack/react-start' import { useState } from 'react' @@ -18,7 +17,7 @@ const testOnServer = createServerFn().handler(() => { return { serverOnServer, clientOnServer } }) -export const Route = createFileRoute('/env-only')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/headers.tsx b/e2e/react-start/server-functions/src/routes/headers.tsx index 0b0f1ff7bc..59b09736b9 100644 --- a/e2e/react-start/server-functions/src/routes/headers.tsx +++ b/e2e/react-start/server-functions/src/routes/headers.tsx @@ -1,10 +1,9 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { createServerFn } from '@tanstack/react-start' import { getHeaders, setHeader } from '@tanstack/react-start/server' import type { HTTPHeaderName } from '@tanstack/react-start/server' -export const Route = createFileRoute('/headers')({ +export const Route = createFileRoute({ loader: async () => { return { testHeaders: await getTestHeaders(), @@ -36,7 +35,7 @@ function ResponseHeaders({ initialTestHeaders: TestHeadersResult }) { const [testHeadersResult, setTestHeadersResult] = - React.useState(initialTestHeaders) + React.useState(null) return (
@@ -58,10 +57,18 @@ function ResponseHeaders({
-

Headers:

- 
-          {JSON.stringify(testHeadersResult.headers, null, 2)}
+        
Initial Headers:

+        
+          {JSON.stringify(initialTestHeaders.headers, null, 2)}
         

+        {testHeadersResult && (
+          <>
+            
Updated Headers:

+            
+              {JSON.stringify(testHeadersResult.headers, null, 2)}
+            

+          
+        )}
) diff --git a/e2e/react-start/server-functions/src/routes/index.tsx b/e2e/react-start/server-functions/src/routes/index.tsx index 4c3673ed34..90fdb817cd 100644 --- a/e2e/react-start/server-functions/src/routes/index.tsx +++ b/e2e/react-start/server-functions/src/routes/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/server-functions/src/routes/isomorphic-fns.tsx b/e2e/react-start/server-functions/src/routes/isomorphic-fns.tsx index 2c7bbc4a8f..dac800a60f 100644 --- a/e2e/react-start/server-functions/src/routes/isomorphic-fns.tsx +++ b/e2e/react-start/server-functions/src/routes/isomorphic-fns.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' import { useState } from 'react' @@ -16,7 +15,7 @@ const getServerEcho = createServerFn() .validator((input: string) => input) .handler(({ data }) => getEcho(data)) -export const Route = createFileRoute('/isomorphic-fns')({ +export const Route = createFileRoute({ component: RouteComponent, loader() { return { diff --git a/e2e/react-start/server-functions/src/routes/multipart.tsx b/e2e/react-start/server-functions/src/routes/multipart.tsx index a80ca0f1cd..817a181d38 100644 --- a/e2e/react-start/server-functions/src/routes/multipart.tsx +++ b/e2e/react-start/server-functions/src/routes/multipart.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { createServerFn } from '@tanstack/react-start' -export const Route = createFileRoute('/multipart')({ +export const Route = createFileRoute({ component: MultipartServerFnCall, }) diff --git a/e2e/react-start/server-functions/src/routes/raw-response.tsx b/e2e/react-start/server-functions/src/routes/raw-response.tsx index cb2c4bfbb8..5c15e08514 100644 --- a/e2e/react-start/server-functions/src/routes/raw-response.tsx +++ b/e2e/react-start/server-functions/src/routes/raw-response.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { createServerFn } from '@tanstack/react-start' -export const Route = createFileRoute('/raw-response')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/return-null.tsx b/e2e/react-start/server-functions/src/routes/return-null.tsx index 6d83d2762f..8e6fd55e7f 100644 --- a/e2e/react-start/server-functions/src/routes/return-null.tsx +++ b/e2e/react-start/server-functions/src/routes/return-null.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import * as React from 'react' @@ -8,7 +7,7 @@ import * as React from 'react' * @link https://github.com/TanStack/router/issues/2776 */ -export const Route = createFileRoute('/return-null')({ +export const Route = createFileRoute({ component: AllowServerFnReturnNull, }) diff --git a/e2e/react-start/server-functions/src/routes/serialize-form-data.tsx b/e2e/react-start/server-functions/src/routes/serialize-form-data.tsx index 901a22fdc0..486b3cf2ee 100644 --- a/e2e/react-start/server-functions/src/routes/serialize-form-data.tsx +++ b/e2e/react-start/server-functions/src/routes/serialize-form-data.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { createServerFn } from '@tanstack/react-start' -export const Route = createFileRoute('/serialize-form-data')({ +export const Route = createFileRoute({ component: SerializeFormDataFnCall, }) diff --git a/e2e/react-start/server-functions/src/routes/status.tsx b/e2e/react-start/server-functions/src/routes/status.tsx index b8dcdee2e6..ec279cf906 100644 --- a/e2e/react-start/server-functions/src/routes/status.tsx +++ b/e2e/react-start/server-functions/src/routes/status.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn, useServerFn } from '@tanstack/react-start' import { setResponseStatus } from '@tanstack/react-start/server' @@ -9,7 +8,7 @@ const helloFn = createServerFn().handler(() => { } }) -export const Route = createFileRoute('/status')({ +export const Route = createFileRoute({ component: StatusComponent, }) diff --git a/e2e/react-start/server-functions/src/routes/submit-post-formdata.tsx b/e2e/react-start/server-functions/src/routes/submit-post-formdata.tsx index 05df922817..2208875ef5 100644 --- a/e2e/react-start/server-functions/src/routes/submit-post-formdata.tsx +++ b/e2e/react-start/server-functions/src/routes/submit-post-formdata.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -export const Route = createFileRoute('/submit-post-formdata')({ +export const Route = createFileRoute({ component: SubmitPostFormDataFn, }) diff --git a/e2e/react-start/server-functions/src/tanstack-start.d.ts b/e2e/react-start/server-functions/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/server-functions/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/server-functions/tests/server-functions.spec.ts b/e2e/react-start/server-functions/tests/server-functions.spec.ts index 56d6608077..80c89004c5 100644 --- a/e2e/react-start/server-functions/tests/server-functions.spec.ts +++ b/e2e/react-start/server-functions/tests/server-functions.spec.ts @@ -179,44 +179,24 @@ test('server function can correctly send and receive headers', async ({ await page.goto('/headers') await page.waitForLoadState('networkidle') - // console.log(await page.getByTestId('test-headers-result').textContent()) - await expect(page.getByTestId('test-headers-result')).toContainText(`{ - "accept": "application/json", - "accept-encoding": "gzip, deflate, br, zstd", - "accept-language": "en-US", - "connection": "keep-alive", - "content-type": "application/json", - "host": "localhost:${PORT}", - "sec-ch-ua": "\\"Chromium\\";v=\\"136\\", \\"HeadlessChrome\\";v=\\"136\\", \\"Not.A/Brand\\";v=\\"99\\"", - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-platform": "\\"Windows\\"", - "sec-fetch-dest": "document", - "sec-fetch-mode": "navigate", - "sec-fetch-site": "none", - "sec-fetch-user": "?1", - "upgrade-insecure-requests": "1", - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.7103.25 Safari/537.36" -}`) + let headers = JSON.parse( + await page.getByTestId('initial-headers-result').innerText(), + ) + expect(headers['host']).toBe(`localhost:${PORT}`) + expect(headers['user-agent']).toContain('Mozilla/5.0') + expect(headers['sec-fetch-mode']).toBe('navigate') await page.getByTestId('test-headers-btn').click() - await page.waitForLoadState('networkidle') + await page.waitForSelector('[data-testid="updated-headers-result"]') + + headers = JSON.parse( + await page.getByTestId('updated-headers-result').innerText(), + ) - await expect(page.getByTestId('test-headers-result')).toContainText(`{ - "host": "localhost:${PORT}", - "connection": "keep-alive", - "sec-ch-ua-platform": "\\"Windows\\"", - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.7103.25 Safari/537.36", - "accept": "application/json", - "sec-ch-ua": "\\"Chromium\\";v=\\"136\\", \\"HeadlessChrome\\";v=\\"136\\", \\"Not.A/Brand\\";v=\\"99\\"", - "content-type": "application/json", - "sec-ch-ua-mobile": "?0", - "accept-language": "en-US", - "sec-fetch-site": "same-origin", - "sec-fetch-mode": "cors", - "sec-fetch-dest": "empty", - "referer": "http://localhost:${PORT}/headers", - "accept-encoding": "gzip, deflate, br, zstd" -}`) + expect(headers['host']).toBe(`localhost:${PORT}`) + expect(headers['user-agent']).toContain('Mozilla/5.0') + expect(headers['sec-fetch-mode']).toBe('cors') + expect(headers['referer']).toBe(`http://localhost:${PORT}/headers`) }) test('Direct POST submitting FormData to a Server function returns the correct message', async ({ diff --git a/e2e/react-start/server-functions/tsconfig.json b/e2e/react-start/server-functions/tsconfig.json index b3a2d67dfa..d35a4b17f4 100644 --- a/e2e/react-start/server-functions/tsconfig.json +++ b/e2e/react-start/server-functions/tsconfig.json @@ -17,6 +17,7 @@ "paths": { "~/*": ["./src/*"] }, - "noEmit": true + "noEmit": true, + "types": ["vite/client"] } } diff --git a/e2e/react-start/server-functions/vite.config.ts b/e2e/react-start/server-functions/vite.config.ts new file mode 100644 index 0000000000..1df337cd40 --- /dev/null +++ b/e2e/react-start/server-functions/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/react-start/website/.gitignore b/e2e/react-start/website/.gitignore index be342025da..a5f619189c 100644 --- a/e2e/react-start/website/.gitignore +++ b/e2e/react-start/website/.gitignore @@ -7,16 +7,14 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ /blob-report/ /playwright/.cache/ + +.tanstack-start/build \ No newline at end of file diff --git a/e2e/react-start/website/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/website/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..ac36454b7c --- /dev/null +++ b/e2e/react-start/website/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,112 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport } from './../../src/routes/$project.$version.docs.framework.$framework.{$}[.]md' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute = + ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport.update({ + id: '/$project/$version/docs/framework/$framework/{$}.md', + path: '/$project/$version/docs/framework/$framework/{$}.md', + getParentRoute: () => rootRoute, + } as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/$project/$version/docs/framework/$framework/{$}.md': { + id: '/$project/$version/docs/framework/$framework/{$}.md' + path: '/$project/$version/docs/framework/$framework/{$}.md' + fullPath: '/$project/$version/docs/framework/$framework/{$}.md' + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/$project.$version.docs.framework.$framework.{$}[.]md' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/$project/$version/docs/framework/$framework/{$}.md']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/{$}.md']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/{$}.md']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/{$}.md']['fullPath'], + unknown + > +} + +// Create and export the route tree + +export interface FileRoutesByFullPath { + '/$project/$version/docs/framework/$framework/{$}.md': typeof ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute +} + +export interface FileRoutesByTo { + '/$project/$version/docs/framework/$framework/{$}.md': typeof ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/$project/$version/docs/framework/$framework/{$}.md': typeof ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/$project/$version/docs/framework/$framework/{$}.md' + fileRoutesByTo: FileRoutesByTo + to: '/$project/$version/docs/framework/$framework/{$}.md' + id: '__root__' | '/$project/$version/docs/framework/$framework/{$}.md' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute: typeof ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute +} + +const rootRouteChildren: RootRouteChildren = { + ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute: + ProjectVersionDocsFrameworkFrameworkChar123Char125DotmdRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/$project/$version/docs/framework/$framework/{$}.md" + ] + }, + "/$project/$version/docs/framework/$framework/{$}.md": { + "filePath": "$project.$version.docs.framework.$framework.{$}[.]md.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/website/app.config.ts b/e2e/react-start/website/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/e2e/react-start/website/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json index e69c2b3ffa..98ca661a1b 100644 --- a/e2e/react-start/website/package.json +++ b/e2e/react-start/website/package.json @@ -1,13 +1,13 @@ { - "name": "tanstack-start-e2e-website", + "name": "tanstack-react-start-e2e-website", "private": true, "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -18,7 +18,6 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { @@ -28,10 +27,11 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", + "vite": "6.1.4", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/react-start/website/playwright.config.ts b/e2e/react-start/website/playwright.config.ts index bb77d0cf70..9806e0c136 100644 --- a/e2e/react-start/website/playwright.config.ts +++ b/e2e/react-start/website/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/react-start/website/src/client.tsx b/e2e/react-start/website/src/client.tsx deleted file mode 100644 index 31385f57f1..0000000000 --- a/e2e/react-start/website/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document!, ) diff --git a/e2e/react-start/website/src/routeTree.gen.ts b/e2e/react-start/website/src/routeTree.gen.ts index 72b5ecded6..3f36d7f172 100644 --- a/e2e/react-start/website/src/routeTree.gen.ts +++ b/e2e/react-start/website/src/routeTree.gen.ts @@ -8,82 +8,83 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LibraryImport } from './routes/_library' -import { Route as LibraryIndexImport } from './routes/_library.index' -import { Route as ProjectIndexImport } from './routes/$project.index' -import { Route as LibraryProjectImport } from './routes/_library.$project' -import { Route as LibraryProjectVersionIndexImport } from './routes/_library.$project.$version.index' -import { Route as ProjectVersionDocsIndexImport } from './routes/$project.$version.docs.index' -import { Route as ProjectVersionDocsFrameworkFrameworkImport } from './routes/$project.$version.docs.framework.$framework' -import { Route as ProjectVersionDocsFrameworkFrameworkIndexImport } from './routes/$project.$version.docs.framework.$framework.index' -import { Route as ProjectVersionDocsFrameworkFrameworkSplatImport } from './routes/$project.$version.docs.framework.$framework.$' -import { Route as ProjectVersionDocsFrameworkFrameworkExamplesSplatImport } from './routes/$project.$version.docs.framework.$framework.examples.$' +import { Route as LibraryRouteImport } from './routes/_library' +import { Route as LibraryIndexRouteImport } from './routes/_library.index' +import { Route as ProjectIndexRouteImport } from './routes/$project.index' +import { Route as LibraryProjectRouteImport } from './routes/_library.$project' +import { Route as LibraryProjectVersionIndexRouteImport } from './routes/_library.$project.$version.index' +import { Route as ProjectVersionDocsIndexRouteImport } from './routes/$project.$version.docs.index' +import { Route as ProjectVersionDocsFrameworkFrameworkRouteImport } from './routes/$project.$version.docs.framework.$framework' +import { Route as ProjectVersionDocsFrameworkFrameworkIndexRouteImport } from './routes/$project.$version.docs.framework.$framework.index' +import { Route as ProjectVersionDocsFrameworkFrameworkSplatRouteImport } from './routes/$project.$version.docs.framework.$framework.$' +import { Route as ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport } from './routes/$project.$version.docs.framework.$framework.examples.$' // Create/Update Routes -const LibraryRoute = LibraryImport.update({ +const LibraryRoute = LibraryRouteImport.update({ id: '/_library', getParentRoute: () => rootRoute, } as any) -const LibraryIndexRoute = LibraryIndexImport.update({ +const LibraryIndexRoute = LibraryIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => LibraryRoute, } as any) -const ProjectIndexRoute = ProjectIndexImport.update({ +const ProjectIndexRoute = ProjectIndexRouteImport.update({ id: '/$project/', path: '/$project/', getParentRoute: () => rootRoute, } as any) -const LibraryProjectRoute = LibraryProjectImport.update({ +const LibraryProjectRoute = LibraryProjectRouteImport.update({ id: '/$project', path: '/$project', getParentRoute: () => LibraryRoute, } as any) -const LibraryProjectVersionIndexRoute = LibraryProjectVersionIndexImport.update( - { +const LibraryProjectVersionIndexRoute = + LibraryProjectVersionIndexRouteImport.update({ id: '/$version/', path: '/$version/', getParentRoute: () => LibraryProjectRoute, - } as any, -) + } as any) -const ProjectVersionDocsIndexRoute = ProjectVersionDocsIndexImport.update({ +const ProjectVersionDocsIndexRoute = ProjectVersionDocsIndexRouteImport.update({ id: '/$project/$version/docs/', path: '/$project/$version/docs/', getParentRoute: () => rootRoute, } as any) const ProjectVersionDocsFrameworkFrameworkRoute = - ProjectVersionDocsFrameworkFrameworkImport.update({ + ProjectVersionDocsFrameworkFrameworkRouteImport.update({ id: '/$project/$version/docs/framework/$framework', path: '/$project/$version/docs/framework/$framework', getParentRoute: () => rootRoute, } as any) const ProjectVersionDocsFrameworkFrameworkIndexRoute = - ProjectVersionDocsFrameworkFrameworkIndexImport.update({ + ProjectVersionDocsFrameworkFrameworkIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, } as any) const ProjectVersionDocsFrameworkFrameworkSplatRoute = - ProjectVersionDocsFrameworkFrameworkSplatImport.update({ + ProjectVersionDocsFrameworkFrameworkSplatRouteImport.update({ id: '/$', path: '/$', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, } as any) const ProjectVersionDocsFrameworkFrameworkExamplesSplatRoute = - ProjectVersionDocsFrameworkFrameworkExamplesSplatImport.update({ + ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport.update({ id: '/examples/$', path: '/examples/$', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, @@ -97,75 +98,168 @@ declare module '@tanstack/react-router' { id: '/_library' path: '' fullPath: '' - preLoaderRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryRouteImport parentRoute: typeof rootRoute } '/_library/$project': { id: '/_library/$project' path: '/$project' fullPath: '/$project' - preLoaderRoute: typeof LibraryProjectImport - parentRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryProjectRouteImport + parentRoute: typeof LibraryRouteImport } '/$project/': { id: '/$project/' path: '/$project' fullPath: '/$project' - preLoaderRoute: typeof ProjectIndexImport + preLoaderRoute: typeof ProjectIndexRouteImport parentRoute: typeof rootRoute } '/_library/': { id: '/_library/' path: '/' fullPath: '/' - preLoaderRoute: typeof LibraryIndexImport - parentRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryIndexRouteImport + parentRoute: typeof LibraryRouteImport } '/$project/$version/docs/': { id: '/$project/$version/docs/' path: '/$project/$version/docs' fullPath: '/$project/$version/docs' - preLoaderRoute: typeof ProjectVersionDocsIndexImport + preLoaderRoute: typeof ProjectVersionDocsIndexRouteImport parentRoute: typeof rootRoute } '/_library/$project/$version/': { id: '/_library/$project/$version/' path: '/$version' fullPath: '/$project/$version' - preLoaderRoute: typeof LibraryProjectVersionIndexImport - parentRoute: typeof LibraryProjectImport + preLoaderRoute: typeof LibraryProjectVersionIndexRouteImport + parentRoute: typeof LibraryProjectRouteImport } '/$project/$version/docs/framework/$framework': { id: '/$project/$version/docs/framework/$framework' path: '/$project/$version/docs/framework/$framework' fullPath: '/$project/$version/docs/framework/$framework' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport parentRoute: typeof rootRoute } '/$project/$version/docs/framework/$framework/$': { id: '/$project/$version/docs/framework/$framework/$' path: '/$' fullPath: '/$project/$version/docs/framework/$framework/$' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkSplatImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkSplatRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } '/$project/$version/docs/framework/$framework/': { id: '/$project/$version/docs/framework/$framework/' path: '/' fullPath: '/$project/$version/docs/framework/$framework/' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkIndexImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkIndexRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } '/$project/$version/docs/framework/$framework/examples/$': { id: '/$project/$version/docs/framework/$framework/examples/$' path: '/examples/$' fullPath: '/$project/$version/docs/framework/$framework/examples/$' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkExamplesSplatImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/_library' { + const createFileRoute: CreateFileRoute< + '/_library', + FileRoutesByPath['/_library']['parentRoute'], + FileRoutesByPath['/_library']['id'], + FileRoutesByPath['/_library']['path'], + FileRoutesByPath['/_library']['fullPath'] + > +} +declare module './routes/_library.$project' { + const createFileRoute: CreateFileRoute< + '/_library/$project', + FileRoutesByPath['/_library/$project']['parentRoute'], + FileRoutesByPath['/_library/$project']['id'], + FileRoutesByPath['/_library/$project']['path'], + FileRoutesByPath['/_library/$project']['fullPath'] + > +} +declare module './routes/$project.index' { + const createFileRoute: CreateFileRoute< + '/$project/', + FileRoutesByPath['/$project/']['parentRoute'], + FileRoutesByPath['/$project/']['id'], + FileRoutesByPath['/$project/']['path'], + FileRoutesByPath['/$project/']['fullPath'] + > +} +declare module './routes/_library.index' { + const createFileRoute: CreateFileRoute< + '/_library/', + FileRoutesByPath['/_library/']['parentRoute'], + FileRoutesByPath['/_library/']['id'], + FileRoutesByPath['/_library/']['path'], + FileRoutesByPath['/_library/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.index' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/', + FileRoutesByPath['/$project/$version/docs/']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/']['id'], + FileRoutesByPath['/$project/$version/docs/']['path'], + FileRoutesByPath['/$project/$version/docs/']['fullPath'] + > +} +declare module './routes/_library.$project.$version.index' { + const createFileRoute: CreateFileRoute< + '/_library/$project/$version/', + FileRoutesByPath['/_library/$project/$version/']['parentRoute'], + FileRoutesByPath['/_library/$project/$version/']['id'], + FileRoutesByPath['/_library/$project/$version/']['path'], + FileRoutesByPath['/_library/$project/$version/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework', + FileRoutesByPath['/$project/$version/docs/framework/$framework']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.$' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/$', + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.index' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/', + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.examples.$' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/examples/$', + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['fullPath'] + > +} + // Create and export the route tree interface LibraryProjectRouteChildren { diff --git a/e2e/react-start/website/src/router.tsx b/e2e/react-start/website/src/router.tsx index 28304cb690..7228520066 100644 --- a/e2e/react-start/website/src/router.tsx +++ b/e2e/react-start/website/src/router.tsx @@ -1,3 +1,4 @@ +/// import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx index 055f77622b..0c70abc68d 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx @@ -1,12 +1,10 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, useLocation } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' import { getDocument } from '~/server/document' import { capitalize, seo } from '~/utils/seo' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/$', -)({ +export const Route = createFileRoute({ loader: ({ params: { _splat } }) => getDocument({ data: _splat!, @@ -28,6 +26,7 @@ function PostErrorComponent({ error }: ErrorComponentProps) { } function Page() { + const pathname = useLocation({ select: (s) => s.pathname }) const post = Route.useLoaderData() return ( @@ -39,6 +38,11 @@ function Page() { {post.title}

{post.content}
+

+ + View Raw Content + +

) } diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx index 5d5cbe324d..9e56e61762 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx @@ -1,10 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' import { capitalize, seo } from '~/utils/seo' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/examples/$', -)({ +export const Route = createFileRoute({ head: ({ params }) => ({ meta: seo({ title: `${capitalize(params._splat || '')} Example | TanStack ${capitalize(params.project)} ${capitalize(params.framework)}`, diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx index 64a30c1ee1..b791228e26 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx @@ -1,9 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/', -)({ - loader: () => { +export const Route = createFileRoute({ + beforeLoad: () => { throw redirect({ from: '/$project/$version/docs/framework/$framework/', to: '/$project/$version/docs/framework/$framework/$', diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.tsx index 5d1be9df39..f2b4a24d77 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.tsx @@ -1,15 +1,8 @@ -import { - Link, - Outlet, - createFileRoute, - useLocation, -} from '@tanstack/react-router' +import { Link, Outlet, useLocation } from '@tanstack/react-router' import { getDocumentHeads } from '~/server/document' import { getProject } from '~/server/projects' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework', -)({ +export const Route = createFileRoute({ loader: async ({ params: { project } }) => { const library = await getProject({ data: project }) const documents = await getDocumentHeads() diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx new file mode 100644 index 0000000000..0272dc643d --- /dev/null +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx @@ -0,0 +1,23 @@ +import { getDocument } from '~/server/document' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params }) => { + // @ts-expect-error + const splat = params['_splat'] || '' + const docPath = splat.split('.md')[0] + + if (!docPath) { + return new Response('Document not found', { status: 404 }) + } + + const doc = await getDocument({ data: docPath }) + const markdown = `# ${doc.title}\n\n${doc.content}` + + return new Response(markdown, { + headers: { + 'Content-Type': 'text/markdown', + 'Content-Disposition': `inline; filename="${doc.title}.md"`, + }, + }) + }, +}) diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.index.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.index.tsx index e379d81908..f15e022443 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.index.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.index.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/$project/$version/docs/')({ - loader: () => { +export const Route = createFileRoute({ + beforeLoad: () => { throw redirect({ from: '/$project/$version/docs', to: '/$project/$version/docs/framework/$framework/$', diff --git a/e2e/react-start/website/src/routes/$project.index.tsx b/e2e/react-start/website/src/routes/$project.index.tsx index 9c6b935e83..6f5d49cef0 100644 --- a/e2e/react-start/website/src/routes/$project.index.tsx +++ b/e2e/react-start/website/src/routes/$project.index.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/$project/')({ +export const Route = createFileRoute({ loader: ({ params }) => { throw redirect({ to: '/$project/$version', diff --git a/e2e/react-start/website/src/routes/__root.tsx b/e2e/react-start/website/src/routes/__root.tsx index 1b98cc37f9..a9a0d5e47f 100644 --- a/e2e/react-start/website/src/routes/__root.tsx +++ b/e2e/react-start/website/src/routes/__root.tsx @@ -1,8 +1,8 @@ import { - Outlet, - createRootRoute, HeadContent, + Outlet, Scripts, + createRootRoute, } from '@tanstack/react-router' import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import * as React from 'react' diff --git a/e2e/react-start/website/src/routes/_library.$project.$version.index.tsx b/e2e/react-start/website/src/routes/_library.$project.$version.index.tsx index d91b72d2b7..25023822d5 100644 --- a/e2e/react-start/website/src/routes/_library.$project.$version.index.tsx +++ b/e2e/react-start/website/src/routes/_library.$project.$version.index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/_library/$project/$version/')({ +export const Route = createFileRoute({ component: Page, }) @@ -14,7 +14,11 @@ function Page() {

version: {params.version}

- + Get started with our documentation.

diff --git a/e2e/react-start/website/src/routes/_library.$project.tsx b/e2e/react-start/website/src/routes/_library.$project.tsx index 3384fcf3a0..8fb100b563 100644 --- a/e2e/react-start/website/src/routes/_library.$project.tsx +++ b/e2e/react-start/website/src/routes/_library.$project.tsx @@ -1,8 +1,8 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' import { getProject } from '~/server/projects' import { seo } from '~/utils/seo' -export const Route = createFileRoute('/_library/$project')({ +export const Route = createFileRoute({ loader: ({ params: { project } }) => getProject({ data: project }), head: ({ loaderData }) => ({ meta: seo({ title: `TanStack ${loaderData?.name || 'Project'}` }), diff --git a/e2e/react-start/website/src/routes/_library.index.tsx b/e2e/react-start/website/src/routes/_library.index.tsx index f08b6c633a..20e6a7468f 100644 --- a/e2e/react-start/website/src/routes/_library.index.tsx +++ b/e2e/react-start/website/src/routes/_library.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_library/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/website/src/routes/_library.tsx b/e2e/react-start/website/src/routes/_library.tsx index e120515350..c3970050ca 100644 --- a/e2e/react-start/website/src/routes/_library.tsx +++ b/e2e/react-start/website/src/routes/_library.tsx @@ -1,12 +1,7 @@ -import { - Link, - Outlet, - createFileRoute, - useLocation, -} from '@tanstack/react-router' +import { Link, Outlet, useLocation } from '@tanstack/react-router' import { getProjects } from '~/server/projects' -export const Route = createFileRoute('/_library')({ +export const Route = createFileRoute({ loader: async () => { const projects = await getProjects() return { diff --git a/e2e/react-start/website/src/ssr.tsx b/e2e/react-start/website/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/e2e/react-start/website/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/react-start/website/src/tanstack-start.d.ts b/e2e/react-start/website/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/website/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/website/tests/app.spec.ts b/e2e/react-start/website/tests/app.spec.ts index f115180956..179fa81bf8 100644 --- a/e2e/react-start/website/tests/app.spec.ts +++ b/e2e/react-start/website/tests/app.spec.ts @@ -17,3 +17,17 @@ test('resolves to the overview docs page', async ({ page }) => { '/router/latest/docs/framework/react/overview', ) }) + +test('clicking on Documentation link navigates to the overview docs page', async ({ + page, +}) => { + await page.goto('/router') + await page.waitForLoadState('networkidle') + + const documentationLink = page.getByLabel('Documentation') + await documentationLink.click() + await page.waitForLoadState('networkidle') + + const pathname = new URL(page.url()).pathname + expect(pathname).toBe('/router/latest/docs/framework/react/overview') +}) diff --git a/e2e/react-start/website/vite.config.ts b/e2e/react-start/website/vite.config.ts new file mode 100644 index 0000000000..a1b3d840f5 --- /dev/null +++ b/e2e/react-start/website/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routeTree.gen.ts b/e2e/solid-router/basic-file-based-code-splitting/src/routeTree.gen.ts index b7e80e980b..7032a890eb 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routeTree.gen.ts @@ -8,75 +8,77 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as WithoutLoaderImport } from './routes/without-loader' -import { Route as ViewportTestImport } from './routes/viewport-test' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as WithoutLoaderRouteImport } from './routes/without-loader' +import { Route as ViewportTestRouteImport } from './routes/viewport-test' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const WithoutLoaderRoute = WithoutLoaderImport.update({ +const WithoutLoaderRoute = WithoutLoaderRouteImport.update({ id: '/without-loader', path: '/without-loader', getParentRoute: () => rootRoute, } as any) -const ViewportTestRoute = ViewportTestImport.update({ +const ViewportTestRoute = ViewportTestRouteImport.update({ id: '/viewport-test', path: '/viewport-test', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -90,75 +92,168 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/viewport-test': { id: '/viewport-test' path: '/viewport-test' fullPath: '/viewport-test' - preLoaderRoute: typeof ViewportTestImport + preLoaderRoute: typeof ViewportTestRouteImport parentRoute: typeof rootRoute } '/without-loader': { id: '/without-loader' path: '/without-loader' fullPath: '/without-loader' - preLoaderRoute: typeof WithoutLoaderImport + preLoaderRoute: typeof WithoutLoaderRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/viewport-test' { + const createFileRoute: CreateFileRoute< + '/viewport-test', + FileRoutesByPath['/viewport-test']['parentRoute'], + FileRoutesByPath['/viewport-test']['id'], + FileRoutesByPath['/viewport-test']['path'], + FileRoutesByPath['/viewport-test']['fullPath'] + > +} +declare module './routes/without-loader' { + const createFileRoute: CreateFileRoute< + '/without-loader', + FileRoutesByPath['/without-loader']['parentRoute'], + FileRoutesByPath['/without-loader']['id'], + FileRoutesByPath['/without-loader']['path'], + FileRoutesByPath['/without-loader']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { @@ -291,3 +386,66 @@ const rootRouteChildren: RootRouteChildren = { export const routeTree = rootRoute ._addFileChildren(rootRouteChildren) ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/_layout", + "/posts", + "/viewport-test", + "/without-loader" + ] + }, + "/": { + "filePath": "index.tsx" + }, + "/_layout": { + "filePath": "_layout.tsx", + "children": [ + "/_layout/_layout-2" + ] + }, + "/posts": { + "filePath": "posts.tsx", + "children": [ + "/posts/$postId", + "/posts/" + ] + }, + "/viewport-test": { + "filePath": "viewport-test.tsx" + }, + "/without-loader": { + "filePath": "without-loader.tsx" + }, + "/_layout/_layout-2": { + "filePath": "_layout/_layout-2.tsx", + "parent": "/_layout", + "children": [ + "/_layout/_layout-2/layout-a", + "/_layout/_layout-2/layout-b" + ] + }, + "/posts/$postId": { + "filePath": "posts.$postId.tsx", + "parent": "/posts" + }, + "/posts/": { + "filePath": "posts.index.tsx", + "parent": "/posts" + }, + "/_layout/_layout-2/layout-a": { + "filePath": "_layout/_layout-2/layout-a.tsx", + "parent": "/_layout/_layout-2" + }, + "/_layout/_layout-2/layout-b": { + "filePath": "_layout/_layout-2/layout-b.tsx", + "parent": "/_layout/_layout-2" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout.tsx index d43b4ef5f5..c549175638 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx index 7a5a3623a0..efeca5ce86 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx index b69951b246..a190b24202 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx index 30dbcce90f..505f8f6fbf 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/index.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/index.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx index 105f08d64e..e23c29a21a 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.$postId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.index.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.index.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.tsx index 11a999f50a..2e28f9beb3 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx index 22dd8fd282..b182feb7b1 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/viewport-test.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/viewport-test')({ +export const Route = createFileRoute({ component: () =>
Hello /viewport-test!
, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/src/routes/without-loader.tsx b/e2e/solid-router/basic-file-based-code-splitting/src/routes/without-loader.tsx index 1506595204..af692bdaca 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/src/routes/without-loader.tsx +++ b/e2e/solid-router/basic-file-based-code-splitting/src/routes/without-loader.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/without-loader')({ +export const Route = createFileRoute({ component: () =>
Hello /without-loader!
, }) diff --git a/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts b/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts index df642f3222..694cb2914f 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts +++ b/e2e/solid-router/basic-file-based-code-splitting/vite.config.ts @@ -1,13 +1,14 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, + verboseFileRoutes: false, codeSplittingOptions: { splitBehavior: ({ routeId }) => { if (routeId === '/posts') { diff --git a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts index e41dbee76d..5d1f7b9af6 100644 --- a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts @@ -9,114 +9,119 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/solid-router' +import type { + CreateFileRoute, + CreateLazyFileRoute, + FileRoutesByPath, +} from '@tanstack/solid-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as EditingBImport } from './routes/editing-b' -import { Route as EditingAImport } from './routes/editing-a' -import { Route as AnchorImport } from './routes/anchor' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as RedirectIndexImport } from './routes/redirect/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as RedirectTargetImport } from './routes/redirect/$target' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as groupLazyinsideImport } from './routes/(group)/lazyinside' -import { Route as groupInsideImport } from './routes/(group)/inside' -import { Route as groupLayoutImport } from './routes/(group)/_layout' -import { Route as anotherGroupOnlyrouteinsideImport } from './routes/(another-group)/onlyrouteinside' -import { Route as RedirectTargetIndexImport } from './routes/redirect/$target/index' -import { Route as RedirectPreloadThirdImport } from './routes/redirect/preload/third' -import { Route as RedirectPreloadSecondImport } from './routes/redirect/preload/second' -import { Route as RedirectPreloadFirstImport } from './routes/redirect/preload/first' -import { Route as RedirectTargetViaLoaderImport } from './routes/redirect/$target/via-loader' -import { Route as RedirectTargetViaBeforeLoadImport } from './routes/redirect/$target/via-beforeLoad' -import { Route as PostsPostIdEditImport } from './routes/posts_.$postId.edit' -import { Route as ParamsSingleValueImport } from './routes/params.single.$value' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' -import { Route as groupSubfolderInsideImport } from './routes/(group)/subfolder/inside' -import { Route as groupLayoutInsidelayoutImport } from './routes/(group)/_layout.insidelayout' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as EditingBRouteImport } from './routes/editing-b' +import { Route as EditingARouteImport } from './routes/editing-a' +import { Route as AnchorRouteImport } from './routes/anchor' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as RedirectIndexRouteImport } from './routes/redirect/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as RedirectTargetRouteImport } from './routes/redirect/$target' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as groupLazyinsideRouteImport } from './routes/(group)/lazyinside' +import { Route as groupInsideRouteImport } from './routes/(group)/inside' +import { Route as groupLayoutRouteImport } from './routes/(group)/_layout' +import { Route as anotherGroupOnlyrouteinsideRouteImport } from './routes/(another-group)/onlyrouteinside' +import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index' +import { Route as RedirectPreloadThirdRouteImport } from './routes/redirect/preload/third' +import { Route as RedirectPreloadSecondRouteImport } from './routes/redirect/preload/second' +import { Route as RedirectPreloadFirstRouteImport } from './routes/redirect/preload/first' +import { Route as RedirectTargetViaLoaderRouteImport } from './routes/redirect/$target/via-loader' +import { Route as RedirectTargetViaBeforeLoadRouteImport } from './routes/redirect/$target/via-beforeLoad' +import { Route as PostsPostIdEditRouteImport } from './routes/posts_.$postId.edit' +import { Route as ParamsSingleValueRouteImport } from './routes/params.single.$value' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' +import { Route as groupSubfolderInsideRouteImport } from './routes/(group)/subfolder/inside' +import { Route as groupLayoutInsidelayoutRouteImport } from './routes/(group)/_layout.insidelayout' // Create Virtual Routes -const groupImport = createFileRoute('/(group)')() +const groupRouteImport = createFileRoute('/(group)')() // Create/Update Routes -const groupRoute = groupImport.update({ +const groupRoute = groupRouteImport.update({ id: '/(group)', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const EditingBRoute = EditingBImport.update({ +const EditingBRoute = EditingBRouteImport.update({ id: '/editing-b', path: '/editing-b', getParentRoute: () => rootRoute, } as any) -const EditingARoute = EditingAImport.update({ +const EditingARoute = EditingARouteImport.update({ id: '/editing-a', path: '/editing-a', getParentRoute: () => rootRoute, } as any) -const AnchorRoute = AnchorImport.update({ +const AnchorRoute = AnchorRouteImport.update({ id: '/anchor', path: '/anchor', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const RedirectIndexRoute = RedirectIndexImport.update({ +const RedirectIndexRoute = RedirectIndexRouteImport.update({ id: '/redirect/', path: '/redirect/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const RedirectTargetRoute = RedirectTargetImport.update({ +const RedirectTargetRoute = RedirectTargetRouteImport.update({ id: '/redirect/$target', path: '/redirect/$target', getParentRoute: () => rootRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const groupLazyinsideRoute = groupLazyinsideImport +const groupLazyinsideRoute = groupLazyinsideRouteImport .update({ id: '/lazyinside', path: '/lazyinside', @@ -124,92 +129,92 @@ const groupLazyinsideRoute = groupLazyinsideImport } as any) .lazy(() => import('./routes/(group)/lazyinside.lazy').then((d) => d.Route)) -const groupInsideRoute = groupInsideImport.update({ +const groupInsideRoute = groupInsideRouteImport.update({ id: '/inside', path: '/inside', getParentRoute: () => groupRoute, } as any) -const groupLayoutRoute = groupLayoutImport.update({ +const groupLayoutRoute = groupLayoutRouteImport.update({ id: '/_layout', getParentRoute: () => groupRoute, } as any) const anotherGroupOnlyrouteinsideRoute = - anotherGroupOnlyrouteinsideImport.update({ + anotherGroupOnlyrouteinsideRouteImport.update({ id: '/(another-group)/onlyrouteinside', path: '/onlyrouteinside', getParentRoute: () => rootRoute, } as any) -const RedirectTargetIndexRoute = RedirectTargetIndexImport.update({ +const RedirectTargetIndexRoute = RedirectTargetIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => RedirectTargetRoute, } as any) -const RedirectPreloadThirdRoute = RedirectPreloadThirdImport.update({ +const RedirectPreloadThirdRoute = RedirectPreloadThirdRouteImport.update({ id: '/redirect/preload/third', path: '/redirect/preload/third', getParentRoute: () => rootRoute, } as any) -const RedirectPreloadSecondRoute = RedirectPreloadSecondImport.update({ +const RedirectPreloadSecondRoute = RedirectPreloadSecondRouteImport.update({ id: '/redirect/preload/second', path: '/redirect/preload/second', getParentRoute: () => rootRoute, } as any) -const RedirectPreloadFirstRoute = RedirectPreloadFirstImport.update({ +const RedirectPreloadFirstRoute = RedirectPreloadFirstRouteImport.update({ id: '/redirect/preload/first', path: '/redirect/preload/first', getParentRoute: () => rootRoute, } as any) -const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderImport.update({ +const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetViaBeforeLoadRoute = - RedirectTargetViaBeforeLoadImport.update({ + RedirectTargetViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, } as any) -const PostsPostIdEditRoute = PostsPostIdEditImport.update({ +const PostsPostIdEditRoute = PostsPostIdEditRouteImport.update({ id: '/posts_/$postId/edit', path: '/posts/$postId/edit', getParentRoute: () => rootRoute, } as any) -const ParamsSingleValueRoute = ParamsSingleValueImport.update({ +const ParamsSingleValueRoute = ParamsSingleValueRouteImport.update({ id: '/params/single/$value', path: '/params/single/$value', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, } as any) -const groupSubfolderInsideRoute = groupSubfolderInsideImport.update({ +const groupSubfolderInsideRoute = groupSubfolderInsideRouteImport.update({ id: '/subfolder/inside', path: '/subfolder/inside', getParentRoute: () => groupRoute, } as any) -const groupLayoutInsidelayoutRoute = groupLayoutInsidelayoutImport.update({ +const groupLayoutInsidelayoutRoute = groupLayoutInsidelayoutRouteImport.update({ id: '/insidelayout', path: '/insidelayout', getParentRoute: () => groupLayoutRoute, @@ -223,201 +228,453 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/anchor': { id: '/anchor' path: '/anchor' fullPath: '/anchor' - preLoaderRoute: typeof AnchorImport + preLoaderRoute: typeof AnchorRouteImport parentRoute: typeof rootRoute } '/editing-a': { id: '/editing-a' path: '/editing-a' fullPath: '/editing-a' - preLoaderRoute: typeof EditingAImport + preLoaderRoute: typeof EditingARouteImport parentRoute: typeof rootRoute } '/editing-b': { id: '/editing-b' path: '/editing-b' fullPath: '/editing-b' - preLoaderRoute: typeof EditingBImport + preLoaderRoute: typeof EditingBRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/(another-group)/onlyrouteinside': { id: '/(another-group)/onlyrouteinside' path: '/onlyrouteinside' fullPath: '/onlyrouteinside' - preLoaderRoute: typeof anotherGroupOnlyrouteinsideImport + preLoaderRoute: typeof anotherGroupOnlyrouteinsideRouteImport parentRoute: typeof rootRoute } '/(group)': { id: '/(group)' path: '/' fullPath: '/' - preLoaderRoute: typeof groupImport + preLoaderRoute: typeof groupRouteImport parentRoute: typeof rootRoute } '/(group)/_layout': { id: '/(group)/_layout' path: '/' fullPath: '/' - preLoaderRoute: typeof groupLayoutImport + preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof groupRoute } '/(group)/inside': { id: '/(group)/inside' path: '/inside' fullPath: '/inside' - preLoaderRoute: typeof groupInsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupInsideRouteImport + parentRoute: typeof groupRouteImport } '/(group)/lazyinside': { id: '/(group)/lazyinside' path: '/lazyinside' fullPath: '/lazyinside' - preLoaderRoute: typeof groupLazyinsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupLazyinsideRouteImport + parentRoute: typeof groupRouteImport } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/$target': { id: '/redirect/$target' path: '/redirect/$target' fullPath: '/redirect/$target' - preLoaderRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/': { id: '/redirect/' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectIndexImport + preLoaderRoute: typeof RedirectIndexRouteImport parentRoute: typeof rootRoute } '/(group)/_layout/insidelayout': { id: '/(group)/_layout/insidelayout' path: '/insidelayout' fullPath: '/insidelayout' - preLoaderRoute: typeof groupLayoutInsidelayoutImport - parentRoute: typeof groupLayoutImport + preLoaderRoute: typeof groupLayoutInsidelayoutRouteImport + parentRoute: typeof groupLayoutRouteImport } '/(group)/subfolder/inside': { id: '/(group)/subfolder/inside' path: '/subfolder/inside' fullPath: '/subfolder/inside' - preLoaderRoute: typeof groupSubfolderInsideImport - parentRoute: typeof groupImport + preLoaderRoute: typeof groupSubfolderInsideRouteImport + parentRoute: typeof groupRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/params/single/$value': { id: '/params/single/$value' path: '/params/single/$value' fullPath: '/params/single/$value' - preLoaderRoute: typeof ParamsSingleValueImport + preLoaderRoute: typeof ParamsSingleValueRouteImport parentRoute: typeof rootRoute } '/posts_/$postId/edit': { id: '/posts_/$postId/edit' path: '/posts/$postId/edit' fullPath: '/posts/$postId/edit' - preLoaderRoute: typeof PostsPostIdEditImport + preLoaderRoute: typeof PostsPostIdEditRouteImport parentRoute: typeof rootRoute } '/redirect/$target/via-beforeLoad': { id: '/redirect/$target/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/redirect/$target/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/via-loader': { id: '/redirect/$target/via-loader' path: '/via-loader' fullPath: '/redirect/$target/via-loader' - preLoaderRoute: typeof RedirectTargetViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/preload/first': { id: '/redirect/preload/first' path: '/redirect/preload/first' fullPath: '/redirect/preload/first' - preLoaderRoute: typeof RedirectPreloadFirstImport + preLoaderRoute: typeof RedirectPreloadFirstRouteImport parentRoute: typeof rootRoute } '/redirect/preload/second': { id: '/redirect/preload/second' path: '/redirect/preload/second' fullPath: '/redirect/preload/second' - preLoaderRoute: typeof RedirectPreloadSecondImport + preLoaderRoute: typeof RedirectPreloadSecondRouteImport parentRoute: typeof rootRoute } '/redirect/preload/third': { id: '/redirect/preload/third' path: '/redirect/preload/third' fullPath: '/redirect/preload/third' - preLoaderRoute: typeof RedirectPreloadThirdImport + preLoaderRoute: typeof RedirectPreloadThirdRouteImport parentRoute: typeof rootRoute } '/redirect/$target/': { id: '/redirect/$target/' path: '/' fullPath: '/redirect/$target/' - preLoaderRoute: typeof RedirectTargetIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/anchor' { + const createFileRoute: CreateFileRoute< + '/anchor', + FileRoutesByPath['/anchor']['parentRoute'], + FileRoutesByPath['/anchor']['id'], + FileRoutesByPath['/anchor']['path'], + FileRoutesByPath['/anchor']['fullPath'] + > +} +declare module './routes/editing-a' { + const createFileRoute: CreateFileRoute< + '/editing-a', + FileRoutesByPath['/editing-a']['parentRoute'], + FileRoutesByPath['/editing-a']['id'], + FileRoutesByPath['/editing-a']['path'], + FileRoutesByPath['/editing-a']['fullPath'] + > +} +declare module './routes/editing-b' { + const createFileRoute: CreateFileRoute< + '/editing-b', + FileRoutesByPath['/editing-b']['parentRoute'], + FileRoutesByPath['/editing-b']['id'], + FileRoutesByPath['/editing-b']['path'], + FileRoutesByPath['/editing-b']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/(another-group)/onlyrouteinside' { + const createFileRoute: CreateFileRoute< + '/(another-group)/onlyrouteinside', + FileRoutesByPath['/(another-group)/onlyrouteinside']['parentRoute'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['id'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['path'], + FileRoutesByPath['/(another-group)/onlyrouteinside']['fullPath'] + > +} + +declare module './routes/(group)/_layout' { + const createFileRoute: CreateFileRoute< + '/(group)/_layout', + FileRoutesByPath['/(group)/_layout']['parentRoute'], + FileRoutesByPath['/(group)/_layout']['id'], + FileRoutesByPath['/(group)/_layout']['path'], + FileRoutesByPath['/(group)/_layout']['fullPath'] + > +} +declare module './routes/(group)/inside' { + const createFileRoute: CreateFileRoute< + '/(group)/inside', + FileRoutesByPath['/(group)/inside']['parentRoute'], + FileRoutesByPath['/(group)/inside']['id'], + FileRoutesByPath['/(group)/inside']['path'], + FileRoutesByPath['/(group)/inside']['fullPath'] + > +} +declare module './routes/(group)/lazyinside' { + const createFileRoute: CreateFileRoute< + '/(group)/lazyinside', + FileRoutesByPath['/(group)/lazyinside']['parentRoute'], + FileRoutesByPath['/(group)/lazyinside']['id'], + FileRoutesByPath['/(group)/lazyinside']['path'], + FileRoutesByPath['/(group)/lazyinside']['fullPath'] + > +} +declare module './routes/(group)/lazyinside.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(group)/lazyinside']['preLoaderRoute'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/redirect/$target' { + const createFileRoute: CreateFileRoute< + '/redirect/$target', + FileRoutesByPath['/redirect/$target']['parentRoute'], + FileRoutesByPath['/redirect/$target']['id'], + FileRoutesByPath['/redirect/$target']['path'], + FileRoutesByPath['/redirect/$target']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/redirect/index' { + const createFileRoute: CreateFileRoute< + '/redirect/', + FileRoutesByPath['/redirect/']['parentRoute'], + FileRoutesByPath['/redirect/']['id'], + FileRoutesByPath['/redirect/']['path'], + FileRoutesByPath['/redirect/']['fullPath'] + > +} +declare module './routes/(group)/_layout.insidelayout' { + const createFileRoute: CreateFileRoute< + '/(group)/_layout/insidelayout', + FileRoutesByPath['/(group)/_layout/insidelayout']['parentRoute'], + FileRoutesByPath['/(group)/_layout/insidelayout']['id'], + FileRoutesByPath['/(group)/_layout/insidelayout']['path'], + FileRoutesByPath['/(group)/_layout/insidelayout']['fullPath'] + > +} +declare module './routes/(group)/subfolder/inside' { + const createFileRoute: CreateFileRoute< + '/(group)/subfolder/inside', + FileRoutesByPath['/(group)/subfolder/inside']['parentRoute'], + FileRoutesByPath['/(group)/subfolder/inside']['id'], + FileRoutesByPath['/(group)/subfolder/inside']['path'], + FileRoutesByPath['/(group)/subfolder/inside']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/params.single.$value' { + const createFileRoute: CreateFileRoute< + '/params/single/$value', + FileRoutesByPath['/params/single/$value']['parentRoute'], + FileRoutesByPath['/params/single/$value']['id'], + FileRoutesByPath['/params/single/$value']['path'], + FileRoutesByPath['/params/single/$value']['fullPath'] + > +} +declare module './routes/posts_.$postId.edit' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/edit', + FileRoutesByPath['/posts_/$postId/edit']['parentRoute'], + FileRoutesByPath['/posts_/$postId/edit']['id'], + FileRoutesByPath['/posts_/$postId/edit']['path'], + FileRoutesByPath['/posts_/$postId/edit']['fullPath'] + > +} +declare module './routes/redirect/$target/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-beforeLoad', + FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-loader', + FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-loader']['id'], + FileRoutesByPath['/redirect/$target/via-loader']['path'], + FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] + > +} +declare module './routes/redirect/preload/first' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/first', + FileRoutesByPath['/redirect/preload/first']['parentRoute'], + FileRoutesByPath['/redirect/preload/first']['id'], + FileRoutesByPath['/redirect/preload/first']['path'], + FileRoutesByPath['/redirect/preload/first']['fullPath'] + > +} +declare module './routes/redirect/preload/second' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/second', + FileRoutesByPath['/redirect/preload/second']['parentRoute'], + FileRoutesByPath['/redirect/preload/second']['id'], + FileRoutesByPath['/redirect/preload/second']['path'], + FileRoutesByPath['/redirect/preload/second']['fullPath'] + > +} +declare module './routes/redirect/preload/third' { + const createFileRoute: CreateFileRoute< + '/redirect/preload/third', + FileRoutesByPath['/redirect/preload/third']['parentRoute'], + FileRoutesByPath['/redirect/preload/third']['id'], + FileRoutesByPath['/redirect/preload/third']['path'], + FileRoutesByPath['/redirect/preload/third']['fullPath'] + > +} +declare module './routes/redirect/$target/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/', + FileRoutesByPath['/redirect/$target/']['parentRoute'], + FileRoutesByPath['/redirect/$target/']['id'], + FileRoutesByPath['/redirect/$target/']['path'], + FileRoutesByPath['/redirect/$target/']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx index 5dfc82fc33..02541fcca3 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/solid-router' +import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(another-group)/onlyrouteinside') -export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx index dd06459a35..b38b7f742f 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/solid-router' +import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/_layout/insidelayout') -export const Route = createFileRoute('/(group)/_layout/insidelayout')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx index 660cfb70e6..f4559572c2 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/(group)/_layout')({ +export const Route = createFileRoute({ component: () => ( <>
/(group)/_layout!
diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx index 76ed0e8a07..eb1d28c1a0 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/solid-router' +import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/inside') -export const Route = createFileRoute('/(group)/inside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/inside' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx index a68febeadd..e4671a84ea 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx @@ -1,12 +1,8 @@ -import { - createLazyFileRoute, - getRouteApi, - useSearch, -} from '@tanstack/solid-router' +import { getRouteApi, useSearch } from '@tanstack/solid-router' const routeApi = getRouteApi('/(group)/lazyinside') -export const Route = createLazyFileRoute('/(group)/lazyinside')({ +export const Route = createLazyFileRoute({ component: () => { const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) const searchViaRouteHook = Route.useSearch() diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx index dcaf7b0727..c11aef8fd1 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' -export const Route = createFileRoute('/(group)/lazyinside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx index 9e963d170c..48b9e1c517 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx @@ -1,10 +1,10 @@ -import { createFileRoute, getRouteApi, useSearch } from '@tanstack/solid-router' +import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/subfolder/inside') -export const Route = createFileRoute('/(group)/subfolder/inside')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout.tsx index d43b4ef5f5..c549175638 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx index 7a5a3623a0..efeca5ce86 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index b69951b246..a190b24202 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 30dbcce90f..505f8f6fbf 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/anchor.tsx b/e2e/solid-router/basic-file-based/src/routes/anchor.tsx index 77c0e5a6de..b14122d179 100644 --- a/e2e/solid-router/basic-file-based/src/routes/anchor.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/anchor.tsx @@ -1,9 +1,4 @@ -import { - Link, - createFileRoute, - useLocation, - useNavigate, -} from '@tanstack/solid-router' +import { Link, useLocation, useNavigate } from '@tanstack/solid-router' import { createEffect, createRenderEffect, @@ -11,7 +6,7 @@ import { onCleanup, } from 'solid-js' -export const Route = createFileRoute('/anchor')({ +export const Route = createFileRoute({ component: AnchorComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx b/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx index e893169025..85b10caafe 100644 --- a/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, useBlocker } from '@tanstack/solid-router' +import { useBlocker } from '@tanstack/solid-router' import { createSignal } from 'solid-js' -export const Route = createFileRoute('/editing-a')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx b/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx index 3dc2d1655f..1d3e27339d 100644 --- a/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, useBlocker } from '@tanstack/solid-router' +import { useBlocker } from '@tanstack/solid-router' import { createEffect, createSignal, createMemo } from 'solid-js' -export const Route = createFileRoute('/editing-b')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/index.tsx b/e2e/solid-router/basic-file-based/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/basic-file-based/src/routes/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx b/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx index 4aca878470..e370dd594c 100644 --- a/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/params/single/$value')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx index a48895f339..f6445ae3ea 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx index c7d8cfe19c..07e41d1b0b 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.tsx index 9a9568837f..7f56ca2292 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ head: () => ({ meta: [ { diff --git a/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx b/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx index f38f369b7a..9e4c81d0f6 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, getRouteApi, useParams } from '@tanstack/solid-router' +import { getRouteApi, useParams } from '@tanstack/solid-router' -export const Route = createFileRoute('/posts_/$postId/edit')({ +export const Route = createFileRoute({ component: PostEditPage, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx index 525dd9da25..c4c78070d3 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, retainSearchParams } from '@tanstack/solid-router' +import { retainSearchParams } from '@tanstack/solid-router' import z from 'zod' -export const Route = createFileRoute('/redirect/$target')({ +export const Route = createFileRoute({ params: { parse: (p) => z diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx index a44008e3c6..7f4c505a93 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx index c88cc07986..bac534bfc5 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx index 5c059717c5..686c0d8971 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx index 043f305e57..26aefc154c 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/')({ +export const Route = createFileRoute({ component: () => (
{ await new Promise((r) => setTimeout(r, 1000)) throw redirect({ from: Route.fullPath, to: '../third' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx index e831276d29..cc162b05d9 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/redirect/preload/third')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts index 06f55406fb..5220b5f816 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts @@ -8,61 +8,63 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, @@ -76,61 +78,136 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx index d43b4ef5f5..c549175638 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx index 7a5a3623a0..efeca5ce86 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx index b69951b246..a190b24202 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 30dbcce90f..505f8f6fbf 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx index 619428c4b5..38ae2af8bd 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx @@ -1,8 +1,4 @@ -import { - ErrorComponent, - createFileRoute, - useRouter, -} from '@tanstack/solid-router' +import { ErrorComponent, useRouter } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createEffect, createMemo } from 'solid-js' import { PostNotFoundError } from '../posts' @@ -35,7 +31,7 @@ export function PostErrorComponent({ error, reset }: ErrorComponentProps) { ) } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx index 75d902a00c..8dbecad08e 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx @@ -1,9 +1,9 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createMemo } from 'solid-js' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/e2e/solid-router/basic-virtual-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-virtual-file-based/src/routeTree.gen.ts index fc2a2b44e1..288a42a970 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-virtual-file-based/src/routeTree.gen.ts @@ -8,89 +8,91 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as postsPostsImport } from './routes/posts/posts' -import { Route as layoutFirstLayoutImport } from './routes/layout/first-layout' -import { Route as homeImport } from './routes/home' -import { Route as postsPostsDetailImport } from './routes/posts/posts-detail' -import { Route as layoutSecondLayoutImport } from './routes/layout/second-layout' -import { Route as postsPostsHomeImport } from './routes/posts/posts-home' -import { Route as ClassicHelloRouteImport } from './routes/file-based-subtree/hello/route' -import { Route as ClassicHelloIndexImport } from './routes/file-based-subtree/hello/index' -import { Route as ClassicHelloWorldImport } from './routes/file-based-subtree/hello/world' -import { Route as ClassicHelloUniverseImport } from './routes/file-based-subtree/hello/universe' -import { Route as bImport } from './routes/b' -import { Route as aImport } from './routes/a' +import { Route as postsPostsRouteImport } from './routes/posts/posts' +import { Route as layoutFirstLayoutRouteImport } from './routes/layout/first-layout' +import { Route as homeRouteImport } from './routes/home' +import { Route as postsPostsDetailRouteImport } from './routes/posts/posts-detail' +import { Route as layoutSecondLayoutRouteImport } from './routes/layout/second-layout' +import { Route as postsPostsHomeRouteImport } from './routes/posts/posts-home' +import { Route as ClassicHelloRouteRouteImport } from './routes/file-based-subtree/hello/route' +import { Route as ClassicHelloIndexRouteImport } from './routes/file-based-subtree/hello/index' +import { Route as ClassicHelloWorldRouteImport } from './routes/file-based-subtree/hello/world' +import { Route as ClassicHelloUniverseRouteImport } from './routes/file-based-subtree/hello/universe' +import { Route as bRouteImport } from './routes/b' +import { Route as aRouteImport } from './routes/a' // Create/Update Routes -const postsPostsRoute = postsPostsImport.update({ +const postsPostsRoute = postsPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const layoutFirstLayoutRoute = layoutFirstLayoutImport.update({ +const layoutFirstLayoutRoute = layoutFirstLayoutRouteImport.update({ id: '/_first', getParentRoute: () => rootRoute, } as any) -const homeRoute = homeImport.update({ +const homeRoute = homeRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const postsPostsDetailRoute = postsPostsDetailImport.update({ +const postsPostsDetailRoute = postsPostsDetailRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => postsPostsRoute, } as any) -const layoutSecondLayoutRoute = layoutSecondLayoutImport.update({ +const layoutSecondLayoutRoute = layoutSecondLayoutRouteImport.update({ id: '/_second', getParentRoute: () => layoutFirstLayoutRoute, } as any) -const postsPostsHomeRoute = postsPostsHomeImport.update({ +const postsPostsHomeRoute = postsPostsHomeRouteImport.update({ id: '/', path: '/', getParentRoute: () => postsPostsRoute, } as any) -const ClassicHelloRouteRoute = ClassicHelloRouteImport.update({ +const ClassicHelloRouteRoute = ClassicHelloRouteRouteImport.update({ id: '/classic/hello', path: '/classic/hello', getParentRoute: () => rootRoute, } as any) -const ClassicHelloIndexRoute = ClassicHelloIndexImport.update({ +const ClassicHelloIndexRoute = ClassicHelloIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloWorldRoute = ClassicHelloWorldImport.update({ +const ClassicHelloWorldRoute = ClassicHelloWorldRouteImport.update({ id: '/world', path: '/world', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloUniverseRoute = ClassicHelloUniverseImport.update({ +const ClassicHelloUniverseRoute = ClassicHelloUniverseRouteImport.update({ id: '/universe', path: '/universe', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const bRoute = bImport.update({ +const bRoute = bRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => layoutSecondLayoutRoute, } as any) -const aRoute = aImport.update({ +const aRoute = aRouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => layoutSecondLayoutRoute, @@ -104,89 +106,200 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof homeImport + preLoaderRoute: typeof homeRouteImport parentRoute: typeof rootRoute } '/_first': { id: '/_first' path: '' fullPath: '' - preLoaderRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutFirstLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsRouteImport parentRoute: typeof rootRoute } '/classic/hello': { id: '/classic/hello' path: '/classic/hello' fullPath: '/classic/hello' - preLoaderRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloRouteRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof postsPostsHomeImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsHomeRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second': { id: '/_first/_second' path: '' fullPath: '' - preLoaderRoute: typeof layoutSecondLayoutImport - parentRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutSecondLayoutRouteImport + parentRoute: typeof layoutFirstLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof postsPostsDetailImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsDetailRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second/layout-a': { id: '/_first/_second/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof aImport - parentRoute: typeof layoutSecondLayoutImport + preLoaderRoute: typeof aRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport } '/_first/_second/layout-b': { id: '/_first/_second/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof bImport - parentRoute: typeof layoutSecondLayoutImport + preLoaderRoute: typeof bRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport } '/classic/hello/universe': { id: '/classic/hello/universe' path: '/universe' fullPath: '/classic/hello/universe' - preLoaderRoute: typeof ClassicHelloUniverseImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloUniverseRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/world': { id: '/classic/hello/world' path: '/world' fullPath: '/classic/hello/world' - preLoaderRoute: typeof ClassicHelloWorldImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloWorldRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/': { id: '/classic/hello/' path: '/' fullPath: '/classic/hello/' - preLoaderRoute: typeof ClassicHelloIndexImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloIndexRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/home' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/layout/first-layout' { + const createFileRoute: CreateFileRoute< + '/_first', + FileRoutesByPath['/_first']['parentRoute'], + FileRoutesByPath['/_first']['id'], + FileRoutesByPath['/_first']['path'], + FileRoutesByPath['/_first']['fullPath'] + > +} +declare module './routes/posts/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/route' { + const createFileRoute: CreateFileRoute< + '/classic/hello', + FileRoutesByPath['/classic/hello']['parentRoute'], + FileRoutesByPath['/classic/hello']['id'], + FileRoutesByPath['/classic/hello']['path'], + FileRoutesByPath['/classic/hello']['fullPath'] + > +} +declare module './routes/posts/posts-home' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/layout/second-layout' { + const createFileRoute: CreateFileRoute< + '/_first/_second', + FileRoutesByPath['/_first/_second']['parentRoute'], + FileRoutesByPath['/_first/_second']['id'], + FileRoutesByPath['/_first/_second']['path'], + FileRoutesByPath['/_first/_second']['fullPath'] + > +} +declare module './routes/posts/posts-detail' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/a' { + const createFileRoute: CreateFileRoute< + '/_first/_second/layout-a', + FileRoutesByPath['/_first/_second/layout-a']['parentRoute'], + FileRoutesByPath['/_first/_second/layout-a']['id'], + FileRoutesByPath['/_first/_second/layout-a']['path'], + FileRoutesByPath['/_first/_second/layout-a']['fullPath'] + > +} +declare module './routes/b' { + const createFileRoute: CreateFileRoute< + '/_first/_second/layout-b', + FileRoutesByPath['/_first/_second/layout-b']['parentRoute'], + FileRoutesByPath['/_first/_second/layout-b']['id'], + FileRoutesByPath['/_first/_second/layout-b']['path'], + FileRoutesByPath['/_first/_second/layout-b']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/universe' { + const createFileRoute: CreateFileRoute< + '/classic/hello/universe', + FileRoutesByPath['/classic/hello/universe']['parentRoute'], + FileRoutesByPath['/classic/hello/universe']['id'], + FileRoutesByPath['/classic/hello/universe']['path'], + FileRoutesByPath['/classic/hello/universe']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/world' { + const createFileRoute: CreateFileRoute< + '/classic/hello/world', + FileRoutesByPath['/classic/hello/world']['parentRoute'], + FileRoutesByPath['/classic/hello/world']['id'], + FileRoutesByPath['/classic/hello/world']['path'], + FileRoutesByPath['/classic/hello/world']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/index' { + const createFileRoute: CreateFileRoute< + '/classic/hello/', + FileRoutesByPath['/classic/hello/']['parentRoute'], + FileRoutesByPath['/classic/hello/']['id'], + FileRoutesByPath['/classic/hello/']['path'], + FileRoutesByPath['/classic/hello/']['fullPath'] + > +} + // Create and export the route tree interface layoutSecondLayoutRouteChildren { @@ -343,3 +456,79 @@ const rootRouteChildren: RootRouteChildren = { export const routeTree = rootRoute ._addFileChildren(rootRouteChildren) ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "root.tsx", + "children": [ + "/", + "/_first", + "/posts", + "/classic/hello" + ] + }, + "/": { + "filePath": "home.tsx" + }, + "/_first": { + "filePath": "layout/first-layout.tsx", + "children": [ + "/_first/_second" + ] + }, + "/posts": { + "filePath": "posts/posts.tsx", + "children": [ + "/posts/", + "/posts/$postId" + ] + }, + "/classic/hello": { + "filePath": "file-based-subtree/hello/route.tsx", + "children": [ + "/classic/hello/universe", + "/classic/hello/world", + "/classic/hello/" + ] + }, + "/posts/": { + "filePath": "posts/posts-home.tsx", + "parent": "/posts" + }, + "/_first/_second": { + "filePath": "layout/second-layout.tsx", + "parent": "/_first", + "children": [ + "/_first/_second/layout-a", + "/_first/_second/layout-b" + ] + }, + "/posts/$postId": { + "filePath": "posts/posts-detail.tsx", + "parent": "/posts" + }, + "/_first/_second/layout-a": { + "filePath": "a.tsx", + "parent": "/_first/_second" + }, + "/_first/_second/layout-b": { + "filePath": "b.tsx", + "parent": "/_first/_second" + }, + "/classic/hello/universe": { + "filePath": "file-based-subtree/hello/universe.tsx", + "parent": "/classic/hello" + }, + "/classic/hello/world": { + "filePath": "file-based-subtree/hello/world.tsx", + "parent": "/classic/hello" + }, + "/classic/hello/": { + "filePath": "file-based-subtree/hello/index.tsx", + "parent": "/classic/hello" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/a.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/a.tsx index 055cba1e6f..a190b24202 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/a.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/b.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/b.tsx index c5bb8051af..505f8f6fbf 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/b.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx index f7ff537916..f86335e291 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx index f4f30d8425..5b95eea555 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx index 2a6bf16c37..20b07c41cc 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx index 03edc7f484..4af11357a2 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx index 5c77421bb2..c549175638 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx index 9ab147de5e..efeca5ce86 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx index 990f473ae8..ef413c1be0 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts-home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx index 9ae6dfc747..46203594d1 100644 --- a/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx +++ b/e2e/solid-router/basic-virtual-file-based/src/routes/posts/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/basic-virtual-file-based/vite.config.ts b/e2e/solid-router/basic-virtual-file-based/vite.config.ts index f87f32286a..1bebd08210 100644 --- a/e2e/solid-router/basic-virtual-file-based/vite.config.ts +++ b/e2e/solid-router/basic-virtual-file-based/vite.config.ts @@ -1,14 +1,15 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import { routes } from './routes' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, + verboseFileRoutes: false, virtualRouteConfig: routes, }), solid(), diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx index 055cba1e6f..a190b24202 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx index c5bb8051af..505f8f6fbf 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index f7ff537916..f86335e291 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index f4f30d8425..5b95eea555 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index 2a6bf16c37..20b07c41cc 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 03edc7f484..4af11357a2 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index 5c77421bb2..c549175638 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index 9ab147de5e..efeca5ce86 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 990f473ae8..ef413c1be0 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index 9ae6dfc747..46203594d1 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts b/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts index 91280315f2..635aa70940 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/vite.config.ts @@ -1,13 +1,14 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, + verboseFileRoutes: false, virtualRouteConfig: './routes.ts', }), solid(), diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx index d43b4ef5f5..c549175638 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx index 7a5a3623a0..efeca5ce86 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index b69951b246..a190b24202 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 30dbcce90f..505f8f6fbf 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx index 55f8871d03..12f48f498d 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx index 11a999f50a..2e28f9beb3 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx index 055cba1e6f..a190b24202 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx index c5bb8051af..505f8f6fbf 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_first/_second/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index f7ff537916..f86335e291 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index f4f30d8425..5b95eea555 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index 2a6bf16c37..20b07c41cc 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 03edc7f484..4af11357a2 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx index bdfb4c7676..510db79b73 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index 5c77421bb2..c549175638 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index 9ab147de5e..efeca5ce86 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_first/_second')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 990f473ae8..ef413c1be0 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +6,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index 33d0386c19..13529228bb 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index 9ae6dfc747..46203594d1 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts index 03f257bbfa..74b4fe341d 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts @@ -9,29 +9,32 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/solid-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as testsPageWithSearchImport } from './routes/(tests)/page-with-search' -import { Route as testsNormalPageImport } from './routes/(tests)/normal-page' -import { Route as testsLazyWithLoaderPageImport } from './routes/(tests)/lazy-with-loader-page' -import { Route as testsLazyPageImport } from './routes/(tests)/lazy-page' +import { Route as IndexRouteImport } from './routes/index' +import { Route as testsPageWithSearchRouteImport } from './routes/(tests)/page-with-search' +import { Route as testsNormalPageRouteImport } from './routes/(tests)/normal-page' +import { Route as testsLazyWithLoaderPageRouteImport } from './routes/(tests)/lazy-with-loader-page' +import { Route as testsLazyPageRouteImport } from './routes/(tests)/lazy-page' // Create Virtual Routes -const testsVirtualPageLazyImport = createFileRoute('/(tests)/virtual-page')() +const testsVirtualPageLazyRouteImport = createFileRoute( + '/(tests)/virtual-page', +)() // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const testsVirtualPageLazyRoute = testsVirtualPageLazyImport +const testsVirtualPageLazyRoute = testsVirtualPageLazyRouteImport .update({ id: '/(tests)/virtual-page', path: '/virtual-page', @@ -39,19 +42,19 @@ const testsVirtualPageLazyRoute = testsVirtualPageLazyImport } as any) .lazy(() => import('./routes/(tests)/virtual-page.lazy').then((d) => d.Route)) -const testsPageWithSearchRoute = testsPageWithSearchImport.update({ +const testsPageWithSearchRoute = testsPageWithSearchRouteImport.update({ id: '/(tests)/page-with-search', path: '/page-with-search', getParentRoute: () => rootRoute, } as any) -const testsNormalPageRoute = testsNormalPageImport.update({ +const testsNormalPageRoute = testsNormalPageRouteImport.update({ id: '/(tests)/normal-page', path: '/normal-page', getParentRoute: () => rootRoute, } as any) -const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport +const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageRouteImport .update({ id: '/(tests)/lazy-with-loader-page', path: '/lazy-with-loader-page', @@ -61,7 +64,7 @@ const testsLazyWithLoaderPageRoute = testsLazyWithLoaderPageImport import('./routes/(tests)/lazy-with-loader-page.lazy').then((d) => d.Route), ) -const testsLazyPageRoute = testsLazyPageImport +const testsLazyPageRoute = testsLazyPageRouteImport .update({ id: '/(tests)/lazy-page', path: '/lazy-page', @@ -77,47 +80,110 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/(tests)/lazy-page': { id: '/(tests)/lazy-page' path: '/lazy-page' fullPath: '/lazy-page' - preLoaderRoute: typeof testsLazyPageImport + preLoaderRoute: typeof testsLazyPageRouteImport parentRoute: typeof rootRoute } '/(tests)/lazy-with-loader-page': { id: '/(tests)/lazy-with-loader-page' path: '/lazy-with-loader-page' fullPath: '/lazy-with-loader-page' - preLoaderRoute: typeof testsLazyWithLoaderPageImport + preLoaderRoute: typeof testsLazyWithLoaderPageRouteImport parentRoute: typeof rootRoute } '/(tests)/normal-page': { id: '/(tests)/normal-page' path: '/normal-page' fullPath: '/normal-page' - preLoaderRoute: typeof testsNormalPageImport + preLoaderRoute: typeof testsNormalPageRouteImport parentRoute: typeof rootRoute } '/(tests)/page-with-search': { id: '/(tests)/page-with-search' path: '/page-with-search' fullPath: '/page-with-search' - preLoaderRoute: typeof testsPageWithSearchImport + preLoaderRoute: typeof testsPageWithSearchRouteImport parentRoute: typeof rootRoute } '/(tests)/virtual-page': { id: '/(tests)/virtual-page' path: '/virtual-page' fullPath: '/virtual-page' - preLoaderRoute: typeof testsVirtualPageLazyImport + preLoaderRoute: typeof testsVirtualPageLazyRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/(tests)/lazy-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/lazy-page', + FileRoutesByPath['/(tests)/lazy-page']['parentRoute'], + FileRoutesByPath['/(tests)/lazy-page']['id'], + FileRoutesByPath['/(tests)/lazy-page']['path'], + FileRoutesByPath['/(tests)/lazy-page']['fullPath'] + > +} +declare module './routes/(tests)/lazy-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/lazy-page']['preLoaderRoute'] + > +} +declare module './routes/(tests)/lazy-with-loader-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/lazy-with-loader-page', + FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'], + FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath'] + > +} +declare module './routes/(tests)/lazy-with-loader-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/lazy-with-loader-page']['preLoaderRoute'] + > +} +declare module './routes/(tests)/normal-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/normal-page', + FileRoutesByPath['/(tests)/normal-page']['parentRoute'], + FileRoutesByPath['/(tests)/normal-page']['id'], + FileRoutesByPath['/(tests)/normal-page']['path'], + FileRoutesByPath['/(tests)/normal-page']['fullPath'] + > +} +declare module './routes/(tests)/page-with-search' { + const createFileRoute: CreateFileRoute< + '/(tests)/page-with-search', + FileRoutesByPath['/(tests)/page-with-search']['parentRoute'], + FileRoutesByPath['/(tests)/page-with-search']['id'], + FileRoutesByPath['/(tests)/page-with-search']['path'], + FileRoutesByPath['/(tests)/page-with-search']['fullPath'] + > +} +declare module './routes/(tests)/virtual-page.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(tests)/virtual-page']['preLoaderRoute'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx index 2e7b3306d2..ff772de0f5 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx @@ -1,7 +1,6 @@ -import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/lazy-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx index 042a053765..79405e27e7 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx @@ -1,3 +1 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/(tests)/lazy-page')({}) +export const Route = createFileRoute({}) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx index 2079777df0..7f5f91be43 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx @@ -1,7 +1,6 @@ -import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/lazy-with-loader-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx index 6f2cf280a4..5463a153af 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { sleep } from '../../posts' -export const Route = createFileRoute('/(tests)/lazy-with-loader-page')({ +export const Route = createFileRoute({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx index 6151049c35..af14b9d095 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/normal-page')({ +export const Route = createFileRoute({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx index 4d5953ed67..073dd2501c 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/page-with-search')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx index 8c6c8ef353..4e79a19cd9 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx @@ -1,7 +1,6 @@ -import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute('/(tests)/virtual-page')({ +export const Route = createLazyFileRoute({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx index 991ecc3435..da8f31fe34 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute, linkOptions } from '@tanstack/solid-router' +import { Link, linkOptions } from '@tanstack/solid-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/e2e/solid-start/basic-tsr-config/.gitignore b/e2e/solid-start/basic-tsr-config/.gitignore index 2b76174be5..14577724eb 100644 --- a/e2e/solid-start/basic-tsr-config/.gitignore +++ b/e2e/solid-start/basic-tsr-config/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/e2e/solid-start/basic-tsr-config/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/basic-tsr-config/app.config.ts b/e2e/solid-start/basic-tsr-config/app.config.ts deleted file mode 100644 index d798414e98..0000000000 --- a/e2e/solid-start/basic-tsr-config/app.config.ts +++ /dev/null @@ -1,8 +0,0 @@ -// app.config.ts -import { defineConfig } from '@tanstack/solid-start/config' - -export default defineConfig({ - tsr: { - appDirectory: './src/app', - }, -}) diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json index 475a1d746b..635a898525 100644 --- a/e2e/solid-start/basic-tsr-config/package.json +++ b/e2e/solid-start/basic-tsr-config/package.json @@ -4,22 +4,22 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "rimraf ./count.txt && vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "rimraf ./count.txt && vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", - "solid-js": "^1.9.5", - "vinxi": "0.5.3" + "solid-js": "^1.9.5" }, "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "typescript": "^5.7.2" + "typescript": "^5.7.2", + "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/solid-start/basic-tsr-config/playwright.config.ts b/e2e/solid-start/basic-tsr-config/playwright.config.ts index bb77d0cf70..e834d88cf4 100644 --- a/e2e/solid-start/basic-tsr-config/playwright.config.ts +++ b/e2e/solid-start/basic-tsr-config/playwright.config.ts @@ -4,6 +4,7 @@ import packageJson from './package.json' with { type: 'json' } const PORT = derivePort(packageJson.name) const baseURL = `http://localhost:${PORT}` + /** * See https://playwright.dev/docs/test-configuration. */ @@ -19,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/basic-tsr-config/src/app/client.tsx b/e2e/solid-start/basic-tsr-config/src/app/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/e2e/solid-start/basic-tsr-config/src/app/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts b/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts index c260510053..3a60fd4405 100644 --- a/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts +++ b/e2e/solid-start/basic-tsr-config/src/app/routeTree.gen.ts @@ -8,14 +8,16 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -29,12 +31,24 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx b/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx index 4d15620109..32e530dbbf 100644 --- a/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx +++ b/e2e/solid-start/basic-tsr-config/src/app/routes/index.tsx @@ -1,5 +1,5 @@ import fs from 'node:fs' -import { createFileRoute, useRouter } from '@tanstack/solid-router' +import { useRouter } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' const filePath = 'count.txt' @@ -17,7 +17,7 @@ const updateCount = createServerFn({ method: 'POST' }) const count = await getCount() await fs.promises.writeFile(filePath, `${count + data}`) }) -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async () => await getCount(), }) diff --git a/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx b/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx deleted file mode 100644 index ebd14c8120..0000000000 --- a/e2e/solid-start/basic-tsr-config/src/app/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts b/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts new file mode 100644 index 0000000000..6b848b9bb7 --- /dev/null +++ b/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts b/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/basic-tsr-config/src/app/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/basic-tsr-config/vite.config.ts b/e2e/solid-start/basic-tsr-config/vite.config.ts new file mode 100644 index 0000000000..347962b83d --- /dev/null +++ b/e2e/solid-start/basic-tsr-config/vite.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({ + tsr: { + srcDirectory: './src/app', + }, + }), + ], +}) diff --git a/e2e/solid-start/basic/.gitignore b/e2e/solid-start/basic/.gitignore index be342025da..a79d5cf129 100644 --- a/e2e/solid-start/basic/.gitignore +++ b/e2e/solid-start/basic/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..e36fccb479 --- /dev/null +++ b/e2e/solid-start/basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api/users' +import { ServerRoute as ApiUsersUserIdRouteImport } from './../../src/routes/api/users.$userId' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersUserIdRoute = ApiUsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$userId': { + id: '/api/users/$userId' + path: '/$userId' + fullPath: '/api/users/$userId' + preLoaderRoute: typeof ApiUsersUserIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api/users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$userId' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$userId']['parentRoute'], + FileRoutesByPath['/api/users/$userId']['id'], + FileRoutesByPath['/api/users/$userId']['path'], + FileRoutesByPath['/api/users/$userId']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersUserIdRoute: typeof ApiUsersUserIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersUserIdRoute: ApiUsersUserIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$userId' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$userId' + id: '__root__' | '/api/users' | '/api/users/$userId' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api/users.ts", + "children": [ + "/api/users/$userId" + ] + }, + "/api/users/$userId": { + "filePath": "api/users.$userId.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/basic/app.config.ts b/e2e/solid-start/basic/app.config.ts deleted file mode 100644 index 2a06e3d3f0..0000000000 --- a/e2e/solid-start/basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index a10fb47d62..01167c343d 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -4,10 +4,10 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -17,7 +17,6 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/solid-start/basic/playwright.config.ts b/e2e/solid-start/basic/playwright.config.ts index 95d043d48b..e834d88cf4 100644 --- a/e2e/solid-start/basic/playwright.config.ts +++ b/e2e/solid-start/basic/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/basic/src/api.ts b/e2e/solid-start/basic/src/api.ts deleted file mode 100644 index ed511bcd26..0000000000 --- a/e2e/solid-start/basic/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/solid-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/solid-start/basic/src/client.tsx b/e2e/solid-start/basic/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/e2e/solid-start/basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/e2e/solid-start/basic/src/routeTree.gen.ts b/e2e/solid-start/basic/src/routeTree.gen.ts index db7101d5f5..d4db3b87d4 100644 --- a/e2e/solid-start/basic/src/routeTree.gen.ts +++ b/e2e/solid-start/basic/src/routeTree.gen.ts @@ -8,220 +8,222 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as UsersImport } from './routes/users' -import { Route as StreamImport } from './routes/stream' -import { Route as SearchParamsImport } from './routes/search-params' -import { Route as ScriptsImport } from './routes/scripts' -import { Route as PostsImport } from './routes/posts' -import { Route as LinksImport } from './routes/links' -import { Route as DeferredImport } from './routes/deferred' -import { Route as LayoutImport } from './routes/_layout' -import { Route as NotFoundRouteImport } from './routes/not-found/route' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as RedirectIndexImport } from './routes/redirect/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as NotFoundIndexImport } from './routes/not-found/index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as RedirectTargetImport } from './routes/redirect/$target' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as NotFoundViaLoaderImport } from './routes/not-found/via-loader' -import { Route as NotFoundViaBeforeLoadImport } from './routes/not-found/via-beforeLoad' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as RedirectTargetIndexImport } from './routes/redirect/$target/index' -import { Route as RedirectTargetViaLoaderImport } from './routes/redirect/$target/via-loader' -import { Route as RedirectTargetViaBeforeLoadImport } from './routes/redirect/$target/via-beforeLoad' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' -import { Route as RedirectTargetServerFnIndexImport } from './routes/redirect/$target/serverFn/index' -import { Route as RedirectTargetServerFnViaUseServerFnImport } from './routes/redirect/$target/serverFn/via-useServerFn' -import { Route as RedirectTargetServerFnViaLoaderImport } from './routes/redirect/$target/serverFn/via-loader' -import { Route as RedirectTargetServerFnViaBeforeLoadImport } from './routes/redirect/$target/serverFn/via-beforeLoad' +import { Route as UsersRouteImport } from './routes/users' +import { Route as StreamRouteImport } from './routes/stream' +import { Route as SearchParamsRouteImport } from './routes/search-params' +import { Route as ScriptsRouteImport } from './routes/scripts' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LinksRouteImport } from './routes/links' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as NotFoundRouteRouteImport } from './routes/not-found/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as RedirectIndexRouteImport } from './routes/redirect/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as NotFoundIndexRouteImport } from './routes/not-found/index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as RedirectTargetRouteImport } from './routes/redirect/$target' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader' +import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index' +import { Route as RedirectTargetViaLoaderRouteImport } from './routes/redirect/$target/via-loader' +import { Route as RedirectTargetViaBeforeLoadRouteImport } from './routes/redirect/$target/via-beforeLoad' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' +import { Route as RedirectTargetServerFnIndexRouteImport } from './routes/redirect/$target/serverFn/index' +import { Route as RedirectTargetServerFnViaUseServerFnRouteImport } from './routes/redirect/$target/serverFn/via-useServerFn' +import { Route as RedirectTargetServerFnViaLoaderRouteImport } from './routes/redirect/$target/serverFn/via-loader' +import { Route as RedirectTargetServerFnViaBeforeLoadRouteImport } from './routes/redirect/$target/serverFn/via-beforeLoad' // Create/Update Routes -const UsersRoute = UsersImport.update({ +const UsersRoute = UsersRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => rootRoute, } as any) -const StreamRoute = StreamImport.update({ +const StreamRoute = StreamRouteImport.update({ id: '/stream', path: '/stream', getParentRoute: () => rootRoute, } as any) -const SearchParamsRoute = SearchParamsImport.update({ +const SearchParamsRoute = SearchParamsRouteImport.update({ id: '/search-params', path: '/search-params', getParentRoute: () => rootRoute, } as any) -const ScriptsRoute = ScriptsImport.update({ +const ScriptsRoute = ScriptsRouteImport.update({ id: '/scripts', path: '/scripts', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LinksRoute = LinksImport.update({ +const LinksRoute = LinksRouteImport.update({ id: '/links', path: '/links', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const NotFoundRouteRoute = NotFoundRouteImport.update({ +const NotFoundRouteRoute = NotFoundRouteRouteImport.update({ id: '/not-found', path: '/not-found', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRoute, } as any) -const RedirectIndexRoute = RedirectIndexImport.update({ +const RedirectIndexRoute = RedirectIndexRouteImport.update({ id: '/redirect/', path: '/redirect/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const NotFoundIndexRoute = NotFoundIndexImport.update({ +const NotFoundIndexRoute = NotFoundIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => NotFoundRouteRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRoute, } as any) -const RedirectTargetRoute = RedirectTargetImport.update({ +const RedirectTargetRoute = RedirectTargetRouteImport.update({ id: '/redirect/$target', path: '/redirect/$target', getParentRoute: () => rootRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const NotFoundViaLoaderRoute = NotFoundViaLoaderImport.update({ +const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => NotFoundRouteRoute, } as any) -const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadImport.update({ +const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => NotFoundRouteRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const RedirectTargetIndexRoute = RedirectTargetIndexImport.update({ +const RedirectTargetIndexRoute = RedirectTargetIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => RedirectTargetRoute, } as any) -const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderImport.update({ +const RedirectTargetViaLoaderRoute = RedirectTargetViaLoaderRouteImport.update({ id: '/via-loader', path: '/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetViaBeforeLoadRoute = - RedirectTargetViaBeforeLoadImport.update({ + RedirectTargetViaBeforeLoadRouteImport.update({ id: '/via-beforeLoad', path: '/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, } as any) const RedirectTargetServerFnIndexRoute = - RedirectTargetServerFnIndexImport.update({ + RedirectTargetServerFnIndexRouteImport.update({ id: '/serverFn/', path: '/serverFn/', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaUseServerFnRoute = - RedirectTargetServerFnViaUseServerFnImport.update({ + RedirectTargetServerFnViaUseServerFnRouteImport.update({ id: '/serverFn/via-useServerFn', path: '/serverFn/via-useServerFn', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaLoaderRoute = - RedirectTargetServerFnViaLoaderImport.update({ + RedirectTargetServerFnViaLoaderRouteImport.update({ id: '/serverFn/via-loader', path: '/serverFn/via-loader', getParentRoute: () => RedirectTargetRoute, } as any) const RedirectTargetServerFnViaBeforeLoadRoute = - RedirectTargetServerFnViaBeforeLoadImport.update({ + RedirectTargetServerFnViaBeforeLoadRouteImport.update({ id: '/serverFn/via-beforeLoad', path: '/serverFn/via-beforeLoad', getParentRoute: () => RedirectTargetRoute, @@ -235,215 +237,488 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/not-found': { id: '/not-found' path: '/not-found' fullPath: '/not-found' - preLoaderRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundRouteRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/links': { id: '/links' path: '/links' fullPath: '/links' - preLoaderRoute: typeof LinksImport + preLoaderRoute: typeof LinksRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/scripts': { id: '/scripts' path: '/scripts' fullPath: '/scripts' - preLoaderRoute: typeof ScriptsImport + preLoaderRoute: typeof ScriptsRouteImport parentRoute: typeof rootRoute } '/search-params': { id: '/search-params' path: '/search-params' fullPath: '/search-params' - preLoaderRoute: typeof SearchParamsImport + preLoaderRoute: typeof SearchParamsRouteImport parentRoute: typeof rootRoute } '/stream': { id: '/stream' path: '/stream' fullPath: '/stream' - preLoaderRoute: typeof StreamImport + preLoaderRoute: typeof StreamRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersImport + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/not-found/via-beforeLoad': { id: '/not-found/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/not-found/via-beforeLoad' - preLoaderRoute: typeof NotFoundViaBeforeLoadImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundViaBeforeLoadRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/not-found/via-loader': { id: '/not-found/via-loader' path: '/via-loader' fullPath: '/not-found/via-loader' - preLoaderRoute: typeof NotFoundViaLoaderImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundViaLoaderRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/$target': { id: '/redirect/$target' path: '/redirect/$target' fullPath: '/redirect/$target' - preLoaderRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetRouteImport parentRoute: typeof rootRoute } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport } '/not-found/': { id: '/not-found/' path: '/' fullPath: '/not-found/' - preLoaderRoute: typeof NotFoundIndexImport - parentRoute: typeof NotFoundRouteImport + preLoaderRoute: typeof NotFoundIndexRouteImport + parentRoute: typeof NotFoundRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/redirect/': { id: '/redirect/' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectIndexImport + preLoaderRoute: typeof RedirectIndexRouteImport parentRoute: typeof rootRoute } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } '/redirect/$target/via-beforeLoad': { id: '/redirect/$target/via-beforeLoad' path: '/via-beforeLoad' fullPath: '/redirect/$target/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/via-loader': { id: '/redirect/$target/via-loader' path: '/via-loader' fullPath: '/redirect/$target/via-loader' - preLoaderRoute: typeof RedirectTargetViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/': { id: '/redirect/$target/' path: '/' fullPath: '/redirect/$target/' - preLoaderRoute: typeof RedirectTargetIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-beforeLoad': { id: '/redirect/$target/serverFn/via-beforeLoad' path: '/serverFn/via-beforeLoad' fullPath: '/redirect/$target/serverFn/via-beforeLoad' - preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaBeforeLoadRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-loader': { id: '/redirect/$target/serverFn/via-loader' path: '/serverFn/via-loader' fullPath: '/redirect/$target/serverFn/via-loader' - preLoaderRoute: typeof RedirectTargetServerFnViaLoaderImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaLoaderRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/via-useServerFn': { id: '/redirect/$target/serverFn/via-useServerFn' path: '/serverFn/via-useServerFn' fullPath: '/redirect/$target/serverFn/via-useServerFn' - preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnViaUseServerFnRouteImport + parentRoute: typeof RedirectTargetRouteImport } '/redirect/$target/serverFn/': { id: '/redirect/$target/serverFn/' path: '/serverFn' fullPath: '/redirect/$target/serverFn' - preLoaderRoute: typeof RedirectTargetServerFnIndexImport - parentRoute: typeof RedirectTargetImport + preLoaderRoute: typeof RedirectTargetServerFnIndexRouteImport + parentRoute: typeof RedirectTargetRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/not-found/route' { + const createFileRoute: CreateFileRoute< + '/not-found', + FileRoutesByPath['/not-found']['parentRoute'], + FileRoutesByPath['/not-found']['id'], + FileRoutesByPath['/not-found']['path'], + FileRoutesByPath['/not-found']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/links' { + const createFileRoute: CreateFileRoute< + '/links', + FileRoutesByPath['/links']['parentRoute'], + FileRoutesByPath['/links']['id'], + FileRoutesByPath['/links']['path'], + FileRoutesByPath['/links']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/scripts' { + const createFileRoute: CreateFileRoute< + '/scripts', + FileRoutesByPath['/scripts']['parentRoute'], + FileRoutesByPath['/scripts']['id'], + FileRoutesByPath['/scripts']['path'], + FileRoutesByPath['/scripts']['fullPath'] + > +} +declare module './routes/search-params' { + const createFileRoute: CreateFileRoute< + '/search-params', + FileRoutesByPath['/search-params']['parentRoute'], + FileRoutesByPath['/search-params']['id'], + FileRoutesByPath['/search-params']['path'], + FileRoutesByPath['/search-params']['fullPath'] + > +} +declare module './routes/stream' { + const createFileRoute: CreateFileRoute< + '/stream', + FileRoutesByPath['/stream']['parentRoute'], + FileRoutesByPath['/stream']['id'], + FileRoutesByPath['/stream']['path'], + FileRoutesByPath['/stream']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/not-found/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/not-found/via-beforeLoad', + FileRoutesByPath['/not-found/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/not-found/via-beforeLoad']['id'], + FileRoutesByPath['/not-found/via-beforeLoad']['path'], + FileRoutesByPath['/not-found/via-beforeLoad']['fullPath'] + > +} +declare module './routes/not-found/via-loader' { + const createFileRoute: CreateFileRoute< + '/not-found/via-loader', + FileRoutesByPath['/not-found/via-loader']['parentRoute'], + FileRoutesByPath['/not-found/via-loader']['id'], + FileRoutesByPath['/not-found/via-loader']['path'], + FileRoutesByPath['/not-found/via-loader']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/redirect/$target' { + const createFileRoute: CreateFileRoute< + '/redirect/$target', + FileRoutesByPath['/redirect/$target']['parentRoute'], + FileRoutesByPath['/redirect/$target']['id'], + FileRoutesByPath['/redirect/$target']['path'], + FileRoutesByPath['/redirect/$target']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/not-found/index' { + const createFileRoute: CreateFileRoute< + '/not-found/', + FileRoutesByPath['/not-found/']['parentRoute'], + FileRoutesByPath['/not-found/']['id'], + FileRoutesByPath['/not-found/']['path'], + FileRoutesByPath['/not-found/']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/redirect/index' { + const createFileRoute: CreateFileRoute< + '/redirect/', + FileRoutesByPath['/redirect/']['parentRoute'], + FileRoutesByPath['/redirect/']['id'], + FileRoutesByPath['/redirect/']['path'], + FileRoutesByPath['/redirect/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} +declare module './routes/redirect/$target/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-beforeLoad', + FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/via-loader', + FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/via-loader']['id'], + FileRoutesByPath['/redirect/$target/via-loader']['path'], + FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] + > +} +declare module './routes/redirect/$target/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/', + FileRoutesByPath['/redirect/$target/']['parentRoute'], + FileRoutesByPath['/redirect/$target/']['id'], + FileRoutesByPath['/redirect/$target/']['path'], + FileRoutesByPath['/redirect/$target/']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-beforeLoad' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-beforeLoad', + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-beforeLoad']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-loader' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-loader', + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-loader']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/via-useServerFn' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/via-useServerFn', + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['id'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['path'], + FileRoutesByPath['/redirect/$target/serverFn/via-useServerFn']['fullPath'] + > +} +declare module './routes/redirect/$target/serverFn/index' { + const createFileRoute: CreateFileRoute< + '/redirect/$target/serverFn/', + FileRoutesByPath['/redirect/$target/serverFn/']['parentRoute'], + FileRoutesByPath['/redirect/$target/serverFn/']['id'], + FileRoutesByPath['/redirect/$target/serverFn/']['path'], + FileRoutesByPath['/redirect/$target/serverFn/']['fullPath'] + > +} + // Create and export the route tree interface NotFoundRouteRouteChildren { diff --git a/e2e/solid-start/basic/src/routes/__root.tsx b/e2e/solid-start/basic/src/routes/__root.tsx index 5ef4d4653b..89c60f9113 100644 --- a/e2e/solid-start/basic/src/routes/__root.tsx +++ b/e2e/solid-start/basic/src/routes/__root.tsx @@ -1,9 +1,9 @@ import { Link, Outlet, createRootRoute } from '@tanstack/solid-router' +import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo' -import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools' export const Route = createRootRoute({ head: () => ({ diff --git a/e2e/solid-start/basic/src/routes/_layout.tsx b/e2e/solid-start/basic/src/routes/_layout.tsx index d43b4ef5f5..c549175638 100644 --- a/e2e/solid-start/basic/src/routes/_layout.tsx +++ b/e2e/solid-start/basic/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx index 7a5a3623a0..efeca5ce86 100644 --- a/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx index b69951b246..a190b24202 100644 --- a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx index 30dbcce90f..505f8f6fbf 100644 --- a/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-start/basic/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/e2e/solid-start/basic/src/routes/api.users.ts b/e2e/solid-start/basic/src/routes/api.users.ts deleted file mode 100644 index 45ac83b2f0..0000000000 --- a/e2e/solid-start/basic/src/routes/api.users.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { json } from '@tanstack/solid-start' -import { createAPIFileRoute } from '@tanstack/solid-start/api' -import axios from 'redaxios' - -import type { User } from '~/utils/users' - -export const APIRoute = createAPIFileRoute('/api/users')({ - GET: async ({ request }) => { - console.info('Fetching users... @', request.url) - const res = await axios.get>( - 'https://jsonplaceholder.typicode.com/users', - ) - - const list = res.data.slice(0, 10) - - return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) - }, -}) diff --git a/e2e/solid-start/basic/src/routes/api/users.$id.ts b/e2e/solid-start/basic/src/routes/api/users.$id.ts deleted file mode 100644 index 7ee1fccbb4..0000000000 --- a/e2e/solid-start/basic/src/routes/api/users.$id.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { json } from '@tanstack/solid-start' -import { createAPIFileRoute } from '@tanstack/solid-start/api' -import axios from 'redaxios' - -import type { User } from '~/utils/users' - -export const APIRoute = createAPIFileRoute('/api/users/$id')({ - GET: async ({ request, params }) => { - console.info(`Fetching users by id=${params.id}... @`, request.url) - try { - const res = await axios.get( - 'https://jsonplaceholder.typicode.com/users/' + params.id, - ) - - return json({ - id: res.data.id, - name: res.data.name, - email: res.data.email, - }) - } catch (e) { - console.error(e) - return json({ error: 'User not found' }, { status: 404 }) - } - }, -}) diff --git a/e2e/solid-start/basic/src/routes/api/users.$userId.ts b/e2e/solid-start/basic/src/routes/api/users.$userId.ts new file mode 100644 index 0000000000..69d966d982 --- /dev/null +++ b/e2e/solid-start/basic/src/routes/api/users.$userId.ts @@ -0,0 +1,27 @@ +import { json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params, request }) => { + console.info(`Fetching users by id=${params.userId}... @`, request.url) + try { + const res = await fetch( + 'https://jsonplaceholder.typicode.com/users/' + params.userId, + ) + if (!res.ok) { + throw new Error('Failed to fetch user') + } + + const user = (await res.json()) as User + + return json({ + id: user.id, + name: user.name, + email: user.email, + }) + } catch (e) { + console.error(e) + return json({ error: 'User not found' }, { status: 404 }) + } + }, +}) diff --git a/e2e/solid-start/basic/src/routes/api/users.ts b/e2e/solid-start/basic/src/routes/api/users.ts new file mode 100644 index 0000000000..c0a6a1a6a2 --- /dev/null +++ b/e2e/solid-start/basic/src/routes/api/users.ts @@ -0,0 +1,58 @@ +import { createMiddleware, json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' + +const userLoggerMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: /users') + const result = await next() + result.response.headers.set('x-users', 'true') + console.info('Out: /users') + return result + }, +) + +const testParentMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: testParentMiddleware') + const result = await next() + result.response.headers.set('x-test-parent', 'true') + console.info('Out: testParentMiddleware') + return result + }, +) + +const testMiddleware = createMiddleware({ type: 'request' }) + .middleware([testParentMiddleware]) + .server(async ({ next, request }) => { + console.info('In: testMiddleware') + const result = await next() + result.response.headers.set('x-test', 'true') + + // if (Math.random() > 0.5) { + // throw new Response(null, { + // status: 302, + // headers: { Location: 'https://www.google.com' }, + // }) + // } + + console.info('Out: testMiddleware') + return result + }) + +export const ServerRoute = createServerFileRoute() + .middleware([testMiddleware, userLoggerMiddleware, testParentMiddleware]) + .methods({ + GET: async ({ request }) => { + console.info('Fetching users... @', request.url) + const res = await fetch('https://jsonplaceholder.typicode.com/users') + if (!res.ok) { + throw new Error('Failed to fetch users') + } + + const data = (await res.json()) as Array + + const list = data.slice(0, 10) + + return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) + }, + }) diff --git a/e2e/solid-start/basic/src/routes/deferred.tsx b/e2e/solid-start/basic/src/routes/deferred.tsx index 2a53643453..5bb96ca571 100644 --- a/e2e/solid-start/basic/src/routes/deferred.tsx +++ b/e2e/solid-start/basic/src/routes/deferred.tsx @@ -1,4 +1,4 @@ -import { Await, createFileRoute } from '@tanstack/solid-router' +import { Await } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import { Suspense, createSignal } from 'solid-js' @@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET' }) return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: async () => { return { deferredStuff: new Promise((r) => diff --git a/e2e/solid-start/basic/src/routes/index.tsx b/e2e/solid-start/basic/src/routes/index.tsx index 6b23caf87b..4024800b8e 100644 --- a/e2e/solid-start/basic/src/routes/index.tsx +++ b/e2e/solid-start/basic/src/routes/index.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { CustomMessage } from '~/components/CustomMessage' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-start/basic/src/routes/links.tsx b/e2e/solid-start/basic/src/routes/links.tsx index d6ce6a449b..05fd8f0494 100644 --- a/e2e/solid-start/basic/src/routes/links.tsx +++ b/e2e/solid-start/basic/src/routes/links.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/links')({ +export const Route = createFileRoute({ component: () => { const navigate = Route.useNavigate() return ( diff --git a/e2e/solid-start/basic/src/routes/not-found/index.tsx b/e2e/solid-start/basic/src/routes/not-found/index.tsx index 34c8ef6146..79e7b5ae56 100644 --- a/e2e/solid-start/basic/src/routes/not-found/index.tsx +++ b/e2e/solid-start/basic/src/routes/not-found/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/not-found/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/solid-start/basic/src/routes/not-found/route.tsx b/e2e/solid-start/basic/src/routes/not-found/route.tsx index 84f5ef81a5..b8343167f5 100644 --- a/e2e/solid-start/basic/src/routes/not-found/route.tsx +++ b/e2e/solid-start/basic/src/routes/not-found/route.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import z from 'zod' -export const Route = createFileRoute('/not-found')({ +export const Route = createFileRoute({ validateSearch: z.object({ preload: z.literal(false).optional(), }), diff --git a/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx b/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx index 5badde63bd..5277edd901 100644 --- a/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx +++ b/e2e/solid-start/basic/src/routes/not-found/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, notFound } from '@tanstack/solid-router' +import { notFound } from '@tanstack/solid-router' -export const Route = createFileRoute('/not-found/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: () => { throw notFound() }, diff --git a/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx b/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx index 20956cc43d..bc0fad6c58 100644 --- a/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx +++ b/e2e/solid-start/basic/src/routes/not-found/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, notFound } from '@tanstack/solid-router' +import { notFound } from '@tanstack/solid-router' -export const Route = createFileRoute('/not-found/via-loader')({ +export const Route = createFileRoute({ loader: () => { throw notFound() }, diff --git a/e2e/solid-start/basic/src/routes/posts.$postId.tsx b/e2e/solid-start/basic/src/routes/posts.$postId.tsx index c6b2fcf5f9..cefc75cdf1 100644 --- a/e2e/solid-start/basic/src/routes/posts.$postId.tsx +++ b/e2e/solid-start/basic/src/routes/posts.$postId.tsx @@ -1,11 +1,11 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent, Link } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' import { fetchPost } from '~/utils/posts' import { NotFound } from '~/components/NotFound' import { PostErrorComponent } from '~/components/PostErrorComponent' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/e2e/solid-start/basic/src/routes/posts.index.tsx b/e2e/solid-start/basic/src/routes/posts.index.tsx index c7d8cfe19c..07e41d1b0b 100644 --- a/e2e/solid-start/basic/src/routes/posts.index.tsx +++ b/e2e/solid-start/basic/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/e2e/solid-start/basic/src/routes/posts.tsx b/e2e/solid-start/basic/src/routes/posts.tsx index 0e94cd4d2c..c053d0de56 100644 --- a/e2e/solid-start/basic/src/routes/posts.tsx +++ b/e2e/solid-start/basic/src/routes/posts.tsx @@ -1,9 +1,9 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { For } from 'solid-js' import { fetchPosts } from '~/utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ head: () => ({ meta: [ { diff --git a/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx b/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx index f8d4627914..4133a9ade9 100644 --- a/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx +++ b/e2e/solid-start/basic/src/routes/posts_.$postId.deep.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' import { PostErrorComponent } from '~/components/PostErrorComponent' import { fetchPost } from '~/utils/posts' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostDeepComponent, diff --git a/e2e/solid-start/basic/src/routes/redirect/$target.tsx b/e2e/solid-start/basic/src/routes/redirect/$target.tsx index 525dd9da25..c4c78070d3 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, retainSearchParams } from '@tanstack/solid-router' +import { retainSearchParams } from '@tanstack/solid-router' import z from 'zod' -export const Route = createFileRoute('/redirect/$target')({ +export const Route = createFileRoute({ params: { parse: (p) => z diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx index 916afd450b..0dde05d9e1 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/')({ +export const Route = createFileRoute({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx index d404672372..6be32366eb 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/serverFn/')({ +export const Route = createFileRoute({ component: () => (

diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx index 81f9dd2d36..3aad8bffa4 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-beforeLoad.tsx @@ -1,9 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { throwRedirect } from '~/components/throwRedirect' -export const Route = createFileRoute( - '/redirect/$target/serverFn/via-beforeLoad', -)({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx index 0b6ac91c15..3087fa2e15 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-loader.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { throwRedirect } from '~/components/throwRedirect' -export const Route = createFileRoute('/redirect/$target/serverFn/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx index 5b0c246474..969f6c02c2 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx @@ -1,9 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { RedirectOnClick } from '~/components/RedirectOnClick' -export const Route = createFileRoute( - '/redirect/$target/serverFn/via-useServerFn', -)({ +export const Route = createFileRoute({ component: () => { const params = Route.useParams() const search = Route.useSearch() diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx index c88cc07986..bac534bfc5 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ +export const Route = createFileRoute({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/solid-start/basic/src/routes/redirect/$target/via-loader.tsx b/e2e/solid-start/basic/src/routes/redirect/$target/via-loader.tsx index 5c059717c5..686c0d8971 100644 --- a/e2e/solid-start/basic/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/$target/via-loader')({ +export const Route = createFileRoute({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/solid-start/basic/src/routes/redirect/index.tsx b/e2e/solid-start/basic/src/routes/redirect/index.tsx index 043f305e57..26aefc154c 100644 --- a/e2e/solid-start/basic/src/routes/redirect/index.tsx +++ b/e2e/solid-start/basic/src/routes/redirect/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect/')({ +export const Route = createFileRoute({ component: () => (
const isProd = import.meta.env.PROD -export const Route = createFileRoute('/scripts')({ +export const Route = createFileRoute({ head: () => ({ scripts: [ { diff --git a/e2e/solid-start/basic/src/routes/search-params.tsx b/e2e/solid-start/basic/src/routes/search-params.tsx index ec941d9a4c..fbacb055ac 100644 --- a/e2e/solid-start/basic/src/routes/search-params.tsx +++ b/e2e/solid-start/basic/src/routes/search-params.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' import { z } from 'zod' -export const Route = createFileRoute('/search-params')({ +export const Route = createFileRoute({ component: () => { const search = Route.useSearch() return ( diff --git a/e2e/solid-start/basic/src/routes/stream.tsx b/e2e/solid-start/basic/src/routes/stream.tsx index d1d21e344a..d0fb3f82cf 100644 --- a/e2e/solid-start/basic/src/routes/stream.tsx +++ b/e2e/solid-start/basic/src/routes/stream.tsx @@ -1,7 +1,7 @@ -import { Await, createFileRoute } from '@tanstack/solid-router' +import { Await } from '@tanstack/solid-router' import { createEffect, createSignal } from 'solid-js' -export const Route = createFileRoute('/stream')({ +export const Route = createFileRoute({ component: Home, loader() { return { diff --git a/e2e/solid-start/basic/src/routes/users.$userId.tsx b/e2e/solid-start/basic/src/routes/users.$userId.tsx index 6f95652e53..276249aef6 100644 --- a/e2e/solid-start/basic/src/routes/users.$userId.tsx +++ b/e2e/solid-start/basic/src/routes/users.$userId.tsx @@ -1,16 +1,13 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' import axios from 'redaxios' -import type { ErrorComponentProps } from '@tanstack/solid-router' import type { User } from '~/utils/users' -import { DEPLOY_URL } from '~/utils/users' import { NotFound } from '~/components/NotFound' import { UserErrorComponent } from '~/components/UserErrorComponent' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ params: { userId } }) => { return await axios - .get(DEPLOY_URL + '/api/users/' + userId) + .get('/api/users/' + userId) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/solid-start/basic/src/routes/users.index.tsx b/e2e/solid-start/basic/src/routes/users.index.tsx index bbc96801a9..662e8b6c68 100644 --- a/e2e/solid-start/basic/src/routes/users.index.tsx +++ b/e2e/solid-start/basic/src/routes/users.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/e2e/solid-start/basic/src/routes/users.tsx b/e2e/solid-start/basic/src/routes/users.tsx index 3c26badbb4..36b7573e64 100644 --- a/e2e/solid-start/basic/src/routes/users.tsx +++ b/e2e/solid-start/basic/src/routes/users.tsx @@ -1,13 +1,12 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import axios from 'redaxios' import type { User } from '~/utils/users' -import { DEPLOY_URL } from '~/utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async () => { return await axios - .get>(DEPLOY_URL + '/api/users') + .get>('/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') diff --git a/e2e/solid-start/basic/src/ssr.tsx b/e2e/solid-start/basic/src/ssr.tsx deleted file mode 100644 index 6d10bea05f..0000000000 --- a/e2e/solid-start/basic/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/solid-start/basic/src/tanstack-start.d.ts b/e2e/solid-start/basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/solid-start/basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/basic/src/utils/users.tsx b/e2e/solid-start/basic/src/utils/users.tsx index 79b45867d5..46be4b1580 100644 --- a/e2e/solid-start/basic/src/utils/users.tsx +++ b/e2e/solid-start/basic/src/utils/users.tsx @@ -4,7 +4,6 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 +const PORT = process.env.VITE_SERVER_PORT || 3000 export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/basic/src/vite-env.d.ts b/e2e/solid-start/basic/src/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/basic/src/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/basic/vite.config.ts b/e2e/solid-start/basic/vite.config.ts new file mode 100644 index 0000000000..3af67d62ad --- /dev/null +++ b/e2e/solid-start/basic/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({}), + ], +}) diff --git a/e2e/solid-start/scroll-restoration/.gitignore b/e2e/solid-start/scroll-restoration/.gitignore index be342025da..a79d5cf129 100644 --- a/e2e/solid-start/scroll-restoration/.gitignore +++ b/e2e/solid-start/scroll-restoration/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/solid-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/e2e/solid-start/scroll-restoration/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/scroll-restoration/app.config.ts b/e2e/solid-start/scroll-restoration/app.config.ts deleted file mode 100644 index 2a06e3d3f0..0000000000 --- a/e2e/solid-start/scroll-restoration/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json index 81fce6eaea..e42cb920ab 100644 --- a/e2e/solid-start/scroll-restoration/package.json +++ b/e2e/solid-start/scroll-restoration/package.json @@ -4,10 +4,10 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -18,7 +18,6 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/solid-start/scroll-restoration/playwright.config.ts b/e2e/solid-start/scroll-restoration/playwright.config.ts index 95d043d48b..e834d88cf4 100644 --- a/e2e/solid-start/scroll-restoration/playwright.config.ts +++ b/e2e/solid-start/scroll-restoration/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/scroll-restoration/src/api.ts b/e2e/solid-start/scroll-restoration/src/api.ts deleted file mode 100644 index ed511bcd26..0000000000 --- a/e2e/solid-start/scroll-restoration/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/solid-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/solid-start/scroll-restoration/src/client.tsx b/e2e/solid-start/scroll-restoration/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/e2e/solid-start/scroll-restoration/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/e2e/solid-start/scroll-restoration/src/routeTree.gen.ts b/e2e/solid-start/scroll-restoration/src/routeTree.gen.ts index d5cbca5b25..36562a9510 100644 --- a/e2e/solid-start/scroll-restoration/src/routeTree.gen.ts +++ b/e2e/solid-start/scroll-restoration/src/routeTree.gen.ts @@ -8,35 +8,37 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as testsWithSearchImport } from './routes/(tests)/with-search' -import { Route as testsWithLoaderImport } from './routes/(tests)/with-loader' -import { Route as testsNormalPageImport } from './routes/(tests)/normal-page' +import { Route as IndexRouteImport } from './routes/index' +import { Route as testsWithSearchRouteImport } from './routes/(tests)/with-search' +import { Route as testsWithLoaderRouteImport } from './routes/(tests)/with-loader' +import { Route as testsNormalPageRouteImport } from './routes/(tests)/normal-page' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const testsWithSearchRoute = testsWithSearchImport.update({ +const testsWithSearchRoute = testsWithSearchRouteImport.update({ id: '/(tests)/with-search', path: '/with-search', getParentRoute: () => rootRoute, } as any) -const testsWithLoaderRoute = testsWithLoaderImport.update({ +const testsWithLoaderRoute = testsWithLoaderRouteImport.update({ id: '/(tests)/with-loader', path: '/with-loader', getParentRoute: () => rootRoute, } as any) -const testsNormalPageRoute = testsNormalPageImport.update({ +const testsNormalPageRoute = testsNormalPageRouteImport.update({ id: '/(tests)/normal-page', path: '/normal-page', getParentRoute: () => rootRoute, @@ -50,33 +52,72 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/(tests)/normal-page': { id: '/(tests)/normal-page' path: '/normal-page' fullPath: '/normal-page' - preLoaderRoute: typeof testsNormalPageImport + preLoaderRoute: typeof testsNormalPageRouteImport parentRoute: typeof rootRoute } '/(tests)/with-loader': { id: '/(tests)/with-loader' path: '/with-loader' fullPath: '/with-loader' - preLoaderRoute: typeof testsWithLoaderImport + preLoaderRoute: typeof testsWithLoaderRouteImport parentRoute: typeof rootRoute } '/(tests)/with-search': { id: '/(tests)/with-search' path: '/with-search' fullPath: '/with-search' - preLoaderRoute: typeof testsWithSearchImport + preLoaderRoute: typeof testsWithSearchRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/(tests)/normal-page' { + const createFileRoute: CreateFileRoute< + '/(tests)/normal-page', + FileRoutesByPath['/(tests)/normal-page']['parentRoute'], + FileRoutesByPath['/(tests)/normal-page']['id'], + FileRoutesByPath['/(tests)/normal-page']['path'], + FileRoutesByPath['/(tests)/normal-page']['fullPath'] + > +} +declare module './routes/(tests)/with-loader' { + const createFileRoute: CreateFileRoute< + '/(tests)/with-loader', + FileRoutesByPath['/(tests)/with-loader']['parentRoute'], + FileRoutesByPath['/(tests)/with-loader']['id'], + FileRoutesByPath['/(tests)/with-loader']['path'], + FileRoutesByPath['/(tests)/with-loader']['fullPath'] + > +} +declare module './routes/(tests)/with-search' { + const createFileRoute: CreateFileRoute< + '/(tests)/with-search', + FileRoutesByPath['/(tests)/with-search']['parentRoute'], + FileRoutesByPath['/(tests)/with-search']['id'], + FileRoutesByPath['/(tests)/with-search']['path'], + FileRoutesByPath['/(tests)/with-search']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/solid-start/scroll-restoration/src/routes/(tests)/normal-page.tsx b/e2e/solid-start/scroll-restoration/src/routes/(tests)/normal-page.tsx index 76d32719ef..b58a556b4f 100644 --- a/e2e/solid-start/scroll-restoration/src/routes/(tests)/normal-page.tsx +++ b/e2e/solid-start/scroll-restoration/src/routes/(tests)/normal-page.tsx @@ -1,8 +1,8 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' + import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/normal-page')({ +export const Route = createFileRoute({ component: Component, }) diff --git a/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-loader.tsx b/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-loader.tsx index aae7611b51..212ea0457f 100644 --- a/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-loader.tsx +++ b/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-loader.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/solid-router' +import { sleep } from 'src/utils/posts' import { ScrollBlock } from '../-components/scroll-block' -import { sleep } from '~/utils/posts' -export const Route = createFileRoute('/(tests)/with-loader')({ +export const Route = createFileRoute({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-search.tsx b/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-search.tsx index 5d43b7f9bb..073dd2501c 100644 --- a/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-search.tsx +++ b/e2e/solid-start/scroll-restoration/src/routes/(tests)/with-search.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute('/(tests)/with-search')({ +export const Route = createFileRoute({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/solid-start/scroll-restoration/src/routes/__root.tsx b/e2e/solid-start/scroll-restoration/src/routes/__root.tsx index 5907fa6ecd..4af70096a1 100644 --- a/e2e/solid-start/scroll-restoration/src/routes/__root.tsx +++ b/e2e/solid-start/scroll-restoration/src/routes/__root.tsx @@ -1,18 +1,14 @@ -import * as Solid from 'solid-js' import { Link, Outlet, createRootRoute, linkOptions, - HeadContent, - Scripts, } from '@tanstack/solid-router' -import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { Dynamic } from 'solid-js/web' +import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo' -import { Dynamic } from 'solid-js/web' -import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' export const Route = createRootRoute({ head: () => ({ diff --git a/e2e/solid-start/scroll-restoration/src/routes/index.tsx b/e2e/solid-start/scroll-restoration/src/routes/index.tsx index e950ce86c9..15c0376e3d 100644 --- a/e2e/solid-start/scroll-restoration/src/routes/index.tsx +++ b/e2e/solid-start/scroll-restoration/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as Solid from 'solid-js' -import { Link, createFileRoute, linkOptions } from '@tanstack/solid-router' +import { Link, linkOptions } from '@tanstack/solid-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/e2e/solid-start/scroll-restoration/src/ssr.tsx b/e2e/solid-start/scroll-restoration/src/ssr.tsx deleted file mode 100644 index 6d10bea05f..0000000000 --- a/e2e/solid-start/scroll-restoration/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts b/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/scroll-restoration/src/utils/users.tsx b/e2e/solid-start/scroll-restoration/src/utils/users.tsx index 79b45867d5..46be4b1580 100644 --- a/e2e/solid-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/solid-start/scroll-restoration/src/utils/users.tsx @@ -4,7 +4,6 @@ export type User = { email: string } -const PORT = - import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 +const PORT = process.env.VITE_SERVER_PORT || 3000 export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/scroll-restoration/src/vite-env.d.ts b/e2e/solid-start/scroll-restoration/src/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/scroll-restoration/src/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/scroll-restoration/vite.config.ts b/e2e/solid-start/scroll-restoration/vite.config.ts new file mode 100644 index 0000000000..3af67d62ad --- /dev/null +++ b/e2e/solid-start/scroll-restoration/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({}), + ], +}) diff --git a/e2e/solid-start/server-functions/.gitignore b/e2e/solid-start/server-functions/.gitignore index be342025da..a79d5cf129 100644 --- a/e2e/solid-start/server-functions/.gitignore +++ b/e2e/solid-start/server-functions/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/solid-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/e2e/solid-start/server-functions/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/server-functions/app.config.ts b/e2e/solid-start/server-functions/app.config.ts deleted file mode 100644 index 2a06e3d3f0..0000000000 --- a/e2e/solid-start/server-functions/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json index cdb85c86ae..dc7d00752b 100644 --- a/e2e/solid-start/server-functions/package.json +++ b/e2e/solid-start/server-functions/package.json @@ -4,10 +4,10 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -18,7 +18,6 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/solid-start/server-functions/playwright.config.ts b/e2e/solid-start/server-functions/playwright.config.ts index 409765549f..afe39a46b1 100644 --- a/e2e/solid-start/server-functions/playwright.config.ts +++ b/e2e/solid-start/server-functions/playwright.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/server-functions/src/client.tsx b/e2e/solid-start/server-functions/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/e2e/solid-start/server-functions/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/e2e/solid-start/server-functions/src/routeTree.gen.ts b/e2e/solid-start/server-functions/src/routeTree.gen.ts index 4a34fccd1c..eb73211d02 100644 --- a/e2e/solid-start/server-functions/src/routeTree.gen.ts +++ b/e2e/solid-start/server-functions/src/routeTree.gen.ts @@ -8,112 +8,114 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as SubmitPostFormdataImport } from './routes/submit-post-formdata' -import { Route as StatusImport } from './routes/status' -import { Route as SerializeFormDataImport } from './routes/serialize-form-data' -import { Route as ReturnNullImport } from './routes/return-null' -import { Route as RawResponseImport } from './routes/raw-response' -import { Route as MultipartImport } from './routes/multipart' -import { Route as IsomorphicFnsImport } from './routes/isomorphic-fns' -import { Route as HeadersImport } from './routes/headers' -import { Route as EnvOnlyImport } from './routes/env-only' -import { Route as DeadCodePreserveImport } from './routes/dead-code-preserve' -import { Route as ConsistentImport } from './routes/consistent' -import { Route as AbortSignalImport } from './routes/abort-signal' -import { Route as IndexImport } from './routes/index' -import { Route as CookiesIndexImport } from './routes/cookies/index' -import { Route as CookiesSetImport } from './routes/cookies/set' +import { Route as SubmitPostFormdataRouteImport } from './routes/submit-post-formdata' +import { Route as StatusRouteImport } from './routes/status' +import { Route as SerializeFormDataRouteImport } from './routes/serialize-form-data' +import { Route as ReturnNullRouteImport } from './routes/return-null' +import { Route as RawResponseRouteImport } from './routes/raw-response' +import { Route as MultipartRouteImport } from './routes/multipart' +import { Route as IsomorphicFnsRouteImport } from './routes/isomorphic-fns' +import { Route as HeadersRouteImport } from './routes/headers' +import { Route as EnvOnlyRouteImport } from './routes/env-only' +import { Route as DeadCodePreserveRouteImport } from './routes/dead-code-preserve' +import { Route as ConsistentRouteImport } from './routes/consistent' +import { Route as AbortSignalRouteImport } from './routes/abort-signal' +import { Route as IndexRouteImport } from './routes/index' +import { Route as CookiesIndexRouteImport } from './routes/cookies/index' +import { Route as CookiesSetRouteImport } from './routes/cookies/set' // Create/Update Routes -const SubmitPostFormdataRoute = SubmitPostFormdataImport.update({ +const SubmitPostFormdataRoute = SubmitPostFormdataRouteImport.update({ id: '/submit-post-formdata', path: '/submit-post-formdata', getParentRoute: () => rootRoute, } as any) -const StatusRoute = StatusImport.update({ +const StatusRoute = StatusRouteImport.update({ id: '/status', path: '/status', getParentRoute: () => rootRoute, } as any) -const SerializeFormDataRoute = SerializeFormDataImport.update({ +const SerializeFormDataRoute = SerializeFormDataRouteImport.update({ id: '/serialize-form-data', path: '/serialize-form-data', getParentRoute: () => rootRoute, } as any) -const ReturnNullRoute = ReturnNullImport.update({ +const ReturnNullRoute = ReturnNullRouteImport.update({ id: '/return-null', path: '/return-null', getParentRoute: () => rootRoute, } as any) -const RawResponseRoute = RawResponseImport.update({ +const RawResponseRoute = RawResponseRouteImport.update({ id: '/raw-response', path: '/raw-response', getParentRoute: () => rootRoute, } as any) -const MultipartRoute = MultipartImport.update({ +const MultipartRoute = MultipartRouteImport.update({ id: '/multipart', path: '/multipart', getParentRoute: () => rootRoute, } as any) -const IsomorphicFnsRoute = IsomorphicFnsImport.update({ +const IsomorphicFnsRoute = IsomorphicFnsRouteImport.update({ id: '/isomorphic-fns', path: '/isomorphic-fns', getParentRoute: () => rootRoute, } as any) -const HeadersRoute = HeadersImport.update({ +const HeadersRoute = HeadersRouteImport.update({ id: '/headers', path: '/headers', getParentRoute: () => rootRoute, } as any) -const EnvOnlyRoute = EnvOnlyImport.update({ +const EnvOnlyRoute = EnvOnlyRouteImport.update({ id: '/env-only', path: '/env-only', getParentRoute: () => rootRoute, } as any) -const DeadCodePreserveRoute = DeadCodePreserveImport.update({ +const DeadCodePreserveRoute = DeadCodePreserveRouteImport.update({ id: '/dead-code-preserve', path: '/dead-code-preserve', getParentRoute: () => rootRoute, } as any) -const ConsistentRoute = ConsistentImport.update({ +const ConsistentRoute = ConsistentRouteImport.update({ id: '/consistent', path: '/consistent', getParentRoute: () => rootRoute, } as any) -const AbortSignalRoute = AbortSignalImport.update({ +const AbortSignalRoute = AbortSignalRouteImport.update({ id: '/abort-signal', path: '/abort-signal', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const CookiesIndexRoute = CookiesIndexImport.update({ +const CookiesIndexRoute = CookiesIndexRouteImport.update({ id: '/cookies/', path: '/cookies/', getParentRoute: () => rootRoute, } as any) -const CookiesSetRoute = CookiesSetImport.update({ +const CookiesSetRoute = CookiesSetRouteImport.update({ id: '/cookies/set', path: '/cookies/set', getParentRoute: () => rootRoute, @@ -127,110 +129,248 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/abort-signal': { id: '/abort-signal' path: '/abort-signal' fullPath: '/abort-signal' - preLoaderRoute: typeof AbortSignalImport + preLoaderRoute: typeof AbortSignalRouteImport parentRoute: typeof rootRoute } '/consistent': { id: '/consistent' path: '/consistent' fullPath: '/consistent' - preLoaderRoute: typeof ConsistentImport + preLoaderRoute: typeof ConsistentRouteImport parentRoute: typeof rootRoute } '/dead-code-preserve': { id: '/dead-code-preserve' path: '/dead-code-preserve' fullPath: '/dead-code-preserve' - preLoaderRoute: typeof DeadCodePreserveImport + preLoaderRoute: typeof DeadCodePreserveRouteImport parentRoute: typeof rootRoute } '/env-only': { id: '/env-only' path: '/env-only' fullPath: '/env-only' - preLoaderRoute: typeof EnvOnlyImport + preLoaderRoute: typeof EnvOnlyRouteImport parentRoute: typeof rootRoute } '/headers': { id: '/headers' path: '/headers' fullPath: '/headers' - preLoaderRoute: typeof HeadersImport + preLoaderRoute: typeof HeadersRouteImport parentRoute: typeof rootRoute } '/isomorphic-fns': { id: '/isomorphic-fns' path: '/isomorphic-fns' fullPath: '/isomorphic-fns' - preLoaderRoute: typeof IsomorphicFnsImport + preLoaderRoute: typeof IsomorphicFnsRouteImport parentRoute: typeof rootRoute } '/multipart': { id: '/multipart' path: '/multipart' fullPath: '/multipart' - preLoaderRoute: typeof MultipartImport + preLoaderRoute: typeof MultipartRouteImport parentRoute: typeof rootRoute } '/raw-response': { id: '/raw-response' path: '/raw-response' fullPath: '/raw-response' - preLoaderRoute: typeof RawResponseImport + preLoaderRoute: typeof RawResponseRouteImport parentRoute: typeof rootRoute } '/return-null': { id: '/return-null' path: '/return-null' fullPath: '/return-null' - preLoaderRoute: typeof ReturnNullImport + preLoaderRoute: typeof ReturnNullRouteImport parentRoute: typeof rootRoute } '/serialize-form-data': { id: '/serialize-form-data' path: '/serialize-form-data' fullPath: '/serialize-form-data' - preLoaderRoute: typeof SerializeFormDataImport + preLoaderRoute: typeof SerializeFormDataRouteImport parentRoute: typeof rootRoute } '/status': { id: '/status' path: '/status' fullPath: '/status' - preLoaderRoute: typeof StatusImport + preLoaderRoute: typeof StatusRouteImport parentRoute: typeof rootRoute } '/submit-post-formdata': { id: '/submit-post-formdata' path: '/submit-post-formdata' fullPath: '/submit-post-formdata' - preLoaderRoute: typeof SubmitPostFormdataImport + preLoaderRoute: typeof SubmitPostFormdataRouteImport parentRoute: typeof rootRoute } '/cookies/set': { id: '/cookies/set' path: '/cookies/set' fullPath: '/cookies/set' - preLoaderRoute: typeof CookiesSetImport + preLoaderRoute: typeof CookiesSetRouteImport parentRoute: typeof rootRoute } '/cookies/': { id: '/cookies/' path: '/cookies' fullPath: '/cookies' - preLoaderRoute: typeof CookiesIndexImport + preLoaderRoute: typeof CookiesIndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/abort-signal' { + const createFileRoute: CreateFileRoute< + '/abort-signal', + FileRoutesByPath['/abort-signal']['parentRoute'], + FileRoutesByPath['/abort-signal']['id'], + FileRoutesByPath['/abort-signal']['path'], + FileRoutesByPath['/abort-signal']['fullPath'] + > +} +declare module './routes/consistent' { + const createFileRoute: CreateFileRoute< + '/consistent', + FileRoutesByPath['/consistent']['parentRoute'], + FileRoutesByPath['/consistent']['id'], + FileRoutesByPath['/consistent']['path'], + FileRoutesByPath['/consistent']['fullPath'] + > +} +declare module './routes/dead-code-preserve' { + const createFileRoute: CreateFileRoute< + '/dead-code-preserve', + FileRoutesByPath['/dead-code-preserve']['parentRoute'], + FileRoutesByPath['/dead-code-preserve']['id'], + FileRoutesByPath['/dead-code-preserve']['path'], + FileRoutesByPath['/dead-code-preserve']['fullPath'] + > +} +declare module './routes/env-only' { + const createFileRoute: CreateFileRoute< + '/env-only', + FileRoutesByPath['/env-only']['parentRoute'], + FileRoutesByPath['/env-only']['id'], + FileRoutesByPath['/env-only']['path'], + FileRoutesByPath['/env-only']['fullPath'] + > +} +declare module './routes/headers' { + const createFileRoute: CreateFileRoute< + '/headers', + FileRoutesByPath['/headers']['parentRoute'], + FileRoutesByPath['/headers']['id'], + FileRoutesByPath['/headers']['path'], + FileRoutesByPath['/headers']['fullPath'] + > +} +declare module './routes/isomorphic-fns' { + const createFileRoute: CreateFileRoute< + '/isomorphic-fns', + FileRoutesByPath['/isomorphic-fns']['parentRoute'], + FileRoutesByPath['/isomorphic-fns']['id'], + FileRoutesByPath['/isomorphic-fns']['path'], + FileRoutesByPath['/isomorphic-fns']['fullPath'] + > +} +declare module './routes/multipart' { + const createFileRoute: CreateFileRoute< + '/multipart', + FileRoutesByPath['/multipart']['parentRoute'], + FileRoutesByPath['/multipart']['id'], + FileRoutesByPath['/multipart']['path'], + FileRoutesByPath['/multipart']['fullPath'] + > +} +declare module './routes/raw-response' { + const createFileRoute: CreateFileRoute< + '/raw-response', + FileRoutesByPath['/raw-response']['parentRoute'], + FileRoutesByPath['/raw-response']['id'], + FileRoutesByPath['/raw-response']['path'], + FileRoutesByPath['/raw-response']['fullPath'] + > +} +declare module './routes/return-null' { + const createFileRoute: CreateFileRoute< + '/return-null', + FileRoutesByPath['/return-null']['parentRoute'], + FileRoutesByPath['/return-null']['id'], + FileRoutesByPath['/return-null']['path'], + FileRoutesByPath['/return-null']['fullPath'] + > +} +declare module './routes/serialize-form-data' { + const createFileRoute: CreateFileRoute< + '/serialize-form-data', + FileRoutesByPath['/serialize-form-data']['parentRoute'], + FileRoutesByPath['/serialize-form-data']['id'], + FileRoutesByPath['/serialize-form-data']['path'], + FileRoutesByPath['/serialize-form-data']['fullPath'] + > +} +declare module './routes/status' { + const createFileRoute: CreateFileRoute< + '/status', + FileRoutesByPath['/status']['parentRoute'], + FileRoutesByPath['/status']['id'], + FileRoutesByPath['/status']['path'], + FileRoutesByPath['/status']['fullPath'] + > +} +declare module './routes/submit-post-formdata' { + const createFileRoute: CreateFileRoute< + '/submit-post-formdata', + FileRoutesByPath['/submit-post-formdata']['parentRoute'], + FileRoutesByPath['/submit-post-formdata']['id'], + FileRoutesByPath['/submit-post-formdata']['path'], + FileRoutesByPath['/submit-post-formdata']['fullPath'] + > +} +declare module './routes/cookies/set' { + const createFileRoute: CreateFileRoute< + '/cookies/set', + FileRoutesByPath['/cookies/set']['parentRoute'], + FileRoutesByPath['/cookies/set']['id'], + FileRoutesByPath['/cookies/set']['path'], + FileRoutesByPath['/cookies/set']['fullPath'] + > +} +declare module './routes/cookies/index' { + const createFileRoute: CreateFileRoute< + '/cookies/', + FileRoutesByPath['/cookies/']['parentRoute'], + FileRoutesByPath['/cookies/']['id'], + FileRoutesByPath['/cookies/']['path'], + FileRoutesByPath['/cookies/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/solid-start/server-functions/src/routes/__root.tsx b/e2e/solid-start/server-functions/src/routes/__root.tsx index 52d64bf7a7..c1855d436a 100644 --- a/e2e/solid-start/server-functions/src/routes/__root.tsx +++ b/e2e/solid-start/server-functions/src/routes/__root.tsx @@ -1,9 +1,8 @@ import { Outlet, createRootRoute } from '@tanstack/solid-router' -import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' -import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' export const Route = createRootRoute({ head: () => ({ diff --git a/e2e/solid-start/server-functions/src/routes/abort-signal.tsx b/e2e/solid-start/server-functions/src/routes/abort-signal.tsx index 752346264e..16aa9bc5b5 100644 --- a/e2e/solid-start/server-functions/src/routes/abort-signal.tsx +++ b/e2e/solid-start/server-functions/src/routes/abort-signal.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import * as Solid from 'solid-js' -export const Route = createFileRoute('/abort-signal')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/consistent.tsx b/e2e/solid-start/server-functions/src/routes/consistent.tsx index 9e4c1b3b08..190c64c0f7 100644 --- a/e2e/solid-start/server-functions/src/routes/consistent.tsx +++ b/e2e/solid-start/server-functions/src/routes/consistent.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { createServerFn } from '@tanstack/solid-start' @@ -10,7 +9,7 @@ import { createServerFn } from '@tanstack/solid-start' * @link https://github.com/TanStack/router/issues/2481 */ -export const Route = createFileRoute('/consistent')({ +export const Route = createFileRoute({ component: ConsistentServerFnCalls, loader: async () => { const data = await cons_serverGetFn1({ data: { username: 'TEST' } }) diff --git a/e2e/solid-start/server-functions/src/routes/cookies/index.tsx b/e2e/solid-start/server-functions/src/routes/cookies/index.tsx index 5cccd18057..13cfd9cbc1 100644 --- a/e2e/solid-start/server-functions/src/routes/cookies/index.tsx +++ b/e2e/solid-start/server-functions/src/routes/cookies/index.tsx @@ -1,10 +1,10 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' import { z } from 'zod' const cookieSchema = z .object({ value: z.string() }) .catch(() => ({ value: `CLIENT-${Date.now()}` })) -export const Route = createFileRoute('/cookies/')({ +export const Route = createFileRoute({ validateSearch: cookieSchema, component: RouteComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/cookies/set.tsx b/e2e/solid-start/server-functions/src/routes/cookies/set.tsx index 32e06725cf..0814829dc4 100644 --- a/e2e/solid-start/server-functions/src/routes/cookies/set.tsx +++ b/e2e/solid-start/server-functions/src/routes/cookies/set.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import { setCookie } from '@tanstack/solid-start/server' import { z } from 'zod' @@ -7,7 +6,7 @@ import * as Solid from 'solid-js' const cookieSchema = z.object({ value: z.string() }) -export const Route = createFileRoute('/cookies/set')({ +export const Route = createFileRoute({ validateSearch: cookieSchema, loaderDeps: ({ search }) => search, loader: async ({ deps }) => { diff --git a/e2e/solid-start/server-functions/src/routes/dead-code-preserve.tsx b/e2e/solid-start/server-functions/src/routes/dead-code-preserve.tsx index 96d7a3ca13..ebf26bfba9 100644 --- a/e2e/solid-start/server-functions/src/routes/dead-code-preserve.tsx +++ b/e2e/solid-start/server-functions/src/routes/dead-code-preserve.tsx @@ -2,9 +2,9 @@ import * as fs from 'node:fs' import { createServerFn } from '@tanstack/solid-start' import { getRequestHeader } from '@tanstack/solid-start/server' import { createSignal } from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' +import {} from '@tanstack/solid-router' -export const Route = createFileRoute('/dead-code-preserve')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/env-only.tsx b/e2e/solid-start/server-functions/src/routes/env-only.tsx index df8f08eed2..d888d20c80 100644 --- a/e2e/solid-start/server-functions/src/routes/env-only.tsx +++ b/e2e/solid-start/server-functions/src/routes/env-only.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import { clientOnly, createServerFn, serverOnly } from '@tanstack/solid-start' import { createSignal } from 'solid-js' @@ -18,7 +17,7 @@ const testOnServer = createServerFn().handler(() => { return { serverOnServer, clientOnServer } }) -export const Route = createFileRoute('/env-only')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/headers.tsx b/e2e/solid-start/server-functions/src/routes/headers.tsx index 94ef5a05c1..2f3acacdbc 100644 --- a/e2e/solid-start/server-functions/src/routes/headers.tsx +++ b/e2e/solid-start/server-functions/src/routes/headers.tsx @@ -1,10 +1,9 @@ -import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { createServerFn } from '@tanstack/solid-start' import { getHeaders, setHeader } from '@tanstack/solid-start/server' import type { HTTPHeaderName } from '@tanstack/solid-start/server' -export const Route = createFileRoute('/headers')({ +export const Route = createFileRoute({ loader: async () => { return { testHeaders: await getTestHeaders(), @@ -36,7 +35,7 @@ function ResponseHeaders({ initialTestHeaders: TestHeadersResult }) { const [testHeadersResult, setTestHeadersResult] = - Solid.createSignal(initialTestHeaders) + Solid.createSignal(null) return (
@@ -58,10 +57,18 @@ function ResponseHeaders({
-

Headers:

- 
-          {JSON.stringify(testHeadersResult().headers, null, 2)}
+        
Initial Headers:

+        
+          {JSON.stringify(initialTestHeaders.headers, null, 2)}
         

+        {testHeadersResult() && (
+          <>
+            
Updated Headers:

+            
+              {JSON.stringify(testHeadersResult()?.headers, null, 2)}
+            

+          
+        )}
) diff --git a/e2e/solid-start/server-functions/src/routes/index.tsx b/e2e/solid-start/server-functions/src/routes/index.tsx index bf28fb8b00..443c52a21c 100644 --- a/e2e/solid-start/server-functions/src/routes/index.tsx +++ b/e2e/solid-start/server-functions/src/routes/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-start/server-functions/src/routes/isomorphic-fns.tsx b/e2e/solid-start/server-functions/src/routes/isomorphic-fns.tsx index 3327b38af7..b01aeb9217 100644 --- a/e2e/solid-start/server-functions/src/routes/isomorphic-fns.tsx +++ b/e2e/solid-start/server-functions/src/routes/isomorphic-fns.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createIsomorphicFn, createServerFn } from '@tanstack/solid-start' import { createSignal } from 'solid-js' @@ -16,7 +15,7 @@ const getServerEcho = createServerFn() .validator((input: string) => input) .handler(({ data }) => getEcho(data)) -export const Route = createFileRoute('/isomorphic-fns')({ +export const Route = createFileRoute({ component: RouteComponent, loader() { return { diff --git a/e2e/solid-start/server-functions/src/routes/multipart.tsx b/e2e/solid-start/server-functions/src/routes/multipart.tsx index 5e959da7ae..5ddb9aa6b5 100644 --- a/e2e/solid-start/server-functions/src/routes/multipart.tsx +++ b/e2e/solid-start/server-functions/src/routes/multipart.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { createServerFn } from '@tanstack/solid-start' -export const Route = createFileRoute('/multipart')({ +export const Route = createFileRoute({ component: MultipartServerFnCall, }) diff --git a/e2e/solid-start/server-functions/src/routes/raw-response.tsx b/e2e/solid-start/server-functions/src/routes/raw-response.tsx index d0ff217944..75a605c50b 100644 --- a/e2e/solid-start/server-functions/src/routes/raw-response.tsx +++ b/e2e/solid-start/server-functions/src/routes/raw-response.tsx @@ -1,8 +1,8 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' + import { createServerFn } from '@tanstack/solid-start' -export const Route = createFileRoute('/raw-response')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/return-null.tsx b/e2e/solid-start/server-functions/src/routes/return-null.tsx index 2e789d2eef..319b8ba32a 100644 --- a/e2e/solid-start/server-functions/src/routes/return-null.tsx +++ b/e2e/solid-start/server-functions/src/routes/return-null.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import * as Solid from 'solid-js' @@ -8,7 +7,7 @@ import * as Solid from 'solid-js' * @link https://github.com/TanStack/router/issues/2776 */ -export const Route = createFileRoute('/return-null')({ +export const Route = createFileRoute({ component: AllowServerFnReturnNull, }) diff --git a/e2e/solid-start/server-functions/src/routes/serialize-form-data.tsx b/e2e/solid-start/server-functions/src/routes/serialize-form-data.tsx index 487d91e86d..d60b4072cf 100644 --- a/e2e/solid-start/server-functions/src/routes/serialize-form-data.tsx +++ b/e2e/solid-start/server-functions/src/routes/serialize-form-data.tsx @@ -1,5 +1,5 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' + import { createServerFn } from '@tanstack/solid-start' const testValues = { @@ -79,6 +79,6 @@ export function SerializeFormDataFnCall() { ) } -export const Route = createFileRoute('/serialize-form-data')({ +export const Route = createFileRoute({ component: SerializeFormDataFnCall, }) diff --git a/e2e/solid-start/server-functions/src/routes/status.tsx b/e2e/solid-start/server-functions/src/routes/status.tsx index 22b45bb28f..867bdd6927 100644 --- a/e2e/solid-start/server-functions/src/routes/status.tsx +++ b/e2e/solid-start/server-functions/src/routes/status.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createServerFn, useServerFn } from '@tanstack/solid-start' import { setResponseStatus } from '@tanstack/solid-start/server' @@ -9,7 +8,7 @@ const helloFn = createServerFn().handler(() => { } }) -export const Route = createFileRoute('/status')({ +export const Route = createFileRoute({ component: StatusComponent, }) diff --git a/e2e/solid-start/server-functions/src/routes/submit-post-formdata.tsx b/e2e/solid-start/server-functions/src/routes/submit-post-formdata.tsx index 3fb6ea356f..8b881645bb 100644 --- a/e2e/solid-start/server-functions/src/routes/submit-post-formdata.tsx +++ b/e2e/solid-start/server-functions/src/routes/submit-post-formdata.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -export const Route = createFileRoute('/submit-post-formdata')({ +export const Route = createFileRoute({ component: SubmitPostFormDataFn, }) diff --git a/e2e/solid-start/server-functions/src/ssr.tsx b/e2e/solid-start/server-functions/src/ssr.tsx deleted file mode 100644 index 6d10bea05f..0000000000 --- a/e2e/solid-start/server-functions/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/solid-start/server-functions/src/tanstack-start.d.ts b/e2e/solid-start/server-functions/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/solid-start/server-functions/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/server-functions/src/vite-env.d.ts b/e2e/solid-start/server-functions/src/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/server-functions/src/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/server-functions/tests/server-functions.spec.ts b/e2e/solid-start/server-functions/tests/server-functions.spec.ts index 56d6608077..80c89004c5 100644 --- a/e2e/solid-start/server-functions/tests/server-functions.spec.ts +++ b/e2e/solid-start/server-functions/tests/server-functions.spec.ts @@ -179,44 +179,24 @@ test('server function can correctly send and receive headers', async ({ await page.goto('/headers') await page.waitForLoadState('networkidle') - // console.log(await page.getByTestId('test-headers-result').textContent()) - await expect(page.getByTestId('test-headers-result')).toContainText(`{ - "accept": "application/json", - "accept-encoding": "gzip, deflate, br, zstd", - "accept-language": "en-US", - "connection": "keep-alive", - "content-type": "application/json", - "host": "localhost:${PORT}", - "sec-ch-ua": "\\"Chromium\\";v=\\"136\\", \\"HeadlessChrome\\";v=\\"136\\", \\"Not.A/Brand\\";v=\\"99\\"", - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-platform": "\\"Windows\\"", - "sec-fetch-dest": "document", - "sec-fetch-mode": "navigate", - "sec-fetch-site": "none", - "sec-fetch-user": "?1", - "upgrade-insecure-requests": "1", - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.7103.25 Safari/537.36" -}`) + let headers = JSON.parse( + await page.getByTestId('initial-headers-result').innerText(), + ) + expect(headers['host']).toBe(`localhost:${PORT}`) + expect(headers['user-agent']).toContain('Mozilla/5.0') + expect(headers['sec-fetch-mode']).toBe('navigate') await page.getByTestId('test-headers-btn').click() - await page.waitForLoadState('networkidle') + await page.waitForSelector('[data-testid="updated-headers-result"]') + + headers = JSON.parse( + await page.getByTestId('updated-headers-result').innerText(), + ) - await expect(page.getByTestId('test-headers-result')).toContainText(`{ - "host": "localhost:${PORT}", - "connection": "keep-alive", - "sec-ch-ua-platform": "\\"Windows\\"", - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.7103.25 Safari/537.36", - "accept": "application/json", - "sec-ch-ua": "\\"Chromium\\";v=\\"136\\", \\"HeadlessChrome\\";v=\\"136\\", \\"Not.A/Brand\\";v=\\"99\\"", - "content-type": "application/json", - "sec-ch-ua-mobile": "?0", - "accept-language": "en-US", - "sec-fetch-site": "same-origin", - "sec-fetch-mode": "cors", - "sec-fetch-dest": "empty", - "referer": "http://localhost:${PORT}/headers", - "accept-encoding": "gzip, deflate, br, zstd" -}`) + expect(headers['host']).toBe(`localhost:${PORT}`) + expect(headers['user-agent']).toContain('Mozilla/5.0') + expect(headers['sec-fetch-mode']).toBe('cors') + expect(headers['referer']).toBe(`http://localhost:${PORT}/headers`) }) test('Direct POST submitting FormData to a Server function returns the correct message', async ({ diff --git a/e2e/solid-start/server-functions/vite.config.ts b/e2e/solid-start/server-functions/vite.config.ts new file mode 100644 index 0000000000..bae1bfaad6 --- /dev/null +++ b/e2e/solid-start/server-functions/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/solid-start/website/.gitignore b/e2e/solid-start/website/.gitignore index be342025da..a79d5cf129 100644 --- a/e2e/solid-start/website/.gitignore +++ b/e2e/solid-start/website/.gitignore @@ -7,13 +7,11 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi # Sentry Config File .env.sentry-build-plugin /test-results/ diff --git a/e2e/solid-start/website/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/website/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/e2e/solid-start/website/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/website/app.config.ts b/e2e/solid-start/website/app.config.ts deleted file mode 100644 index 2a06e3d3f0..0000000000 --- a/e2e/solid-start/website/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json index 1f3a38c036..5b6f4bd55f 100644 --- a/e2e/solid-start/website/package.json +++ b/e2e/solid-start/website/package.json @@ -4,10 +4,10 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev --port 3000", - "dev:e2e": "vinxi dev", - "build": "vinxi build && tsc --noEmit", - "start": "vinxi start", + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", "test:e2e": "playwright test --project=chromium" }, "dependencies": { @@ -17,7 +17,6 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/solid-start/website/playwright.config.ts b/e2e/solid-start/website/playwright.config.ts index bb77d0cf70..e834d88cf4 100644 --- a/e2e/solid-start/website/playwright.config.ts +++ b/e2e/solid-start/website/playwright.config.ts @@ -4,6 +4,7 @@ import packageJson from './package.json' with { type: 'json' } const PORT = derivePort(packageJson.name) const baseURL = `http://localhost:${PORT}` + /** * See https://playwright.dev/docs/test-configuration. */ @@ -19,7 +20,7 @@ export default defineConfig({ }, webServer: { - command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, url: baseURL, reuseExistingServer: !process.env.CI, stdout: 'pipe', diff --git a/e2e/solid-start/website/src/client.tsx b/e2e/solid-start/website/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/e2e/solid-start/website/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/e2e/solid-start/website/src/routeTree.gen.ts b/e2e/solid-start/website/src/routeTree.gen.ts index 32515b924b..e28cb9bd55 100644 --- a/e2e/solid-start/website/src/routeTree.gen.ts +++ b/e2e/solid-start/website/src/routeTree.gen.ts @@ -8,82 +8,83 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LibraryImport } from './routes/_library' -import { Route as LibraryIndexImport } from './routes/_library.index' -import { Route as ProjectIndexImport } from './routes/$project.index' -import { Route as LibraryProjectImport } from './routes/_library.$project' -import { Route as LibraryProjectVersionIndexImport } from './routes/_library.$project.$version.index' -import { Route as ProjectVersionDocsIndexImport } from './routes/$project.$version.docs.index' -import { Route as ProjectVersionDocsFrameworkFrameworkImport } from './routes/$project.$version.docs.framework.$framework' -import { Route as ProjectVersionDocsFrameworkFrameworkIndexImport } from './routes/$project.$version.docs.framework.$framework.index' -import { Route as ProjectVersionDocsFrameworkFrameworkSplatImport } from './routes/$project.$version.docs.framework.$framework.$' -import { Route as ProjectVersionDocsFrameworkFrameworkExamplesSplatImport } from './routes/$project.$version.docs.framework.$framework.examples.$' +import { Route as LibraryRouteImport } from './routes/_library' +import { Route as LibraryIndexRouteImport } from './routes/_library.index' +import { Route as ProjectIndexRouteImport } from './routes/$project.index' +import { Route as LibraryProjectRouteImport } from './routes/_library.$project' +import { Route as LibraryProjectVersionIndexRouteImport } from './routes/_library.$project.$version.index' +import { Route as ProjectVersionDocsIndexRouteImport } from './routes/$project.$version.docs.index' +import { Route as ProjectVersionDocsFrameworkFrameworkRouteImport } from './routes/$project.$version.docs.framework.$framework' +import { Route as ProjectVersionDocsFrameworkFrameworkIndexRouteImport } from './routes/$project.$version.docs.framework.$framework.index' +import { Route as ProjectVersionDocsFrameworkFrameworkSplatRouteImport } from './routes/$project.$version.docs.framework.$framework.$' +import { Route as ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport } from './routes/$project.$version.docs.framework.$framework.examples.$' // Create/Update Routes -const LibraryRoute = LibraryImport.update({ +const LibraryRoute = LibraryRouteImport.update({ id: '/_library', getParentRoute: () => rootRoute, } as any) -const LibraryIndexRoute = LibraryIndexImport.update({ +const LibraryIndexRoute = LibraryIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => LibraryRoute, } as any) -const ProjectIndexRoute = ProjectIndexImport.update({ +const ProjectIndexRoute = ProjectIndexRouteImport.update({ id: '/$project/', path: '/$project/', getParentRoute: () => rootRoute, } as any) -const LibraryProjectRoute = LibraryProjectImport.update({ +const LibraryProjectRoute = LibraryProjectRouteImport.update({ id: '/$project', path: '/$project', getParentRoute: () => LibraryRoute, } as any) -const LibraryProjectVersionIndexRoute = LibraryProjectVersionIndexImport.update( - { +const LibraryProjectVersionIndexRoute = + LibraryProjectVersionIndexRouteImport.update({ id: '/$version/', path: '/$version/', getParentRoute: () => LibraryProjectRoute, - } as any, -) + } as any) -const ProjectVersionDocsIndexRoute = ProjectVersionDocsIndexImport.update({ +const ProjectVersionDocsIndexRoute = ProjectVersionDocsIndexRouteImport.update({ id: '/$project/$version/docs/', path: '/$project/$version/docs/', getParentRoute: () => rootRoute, } as any) const ProjectVersionDocsFrameworkFrameworkRoute = - ProjectVersionDocsFrameworkFrameworkImport.update({ + ProjectVersionDocsFrameworkFrameworkRouteImport.update({ id: '/$project/$version/docs/framework/$framework', path: '/$project/$version/docs/framework/$framework', getParentRoute: () => rootRoute, } as any) const ProjectVersionDocsFrameworkFrameworkIndexRoute = - ProjectVersionDocsFrameworkFrameworkIndexImport.update({ + ProjectVersionDocsFrameworkFrameworkIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, } as any) const ProjectVersionDocsFrameworkFrameworkSplatRoute = - ProjectVersionDocsFrameworkFrameworkSplatImport.update({ + ProjectVersionDocsFrameworkFrameworkSplatRouteImport.update({ id: '/$', path: '/$', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, } as any) const ProjectVersionDocsFrameworkFrameworkExamplesSplatRoute = - ProjectVersionDocsFrameworkFrameworkExamplesSplatImport.update({ + ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport.update({ id: '/examples/$', path: '/examples/$', getParentRoute: () => ProjectVersionDocsFrameworkFrameworkRoute, @@ -97,75 +98,168 @@ declare module '@tanstack/solid-router' { id: '/_library' path: '' fullPath: '' - preLoaderRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryRouteImport parentRoute: typeof rootRoute } '/_library/$project': { id: '/_library/$project' path: '/$project' fullPath: '/$project' - preLoaderRoute: typeof LibraryProjectImport - parentRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryProjectRouteImport + parentRoute: typeof LibraryRouteImport } '/$project/': { id: '/$project/' path: '/$project' fullPath: '/$project' - preLoaderRoute: typeof ProjectIndexImport + preLoaderRoute: typeof ProjectIndexRouteImport parentRoute: typeof rootRoute } '/_library/': { id: '/_library/' path: '/' fullPath: '/' - preLoaderRoute: typeof LibraryIndexImport - parentRoute: typeof LibraryImport + preLoaderRoute: typeof LibraryIndexRouteImport + parentRoute: typeof LibraryRouteImport } '/$project/$version/docs/': { id: '/$project/$version/docs/' path: '/$project/$version/docs' fullPath: '/$project/$version/docs' - preLoaderRoute: typeof ProjectVersionDocsIndexImport + preLoaderRoute: typeof ProjectVersionDocsIndexRouteImport parentRoute: typeof rootRoute } '/_library/$project/$version/': { id: '/_library/$project/$version/' path: '/$version' fullPath: '/$project/$version' - preLoaderRoute: typeof LibraryProjectVersionIndexImport - parentRoute: typeof LibraryProjectImport + preLoaderRoute: typeof LibraryProjectVersionIndexRouteImport + parentRoute: typeof LibraryProjectRouteImport } '/$project/$version/docs/framework/$framework': { id: '/$project/$version/docs/framework/$framework' path: '/$project/$version/docs/framework/$framework' fullPath: '/$project/$version/docs/framework/$framework' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport parentRoute: typeof rootRoute } '/$project/$version/docs/framework/$framework/$': { id: '/$project/$version/docs/framework/$framework/$' path: '/$' fullPath: '/$project/$version/docs/framework/$framework/$' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkSplatImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkSplatRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } '/$project/$version/docs/framework/$framework/': { id: '/$project/$version/docs/framework/$framework/' path: '/' fullPath: '/$project/$version/docs/framework/$framework/' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkIndexImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkIndexRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } '/$project/$version/docs/framework/$framework/examples/$': { id: '/$project/$version/docs/framework/$framework/examples/$' path: '/examples/$' fullPath: '/$project/$version/docs/framework/$framework/examples/$' - preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkExamplesSplatImport - parentRoute: typeof ProjectVersionDocsFrameworkFrameworkImport + preLoaderRoute: typeof ProjectVersionDocsFrameworkFrameworkExamplesSplatRouteImport + parentRoute: typeof ProjectVersionDocsFrameworkFrameworkRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/_library' { + const createFileRoute: CreateFileRoute< + '/_library', + FileRoutesByPath['/_library']['parentRoute'], + FileRoutesByPath['/_library']['id'], + FileRoutesByPath['/_library']['path'], + FileRoutesByPath['/_library']['fullPath'] + > +} +declare module './routes/_library.$project' { + const createFileRoute: CreateFileRoute< + '/_library/$project', + FileRoutesByPath['/_library/$project']['parentRoute'], + FileRoutesByPath['/_library/$project']['id'], + FileRoutesByPath['/_library/$project']['path'], + FileRoutesByPath['/_library/$project']['fullPath'] + > +} +declare module './routes/$project.index' { + const createFileRoute: CreateFileRoute< + '/$project/', + FileRoutesByPath['/$project/']['parentRoute'], + FileRoutesByPath['/$project/']['id'], + FileRoutesByPath['/$project/']['path'], + FileRoutesByPath['/$project/']['fullPath'] + > +} +declare module './routes/_library.index' { + const createFileRoute: CreateFileRoute< + '/_library/', + FileRoutesByPath['/_library/']['parentRoute'], + FileRoutesByPath['/_library/']['id'], + FileRoutesByPath['/_library/']['path'], + FileRoutesByPath['/_library/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.index' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/', + FileRoutesByPath['/$project/$version/docs/']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/']['id'], + FileRoutesByPath['/$project/$version/docs/']['path'], + FileRoutesByPath['/$project/$version/docs/']['fullPath'] + > +} +declare module './routes/_library.$project.$version.index' { + const createFileRoute: CreateFileRoute< + '/_library/$project/$version/', + FileRoutesByPath['/_library/$project/$version/']['parentRoute'], + FileRoutesByPath['/_library/$project/$version/']['id'], + FileRoutesByPath['/_library/$project/$version/']['path'], + FileRoutesByPath['/_library/$project/$version/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework', + FileRoutesByPath['/$project/$version/docs/framework/$framework']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.$' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/$', + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/$']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.index' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/', + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/']['fullPath'] + > +} +declare module './routes/$project.$version.docs.framework.$framework.examples.$' { + const createFileRoute: CreateFileRoute< + '/$project/$version/docs/framework/$framework/examples/$', + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['parentRoute'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['id'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['path'], + FileRoutesByPath['/$project/$version/docs/framework/$framework/examples/$']['fullPath'] + > +} + // Create and export the route tree interface LibraryProjectRouteChildren { diff --git a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx index 1df208a1c4..e5da7812c9 100644 --- a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx +++ b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx @@ -1,12 +1,10 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/solid-router' +import { ErrorComponent } from '@tanstack/solid-router' import type { ErrorComponentProps } from '@tanstack/solid-router' import { NotFound } from '~/components/NotFound' import { getDocument } from '~/server/document' import { capitalize, seo } from '~/utils/seo' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/$', -)({ +export const Route = createFileRoute({ loader: ({ params: { _splat } }) => getDocument({ data: _splat!, diff --git a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx index 53e0c46c1b..378623cd08 100644 --- a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx +++ b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx @@ -1,10 +1,7 @@ -import { createFileRoute } from '@tanstack/solid-router' import { NotFound } from '~/components/NotFound' import { capitalize, seo } from '~/utils/seo' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/examples/$', -)({ +export const Route = createFileRoute({ head: ({ params }) => ({ meta: seo({ title: `${capitalize(params._splat || '')} Example | TanStack ${capitalize(params.project)} ${capitalize(params.framework)}`, diff --git a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx index 3f6e4af4ef..ca9ac68ae3 100644 --- a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx +++ b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.index.tsx @@ -1,9 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework/', -)({ - loader: () => { +export const Route = createFileRoute({ + beforeLoad: () => { throw redirect({ from: '/$project/$version/docs/framework/$framework/', to: '/$project/$version/docs/framework/$framework/$', diff --git a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.tsx b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.tsx index 62d59befae..20ff5eb2c0 100644 --- a/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.tsx +++ b/e2e/solid-start/website/src/routes/$project.$version.docs.framework.$framework.tsx @@ -1,15 +1,8 @@ -import { - Link, - Outlet, - createFileRoute, - useLocation, -} from '@tanstack/solid-router' +import { Link, Outlet, useLocation } from '@tanstack/solid-router' import { getDocumentHeads } from '~/server/document' import { getProject } from '~/server/projects' -export const Route = createFileRoute( - '/$project/$version/docs/framework/$framework', -)({ +export const Route = createFileRoute({ loader: async ({ params: { project } }) => { const library = await getProject({ data: project }) const documents = await getDocumentHeads() diff --git a/e2e/solid-start/website/src/routes/$project.$version.docs.index.tsx b/e2e/solid-start/website/src/routes/$project.$version.docs.index.tsx index ff049e373c..275b1df1cd 100644 --- a/e2e/solid-start/website/src/routes/$project.$version.docs.index.tsx +++ b/e2e/solid-start/website/src/routes/$project.$version.docs.index.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/$project/$version/docs/')({ - loader: () => { +export const Route = createFileRoute({ + beforeLoad: () => { throw redirect({ from: '/$project/$version/docs', to: '/$project/$version/docs/framework/$framework/$', diff --git a/e2e/solid-start/website/src/routes/$project.index.tsx b/e2e/solid-start/website/src/routes/$project.index.tsx index 6e250ac011..ee2400f806 100644 --- a/e2e/solid-start/website/src/routes/$project.index.tsx +++ b/e2e/solid-start/website/src/routes/$project.index.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/$project/')({ +export const Route = createFileRoute({ loader: ({ params }) => { throw redirect({ to: '/$project/$version', diff --git a/e2e/solid-start/website/src/routes/__root.tsx b/e2e/solid-start/website/src/routes/__root.tsx index d33148818f..145a126851 100644 --- a/e2e/solid-start/website/src/routes/__root.tsx +++ b/e2e/solid-start/website/src/routes/__root.tsx @@ -1,8 +1,8 @@ import { Outlet, createRootRoute } from '@tanstack/solid-router' +import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo' -import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' export const Route = createRootRoute({ head: () => ({ diff --git a/e2e/solid-start/website/src/routes/_library.$project.$version.index.tsx b/e2e/solid-start/website/src/routes/_library.$project.$version.index.tsx index 201e85f8e9..847edba780 100644 --- a/e2e/solid-start/website/src/routes/_library.$project.$version.index.tsx +++ b/e2e/solid-start/website/src/routes/_library.$project.$version.index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/_library/$project/$version/')({ +export const Route = createFileRoute({ component: Page, }) @@ -14,7 +14,7 @@ function Page() {

version: {params().version}

- + Get started with our documentation.

diff --git a/e2e/solid-start/website/src/routes/_library.$project.tsx b/e2e/solid-start/website/src/routes/_library.$project.tsx index 6fdcb8e530..c057827d8b 100644 --- a/e2e/solid-start/website/src/routes/_library.$project.tsx +++ b/e2e/solid-start/website/src/routes/_library.$project.tsx @@ -1,8 +1,8 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' import { getProject } from '~/server/projects' import { seo } from '~/utils/seo' -export const Route = createFileRoute('/_library/$project')({ +export const Route = createFileRoute({ loader: ({ params: { project } }) => getProject({ data: project }), head: ({ loaderData }) => ({ meta: seo({ title: `TanStack ${loaderData?.name || 'Project'}` }), diff --git a/e2e/solid-start/website/src/routes/_library.index.tsx b/e2e/solid-start/website/src/routes/_library.index.tsx index 25bf776480..5e5b1c6cd8 100644 --- a/e2e/solid-start/website/src/routes/_library.index.tsx +++ b/e2e/solid-start/website/src/routes/_library.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_library/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/solid-start/website/src/routes/_library.tsx b/e2e/solid-start/website/src/routes/_library.tsx index c25ae5cfe1..17ce91d83b 100644 --- a/e2e/solid-start/website/src/routes/_library.tsx +++ b/e2e/solid-start/website/src/routes/_library.tsx @@ -1,12 +1,7 @@ -import { - Link, - Outlet, - createFileRoute, - useLocation, -} from '@tanstack/solid-router' +import { Link, Outlet, useLocation } from '@tanstack/solid-router' import { getProjects } from '~/server/projects' -export const Route = createFileRoute('/_library')({ +export const Route = createFileRoute({ loader: async () => { const projects = await getProjects() return { diff --git a/e2e/solid-start/website/src/ssr.tsx b/e2e/solid-start/website/src/ssr.tsx deleted file mode 100644 index ebd14c8120..0000000000 --- a/e2e/solid-start/website/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/e2e/solid-start/website/src/tanstack-start.d.ts b/e2e/solid-start/website/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/solid-start/website/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/website/src/vite-env.d.ts b/e2e/solid-start/website/src/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/website/src/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/website/tests/app.spec.ts b/e2e/solid-start/website/tests/app.spec.ts index 7282086ad4..f697b5c417 100644 --- a/e2e/solid-start/website/tests/app.spec.ts +++ b/e2e/solid-start/website/tests/app.spec.ts @@ -17,3 +17,17 @@ test('resolves to the overview docs page', async ({ page }) => { '/router/latest/docs/framework/solid/overview', ) }) + +test('clicking on Documentation link navigates to the overview docs page', async ({ + page, +}) => { + await page.goto('/router') + await page.waitForLoadState('networkidle') + + const documentationLink = page.getByLabel('Documentation') + await documentationLink.click() + await page.waitForLoadState('networkidle') + + const pathname = new URL(page.url()).pathname + expect(pathname).toBe('/router/latest/docs/framework/solid/overview') +}) diff --git a/e2e/solid-start/website/vite.config.ts b/e2e/solid-start/website/vite.config.ts new file mode 100644 index 0000000000..3af67d62ad --- /dev/null +++ b/e2e/solid-start/website/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({}), + ], +}) diff --git a/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts b/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts index 173f5e2531..75c929ae89 100644 --- a/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts +++ b/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts @@ -8,55 +8,57 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LoginImport } from './routes/login' -import { Route as AuthImport } from './routes/_auth' -import { Route as IndexImport } from './routes/index' -import { Route as AuthInvoicesImport } from './routes/_auth.invoices' -import { Route as AuthDashboardImport } from './routes/_auth.dashboard' -import { Route as AuthInvoicesIndexImport } from './routes/_auth.invoices.index' -import { Route as AuthInvoicesInvoiceIdImport } from './routes/_auth.invoices.$invoiceId' +import { Route as LoginRouteImport } from './routes/login' +import { Route as AuthRouteImport } from './routes/_auth' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthInvoicesRouteImport } from './routes/_auth.invoices' +import { Route as AuthDashboardRouteImport } from './routes/_auth.dashboard' +import { Route as AuthInvoicesIndexRouteImport } from './routes/_auth.invoices.index' +import { Route as AuthInvoicesInvoiceIdRouteImport } from './routes/_auth.invoices.$invoiceId' // Create/Update Routes -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const AuthRoute = AuthImport.update({ +const AuthRoute = AuthRouteImport.update({ id: '/_auth', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthInvoicesRoute = AuthInvoicesImport.update({ +const AuthInvoicesRoute = AuthInvoicesRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => AuthRoute, } as any) -const AuthDashboardRoute = AuthDashboardImport.update({ +const AuthDashboardRoute = AuthDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => AuthRoute, } as any) -const AuthInvoicesIndexRoute = AuthInvoicesIndexImport.update({ +const AuthInvoicesIndexRoute = AuthInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthInvoicesRoute, } as any) -const AuthInvoicesInvoiceIdRoute = AuthInvoicesInvoiceIdImport.update({ +const AuthInvoicesInvoiceIdRoute = AuthInvoicesInvoiceIdRouteImport.update({ id: '/$invoiceId', path: '/$invoiceId', getParentRoute: () => AuthInvoicesRoute, @@ -70,54 +72,120 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_auth': { id: '/_auth' path: '' fullPath: '' - preLoaderRoute: typeof AuthImport + preLoaderRoute: typeof AuthRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/_auth/dashboard': { id: '/_auth/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof AuthDashboardImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthDashboardRouteImport + parentRoute: typeof AuthRouteImport } '/_auth/invoices': { id: '/_auth/invoices' path: '/invoices' fullPath: '/invoices' - preLoaderRoute: typeof AuthInvoicesImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthInvoicesRouteImport + parentRoute: typeof AuthRouteImport } '/_auth/invoices/$invoiceId': { id: '/_auth/invoices/$invoiceId' path: '/$invoiceId' fullPath: '/invoices/$invoiceId' - preLoaderRoute: typeof AuthInvoicesInvoiceIdImport - parentRoute: typeof AuthInvoicesImport + preLoaderRoute: typeof AuthInvoicesInvoiceIdRouteImport + parentRoute: typeof AuthInvoicesRouteImport } '/_auth/invoices/': { id: '/_auth/invoices/' path: '/' fullPath: '/invoices/' - preLoaderRoute: typeof AuthInvoicesIndexImport - parentRoute: typeof AuthInvoicesImport + preLoaderRoute: typeof AuthInvoicesIndexRouteImport + parentRoute: typeof AuthInvoicesRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_auth' { + const createFileRoute: CreateFileRoute< + '/_auth', + FileRoutesByPath['/_auth']['parentRoute'], + FileRoutesByPath['/_auth']['id'], + FileRoutesByPath['/_auth']['path'], + FileRoutesByPath['/_auth']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/_auth.dashboard' { + const createFileRoute: CreateFileRoute< + '/_auth/dashboard', + FileRoutesByPath['/_auth/dashboard']['parentRoute'], + FileRoutesByPath['/_auth/dashboard']['id'], + FileRoutesByPath['/_auth/dashboard']['path'], + FileRoutesByPath['/_auth/dashboard']['fullPath'] + > +} +declare module './routes/_auth.invoices' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices', + FileRoutesByPath['/_auth/invoices']['parentRoute'], + FileRoutesByPath['/_auth/invoices']['id'], + FileRoutesByPath['/_auth/invoices']['path'], + FileRoutesByPath['/_auth/invoices']['fullPath'] + > +} +declare module './routes/_auth.invoices.$invoiceId' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices/$invoiceId', + FileRoutesByPath['/_auth/invoices/$invoiceId']['parentRoute'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['id'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['path'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['fullPath'] + > +} +declare module './routes/_auth.invoices.index' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices/', + FileRoutesByPath['/_auth/invoices/']['parentRoute'], + FileRoutesByPath['/_auth/invoices/']['id'], + FileRoutesByPath['/_auth/invoices/']['path'], + FileRoutesByPath['/_auth/invoices/']['fullPath'] + > +} + // Create and export the route tree interface AuthInvoicesRouteChildren { diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx index a4c6fc7cdf..68231e780c 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx @@ -1,9 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute('/_auth/dashboard')({ +export const Route = createFileRoute({ component: DashboardPage, }) diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx index 896133db24..fa727b8e49 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { fetchInvoiceById } from '../posts' -export const Route = createFileRoute('/_auth/invoices/$invoiceId')({ +export const Route = createFileRoute({ loader: async ({ params: { invoiceId } }) => { return { invoice: await fetchInvoiceById(Number.parseInt(invoiceId)), diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx index 5ba27d4cc0..d0bd95b152 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_auth/invoices/')({ +export const Route = createFileRoute({ component: () =>
Select an invoice to view it!
, }) diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx index c3cda59142..5b4c97ee86 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchInvoices } from '../posts' -export const Route = createFileRoute('/_auth/invoices')({ +export const Route = createFileRoute({ loader: async () => ({ invoices: await fetchInvoices(), }), diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx index a218577627..3bceaa2d6f 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx @@ -1,13 +1,7 @@ -import { - Link, - Outlet, - createFileRoute, - redirect, - useRouter, -} from '@tanstack/react-router' +import { Link, Outlet, redirect, useRouter } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute('/_auth')({ +export const Route = createFileRoute({ beforeLoad: ({ context, location }) => { // Check if user is authenticated if (!context.auth.isAuthenticated) { diff --git a/examples/react/authenticated-routes-firebase/src/routes/index.tsx b/examples/react/authenticated-routes-firebase/src/routes/index.tsx index e9264fed15..fc88a8cbfb 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/index.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/index.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute, redirect } from '@tanstack/react-router' +import { Link, redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { // Log for debugging console.log('Checking context on index.tsx:', context) // Check if user is authenticated diff --git a/examples/react/authenticated-routes-firebase/src/routes/login.tsx b/examples/react/authenticated-routes-firebase/src/routes/login.tsx index 1c665b9fbc..b46186e353 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/login.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/login.tsx @@ -1,10 +1,5 @@ import * as React from 'react' -import { - createFileRoute, - redirect, - useRouter, - useRouterState, -} from '@tanstack/react-router' +import { redirect, useRouter, useRouterState } from '@tanstack/react-router' import { z } from 'zod' import { useAuth } from '../auth' @@ -20,7 +15,7 @@ import { // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion const fallback = '/dashboard' as const -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ validateSearch: z.object({ redirect: z.string().optional().catch(''), }), diff --git a/examples/react/authenticated-routes/src/routeTree.gen.ts b/examples/react/authenticated-routes/src/routeTree.gen.ts index 173f5e2531..75c929ae89 100644 --- a/examples/react/authenticated-routes/src/routeTree.gen.ts +++ b/examples/react/authenticated-routes/src/routeTree.gen.ts @@ -8,55 +8,57 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LoginImport } from './routes/login' -import { Route as AuthImport } from './routes/_auth' -import { Route as IndexImport } from './routes/index' -import { Route as AuthInvoicesImport } from './routes/_auth.invoices' -import { Route as AuthDashboardImport } from './routes/_auth.dashboard' -import { Route as AuthInvoicesIndexImport } from './routes/_auth.invoices.index' -import { Route as AuthInvoicesInvoiceIdImport } from './routes/_auth.invoices.$invoiceId' +import { Route as LoginRouteImport } from './routes/login' +import { Route as AuthRouteImport } from './routes/_auth' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthInvoicesRouteImport } from './routes/_auth.invoices' +import { Route as AuthDashboardRouteImport } from './routes/_auth.dashboard' +import { Route as AuthInvoicesIndexRouteImport } from './routes/_auth.invoices.index' +import { Route as AuthInvoicesInvoiceIdRouteImport } from './routes/_auth.invoices.$invoiceId' // Create/Update Routes -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const AuthRoute = AuthImport.update({ +const AuthRoute = AuthRouteImport.update({ id: '/_auth', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthInvoicesRoute = AuthInvoicesImport.update({ +const AuthInvoicesRoute = AuthInvoicesRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => AuthRoute, } as any) -const AuthDashboardRoute = AuthDashboardImport.update({ +const AuthDashboardRoute = AuthDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => AuthRoute, } as any) -const AuthInvoicesIndexRoute = AuthInvoicesIndexImport.update({ +const AuthInvoicesIndexRoute = AuthInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthInvoicesRoute, } as any) -const AuthInvoicesInvoiceIdRoute = AuthInvoicesInvoiceIdImport.update({ +const AuthInvoicesInvoiceIdRoute = AuthInvoicesInvoiceIdRouteImport.update({ id: '/$invoiceId', path: '/$invoiceId', getParentRoute: () => AuthInvoicesRoute, @@ -70,54 +72,120 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_auth': { id: '/_auth' path: '' fullPath: '' - preLoaderRoute: typeof AuthImport + preLoaderRoute: typeof AuthRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/_auth/dashboard': { id: '/_auth/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof AuthDashboardImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthDashboardRouteImport + parentRoute: typeof AuthRouteImport } '/_auth/invoices': { id: '/_auth/invoices' path: '/invoices' fullPath: '/invoices' - preLoaderRoute: typeof AuthInvoicesImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthInvoicesRouteImport + parentRoute: typeof AuthRouteImport } '/_auth/invoices/$invoiceId': { id: '/_auth/invoices/$invoiceId' path: '/$invoiceId' fullPath: '/invoices/$invoiceId' - preLoaderRoute: typeof AuthInvoicesInvoiceIdImport - parentRoute: typeof AuthInvoicesImport + preLoaderRoute: typeof AuthInvoicesInvoiceIdRouteImport + parentRoute: typeof AuthInvoicesRouteImport } '/_auth/invoices/': { id: '/_auth/invoices/' path: '/' fullPath: '/invoices/' - preLoaderRoute: typeof AuthInvoicesIndexImport - parentRoute: typeof AuthInvoicesImport + preLoaderRoute: typeof AuthInvoicesIndexRouteImport + parentRoute: typeof AuthInvoicesRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_auth' { + const createFileRoute: CreateFileRoute< + '/_auth', + FileRoutesByPath['/_auth']['parentRoute'], + FileRoutesByPath['/_auth']['id'], + FileRoutesByPath['/_auth']['path'], + FileRoutesByPath['/_auth']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/_auth.dashboard' { + const createFileRoute: CreateFileRoute< + '/_auth/dashboard', + FileRoutesByPath['/_auth/dashboard']['parentRoute'], + FileRoutesByPath['/_auth/dashboard']['id'], + FileRoutesByPath['/_auth/dashboard']['path'], + FileRoutesByPath['/_auth/dashboard']['fullPath'] + > +} +declare module './routes/_auth.invoices' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices', + FileRoutesByPath['/_auth/invoices']['parentRoute'], + FileRoutesByPath['/_auth/invoices']['id'], + FileRoutesByPath['/_auth/invoices']['path'], + FileRoutesByPath['/_auth/invoices']['fullPath'] + > +} +declare module './routes/_auth.invoices.$invoiceId' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices/$invoiceId', + FileRoutesByPath['/_auth/invoices/$invoiceId']['parentRoute'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['id'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['path'], + FileRoutesByPath['/_auth/invoices/$invoiceId']['fullPath'] + > +} +declare module './routes/_auth.invoices.index' { + const createFileRoute: CreateFileRoute< + '/_auth/invoices/', + FileRoutesByPath['/_auth/invoices/']['parentRoute'], + FileRoutesByPath['/_auth/invoices/']['id'], + FileRoutesByPath['/_auth/invoices/']['path'], + FileRoutesByPath['/_auth/invoices/']['fullPath'] + > +} + // Create and export the route tree interface AuthInvoicesRouteChildren { diff --git a/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx b/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx index 51fbf3e81a..4a37b7ffd2 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx @@ -1,9 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute('/_auth/dashboard')({ +export const Route = createFileRoute({ component: DashboardPage, }) diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx index 15b502d5e9..754de7c3d8 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { fetchInvoiceById } from '../posts' -export const Route = createFileRoute('/_auth/invoices/$invoiceId')({ +export const Route = createFileRoute({ loader: async ({ params: { invoiceId } }) => { return { invoice: await fetchInvoiceById(parseInt(invoiceId)), diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx index 5ba27d4cc0..d0bd95b152 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_auth/invoices/')({ +export const Route = createFileRoute({ component: () =>
Select an invoice to view it!
, }) diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx index c3cda59142..5b4c97ee86 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchInvoices } from '../posts' -export const Route = createFileRoute('/_auth/invoices')({ +export const Route = createFileRoute({ loader: async () => ({ invoices: await fetchInvoices(), }), diff --git a/examples/react/authenticated-routes/src/routes/_auth.tsx b/examples/react/authenticated-routes/src/routes/_auth.tsx index 00c97cbeb7..b69fcef29b 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.tsx @@ -1,15 +1,9 @@ import * as React from 'react' -import { - Link, - Outlet, - createFileRoute, - redirect, - useRouter, -} from '@tanstack/react-router' +import { Link, Outlet, redirect, useRouter } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute('/_auth')({ +export const Route = createFileRoute({ beforeLoad: ({ context, location }) => { if (!context.auth.isAuthenticated) { throw redirect({ diff --git a/examples/react/authenticated-routes/src/routes/index.tsx b/examples/react/authenticated-routes/src/routes/index.tsx index f5fc871378..cf5cf40e2f 100644 --- a/examples/react/authenticated-routes/src/routes/index.tsx +++ b/examples/react/authenticated-routes/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/examples/react/authenticated-routes/src/routes/login.tsx b/examples/react/authenticated-routes/src/routes/login.tsx index dd78f66f9c..71360e9661 100644 --- a/examples/react/authenticated-routes/src/routes/login.tsx +++ b/examples/react/authenticated-routes/src/routes/login.tsx @@ -1,10 +1,5 @@ import * as React from 'react' -import { - createFileRoute, - redirect, - useRouter, - useRouterState, -} from '@tanstack/react-router' +import { redirect, useRouter, useRouterState } from '@tanstack/react-router' import { z } from 'zod' import { useAuth } from '../auth' @@ -13,7 +8,7 @@ import { sleep } from '../utils' // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion const fallback = '/dashboard' as const -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ validateSearch: z.object({ redirect: z.string().optional().catch(''), }), diff --git a/examples/react/basic-file-based/src/routeTree.gen.ts b/examples/react/basic-file-based/src/routeTree.gen.ts index 1f98acd3e4..cb8f883420 100644 --- a/examples/react/basic-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-file-based/src/routeTree.gen.ts @@ -8,72 +8,73 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AnchorImport } from './routes/anchor' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as AnchorRouteImport } from './routes/anchor' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const AnchorRoute = AnchorImport.update({ +const AnchorRoute = AnchorRouteImport.update({ id: '/anchor', path: '/anchor', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -87,68 +88,152 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/anchor': { id: '/anchor' path: '/anchor' fullPath: '/anchor' - preLoaderRoute: typeof AnchorImport + preLoaderRoute: typeof AnchorRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts.route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/anchor' { + const createFileRoute: CreateFileRoute< + '/anchor', + FileRoutesByPath['/anchor']['parentRoute'], + FileRoutesByPath['/anchor']['id'], + FileRoutesByPath['/anchor']['path'], + FileRoutesByPath['/anchor']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx index 202070f1ff..fd83a0eaa0 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index c5bcffd5a4..abd82a2bf6 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 5649f77d8e..a190b24202 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm layout A!
diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 742e48bfb4..505f8f6fbf 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm layout B!
diff --git a/examples/react/basic-file-based/src/routes/anchor.tsx b/examples/react/basic-file-based/src/routes/anchor.tsx index fbe16ed55c..21dce23c39 100644 --- a/examples/react/basic-file-based/src/routes/anchor.tsx +++ b/examples/react/basic-file-based/src/routes/anchor.tsx @@ -1,12 +1,7 @@ import { useLayoutEffect, useRef, useState } from 'react' -import { - Link, - createFileRoute, - useLocation, - useNavigate, -} from '@tanstack/react-router' - -export const Route = createFileRoute('/anchor')({ +import { Link, useLocation, useNavigate } from '@tanstack/react-router' + +export const Route = createFileRoute({ component: AnchorComponent, }) diff --git a/examples/react/basic-file-based/src/routes/index.tsx b/examples/react/basic-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/basic-file-based/src/routes/index.tsx +++ b/examples/react/basic-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/basic-file-based/src/routes/posts.$postId.tsx b/examples/react/basic-file-based/src/routes/posts.$postId.tsx index cded91ef96..0578182ecb 100644 --- a/examples/react/basic-file-based/src/routes/posts.$postId.tsx +++ b/examples/react/basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/react/basic-file-based/src/routes/posts.index.tsx b/examples/react/basic-file-based/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/examples/react/basic-file-based/src/routes/posts.index.tsx +++ b/examples/react/basic-file-based/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-file-based/src/routes/posts.route.tsx b/examples/react/basic-file-based/src/routes/posts.route.tsx index 0115fc8063..0aca21ad57 100644 --- a/examples/react/basic-file-based/src/routes/posts.route.tsx +++ b/examples/react/basic-file-based/src/routes/posts.route.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routeTree.gen.ts b/examples/react/basic-react-query-file-based/src/routeTree.gen.ts index 67944b5f0c..5529781e33 100644 --- a/examples/react/basic-react-query-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-react-query-file-based/src/routeTree.gen.ts @@ -8,65 +8,66 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -80,61 +81,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts.route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx index c3b12442b8..5c4a461d8d 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index 9a48b73a46..1e1400f5a7 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 5649f77d8e..a190b24202 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm layout A!
diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 742e48bfb4..505f8f6fbf 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm layout B!
diff --git a/examples/react/basic-react-query-file-based/src/routes/index.tsx b/examples/react/basic-react-query-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/basic-react-query-file-based/src/routes/index.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx index 4cf6beca88..c3ae5dc441 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,5 @@ import * as React from 'react' -import { - ErrorComponent, - createFileRoute, - useRouter, -} from '@tanstack/react-router' +import { ErrorComponent, useRouter } from '@tanstack/react-router' import { useQueryErrorResetBoundary, useSuspenseQuery, @@ -12,7 +8,7 @@ import { PostNotFoundError } from '../posts' import { postQueryOptions } from '../postQueryOptions' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx index 0ba745c0ab..dc6dcaf036 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsLayoutComponent, diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.disabled.json similarity index 100% rename from examples/react/basic-ssr-file-based/package.json rename to examples/react/basic-ssr-file-based/package.disabled.json diff --git a/examples/react/basic-ssr-file-based/src/routeTree.gen.ts b/examples/react/basic-ssr-file-based/src/routeTree.gen.ts index 7092dee6de..4ff6d62320 100644 --- a/examples/react/basic-ssr-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-ssr-file-based/src/routeTree.gen.ts @@ -10,40 +10,41 @@ // Import Routes +import type { FileRoutesByPath, CreateFileRoute } from '@tanstack/react-router' import { Route as rootRoute } from './routes/__root' -import { Route as ErrorImport } from './routes/error' -import { Route as PostsRouteImport } from './routes/posts/route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts/index' -import { Route as PostsPostIdImport } from './routes/posts/$postId' +import { Route as ErrorRouteImport } from './routes/error' +import { Route as PostsRouteRouteImport } from './routes/posts/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts/index' +import { Route as PostsPostIdRouteImport } from './routes/posts/$postId' // Create/Update Routes -const ErrorRoute = ErrorImport.update({ +const ErrorRoute = ErrorRouteImport.update({ id: '/error', path: '/error', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, @@ -57,40 +58,88 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/error': { id: '/error' path: '/error' fullPath: '/error' - preLoaderRoute: typeof ErrorImport + preLoaderRoute: typeof ErrorRouteImport parentRoute: typeof rootRoute } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts/route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/error' { + const createFileRoute: CreateFileRoute< + '/error', + FileRoutesByPath['/error']['parentRoute'], + FileRoutesByPath['/error']['id'], + FileRoutesByPath['/error']['path'], + FileRoutesByPath['/error']['fullPath'] + > +} +declare module './routes/posts/$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts/index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { @@ -156,6 +205,9 @@ export const routeTree = rootRoute ._addFileChildren(rootRouteChildren) ._addFileTypes() +// @ts-ignore +import type * as ServerTypes from '../.tanstack-start/server-routes/routeTree.gen.ts' + /* ROUTE_MANIFEST_START { "routes": { diff --git a/examples/react/basic-ssr-file-based/src/routes/error.tsx b/examples/react/basic-ssr-file-based/src/routes/error.tsx index 52d42f2a99..33412fe3da 100644 --- a/examples/react/basic-ssr-file-based/src/routes/error.tsx +++ b/examples/react/basic-ssr-file-based/src/routes/error.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute('/error')({ +export const Route = createFileRoute({ component: ErrorComponent, loader: async () => { if (Math.random() > 0.5) throw new Error('Random error!') diff --git a/examples/react/basic-ssr-file-based/src/routes/index.tsx b/examples/react/basic-ssr-file-based/src/routes/index.tsx index eac7746031..b27dfd977a 100644 --- a/examples/react/basic-ssr-file-based/src/routes/index.tsx +++ b/examples/react/basic-ssr-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: IndexComponent, }) diff --git a/examples/react/basic-ssr-file-based/src/routes/posts/$postId.tsx b/examples/react/basic-ssr-file-based/src/routes/posts/$postId.tsx index b045eb784f..4f474865dd 100644 --- a/examples/react/basic-ssr-file-based/src/routes/posts/$postId.tsx +++ b/examples/react/basic-ssr-file-based/src/routes/posts/$postId.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import type { PostType } from '../posts' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params }) => { console.info(`Fetching post with id ${params.postId}...`) diff --git a/examples/react/basic-ssr-file-based/src/routes/posts/index.tsx b/examples/react/basic-ssr-file-based/src/routes/posts/index.tsx index 5b5f08f95b..13529228bb 100644 --- a/examples/react/basic-ssr-file-based/src/routes/posts/index.tsx +++ b/examples/react/basic-ssr-file-based/src/routes/posts/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-ssr-file-based/src/routes/posts/route.tsx b/examples/react/basic-ssr-file-based/src/routes/posts/route.tsx index 3699478d0a..4900ccb437 100644 --- a/examples/react/basic-ssr-file-based/src/routes/posts/route.tsx +++ b/examples/react/basic-ssr-file-based/src/routes/posts/route.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' export type PostType = { id: string @@ -7,7 +7,7 @@ export type PostType = { body: string } -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => { console.info('Fetching posts...') await new Promise((r) => diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.disabled.json similarity index 100% rename from examples/react/basic-ssr-streaming-file-based/package.json rename to examples/react/basic-ssr-streaming-file-based/package.disabled.json diff --git a/examples/react/basic-ssr-streaming-file-based/src/routeTree.gen.ts b/examples/react/basic-ssr-streaming-file-based/src/routeTree.gen.ts index 7092dee6de..4ff6d62320 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-ssr-streaming-file-based/src/routeTree.gen.ts @@ -10,40 +10,41 @@ // Import Routes +import type { FileRoutesByPath, CreateFileRoute } from '@tanstack/react-router' import { Route as rootRoute } from './routes/__root' -import { Route as ErrorImport } from './routes/error' -import { Route as PostsRouteImport } from './routes/posts/route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts/index' -import { Route as PostsPostIdImport } from './routes/posts/$postId' +import { Route as ErrorRouteImport } from './routes/error' +import { Route as PostsRouteRouteImport } from './routes/posts/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts/index' +import { Route as PostsPostIdRouteImport } from './routes/posts/$postId' // Create/Update Routes -const ErrorRoute = ErrorImport.update({ +const ErrorRoute = ErrorRouteImport.update({ id: '/error', path: '/error', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, @@ -57,40 +58,88 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/error': { id: '/error' path: '/error' fullPath: '/error' - preLoaderRoute: typeof ErrorImport + preLoaderRoute: typeof ErrorRouteImport parentRoute: typeof rootRoute } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts/route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/error' { + const createFileRoute: CreateFileRoute< + '/error', + FileRoutesByPath['/error']['parentRoute'], + FileRoutesByPath['/error']['id'], + FileRoutesByPath['/error']['path'], + FileRoutesByPath['/error']['fullPath'] + > +} +declare module './routes/posts/$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts/index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { @@ -156,6 +205,9 @@ export const routeTree = rootRoute ._addFileChildren(rootRouteChildren) ._addFileTypes() +// @ts-ignore +import type * as ServerTypes from '../.tanstack-start/server-routes/routeTree.gen.ts' + /* ROUTE_MANIFEST_START { "routes": { diff --git a/examples/react/basic-ssr-streaming-file-based/src/routes/error.tsx b/examples/react/basic-ssr-streaming-file-based/src/routes/error.tsx index 8ab6d2b52d..a8f14563d2 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routes/error.tsx +++ b/examples/react/basic-ssr-streaming-file-based/src/routes/error.tsx @@ -1,4 +1,4 @@ -import { Await, createFileRoute } from '@tanstack/react-router' +import { Await } from '@tanstack/react-router' import * as React from 'react' async function loadData() { @@ -7,7 +7,7 @@ async function loadData() { return 'Hello!' } -export const Route = createFileRoute('/error')({ +export const Route = createFileRoute({ component: ErrorComponent, loader: () => { if (Math.random() > 0.5) throw new Error('Random error!') diff --git a/examples/react/basic-ssr-streaming-file-based/src/routes/index.tsx b/examples/react/basic-ssr-streaming-file-based/src/routes/index.tsx index 50c2706a26..33f887a27b 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routes/index.tsx +++ b/examples/react/basic-ssr-streaming-file-based/src/routes/index.tsx @@ -1,7 +1,7 @@ -import { Await, createFileRoute } from '@tanstack/react-router' +import { Await } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ loader: () => ({ date: new Date(), deferred: new Promise<{ date: Date }>((r) => diff --git a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/$postId.tsx b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/$postId.tsx index 0a3f603008..9466546c60 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/$postId.tsx +++ b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/$postId.tsx @@ -1,4 +1,4 @@ -import { Await, createFileRoute, notFound } from '@tanstack/react-router' +import { Await, notFound } from '@tanstack/react-router' import * as React from 'react' import type { PostType } from './route' @@ -32,7 +32,7 @@ async function fetchComments(postId: string) { ).then((r) => r.json() as Promise>) } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => { const commentsPromise = fetchComments(postId) const post = await fetchPostById(postId) diff --git a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/index.tsx b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/index.tsx index 2aa298c265..a88aaa8f26 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/index.tsx +++ b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/index.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, wrapInSuspense: true, errorComponent: ({ error }) => { diff --git a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/route.tsx b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/route.tsx index ad2b0082ad..ceb14625f2 100644 --- a/examples/react/basic-ssr-streaming-file-based/src/routes/posts/route.tsx +++ b/examples/react/basic-ssr-streaming-file-based/src/routes/posts/route.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' export type PostType = { id: string @@ -7,7 +7,7 @@ export type PostType = { body: string } -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => { console.info('Fetching posts...') await new Promise((r) => diff --git a/examples/react/basic-virtual-file-based/src/routeTree.gen.ts b/examples/react/basic-virtual-file-based/src/routeTree.gen.ts index 22a3dcf194..c6ef800c5a 100644 --- a/examples/react/basic-virtual-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-virtual-file-based/src/routeTree.gen.ts @@ -9,103 +9,104 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as postsPostsImport } from './routes/posts/posts' -import { Route as layoutFirstLayoutImport } from './routes/layout/first-layout' -import { Route as homeImport } from './routes/home' -import { Route as postsPostsDetailImport } from './routes/posts/posts-detail' -import { Route as layoutSecondLayoutImport } from './routes/layout/second-layout' -import { Route as postsPostsHomeImport } from './routes/posts/posts-home' -import { Route as ClassicHelloRouteImport } from './routes/file-based-subtree/hello/route' -import { Route as ClassicHelloIndexImport } from './routes/file-based-subtree/hello/index' -import { Route as ClassicHelloWorldImport } from './routes/file-based-subtree/hello/world' -import { Route as ClassicHelloUniverseImport } from './routes/file-based-subtree/hello/universe' -import { Route as bImport } from './routes/b' -import { Route as aImport } from './routes/a' +import { Route as postsPostsRouteImport } from './routes/posts/posts' +import { Route as layoutFirstLayoutRouteImport } from './routes/layout/first-layout' +import { Route as homeRouteImport } from './routes/home' +import { Route as postsPostsDetailRouteImport } from './routes/posts/posts-detail' +import { Route as layoutSecondLayoutRouteImport } from './routes/layout/second-layout' +import { Route as postsPostsHomeRouteImport } from './routes/posts/posts-home' +import { Route as ClassicHelloRouteRouteImport } from './routes/file-based-subtree/hello/route' +import { Route as ClassicHelloIndexRouteImport } from './routes/file-based-subtree/hello/index' +import { Route as ClassicHelloWorldRouteImport } from './routes/file-based-subtree/hello/world' +import { Route as ClassicHelloUniverseRouteImport } from './routes/file-based-subtree/hello/universe' +import { Route as bRouteImport } from './routes/b' +import { Route as aRouteImport } from './routes/a' // Create Virtual Routes -const FirstSecondLayoutRouteWithoutFileImport = createFileRoute( +const FirstSecondLayoutRouteWithoutFileRouteImport = createFileRoute( '/_first/_second-layout/route-without-file', )() // Create/Update Routes -const postsPostsRoute = postsPostsImport.update({ +const postsPostsRoute = postsPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const layoutFirstLayoutRoute = layoutFirstLayoutImport.update({ +const layoutFirstLayoutRoute = layoutFirstLayoutRouteImport.update({ id: '/_first', getParentRoute: () => rootRoute, } as any) -const homeRoute = homeImport.update({ +const homeRoute = homeRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const postsPostsDetailRoute = postsPostsDetailImport.update({ +const postsPostsDetailRoute = postsPostsDetailRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => postsPostsRoute, } as any) -const layoutSecondLayoutRoute = layoutSecondLayoutImport.update({ +const layoutSecondLayoutRoute = layoutSecondLayoutRouteImport.update({ id: '/_second-layout', getParentRoute: () => layoutFirstLayoutRoute, } as any) -const postsPostsHomeRoute = postsPostsHomeImport.update({ +const postsPostsHomeRoute = postsPostsHomeRouteImport.update({ id: '/', path: '/', getParentRoute: () => postsPostsRoute, } as any) -const ClassicHelloRouteRoute = ClassicHelloRouteImport.update({ +const ClassicHelloRouteRoute = ClassicHelloRouteRouteImport.update({ id: '/classic/hello', path: '/classic/hello', getParentRoute: () => rootRoute, } as any) -const ClassicHelloIndexRoute = ClassicHelloIndexImport.update({ +const ClassicHelloIndexRoute = ClassicHelloIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloWorldRoute = ClassicHelloWorldImport.update({ +const ClassicHelloWorldRoute = ClassicHelloWorldRouteImport.update({ id: '/world', path: '/world', getParentRoute: () => ClassicHelloRouteRoute, } as any) -const ClassicHelloUniverseRoute = ClassicHelloUniverseImport.update({ +const ClassicHelloUniverseRoute = ClassicHelloUniverseRouteImport.update({ id: '/universe', path: '/universe', getParentRoute: () => ClassicHelloRouteRoute, } as any) const FirstSecondLayoutRouteWithoutFileRoute = - FirstSecondLayoutRouteWithoutFileImport.update({ + FirstSecondLayoutRouteWithoutFileRouteImport.update({ id: '/route-without-file', path: '/route-without-file', getParentRoute: () => layoutSecondLayoutRoute, } as any) -const bRoute = bImport.update({ +const bRoute = bRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => FirstSecondLayoutRouteWithoutFileRoute, } as any) -const aRoute = aImport.update({ +const aRoute = aRouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => FirstSecondLayoutRouteWithoutFileRoute, @@ -119,96 +120,208 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof homeImport + preLoaderRoute: typeof homeRouteImport parentRoute: typeof rootRoute } '/_first': { id: '/_first' path: '' fullPath: '' - preLoaderRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutFirstLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsRouteImport parentRoute: typeof rootRoute } '/classic/hello': { id: '/classic/hello' path: '/classic/hello' fullPath: '/classic/hello' - preLoaderRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloRouteRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof postsPostsHomeImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsHomeRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second-layout': { id: '/_first/_second-layout' path: '' fullPath: '' - preLoaderRoute: typeof layoutSecondLayoutImport - parentRoute: typeof layoutFirstLayoutImport + preLoaderRoute: typeof layoutSecondLayoutRouteImport + parentRoute: typeof layoutFirstLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof postsPostsDetailImport - parentRoute: typeof postsPostsImport + preLoaderRoute: typeof postsPostsDetailRouteImport + parentRoute: typeof postsPostsRouteImport } '/_first/_second-layout/route-without-file': { id: '/_first/_second-layout/route-without-file' path: '/route-without-file' fullPath: '/route-without-file' - preLoaderRoute: typeof FirstSecondLayoutRouteWithoutFileImport - parentRoute: typeof layoutSecondLayoutImport + preLoaderRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport } '/classic/hello/universe': { id: '/classic/hello/universe' path: '/universe' fullPath: '/classic/hello/universe' - preLoaderRoute: typeof ClassicHelloUniverseImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloUniverseRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/world': { id: '/classic/hello/world' path: '/world' fullPath: '/classic/hello/world' - preLoaderRoute: typeof ClassicHelloWorldImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloWorldRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/classic/hello/': { id: '/classic/hello/' path: '/' fullPath: '/classic/hello/' - preLoaderRoute: typeof ClassicHelloIndexImport - parentRoute: typeof ClassicHelloRouteImport + preLoaderRoute: typeof ClassicHelloIndexRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport } '/_first/_second-layout/route-without-file/layout-a': { id: '/_first/_second-layout/route-without-file/layout-a' path: '/layout-a' fullPath: '/route-without-file/layout-a' - preLoaderRoute: typeof aImport - parentRoute: typeof FirstSecondLayoutRouteWithoutFileImport + preLoaderRoute: typeof aRouteImport + parentRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport } '/_first/_second-layout/route-without-file/layout-b': { id: '/_first/_second-layout/route-without-file/layout-b' path: '/layout-b' fullPath: '/route-without-file/layout-b' - preLoaderRoute: typeof bImport - parentRoute: typeof FirstSecondLayoutRouteWithoutFileImport + preLoaderRoute: typeof bRouteImport + parentRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/home' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/layout/first-layout' { + const createFileRoute: CreateFileRoute< + '/_first', + FileRoutesByPath['/_first']['parentRoute'], + FileRoutesByPath['/_first']['id'], + FileRoutesByPath['/_first']['path'], + FileRoutesByPath['/_first']['fullPath'] + > +} +declare module './routes/posts/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/route' { + const createFileRoute: CreateFileRoute< + '/classic/hello', + FileRoutesByPath['/classic/hello']['parentRoute'], + FileRoutesByPath['/classic/hello']['id'], + FileRoutesByPath['/classic/hello']['path'], + FileRoutesByPath['/classic/hello']['fullPath'] + > +} +declare module './routes/posts/posts-home' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/layout/second-layout' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout', + FileRoutesByPath['/_first/_second-layout']['parentRoute'], + FileRoutesByPath['/_first/_second-layout']['id'], + FileRoutesByPath['/_first/_second-layout']['path'], + FileRoutesByPath['/_first/_second-layout']['fullPath'] + > +} +declare module './routes/posts/posts-detail' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} + +declare module './routes/file-based-subtree/hello/universe' { + const createFileRoute: CreateFileRoute< + '/classic/hello/universe', + FileRoutesByPath['/classic/hello/universe']['parentRoute'], + FileRoutesByPath['/classic/hello/universe']['id'], + FileRoutesByPath['/classic/hello/universe']['path'], + FileRoutesByPath['/classic/hello/universe']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/world' { + const createFileRoute: CreateFileRoute< + '/classic/hello/world', + FileRoutesByPath['/classic/hello/world']['parentRoute'], + FileRoutesByPath['/classic/hello/world']['id'], + FileRoutesByPath['/classic/hello/world']['path'], + FileRoutesByPath['/classic/hello/world']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/index' { + const createFileRoute: CreateFileRoute< + '/classic/hello/', + FileRoutesByPath['/classic/hello/']['parentRoute'], + FileRoutesByPath['/classic/hello/']['id'], + FileRoutesByPath['/classic/hello/']['path'], + FileRoutesByPath['/classic/hello/']['fullPath'] + > +} +declare module './routes/a' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout/route-without-file/layout-a', + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['parentRoute'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['id'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['path'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['fullPath'] + > +} +declare module './routes/b' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout/route-without-file/layout-b', + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['parentRoute'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['id'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['path'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['fullPath'] + > +} + // Create and export the route tree interface FirstSecondLayoutRouteWithoutFileRouteChildren { diff --git a/examples/react/basic-virtual-file-based/src/routes/a.tsx b/examples/react/basic-virtual-file-based/src/routes/a.tsx index aa765e6891..a190b24202 100644 --- a/examples/react/basic-virtual-file-based/src/routes/a.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/a.tsx @@ -1,8 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute( - '/_first/_second-layout/route-without-file/layout-a', -)({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/b.tsx b/examples/react/basic-virtual-file-based/src/routes/b.tsx index 1a7fcaebdb..505f8f6fbf 100644 --- a/examples/react/basic-virtual-file-based/src/routes/b.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/b.tsx @@ -1,8 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute( - '/_first/_second-layout/route-without-file/layout-b', -)({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx index c7417e5eeb..f86335e291 100644 --- a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/')({ +export const Route = createFileRoute({ component: () =>
This is the index
, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx index 566efc8777..620dd2b76b 100644 --- a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/classic/hello')({ +export const Route = createFileRoute({ component: () => (
Hello! diff --git a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx index e00c47d74b..20b07c41cc 100644 --- a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/universe')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx index 9783557342..4af11357a2 100644 --- a/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/classic/hello/world')({ +export const Route = createFileRoute({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/home.tsx b/examples/react/basic-virtual-file-based/src/routes/home.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/basic-virtual-file-based/src/routes/home.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/layout/first-layout.tsx b/examples/react/basic-virtual-file-based/src/routes/layout/first-layout.tsx index d39e206f2d..5c4a461d8d 100644 --- a/examples/react/basic-virtual-file-based/src/routes/layout/first-layout.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/layout/second-layout.tsx b/examples/react/basic-virtual-file-based/src/routes/layout/second-layout.tsx index 2f56647492..478d9afbec 100644 --- a/examples/react/basic-virtual-file-based/src/routes/layout/second-layout.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_first/_second-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/posts/posts-detail.tsx b/examples/react/basic-virtual-file-based/src/routes/posts/posts-detail.tsx index 948d52d6d6..654f3cfd18 100644 --- a/examples/react/basic-virtual-file-based/src/routes/posts/posts-detail.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/posts/posts-detail.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/examples/react/basic-virtual-file-based/src/routes/posts/posts-home.tsx b/examples/react/basic-virtual-file-based/src/routes/posts/posts-home.tsx index 056433ca0a..fdbe5865e5 100644 --- a/examples/react/basic-virtual-file-based/src/routes/posts/posts-home.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/posts/posts-home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-virtual-file-based/src/routes/posts/posts.tsx b/examples/react/basic-virtual-file-based/src/routes/posts/posts.tsx index a2ab1ee388..f92c37f537 100644 --- a/examples/react/basic-virtual-file-based/src/routes/posts/posts.tsx +++ b/examples/react/basic-virtual-file-based/src/routes/posts/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/examples/react/basic-virtual-file-based/vite.config.ts b/examples/react/basic-virtual-file-based/vite.config.ts index a04fbc2dcb..ea7fb55e88 100644 --- a/examples/react/basic-virtual-file-based/vite.config.ts +++ b/examples/react/basic-virtual-file-based/vite.config.ts @@ -1,13 +1,14 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, + verboseFileRoutes: false, virtualRouteConfig: './routes.ts', }), react(), diff --git a/examples/react/basic-virtual-inside-file-based/src/routeTree.gen.ts b/examples/react/basic-virtual-inside-file-based/src/routeTree.gen.ts index 79d98a78be..b9890b4077 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-virtual-inside-file-based/src/routeTree.gen.ts @@ -8,75 +8,77 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as LayoutImport } from './routes/_layout' -import { Route as IndexImport } from './routes/index' -import { Route as postsDetailsImport } from './routes/posts/details' -import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2' -import { Route as postsHomeImport } from './routes/posts/home' -import { Route as postsLetsGoIndexImport } from './routes/posts/lets-go/index' -import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b' -import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a' -import { Route as postsLetsGoDeeperHomeImport } from './routes/posts/lets-go/deeper/home' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as postsDetailsRouteImport } from './routes/posts/details' +import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' +import { Route as postsHomeRouteImport } from './routes/posts/home' +import { Route as postsLetsGoIndexRouteImport } from './routes/posts/lets-go/index' +import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b' +import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a' +import { Route as postsLetsGoDeeperHomeRouteImport } from './routes/posts/lets-go/deeper/home' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const LayoutRoute = LayoutImport.update({ +const LayoutRoute = LayoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const postsDetailsRoute = postsDetailsImport.update({ +const postsDetailsRoute = postsDetailsRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2Route = LayoutLayout2Import.update({ +const LayoutLayout2Route = LayoutLayout2RouteImport.update({ id: '/_layout-2', getParentRoute: () => LayoutRoute, } as any) -const postsHomeRoute = postsHomeImport.update({ +const postsHomeRoute = postsHomeRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const postsLetsGoIndexRoute = postsLetsGoIndexImport.update({ +const postsLetsGoIndexRoute = postsLetsGoIndexRouteImport.update({ id: '/inception/', path: '/inception/', getParentRoute: () => PostsRoute, } as any) -const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({ +const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({ id: '/layout-b', path: '/layout-b', getParentRoute: () => LayoutLayout2Route, } as any) -const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({ +const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({ id: '/layout-a', path: '/layout-a', getParentRoute: () => LayoutLayout2Route, } as any) -const postsLetsGoDeeperHomeRoute = postsLetsGoDeeperHomeImport.update({ +const postsLetsGoDeeperHomeRoute = postsLetsGoDeeperHomeRouteImport.update({ id: '/inception/deeper/', path: '/inception/deeper/', getParentRoute: () => PostsRoute, @@ -90,75 +92,168 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof postsHomeImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof postsHomeRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2': { id: '/_layout/_layout-2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutLayout2Import - parentRoute: typeof LayoutImport + preLoaderRoute: typeof LayoutLayout2RouteImport + parentRoute: typeof LayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof postsDetailsImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof postsDetailsRouteImport + parentRoute: typeof PostsRouteImport } '/_layout/_layout-2/layout-a': { id: '/_layout/_layout-2/layout-a' path: '/layout-a' fullPath: '/layout-a' - preLoaderRoute: typeof LayoutLayout2LayoutAImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutARouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/_layout/_layout-2/layout-b': { id: '/_layout/_layout-2/layout-b' path: '/layout-b' fullPath: '/layout-b' - preLoaderRoute: typeof LayoutLayout2LayoutBImport - parentRoute: typeof LayoutLayout2Import + preLoaderRoute: typeof LayoutLayout2LayoutBRouteImport + parentRoute: typeof LayoutLayout2RouteImport } '/posts/inception/': { id: '/posts/inception/' path: '/inception' fullPath: '/posts/inception' - preLoaderRoute: typeof postsLetsGoIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof postsLetsGoIndexRouteImport + parentRoute: typeof PostsRouteImport } '/posts/inception/deeper/': { id: '/posts/inception/deeper/' path: '/inception/deeper' fullPath: '/posts/inception/deeper' - preLoaderRoute: typeof postsLetsGoDeeperHomeImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof postsLetsGoDeeperHomeRouteImport + parentRoute: typeof PostsRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/posts/home' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_layout/_layout-2' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2', + FileRoutesByPath['/_layout/_layout-2']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2']['id'], + FileRoutesByPath['/_layout/_layout-2']['path'], + FileRoutesByPath['/_layout/_layout-2']['fullPath'] + > +} +declare module './routes/posts/details' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-a' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-a', + FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] + > +} +declare module './routes/_layout/_layout-2/layout-b' { + const createFileRoute: CreateFileRoute< + '/_layout/_layout-2/layout-b', + FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], + FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] + > +} +declare module './routes/posts/lets-go/index' { + const createFileRoute: CreateFileRoute< + '/posts/inception/', + FileRoutesByPath['/posts/inception/']['parentRoute'], + FileRoutesByPath['/posts/inception/']['id'], + FileRoutesByPath['/posts/inception/']['path'], + FileRoutesByPath['/posts/inception/']['fullPath'] + > +} +declare module './routes/posts/lets-go/deeper/home' { + const createFileRoute: CreateFileRoute< + '/posts/inception/deeper/', + FileRoutesByPath['/posts/inception/deeper/']['parentRoute'], + FileRoutesByPath['/posts/inception/deeper/']['id'], + FileRoutesByPath['/posts/inception/deeper/']['path'], + FileRoutesByPath['/posts/inception/deeper/']['fullPath'] + > +} + // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/_layout.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/_layout.tsx index 02ddbb1cd9..5c4a461d8d 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/_layout.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/_layout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2.tsx index 3b7dbf2903..483b910862 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_layout/_layout-2')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-a.tsx index 61e19b4d9f..a190b24202 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-b.tsx index cceed1fb9a..505f8f6fbf 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/index.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/index.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/posts.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/posts.tsx index c7a09ed7f8..4469b2216a 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/posts.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/posts.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/posts/details.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/posts/details.tsx index 6479bdf803..fc10978507 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/posts/details.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/posts/details.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/posts/home.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/posts/home.tsx index 056433ca0a..fdbe5865e5 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/posts/home.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/posts/home.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/deeper/home.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/deeper/home.tsx index 11f7fa95ca..f8bc76644a 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/deeper/home.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/deeper/home.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/inception/deeper/')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/inception/deeper/!
, }) diff --git a/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/index.tsx b/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/index.tsx index 964ab3c900..1c7ea68931 100644 --- a/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/index.tsx +++ b/examples/react/basic-virtual-inside-file-based/src/routes/posts/lets-go/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/inception/')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/inception/!
, }) diff --git a/examples/react/basic-virtual-inside-file-based/vite.config.ts b/examples/react/basic-virtual-inside-file-based/vite.config.ts index b819774577..3524a957da 100644 --- a/examples/react/basic-virtual-inside-file-based/vite.config.ts +++ b/examples/react/basic-virtual-inside-file-based/vite.config.ts @@ -1,11 +1,15 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), react(), ], }) diff --git a/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts b/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts index 4f3339865d..dbe0e74c42 100644 --- a/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts +++ b/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts @@ -8,131 +8,132 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LoginImport } from './routes/login' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as AuthImport } from './routes/_auth' -import { Route as DashboardRouteImport } from './routes/dashboard.route' -import { Route as IndexImport } from './routes/index' -import { Route as ExpensiveIndexImport } from './routes/expensive/index' -import { Route as DashboardIndexImport } from './routes/dashboard.index' -import { Route as PathlessLayoutRouteBImport } from './routes/_pathlessLayout.route-b' -import { Route as PathlessLayoutRouteAImport } from './routes/_pathlessLayout.route-a' -import { Route as AuthProfileImport } from './routes/_auth.profile' -import { Route as thisFolderIsNotInTheUrlRouteGroupImport } from './routes/(this-folder-is-not-in-the-url)/route-group' -import { Route as DashboardUsersRouteImport } from './routes/dashboard.users.route' -import { Route as DashboardInvoicesRouteImport } from './routes/dashboard.invoices.route' -import { Route as DashboardUsersIndexImport } from './routes/dashboard.users.index' -import { Route as DashboardInvoicesIndexImport } from './routes/dashboard.invoices.index' -import { Route as DashboardUsersUserImport } from './routes/dashboard.users.user' -import { Route as DashboardInvoicesInvoiceIdImport } from './routes/dashboard.invoices.$invoiceId' +import { Route as LoginRouteImport } from './routes/login' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as AuthRouteImport } from './routes/_auth' +import { Route as DashboardRouteRouteImport } from './routes/dashboard.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ExpensiveIndexRouteImport } from './routes/expensive/index' +import { Route as DashboardIndexRouteImport } from './routes/dashboard.index' +import { Route as PathlessLayoutRouteBRouteImport } from './routes/_pathlessLayout.route-b' +import { Route as PathlessLayoutRouteARouteImport } from './routes/_pathlessLayout.route-a' +import { Route as AuthProfileRouteImport } from './routes/_auth.profile' +import { Route as thisFolderIsNotInTheUrlRouteGroupRouteImport } from './routes/(this-folder-is-not-in-the-url)/route-group' +import { Route as DashboardUsersRouteRouteImport } from './routes/dashboard.users.route' +import { Route as DashboardInvoicesRouteRouteImport } from './routes/dashboard.invoices.route' +import { Route as DashboardUsersIndexRouteImport } from './routes/dashboard.users.index' +import { Route as DashboardInvoicesIndexRouteImport } from './routes/dashboard.invoices.index' +import { Route as DashboardUsersUserRouteImport } from './routes/dashboard.users.user' +import { Route as DashboardInvoicesInvoiceIdRouteImport } from './routes/dashboard.invoices.$invoiceId' // Create/Update Routes -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const AuthRoute = AuthImport.update({ +const AuthRoute = AuthRouteImport.update({ id: '/_auth', getParentRoute: () => rootRoute, } as any) -const DashboardRouteRoute = DashboardRouteImport.update({ +const DashboardRouteRoute = DashboardRouteRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const ExpensiveIndexRoute = ExpensiveIndexImport.update({ +const ExpensiveIndexRoute = ExpensiveIndexRouteImport.update({ id: '/expensive/', path: '/expensive/', getParentRoute: () => rootRoute, } as any) -const DashboardIndexRoute = DashboardIndexImport.update({ +const DashboardIndexRoute = DashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardRouteRoute, } as any) -const PathlessLayoutRouteBRoute = PathlessLayoutRouteBImport.update({ +const PathlessLayoutRouteBRoute = PathlessLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutRoute, } as any) -const PathlessLayoutRouteARoute = PathlessLayoutRouteAImport.update({ +const PathlessLayoutRouteARoute = PathlessLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutRoute, } as any) -const AuthProfileRoute = AuthProfileImport.update({ +const AuthProfileRoute = AuthProfileRouteImport.update({ id: '/profile', path: '/profile', getParentRoute: () => AuthRoute, } as any) const thisFolderIsNotInTheUrlRouteGroupRoute = - thisFolderIsNotInTheUrlRouteGroupImport.update({ + thisFolderIsNotInTheUrlRouteGroupRouteImport.update({ id: '/(this-folder-is-not-in-the-url)/route-group', path: '/route-group', getParentRoute: () => rootRoute, } as any) -const DashboardUsersRouteRoute = DashboardUsersRouteImport.update({ +const DashboardUsersRouteRoute = DashboardUsersRouteRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardInvoicesRouteRoute = DashboardInvoicesRouteImport.update({ +const DashboardInvoicesRouteRoute = DashboardInvoicesRouteRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardUsersIndexRoute = DashboardUsersIndexImport.update({ +const DashboardUsersIndexRoute = DashboardUsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesIndexRoute = DashboardInvoicesIndexImport.update({ +const DashboardInvoicesIndexRoute = DashboardInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardInvoicesRouteRoute, } as any) -const DashboardUsersUserRoute = DashboardUsersUserImport.update({ +const DashboardUsersUserRoute = DashboardUsersUserRouteImport.update({ id: '/user', path: '/user', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesInvoiceIdRoute = DashboardInvoicesInvoiceIdImport.update( - { +const DashboardInvoicesInvoiceIdRoute = + DashboardInvoicesInvoiceIdRouteImport.update({ id: '/$invoiceId', path: '/$invoiceId', getParentRoute: () => DashboardInvoicesRouteRoute, - } as any, -) + } as any) // Populate the FileRoutesByPath interface @@ -142,124 +143,280 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/dashboard': { id: '/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardRouteRouteImport parentRoute: typeof rootRoute } '/_auth': { id: '/_auth' path: '' fullPath: '' - preLoaderRoute: typeof AuthImport + preLoaderRoute: typeof AuthRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices': { id: '/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof DashboardInvoicesRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardInvoicesRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/dashboard/users': { id: '/dashboard/users' path: '/users' fullPath: '/dashboard/users' - preLoaderRoute: typeof DashboardUsersRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardUsersRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/(this-folder-is-not-in-the-url)/route-group': { id: '/(this-folder-is-not-in-the-url)/route-group' path: '/route-group' fullPath: '/route-group' - preLoaderRoute: typeof thisFolderIsNotInTheUrlRouteGroupImport + preLoaderRoute: typeof thisFolderIsNotInTheUrlRouteGroupRouteImport parentRoute: typeof rootRoute } '/_auth/profile': { id: '/_auth/profile' path: '/profile' fullPath: '/profile' - preLoaderRoute: typeof AuthProfileImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthProfileRouteImport + parentRoute: typeof AuthRouteImport } '/_pathlessLayout/route-a': { id: '/_pathlessLayout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutRouteAImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/_pathlessLayout/route-b': { id: '/_pathlessLayout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutRouteBImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/dashboard/': { id: '/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof DashboardIndexImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardIndexRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/expensive/': { id: '/expensive/' path: '/expensive' fullPath: '/expensive' - preLoaderRoute: typeof ExpensiveIndexImport + preLoaderRoute: typeof ExpensiveIndexRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices/$invoiceId': { id: '/dashboard/invoices/$invoiceId' path: '/$invoiceId' fullPath: '/dashboard/invoices/$invoiceId' - preLoaderRoute: typeof DashboardInvoicesInvoiceIdImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesInvoiceIdRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/user': { id: '/dashboard/users/user' path: '/user' fullPath: '/dashboard/users/user' - preLoaderRoute: typeof DashboardUsersUserImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersUserRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } '/dashboard/invoices/': { id: '/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof DashboardInvoicesIndexImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesIndexRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/': { id: '/dashboard/users/' path: '/' fullPath: '/dashboard/users/' - preLoaderRoute: typeof DashboardUsersIndexImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersIndexRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/dashboard.route' { + const createFileRoute: CreateFileRoute< + '/dashboard', + FileRoutesByPath['/dashboard']['parentRoute'], + FileRoutesByPath['/dashboard']['id'], + FileRoutesByPath['/dashboard']['path'], + FileRoutesByPath['/dashboard']['fullPath'] + > +} +declare module './routes/_auth' { + const createFileRoute: CreateFileRoute< + '/_auth', + FileRoutesByPath['/_auth']['parentRoute'], + FileRoutesByPath['/_auth']['id'], + FileRoutesByPath['/_auth']['path'], + FileRoutesByPath['/_auth']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/dashboard.invoices.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices', + FileRoutesByPath['/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/dashboard/invoices']['id'], + FileRoutesByPath['/dashboard/invoices']['path'], + FileRoutesByPath['/dashboard/invoices']['fullPath'] + > +} +declare module './routes/dashboard.users.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/users', + FileRoutesByPath['/dashboard/users']['parentRoute'], + FileRoutesByPath['/dashboard/users']['id'], + FileRoutesByPath['/dashboard/users']['path'], + FileRoutesByPath['/dashboard/users']['fullPath'] + > +} +declare module './routes/(this-folder-is-not-in-the-url)/route-group' { + const createFileRoute: CreateFileRoute< + '/(this-folder-is-not-in-the-url)/route-group', + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['parentRoute'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['id'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['path'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['fullPath'] + > +} +declare module './routes/_auth.profile' { + const createFileRoute: CreateFileRoute< + '/_auth/profile', + FileRoutesByPath['/_auth/profile']['parentRoute'], + FileRoutesByPath['/_auth/profile']['id'], + FileRoutesByPath['/_auth/profile']['path'], + FileRoutesByPath['/_auth/profile']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-a', + FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-b', + FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] + > +} +declare module './routes/dashboard.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/', + FileRoutesByPath['/dashboard/']['parentRoute'], + FileRoutesByPath['/dashboard/']['id'], + FileRoutesByPath['/dashboard/']['path'], + FileRoutesByPath['/dashboard/']['fullPath'] + > +} +declare module './routes/expensive/index' { + const createFileRoute: CreateFileRoute< + '/expensive/', + FileRoutesByPath['/expensive/']['parentRoute'], + FileRoutesByPath['/expensive/']['id'], + FileRoutesByPath['/expensive/']['path'], + FileRoutesByPath['/expensive/']['fullPath'] + > +} +declare module './routes/dashboard.invoices.$invoiceId' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/$invoiceId', + FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] + > +} +declare module './routes/dashboard.users.user' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/user', + FileRoutesByPath['/dashboard/users/user']['parentRoute'], + FileRoutesByPath['/dashboard/users/user']['id'], + FileRoutesByPath['/dashboard/users/user']['path'], + FileRoutesByPath['/dashboard/users/user']['fullPath'] + > +} +declare module './routes/dashboard.invoices.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/', + FileRoutesByPath['/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/']['id'], + FileRoutesByPath['/dashboard/invoices/']['path'], + FileRoutesByPath['/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/dashboard.users.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/', + FileRoutesByPath['/dashboard/users/']['parentRoute'], + FileRoutesByPath['/dashboard/users/']['id'], + FileRoutesByPath['/dashboard/users/']['path'], + FileRoutesByPath['/dashboard/users/']['fullPath'] + > +} + // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx b/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx index 4541afc8d0..c2e8814a2d 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx @@ -1,9 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute( - '/(this-folder-is-not-in-the-url)/route-group', -)({ +export const Route = createFileRoute({ component: RouteGroupExample, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx b/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx index fa63df98b0..7b3d690e6e 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_auth/profile')({ +export const Route = createFileRoute({ component: ProfileComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx b/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx index f4f3876f26..60945fd245 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { auth } from '../utils/auth' -export const Route = createFileRoute('/_auth')({ +export const Route = createFileRoute({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx index ce791bcf2f..f81e516bd8 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/route-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx index aa3010287d..c7ff7c5d74 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/route-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx index 4884d30343..6202a8b2db 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx index 22fb1c83c6..9798188424 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/')({ +export const Route = createFileRoute({ loader: () => fetchInvoices(), component: DashboardIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index d615c89a2c..a04c00532c 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,16 +1,11 @@ import * as React from 'react' -import { - Link, - createFileRoute, - useNavigate, - useRouter, -} from '@tanstack/react-router' +import { Link, useNavigate, useRouter } from '@tanstack/react-router' import { z } from 'zod' import { InvoiceFields } from '../components/InvoiceFields' import { useMutation } from '../hooks/useMutation' import { fetchInvoiceById, patchInvoice } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ +export const Route = createFileRoute({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx index 4df164a96e..c36ab63e2f 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,12 +1,12 @@ import * as React from 'react' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { InvoiceFields } from '../components/InvoiceFields' import { Spinner } from '../components/Spinner' import { useMutation } from '../hooks/useMutation' import { postInvoice } from '../utils/mockTodos' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices/')({ +export const Route = createFileRoute({ component: InvoicesIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx index e1a123946d..a784671c81 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,14 +1,9 @@ import * as React from 'react' -import { - Link, - MatchRoute, - Outlet, - createFileRoute, -} from '@tanstack/react-router' +import { Link, MatchRoute, Outlet } from '@tanstack/react-router' import { Spinner } from '../components/Spinner' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices')({ +export const Route = createFileRoute({ loader: () => fetchInvoices(), component: InvoicesComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx index b718b59a2d..78f697adbc 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx @@ -1,12 +1,7 @@ import * as React from 'react' -import { - Link, - Outlet, - createFileRoute, - linkOptions, -} from '@tanstack/react-router' +import { Link, Outlet, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute('/dashboard')({ +export const Route = createFileRoute({ component: DashboardComponent, loader: () => ({ crumb: 'Dashboard', diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx index 7ad9771152..2793568c42 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/dashboard/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx index 0d8886872f..31be72e784 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx @@ -3,7 +3,6 @@ import { Link, MatchRoute, Outlet, - createFileRoute, retainSearchParams, useNavigate, } from '@tanstack/react-router' @@ -13,7 +12,7 @@ import { fetchUsers } from '../utils/mockTodos' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute('/dashboard/users')({ +export const Route = createFileRoute({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx index fb8d1cc880..08ab031105 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { z } from 'zod' import { fetchUserById } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/users/user')({ +export const Route = createFileRoute({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx b/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx index 42e1b4c0e8..5066d67ac5 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/react-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute('/expensive/')({ +export const Route = createFileRoute({ component: Expensive, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/index.tsx b/examples/react/kitchen-sink-file-based/src/routes/index.tsx index a99ada182b..b0d05ea341 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: IndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/login.tsx b/examples/react/kitchen-sink-file-based/src/routes/login.tsx index 42c01d793f..4d577af794 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/login.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/login.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts b/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts index 0ba6d5e9a5..48d30adc2a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts +++ b/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts @@ -8,130 +8,131 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LoginImport } from './routes/login' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as AuthImport } from './routes/_auth' -import { Route as DashboardRouteImport } from './routes/dashboard.route' -import { Route as IndexImport } from './routes/index' -import { Route as ExpensiveIndexImport } from './routes/expensive/index' -import { Route as DashboardIndexImport } from './routes/dashboard.index' -import { Route as FooBarImport } from './routes/foo/bar' -import { Route as PathlessLayoutRouteBImport } from './routes/_pathlessLayout.route-b' -import { Route as PathlessLayoutRouteAImport } from './routes/_pathlessLayout.route-a' -import { Route as AuthProfileImport } from './routes/_auth.profile' -import { Route as DashboardUsersRouteImport } from './routes/dashboard.users.route' -import { Route as DashboardInvoicesRouteImport } from './routes/dashboard.invoices.route' -import { Route as DashboardUsersIndexImport } from './routes/dashboard.users.index' -import { Route as DashboardInvoicesIndexImport } from './routes/dashboard.invoices.index' -import { Route as DashboardUsersUserImport } from './routes/dashboard.users.user' -import { Route as DashboardInvoicesInvoiceIdImport } from './routes/dashboard.invoices.$invoiceId' +import { Route as LoginRouteImport } from './routes/login' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as AuthRouteImport } from './routes/_auth' +import { Route as DashboardRouteRouteImport } from './routes/dashboard.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ExpensiveIndexRouteImport } from './routes/expensive/index' +import { Route as DashboardIndexRouteImport } from './routes/dashboard.index' +import { Route as FooBarRouteImport } from './routes/foo/bar' +import { Route as PathlessLayoutRouteBRouteImport } from './routes/_pathlessLayout.route-b' +import { Route as PathlessLayoutRouteARouteImport } from './routes/_pathlessLayout.route-a' +import { Route as AuthProfileRouteImport } from './routes/_auth.profile' +import { Route as DashboardUsersRouteRouteImport } from './routes/dashboard.users.route' +import { Route as DashboardInvoicesRouteRouteImport } from './routes/dashboard.invoices.route' +import { Route as DashboardUsersIndexRouteImport } from './routes/dashboard.users.index' +import { Route as DashboardInvoicesIndexRouteImport } from './routes/dashboard.invoices.index' +import { Route as DashboardUsersUserRouteImport } from './routes/dashboard.users.user' +import { Route as DashboardInvoicesInvoiceIdRouteImport } from './routes/dashboard.invoices.$invoiceId' // Create/Update Routes -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const AuthRoute = AuthImport.update({ +const AuthRoute = AuthRouteImport.update({ id: '/_auth', getParentRoute: () => rootRoute, } as any) -const DashboardRouteRoute = DashboardRouteImport.update({ +const DashboardRouteRoute = DashboardRouteRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const ExpensiveIndexRoute = ExpensiveIndexImport.update({ +const ExpensiveIndexRoute = ExpensiveIndexRouteImport.update({ id: '/expensive/', path: '/expensive/', getParentRoute: () => rootRoute, } as any) -const DashboardIndexRoute = DashboardIndexImport.update({ +const DashboardIndexRoute = DashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardRouteRoute, } as any) -const FooBarRoute = FooBarImport.update({ +const FooBarRoute = FooBarRouteImport.update({ id: '/foo/bar', path: '/foo/bar', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRouteBRoute = PathlessLayoutRouteBImport.update({ +const PathlessLayoutRouteBRoute = PathlessLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutRoute, } as any) -const PathlessLayoutRouteARoute = PathlessLayoutRouteAImport.update({ +const PathlessLayoutRouteARoute = PathlessLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutRoute, } as any) -const AuthProfileRoute = AuthProfileImport.update({ +const AuthProfileRoute = AuthProfileRouteImport.update({ id: '/profile', path: '/profile', getParentRoute: () => AuthRoute, } as any) -const DashboardUsersRouteRoute = DashboardUsersRouteImport.update({ +const DashboardUsersRouteRoute = DashboardUsersRouteRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardInvoicesRouteRoute = DashboardInvoicesRouteImport.update({ +const DashboardInvoicesRouteRoute = DashboardInvoicesRouteRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardUsersIndexRoute = DashboardUsersIndexImport.update({ +const DashboardUsersIndexRoute = DashboardUsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesIndexRoute = DashboardInvoicesIndexImport.update({ +const DashboardInvoicesIndexRoute = DashboardInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardInvoicesRouteRoute, } as any) -const DashboardUsersUserRoute = DashboardUsersUserImport.update({ +const DashboardUsersUserRoute = DashboardUsersUserRouteImport.update({ id: '/user', path: '/user', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesInvoiceIdRoute = DashboardInvoicesInvoiceIdImport.update( - { +const DashboardInvoicesInvoiceIdRoute = + DashboardInvoicesInvoiceIdRouteImport.update({ id: '/$invoiceId', path: '/$invoiceId', getParentRoute: () => DashboardInvoicesRouteRoute, - } as any, -) + } as any) // Populate the FileRoutesByPath interface @@ -141,124 +142,280 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/dashboard': { id: '/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardRouteRouteImport parentRoute: typeof rootRoute } '/_auth': { id: '/_auth' path: '' fullPath: '' - preLoaderRoute: typeof AuthImport + preLoaderRoute: typeof AuthRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices': { id: '/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof DashboardInvoicesRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardInvoicesRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/dashboard/users': { id: '/dashboard/users' path: '/users' fullPath: '/dashboard/users' - preLoaderRoute: typeof DashboardUsersRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardUsersRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/_auth/profile': { id: '/_auth/profile' path: '/profile' fullPath: '/profile' - preLoaderRoute: typeof AuthProfileImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthProfileRouteImport + parentRoute: typeof AuthRouteImport } '/_pathlessLayout/route-a': { id: '/_pathlessLayout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutRouteAImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/_pathlessLayout/route-b': { id: '/_pathlessLayout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutRouteBImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/foo/bar': { id: '/foo/bar' path: '/foo/bar' fullPath: '/foo/bar' - preLoaderRoute: typeof FooBarImport + preLoaderRoute: typeof FooBarRouteImport parentRoute: typeof rootRoute } '/dashboard/': { id: '/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof DashboardIndexImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardIndexRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/expensive/': { id: '/expensive/' path: '/expensive' fullPath: '/expensive' - preLoaderRoute: typeof ExpensiveIndexImport + preLoaderRoute: typeof ExpensiveIndexRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices/$invoiceId': { id: '/dashboard/invoices/$invoiceId' path: '/$invoiceId' fullPath: '/dashboard/invoices/$invoiceId' - preLoaderRoute: typeof DashboardInvoicesInvoiceIdImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesInvoiceIdRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/user': { id: '/dashboard/users/user' path: '/user' fullPath: '/dashboard/users/user' - preLoaderRoute: typeof DashboardUsersUserImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersUserRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } '/dashboard/invoices/': { id: '/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof DashboardInvoicesIndexImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesIndexRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/': { id: '/dashboard/users/' path: '/' fullPath: '/dashboard/users/' - preLoaderRoute: typeof DashboardUsersIndexImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersIndexRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/dashboard.route' { + const createFileRoute: CreateFileRoute< + '/dashboard', + FileRoutesByPath['/dashboard']['parentRoute'], + FileRoutesByPath['/dashboard']['id'], + FileRoutesByPath['/dashboard']['path'], + FileRoutesByPath['/dashboard']['fullPath'] + > +} +declare module './routes/_auth' { + const createFileRoute: CreateFileRoute< + '/_auth', + FileRoutesByPath['/_auth']['parentRoute'], + FileRoutesByPath['/_auth']['id'], + FileRoutesByPath['/_auth']['path'], + FileRoutesByPath['/_auth']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/dashboard.invoices.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices', + FileRoutesByPath['/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/dashboard/invoices']['id'], + FileRoutesByPath['/dashboard/invoices']['path'], + FileRoutesByPath['/dashboard/invoices']['fullPath'] + > +} +declare module './routes/dashboard.users.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/users', + FileRoutesByPath['/dashboard/users']['parentRoute'], + FileRoutesByPath['/dashboard/users']['id'], + FileRoutesByPath['/dashboard/users']['path'], + FileRoutesByPath['/dashboard/users']['fullPath'] + > +} +declare module './routes/_auth.profile' { + const createFileRoute: CreateFileRoute< + '/_auth/profile', + FileRoutesByPath['/_auth/profile']['parentRoute'], + FileRoutesByPath['/_auth/profile']['id'], + FileRoutesByPath['/_auth/profile']['path'], + FileRoutesByPath['/_auth/profile']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-a', + FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-b', + FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] + > +} +declare module './routes/foo/bar' { + const createFileRoute: CreateFileRoute< + '/foo/bar', + FileRoutesByPath['/foo/bar']['parentRoute'], + FileRoutesByPath['/foo/bar']['id'], + FileRoutesByPath['/foo/bar']['path'], + FileRoutesByPath['/foo/bar']['fullPath'] + > +} +declare module './routes/dashboard.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/', + FileRoutesByPath['/dashboard/']['parentRoute'], + FileRoutesByPath['/dashboard/']['id'], + FileRoutesByPath['/dashboard/']['path'], + FileRoutesByPath['/dashboard/']['fullPath'] + > +} +declare module './routes/expensive/index' { + const createFileRoute: CreateFileRoute< + '/expensive/', + FileRoutesByPath['/expensive/']['parentRoute'], + FileRoutesByPath['/expensive/']['id'], + FileRoutesByPath['/expensive/']['path'], + FileRoutesByPath['/expensive/']['fullPath'] + > +} +declare module './routes/dashboard.invoices.$invoiceId' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/$invoiceId', + FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] + > +} +declare module './routes/dashboard.users.user' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/user', + FileRoutesByPath['/dashboard/users/user']['parentRoute'], + FileRoutesByPath['/dashboard/users/user']['id'], + FileRoutesByPath['/dashboard/users/user']['path'], + FileRoutesByPath['/dashboard/users/user']['fullPath'] + > +} +declare module './routes/dashboard.invoices.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/', + FileRoutesByPath['/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/']['id'], + FileRoutesByPath['/dashboard/invoices/']['path'], + FileRoutesByPath['/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/dashboard.users.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/', + FileRoutesByPath['/dashboard/users/']['parentRoute'], + FileRoutesByPath['/dashboard/users/']['id'], + FileRoutesByPath['/dashboard/users/']['path'], + FileRoutesByPath['/dashboard/users/']['fullPath'] + > +} + // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx index fa63df98b0..7b3d690e6e 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_auth/profile')({ +export const Route = createFileRoute({ component: ProfileComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx index 30fdcf9f28..2d93a859c8 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { auth } from '../utils/auth' -export const Route = createFileRoute('/_auth')({ +export const Route = createFileRoute({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx index ce791bcf2f..f81e516bd8 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/route-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx index aa3010287d..c7ff7c5d74 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/route-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx index 1f13b66ee8..e596f802b0 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx index 86fdaf1172..e1a97c0d00 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { useSuspenseQuery } from '@tanstack/react-query' import { invoicesQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute('/dashboard/')({ +export const Route = createFileRoute({ loader: (opts) => opts.context.queryClient.ensureQueryData(invoicesQueryOptions()), component: DashboardIndexComponent, diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index 5a8a3c5308..a2df18d5ea 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, createFileRoute, useNavigate } from '@tanstack/react-router' +import { Link, useNavigate } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { z } from 'zod' import { InvoiceFields } from '../components/InvoiceFields' @@ -8,7 +8,7 @@ import { useUpdateInvoiceMutation, } from '../utils/queryOptions' -export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ +export const Route = createFileRoute({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx index 5537b15bb6..7a8978b599 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,11 +1,11 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { InvoiceFields } from '../components/InvoiceFields' import { Spinner } from '../components/Spinner' import { useCreateInvoiceMutation } from '../utils/queryOptions' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices/')({ +export const Route = createFileRoute({ component: InvoicesIndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx index 4c613cb7a7..7e0dfb11b3 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,15 +1,10 @@ import * as React from 'react' -import { - Link, - MatchRoute, - Outlet, - createFileRoute, -} from '@tanstack/react-router' +import { Link, MatchRoute, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { Spinner } from '../components/Spinner' import { invoicesQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute('/dashboard/invoices')({ +export const Route = createFileRoute({ loader: (opts) => opts.context.queryClient.ensureQueryData(invoicesQueryOptions()), component: InvoicesComponent, diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx index fc6ac0701e..25dadabf53 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/dashboard')({ +export const Route = createFileRoute({ component: DashboardComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx index 7ad9771152..2793568c42 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/dashboard/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx index e7b2eb2316..0457ed137c 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx @@ -4,7 +4,6 @@ import { Link, MatchRoute, Outlet, - createFileRoute, retainSearchParams, useNavigate, } from '@tanstack/react-router' @@ -15,7 +14,7 @@ import { usersQueryOptions } from '../utils/queryOptions' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute('/dashboard/users')({ +export const Route = createFileRoute({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx index 0dece3c32f..87eeae270c 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx @@ -1,10 +1,10 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { useSuspenseQuery } from '@tanstack/react-query' import { z } from 'zod' import { userQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute('/dashboard/users/user')({ +export const Route = createFileRoute({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx index 42e1b4c0e8..5066d67ac5 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/react-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute('/expensive/')({ +export const Route = createFileRoute({ component: Expensive, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx index aa5920563e..c91111016b 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute('/foo/bar')({ +export const Route = createFileRoute({ component: () =>
{JSON.stringify(Route.useSearch())}
, validateSearch: z.object({ asdf: z.string() }), }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx index a99ada182b..b0d05ea341 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: IndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx index bcc606ac33..1fdb01084a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/react/kitchen-sink/src/main.tsx b/examples/react/kitchen-sink/src/main.tsx index 6c0c347284..3465637ce0 100644 --- a/examples/react/kitchen-sink/src/main.tsx +++ b/examples/react/kitchen-sink/src/main.tsx @@ -68,7 +68,7 @@ function RootComponent() { ['/route-a', 'Pathless Layout A'], ['/route-b', 'Pathless Layout B'], ['/profile', 'Profile'], - ['/login', 'Login'], + ...(auth.status === 'loggedOut' ? [['/login', 'Login']] : []), ] as const ).map(([to, label]) => { return ( @@ -642,6 +642,7 @@ const authPathlessLayoutRoute = createRoute({ beforeLoad: ({ context, location }) => { // If the user is logged out, redirect them to the login page if (context.auth.status === 'loggedOut') { + console.log(location) throw redirect({ to: loginRoute.to, search: { @@ -674,6 +675,15 @@ function ProfileComponent() {
Username:{username}
+
) } @@ -714,7 +724,10 @@ function LoginComponent() { Logged in as {auth.username}
diff --git a/examples/react/large-file-based/src/routeTree.gen.ts b/examples/react/large-file-based/src/routeTree.gen.ts index e4f3a85ab1..44cc9055f8 100644 --- a/examples/react/large-file-based/src/routeTree.gen.ts +++ b/examples/react/large-file-based/src/routeTree.gen.ts @@ -8,63 +8,65 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as RelativeImport } from './routes/relative' -import { Route as LinkPropsImport } from './routes/linkProps' -import { Route as AbsoluteImport } from './routes/absolute' -import { Route as SearchRouteImport } from './routes/search/route' -import { Route as ParamsRouteImport } from './routes/params/route' -import { Route as IndexImport } from './routes/index' -import { Route as SearchSearchPlaceholderImport } from './routes/search/searchPlaceholder' -import { Route as ParamsParamsPlaceholderImport } from './routes/params/$paramsPlaceholder' +import { Route as RelativeRouteImport } from './routes/relative' +import { Route as LinkPropsRouteImport } from './routes/linkProps' +import { Route as AbsoluteRouteImport } from './routes/absolute' +import { Route as SearchRouteRouteImport } from './routes/search/route' +import { Route as ParamsRouteRouteImport } from './routes/params/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as SearchSearchPlaceholderRouteImport } from './routes/search/searchPlaceholder' +import { Route as ParamsParamsPlaceholderRouteImport } from './routes/params/$paramsPlaceholder' // Create/Update Routes -const RelativeRoute = RelativeImport.update({ +const RelativeRoute = RelativeRouteImport.update({ id: '/relative', path: '/relative', getParentRoute: () => rootRoute, } as any) -const LinkPropsRoute = LinkPropsImport.update({ +const LinkPropsRoute = LinkPropsRouteImport.update({ id: '/linkProps', path: '/linkProps', getParentRoute: () => rootRoute, } as any) -const AbsoluteRoute = AbsoluteImport.update({ +const AbsoluteRoute = AbsoluteRouteImport.update({ id: '/absolute', path: '/absolute', getParentRoute: () => rootRoute, } as any) -const SearchRouteRoute = SearchRouteImport.update({ +const SearchRouteRoute = SearchRouteRouteImport.update({ id: '/search', path: '/search', getParentRoute: () => rootRoute, } as any) -const ParamsRouteRoute = ParamsRouteImport.update({ +const ParamsRouteRoute = ParamsRouteRouteImport.update({ id: '/params', path: '/params', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const SearchSearchPlaceholderRoute = SearchSearchPlaceholderImport.update({ +const SearchSearchPlaceholderRoute = SearchSearchPlaceholderRouteImport.update({ id: '/searchPlaceholder', path: '/searchPlaceholder', getParentRoute: () => SearchRouteRoute, } as any) -const ParamsParamsPlaceholderRoute = ParamsParamsPlaceholderImport.update({ +const ParamsParamsPlaceholderRoute = ParamsParamsPlaceholderRouteImport.update({ id: '/$paramsPlaceholder', path: '/$paramsPlaceholder', getParentRoute: () => ParamsRouteRoute, @@ -78,61 +80,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/params': { id: '/params' path: '/params' fullPath: '/params' - preLoaderRoute: typeof ParamsRouteImport + preLoaderRoute: typeof ParamsRouteRouteImport parentRoute: typeof rootRoute } '/search': { id: '/search' path: '/search' fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport + preLoaderRoute: typeof SearchRouteRouteImport parentRoute: typeof rootRoute } '/absolute': { id: '/absolute' path: '/absolute' fullPath: '/absolute' - preLoaderRoute: typeof AbsoluteImport + preLoaderRoute: typeof AbsoluteRouteImport parentRoute: typeof rootRoute } '/linkProps': { id: '/linkProps' path: '/linkProps' fullPath: '/linkProps' - preLoaderRoute: typeof LinkPropsImport + preLoaderRoute: typeof LinkPropsRouteImport parentRoute: typeof rootRoute } '/relative': { id: '/relative' path: '/relative' fullPath: '/relative' - preLoaderRoute: typeof RelativeImport + preLoaderRoute: typeof RelativeRouteImport parentRoute: typeof rootRoute } '/params/$paramsPlaceholder': { id: '/params/$paramsPlaceholder' path: '/$paramsPlaceholder' fullPath: '/params/$paramsPlaceholder' - preLoaderRoute: typeof ParamsParamsPlaceholderImport - parentRoute: typeof ParamsRouteImport + preLoaderRoute: typeof ParamsParamsPlaceholderRouteImport + parentRoute: typeof ParamsRouteRouteImport } '/search/searchPlaceholder': { id: '/search/searchPlaceholder' path: '/searchPlaceholder' fullPath: '/search/searchPlaceholder' - preLoaderRoute: typeof SearchSearchPlaceholderImport - parentRoute: typeof SearchRouteImport + preLoaderRoute: typeof SearchSearchPlaceholderRouteImport + parentRoute: typeof SearchRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/params/route' { + const createFileRoute: CreateFileRoute< + '/params', + FileRoutesByPath['/params']['parentRoute'], + FileRoutesByPath['/params']['id'], + FileRoutesByPath['/params']['path'], + FileRoutesByPath['/params']['fullPath'] + > +} +declare module './routes/search/route' { + const createFileRoute: CreateFileRoute< + '/search', + FileRoutesByPath['/search']['parentRoute'], + FileRoutesByPath['/search']['id'], + FileRoutesByPath['/search']['path'], + FileRoutesByPath['/search']['fullPath'] + > +} +declare module './routes/absolute' { + const createFileRoute: CreateFileRoute< + '/absolute', + FileRoutesByPath['/absolute']['parentRoute'], + FileRoutesByPath['/absolute']['id'], + FileRoutesByPath['/absolute']['path'], + FileRoutesByPath['/absolute']['fullPath'] + > +} +declare module './routes/linkProps' { + const createFileRoute: CreateFileRoute< + '/linkProps', + FileRoutesByPath['/linkProps']['parentRoute'], + FileRoutesByPath['/linkProps']['id'], + FileRoutesByPath['/linkProps']['path'], + FileRoutesByPath['/linkProps']['fullPath'] + > +} +declare module './routes/relative' { + const createFileRoute: CreateFileRoute< + '/relative', + FileRoutesByPath['/relative']['parentRoute'], + FileRoutesByPath['/relative']['id'], + FileRoutesByPath['/relative']['path'], + FileRoutesByPath['/relative']['fullPath'] + > +} +declare module './routes/params/$paramsPlaceholder' { + const createFileRoute: CreateFileRoute< + '/params/$paramsPlaceholder', + FileRoutesByPath['/params/$paramsPlaceholder']['parentRoute'], + FileRoutesByPath['/params/$paramsPlaceholder']['id'], + FileRoutesByPath['/params/$paramsPlaceholder']['path'], + FileRoutesByPath['/params/$paramsPlaceholder']['fullPath'] + > +} +declare module './routes/search/searchPlaceholder' { + const createFileRoute: CreateFileRoute< + '/search/searchPlaceholder', + FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], + FileRoutesByPath['/search/searchPlaceholder']['id'], + FileRoutesByPath['/search/searchPlaceholder']['path'], + FileRoutesByPath['/search/searchPlaceholder']['fullPath'] + > +} + // Create and export the route tree interface ParamsRouteRouteChildren { diff --git a/examples/react/large-file-based/src/routes/absolute.tsx b/examples/react/large-file-based/src/routes/absolute.tsx index ba1f875050..857515fa10 100644 --- a/examples/react/large-file-based/src/routes/absolute.tsx +++ b/examples/react/large-file-based/src/routes/absolute.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/absolute')({ +export const Route = createFileRoute({ component: AbsoluteComponent, }) diff --git a/examples/react/large-file-based/src/routes/index.tsx b/examples/react/large-file-based/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/large-file-based/src/routes/index.tsx +++ b/examples/react/large-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/large-file-based/src/routes/linkProps.tsx b/examples/react/large-file-based/src/routes/linkProps.tsx index 2811bcd5a8..83cee49160 100644 --- a/examples/react/large-file-based/src/routes/linkProps.tsx +++ b/examples/react/large-file-based/src/routes/linkProps.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute, linkOptions } from '@tanstack/react-router' +import { Link, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute('/linkProps')({ +export const Route = createFileRoute({ component: LinkPropsPage, }) diff --git a/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx b/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx index 35f85eab9b..8e45ed1eba 100644 --- a/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx +++ b/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { z } from 'zod' import { queryOptions } from '@tanstack/react-query' @@ -20,7 +20,7 @@ const paramsQueryOptions = queryOptions({ }, }) -export const Route = createFileRoute('/params/$paramsPlaceholder')({ +export const Route = createFileRoute({ component: ParamsComponent, loader: (opts) => opts.context.queryClient.ensureQueryData(paramsQueryOptions), diff --git a/examples/react/large-file-based/src/routes/params/route.tsx b/examples/react/large-file-based/src/routes/params/route.tsx index 32f2b82024..a37f312161 100644 --- a/examples/react/large-file-based/src/routes/params/route.tsx +++ b/examples/react/large-file-based/src/routes/params/route.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/params')({ +export const Route = createFileRoute({ component: () =>
Hello /params!
, }) diff --git a/examples/react/large-file-based/src/routes/relative.tsx b/examples/react/large-file-based/src/routes/relative.tsx index 6f6e581efd..cf25ec6f9f 100644 --- a/examples/react/large-file-based/src/routes/relative.tsx +++ b/examples/react/large-file-based/src/routes/relative.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/relative')({ +export const Route = createFileRoute({ component: RelativeComponent, }) diff --git a/examples/react/large-file-based/src/routes/search/route.tsx b/examples/react/large-file-based/src/routes/search/route.tsx index 364daefb12..13eaab8d40 100644 --- a/examples/react/large-file-based/src/routes/search/route.tsx +++ b/examples/react/large-file-based/src/routes/search/route.tsx @@ -1,12 +1,12 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { z } from 'zod' const search = z.object({ rootSearch: z.number(), }) -export const Route = createFileRoute('/search')({ +export const Route = createFileRoute({ component: () =>
Hello /search!
, validateSearch: search, }) diff --git a/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx b/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx index 60372e8b98..c8249a3728 100644 --- a/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx +++ b/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { z } from 'zod' import { queryOptions } from '@tanstack/react-query' @@ -26,7 +26,7 @@ const searchQueryOptions = queryOptions({ }, }) -export const Route = createFileRoute('/search/searchPlaceholder')({ +export const Route = createFileRoute({ component: SearchComponent, validateSearch: search, loader: (opts) => diff --git a/examples/react/quickstart-file-based/src/routeTree.gen.ts b/examples/react/quickstart-file-based/src/routeTree.gen.ts index 48c183c8da..3f5c19883b 100644 --- a/examples/react/quickstart-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-file-based/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-file-based/src/routes/about.tsx b/examples/react/quickstart-file-based/src/routes/about.tsx index 492e6b85c2..6ac3e560c5 100644 --- a/examples/react/quickstart-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-file-based/src/routes/about.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: AboutComponent, }) diff --git a/examples/react/quickstart-file-based/src/routes/index.tsx b/examples/react/quickstart-file-based/src/routes/index.tsx index c4588fb2c9..acb0446745 100644 --- a/examples/react/quickstart-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts b/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts index 48c183c8da..3f5c19883b 100644 --- a/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-rspack-file-based/src/routes/about.tsx b/examples/react/quickstart-rspack-file-based/src/routes/about.tsx index 492e6b85c2..6ac3e560c5 100644 --- a/examples/react/quickstart-rspack-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-rspack-file-based/src/routes/about.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: AboutComponent, }) diff --git a/examples/react/quickstart-rspack-file-based/src/routes/index.tsx b/examples/react/quickstart-rspack-file-based/src/routes/index.tsx index c4588fb2c9..acb0446745 100644 --- a/examples/react/quickstart-rspack-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-rspack-file-based/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts b/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts index 48c183c8da..3f5c19883b 100644 --- a/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-webpack-file-based/src/routes/about.tsx b/examples/react/quickstart-webpack-file-based/src/routes/about.tsx index 0d58b8cb0b..d57890bd6c 100644 --- a/examples/react/quickstart-webpack-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-webpack-file-based/src/routes/about.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: AboutComponent, }) diff --git a/examples/react/quickstart-webpack-file-based/src/routes/index.tsx b/examples/react/quickstart-webpack-file-based/src/routes/index.tsx index c6b6b31c01..3254ca4186 100644 --- a/examples/react/quickstart-webpack-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-webpack-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts index 708707e98c..480c6da472 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostIdImport } from './routes/$postId' -import { Route as IndexImport } from './routes/index' +import { Route as PostIdRouteImport } from './routes/$postId' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const PostIdRoute = PostIdImport.update({ +const PostIdRoute = PostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/$postId': { id: '/$postId' path: '/$postId' fullPath: '/$postId' - preLoaderRoute: typeof PostIdImport + preLoaderRoute: typeof PostIdRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/$postId' { + const createFileRoute: CreateFileRoute< + '/$postId', + FileRoutesByPath['/$postId']['parentRoute'], + FileRoutesByPath['/$postId']['id'], + FileRoutesByPath['/$postId']['path'], + FileRoutesByPath['/$postId']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts index 0e85860a5b..35540eeb42 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { postQueryOptions } from '@router-mono-react-query/post-query' -export const Route = createFileRoute('/$postId')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts b/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts index 880ec469fe..b1a99aecbb 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { postsQueryOptions } from '@router-mono-react-query/post-query' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient } }) => { return queryClient.ensureQueryData(postsQueryOptions) }, diff --git a/examples/react/router-monorepo-react-query/packages/router/vite.config.ts b/examples/react/router-monorepo-react-query/packages/router/vite.config.ts index 7b846b67b0..b471bd3f58 100644 --- a/examples/react/router-monorepo-react-query/packages/router/vite.config.ts +++ b/examples/react/router-monorepo-react-query/packages/router/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite' import dts from 'vite-plugin-dts' import * as path from 'node:path' import { fileURLToPath } from 'node:url' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import react from '@vitejs/plugin-react' const __filename = fileURLToPath(import.meta.url) @@ -17,7 +17,7 @@ export default defineConfig({ tsconfigPath: path.join(__dirname, 'tsconfig.json'), }), react(), - TanStackRouterVite(), + tanstackRouter(), ], build: { outDir: './dist', diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts index 708707e98c..480c6da472 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostIdImport } from './routes/$postId' -import { Route as IndexImport } from './routes/index' +import { Route as PostIdRouteImport } from './routes/$postId' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const PostIdRoute = PostIdImport.update({ +const PostIdRoute = PostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/$postId': { id: '/$postId' path: '/$postId' fullPath: '/$postId' - preLoaderRoute: typeof PostIdImport + preLoaderRoute: typeof PostIdRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/$postId' { + const createFileRoute: CreateFileRoute< + '/$postId', + FileRoutesByPath['/$postId']['parentRoute'], + FileRoutesByPath['/$postId']['id'], + FileRoutesByPath['/$postId']['path'], + FileRoutesByPath['/$postId']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts index 670d4cc883..14110f613f 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/react-router' import { fetchPost } from '../fetch/posts' -export const Route = createFileRoute('/$postId')({ +export const Route = createFileRoute({ loader: ({ params }) => fetchPost(params.postId), }) diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts index 2dc2272d1f..2e8127f3f6 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { fetchPosts } from '../fetch/posts' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ loader: () => { return fetchPosts() }, diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/vite.config.ts b/examples/react/router-monorepo-simple-lazy/packages/router/vite.config.ts index d71c28ac2d..21aa5e70f4 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/vite.config.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite' import dts from 'vite-plugin-dts' import * as path from 'node:path' import { fileURLToPath } from 'node:url' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import react from '@vitejs/plugin-react' const __filename = fileURLToPath(import.meta.url) @@ -15,7 +15,7 @@ export default defineConfig({ tsconfigPath: path.join(__dirname, 'tsconfig.json'), }), react(), - TanStackRouterVite(), + tanstackRouter(), ], build: { outDir: './dist', diff --git a/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts index 708707e98c..480c6da472 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostIdImport } from './routes/$postId' -import { Route as IndexImport } from './routes/index' +import { Route as PostIdRouteImport } from './routes/$postId' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const PostIdRoute = PostIdImport.update({ +const PostIdRoute = PostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/$postId': { id: '/$postId' path: '/$postId' fullPath: '/$postId' - preLoaderRoute: typeof PostIdImport + preLoaderRoute: typeof PostIdRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/$postId' { + const createFileRoute: CreateFileRoute< + '/$postId', + FileRoutesByPath['/$postId']['parentRoute'], + FileRoutesByPath['/$postId']['id'], + FileRoutesByPath['/$postId']['path'], + FileRoutesByPath['/$postId']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts index 670d4cc883..14110f613f 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/react-router' import { fetchPost } from '../fetch/posts' -export const Route = createFileRoute('/$postId')({ +export const Route = createFileRoute({ loader: ({ params }) => fetchPost(params.postId), }) diff --git a/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts b/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts index 2dc2272d1f..2e8127f3f6 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { fetchPosts } from '../fetch/posts' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ loader: () => { return fetchPosts() }, diff --git a/examples/react/router-monorepo-simple/packages/router/vite.config.ts b/examples/react/router-monorepo-simple/packages/router/vite.config.ts index d71c28ac2d..21aa5e70f4 100644 --- a/examples/react/router-monorepo-simple/packages/router/vite.config.ts +++ b/examples/react/router-monorepo-simple/packages/router/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite' import dts from 'vite-plugin-dts' import * as path from 'node:path' import { fileURLToPath } from 'node:url' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import react from '@vitejs/plugin-react' const __filename = fileURLToPath(import.meta.url) @@ -15,7 +15,7 @@ export default defineConfig({ tsconfigPath: path.join(__dirname, 'tsconfig.json'), }), react(), - TanStackRouterVite(), + tanstackRouter(), ], build: { outDir: './dist', diff --git a/examples/react/search-validator-adapters/src/routeTree.gen.ts b/examples/react/search-validator-adapters/src/routeTree.gen.ts index 4e8d04aa89..a90eb1dfcd 100644 --- a/examples/react/search-validator-adapters/src/routeTree.gen.ts +++ b/examples/react/search-validator-adapters/src/routeTree.gen.ts @@ -8,35 +8,37 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as UsersZodIndexImport } from './routes/users/zod.index' -import { Route as UsersValibotIndexImport } from './routes/users/valibot.index' -import { Route as UsersArktypeIndexImport } from './routes/users/arktype.index' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersZodIndexRouteImport } from './routes/users/zod.index' +import { Route as UsersValibotIndexRouteImport } from './routes/users/valibot.index' +import { Route as UsersArktypeIndexRouteImport } from './routes/users/arktype.index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersZodIndexRoute = UsersZodIndexImport.update({ +const UsersZodIndexRoute = UsersZodIndexRouteImport.update({ id: '/users/zod/', path: '/users/zod/', getParentRoute: () => rootRoute, } as any) -const UsersValibotIndexRoute = UsersValibotIndexImport.update({ +const UsersValibotIndexRoute = UsersValibotIndexRouteImport.update({ id: '/users/valibot/', path: '/users/valibot/', getParentRoute: () => rootRoute, } as any) -const UsersArktypeIndexRoute = UsersArktypeIndexImport.update({ +const UsersArktypeIndexRoute = UsersArktypeIndexRouteImport.update({ id: '/users/arktype/', path: '/users/arktype/', getParentRoute: () => rootRoute, @@ -50,33 +52,72 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/users/arktype/': { id: '/users/arktype/' path: '/users/arktype' fullPath: '/users/arktype' - preLoaderRoute: typeof UsersArktypeIndexImport + preLoaderRoute: typeof UsersArktypeIndexRouteImport parentRoute: typeof rootRoute } '/users/valibot/': { id: '/users/valibot/' path: '/users/valibot' fullPath: '/users/valibot' - preLoaderRoute: typeof UsersValibotIndexImport + preLoaderRoute: typeof UsersValibotIndexRouteImport parentRoute: typeof rootRoute } '/users/zod/': { id: '/users/zod/' path: '/users/zod' fullPath: '/users/zod' - preLoaderRoute: typeof UsersZodIndexImport + preLoaderRoute: typeof UsersZodIndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/users/arktype.index' { + const createFileRoute: CreateFileRoute< + '/users/arktype/', + FileRoutesByPath['/users/arktype/']['parentRoute'], + FileRoutesByPath['/users/arktype/']['id'], + FileRoutesByPath['/users/arktype/']['path'], + FileRoutesByPath['/users/arktype/']['fullPath'] + > +} +declare module './routes/users/valibot.index' { + const createFileRoute: CreateFileRoute< + '/users/valibot/', + FileRoutesByPath['/users/valibot/']['parentRoute'], + FileRoutesByPath['/users/valibot/']['id'], + FileRoutesByPath['/users/valibot/']['path'], + FileRoutesByPath['/users/valibot/']['fullPath'] + > +} +declare module './routes/users/zod.index' { + const createFileRoute: CreateFileRoute< + '/users/zod/', + FileRoutesByPath['/users/zod/']['parentRoute'], + FileRoutesByPath['/users/zod/']['id'], + FileRoutesByPath['/users/zod/']['path'], + FileRoutesByPath['/users/zod/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/search-validator-adapters/src/routes/index.tsx b/examples/react/search-validator-adapters/src/routes/index.tsx index c00341b613..e279d9c1e0 100644 --- a/examples/react/search-validator-adapters/src/routes/index.tsx +++ b/examples/react/search-validator-adapters/src/routes/index.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' + import { Header } from '../components/Header' import { Content } from '../components/Content' @@ -12,6 +12,6 @@ export const Index: React.FunctionComponent = () => { ) } -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Index, }) diff --git a/examples/react/search-validator-adapters/src/routes/users/arktype.index.tsx b/examples/react/search-validator-adapters/src/routes/users/arktype.index.tsx index 3595f1ef01..38af594c85 100644 --- a/examples/react/search-validator-adapters/src/routes/users/arktype.index.tsx +++ b/examples/react/search-validator-adapters/src/routes/users/arktype.index.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { createFileRoute, useNavigate } from '@tanstack/react-router' +import { useNavigate } from '@tanstack/react-router' import { type } from 'arktype' import { Header } from '../../components/Header' import { Users, usersQueryOptions } from '../../components/Users' @@ -32,7 +32,7 @@ const search = type({ search: 'string = ""', }) -export const Route = createFileRoute('/users/arktype/')({ +export const Route = createFileRoute({ validateSearch: search, loaderDeps: (opt) => ({ search: opt.search }), loader: (opt) => { diff --git a/examples/react/search-validator-adapters/src/routes/users/valibot.index.tsx b/examples/react/search-validator-adapters/src/routes/users/valibot.index.tsx index 33ff6623f0..1a8bc7dd18 100644 --- a/examples/react/search-validator-adapters/src/routes/users/valibot.index.tsx +++ b/examples/react/search-validator-adapters/src/routes/users/valibot.index.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { createFileRoute, useNavigate } from '@tanstack/react-router' +import { useNavigate } from '@tanstack/react-router' import * as v from 'valibot' import { Header } from '../../components/Header' import { Users, usersQueryOptions } from '../../components/Users' @@ -26,7 +26,7 @@ const Valibot = () => { ) } -export const Route = createFileRoute('/users/valibot/')({ +export const Route = createFileRoute({ validateSearch: v.object({ search: v.fallback(v.optional(v.string(), ''), ''), }), diff --git a/examples/react/search-validator-adapters/src/routes/users/zod.index.tsx b/examples/react/search-validator-adapters/src/routes/users/zod.index.tsx index 7a94b04d54..8f095d156f 100644 --- a/examples/react/search-validator-adapters/src/routes/users/zod.index.tsx +++ b/examples/react/search-validator-adapters/src/routes/users/zod.index.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { createFileRoute, useNavigate } from '@tanstack/react-router' +import { useNavigate } from '@tanstack/react-router' import { fallback, zodValidator } from '@tanstack/zod-adapter' import { z } from 'zod' import { Header } from '../../components/Header' @@ -29,7 +29,7 @@ const Zod = () => { ) } -export const Route = createFileRoute('/users/zod/')({ +export const Route = createFileRoute({ validateSearch: zodValidator( z.object({ search: fallback(z.string().optional(), undefined), diff --git a/examples/react/search-validator-adapters/vite.config.ts b/examples/react/search-validator-adapters/vite.config.ts index 8cf11338ed..a14d94a148 100644 --- a/examples/react/search-validator-adapters/vite.config.ts +++ b/examples/react/search-validator-adapters/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import packageJson from './package.json' export default defineConfig({ @@ -12,7 +12,11 @@ export default defineConfig({ typecheck: { enabled: true }, }, plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), react(), ], }) diff --git a/examples/react/start-bare/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-bare/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-bare/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-bare/app.config.ts b/examples/react/start-bare/app.config.ts deleted file mode 100644 index 775bee171b..0000000000 --- a/examples/react/start-bare/app.config.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' -import tailwindcss from '@tailwindcss/vite' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - tailwindcss(), - ], - }, -}) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index c87ecebfde..9874aa3d3c 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-router": "^1.120.3", @@ -14,7 +14,6 @@ "@tanstack/react-start": "^1.120.3", "react": "^19.0.0", "react-dom": "^19.0.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/start-bare/src/api.ts b/examples/react/start-bare/src/api.ts deleted file mode 100644 index 8b9fef1667..0000000000 --- a/examples/react/start-bare/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/react-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/examples/react/start-bare/src/client.tsx b/examples/react/start-bare/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-bare/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-bare/src/routeTree.gen.ts b/examples/react/start-bare/src/routeTree.gen.ts index 48c183c8da..3f5c19883b 100644 --- a/examples/react/start-bare/src/routeTree.gen.ts +++ b/examples/react/start-bare/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/start-bare/src/routes/about.tsx b/examples/react/start-bare/src/routes/about.tsx index ca401c33c7..f0d5d234a0 100644 --- a/examples/react/start-bare/src/routes/about.tsx +++ b/examples/react/start-bare/src/routes/about.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/react/start-bare/src/routes/index.tsx b/examples/react/start-bare/src/routes/index.tsx index e9de615dc9..bd87c0bf42 100644 --- a/examples/react/start-bare/src/routes/index.tsx +++ b/examples/react/start-bare/src/routes/index.tsx @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/react-router' import Counter from '~/components/Counter' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/react/start-bare/src/tanstack-start.d.ts b/examples/react/start-bare/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-bare/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-bare/vite.config.ts b/examples/react/start-bare/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-bare/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-basic-auth/.gitignore b/examples/react/start-basic-auth/.gitignore index b15fed94e2..2818549158 100644 --- a/examples/react/start-basic-auth/.gitignore +++ b/examples/react/start-basic-auth/.gitignore @@ -7,14 +7,10 @@ yarn.lock .cache .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-basic-auth/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-basic-auth/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-basic-auth/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-basic-auth/app.config.ts b/examples/react/start-basic-auth/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-basic-auth/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 554777cc4e..a419d8845a 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", + "dev": "vite dev", + "build": "vite build", + "start": "vite start", "prisma-generate": "prisma generate" }, "dependencies": { @@ -18,8 +18,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "tailwind-merge": "^2.6.0" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-basic-auth/src/client.tsx b/examples/react/start-basic-auth/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-basic-auth/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-basic-auth/src/routeTree.gen.ts b/examples/react/start-basic-auth/src/routeTree.gen.ts index 8c5a37a7e8..c7cab2e4d5 100644 --- a/examples/react/start-basic-auth/src/routeTree.gen.ts +++ b/examples/react/start-basic-auth/src/routeTree.gen.ts @@ -8,62 +8,64 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as SignupImport } from './routes/signup' -import { Route as LogoutImport } from './routes/logout' -import { Route as LoginImport } from './routes/login' -import { Route as AuthedImport } from './routes/_authed' -import { Route as IndexImport } from './routes/index' -import { Route as AuthedPostsRouteImport } from './routes/_authed/posts.route' -import { Route as AuthedPostsIndexImport } from './routes/_authed/posts.index' -import { Route as AuthedPostsPostIdImport } from './routes/_authed/posts.$postId' +import { Route as SignupRouteImport } from './routes/signup' +import { Route as LogoutRouteImport } from './routes/logout' +import { Route as LoginRouteImport } from './routes/login' +import { Route as AuthedRouteImport } from './routes/_authed' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthedPostsRouteRouteImport } from './routes/_authed/posts.route' +import { Route as AuthedPostsIndexRouteImport } from './routes/_authed/posts.index' +import { Route as AuthedPostsPostIdRouteImport } from './routes/_authed/posts.$postId' // Create/Update Routes -const SignupRoute = SignupImport.update({ +const SignupRoute = SignupRouteImport.update({ id: '/signup', path: '/signup', getParentRoute: () => rootRoute, } as any) -const LogoutRoute = LogoutImport.update({ +const LogoutRoute = LogoutRouteImport.update({ id: '/logout', path: '/logout', getParentRoute: () => rootRoute, } as any) -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const AuthedRoute = AuthedImport.update({ +const AuthedRoute = AuthedRouteImport.update({ id: '/_authed', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthedPostsRouteRoute = AuthedPostsRouteImport.update({ +const AuthedPostsRouteRoute = AuthedPostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsIndexRoute = AuthedPostsIndexImport.update({ +const AuthedPostsIndexRoute = AuthedPostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthedPostsRouteRoute, } as any) -const AuthedPostsPostIdRoute = AuthedPostsPostIdImport.update({ +const AuthedPostsPostIdRoute = AuthedPostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => AuthedPostsRouteRoute, @@ -77,61 +79,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_authed': { id: '/_authed' path: '' fullPath: '' - preLoaderRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/logout': { id: '/logout' path: '/logout' fullPath: '/logout' - preLoaderRoute: typeof LogoutImport + preLoaderRoute: typeof LogoutRouteImport parentRoute: typeof rootRoute } '/signup': { id: '/signup' path: '/signup' fullPath: '/signup' - preLoaderRoute: typeof SignupImport + preLoaderRoute: typeof SignupRouteImport parentRoute: typeof rootRoute } '/_authed/posts': { id: '/_authed/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof AuthedPostsRouteImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedPostsRouteRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/$postId': { id: '/_authed/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof AuthedPostsPostIdImport - parentRoute: typeof AuthedPostsRouteImport + preLoaderRoute: typeof AuthedPostsPostIdRouteImport + parentRoute: typeof AuthedPostsRouteRouteImport } '/_authed/posts/': { id: '/_authed/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof AuthedPostsIndexImport - parentRoute: typeof AuthedPostsRouteImport + preLoaderRoute: typeof AuthedPostsIndexRouteImport + parentRoute: typeof AuthedPostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_authed' { + const createFileRoute: CreateFileRoute< + '/_authed', + FileRoutesByPath['/_authed']['parentRoute'], + FileRoutesByPath['/_authed']['id'], + FileRoutesByPath['/_authed']['path'], + FileRoutesByPath['/_authed']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/logout' { + const createFileRoute: CreateFileRoute< + '/logout', + FileRoutesByPath['/logout']['parentRoute'], + FileRoutesByPath['/logout']['id'], + FileRoutesByPath['/logout']['path'], + FileRoutesByPath['/logout']['fullPath'] + > +} +declare module './routes/signup' { + const createFileRoute: CreateFileRoute< + '/signup', + FileRoutesByPath['/signup']['parentRoute'], + FileRoutesByPath['/signup']['id'], + FileRoutesByPath['/signup']['path'], + FileRoutesByPath['/signup']['fullPath'] + > +} +declare module './routes/_authed/posts.route' { + const createFileRoute: CreateFileRoute< + '/_authed/posts', + FileRoutesByPath['/_authed/posts']['parentRoute'], + FileRoutesByPath['/_authed/posts']['id'], + FileRoutesByPath['/_authed/posts']['path'], + FileRoutesByPath['/_authed/posts']['fullPath'] + > +} +declare module './routes/_authed/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/$postId', + FileRoutesByPath['/_authed/posts/$postId']['parentRoute'], + FileRoutesByPath['/_authed/posts/$postId']['id'], + FileRoutesByPath['/_authed/posts/$postId']['path'], + FileRoutesByPath['/_authed/posts/$postId']['fullPath'] + > +} +declare module './routes/_authed/posts.index' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/', + FileRoutesByPath['/_authed/posts/']['parentRoute'], + FileRoutesByPath['/_authed/posts/']['id'], + FileRoutesByPath['/_authed/posts/']['path'], + FileRoutesByPath['/_authed/posts/']['fullPath'] + > +} + // Create and export the route tree interface AuthedPostsRouteRouteChildren { diff --git a/examples/react/start-basic-auth/src/routes/_authed.tsx b/examples/react/start-basic-auth/src/routes/_authed.tsx index 3944e590f9..f1049611a4 100644 --- a/examples/react/start-basic-auth/src/routes/_authed.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' @@ -42,7 +41,7 @@ export const loginFn = createServerFn({ method: 'POST' }) }) }) -export const Route = createFileRoute('/_authed')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { if (!context.user) { throw new Error('Not authenticated') diff --git a/examples/react/start-basic-auth/src/routes/_authed/posts.$postId.tsx b/examples/react/start-basic-auth/src/routes/_authed/posts.$postId.tsx index 039271bb89..c6c36f3ea4 100644 --- a/examples/react/start-basic-auth/src/routes/_authed/posts.$postId.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound.js' import { fetchPost } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/examples/react/start-basic-auth/src/routes/_authed/posts.index.tsx b/examples/react/start-basic-auth/src/routes/_authed/posts.index.tsx index ea9e667e54..13529228bb 100644 --- a/examples/react/start-basic-auth/src/routes/_authed/posts.index.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_authed/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-basic-auth/src/routes/_authed/posts.route.tsx b/examples/react/start-basic-auth/src/routes/_authed/posts.route.tsx index 86c8ef4138..f9b50197cf 100644 --- a/examples/react/start-basic-auth/src/routes/_authed/posts.route.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed/posts.route.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/react/start-basic-auth/src/routes/index.tsx b/examples/react/start-basic-auth/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/examples/react/start-basic-auth/src/routes/index.tsx +++ b/examples/react/start-basic-auth/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-basic-auth/src/routes/login.tsx b/examples/react/start-basic-auth/src/routes/login.tsx index 03ced20832..269ca5e816 100644 --- a/examples/react/start-basic-auth/src/routes/login.tsx +++ b/examples/react/start-basic-auth/src/routes/login.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { Login } from '~/components/Login' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ component: LoginComp, }) diff --git a/examples/react/start-basic-auth/src/routes/logout.tsx b/examples/react/start-basic-auth/src/routes/logout.tsx index d072c25008..a7023a1793 100644 --- a/examples/react/start-basic-auth/src/routes/logout.tsx +++ b/examples/react/start-basic-auth/src/routes/logout.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { useAppSession } from '~/utils/session' @@ -12,7 +12,7 @@ const logoutFn = createServerFn().handler(async () => { }) }) -export const Route = createFileRoute('/logout')({ +export const Route = createFileRoute({ preload: false, loader: () => logoutFn(), }) diff --git a/examples/react/start-basic-auth/src/routes/signup.tsx b/examples/react/start-basic-auth/src/routes/signup.tsx index 8f052d3629..a8dbef283b 100644 --- a/examples/react/start-basic-auth/src/routes/signup.tsx +++ b/examples/react/start-basic-auth/src/routes/signup.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' @@ -62,7 +62,7 @@ export const signupFn = createServerFn({ method: 'POST' }) }) }) -export const Route = createFileRoute('/signup')({ +export const Route = createFileRoute({ component: SignupComp, }) diff --git a/e2e/react-start/basic-auth/src/ssr.tsx b/examples/react/start-basic-auth/src/server.ts similarity index 100% rename from e2e/react-start/basic-auth/src/ssr.tsx rename to examples/react/start-basic-auth/src/server.ts diff --git a/examples/react/start-basic-auth/src/ssr.tsx b/examples/react/start-basic-auth/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-basic-auth/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-auth/src/tanstack-start.d.ts b/examples/react/start-basic-auth/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-basic-auth/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-auth/vite.config.ts b/examples/react/start-basic-auth/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-basic-auth/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-basic-react-query/.gitignore b/examples/react/start-basic-react-query/.gitignore index be342025da..ca63f49885 100644 --- a/examples/react/start-basic-react-query/.gitignore +++ b/examples/react/start-basic-react-query/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-basic-react-query/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-basic-react-query/app.config.ts b/examples/react/start-basic-react-query/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-basic-react-query/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 9c27d1a42d..0330ad793b 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-query": "^5.66.0", @@ -18,8 +18,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "tailwind-merge": "^2.6.0" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-basic-react-query/src/client.tsx b/examples/react/start-basic-react-query/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-basic-react-query/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-basic-react-query/src/routeTree.gen.ts b/examples/react/start-basic-react-query/src/routeTree.gen.ts index 4dca20ee9c..3c6af11ae1 100644 --- a/examples/react/start-basic-react-query/src/routeTree.gen.ts +++ b/examples/react/start-basic-react-query/src/routeTree.gen.ts @@ -8,107 +8,108 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as RedirectImport } from './routes/redirect' -import { Route as DeferredImport } from './routes/deferred' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as UsersRouteImport } from './routes/users.route' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as RedirectRouteImport } from './routes/redirect' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as UsersRouteRouteImport } from './routes/users.route' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const RedirectRoute = RedirectImport.update({ +const RedirectRoute = RedirectRouteImport.update({ id: '/redirect', path: '/redirect', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const UsersRouteRoute = UsersRouteImport.update({ +const UsersRouteRoute = UsersRouteRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRouteRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -122,103 +123,232 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersRouteImport + preLoaderRoute: typeof UsersRouteRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/redirect': { id: '/redirect' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectImport + preLoaderRoute: typeof RedirectRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersRouteImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersRouteImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts.route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/users.route' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/start-basic-react-query/src/routes/_pathlessLayout.tsx b/examples/react/start-basic-react-query/src/routes/_pathlessLayout.tsx index 3353841595..209e478e44 100644 --- a/examples/react/start-basic-react-query/src/routes/_pathlessLayout.tsx +++ b/examples/react/start-basic-react-query/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout.tsx index 0dcb1270ad..97f5dc3ea3 100644 --- a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 426a8fe486..a0bd5240b7 100644 --- a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 20facf2daf..2864ec1f28 100644 --- a/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/start-basic-react-query/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/react/start-basic-react-query/src/routes/deferred.tsx b/examples/react/start-basic-react-query/src/routes/deferred.tsx index 666ae26e49..16a9f72593 100644 --- a/examples/react/start-basic-react-query/src/routes/deferred.tsx +++ b/examples/react/start-basic-react-query/src/routes/deferred.tsx @@ -1,5 +1,5 @@ import { queryOptions, useSuspenseQuery } from '@tanstack/react-query' -import { createFileRoute } from '@tanstack/react-router' +import {} from '@tanstack/react-router' import { Suspense, useState } from 'react' const deferredQueryOptions = () => @@ -15,7 +15,7 @@ const deferredQueryOptions = () => }, }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: ({ context }) => { // Kick off loading as early as possible! context.queryClient.prefetchQuery(deferredQueryOptions()) diff --git a/examples/react/start-basic-react-query/src/routes/index.tsx b/examples/react/start-basic-react-query/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/examples/react/start-basic-react-query/src/routes/index.tsx +++ b/examples/react/start-basic-react-query/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-basic-react-query/src/routes/posts.$postId.tsx b/examples/react/start-basic-react-query/src/routes/posts.$postId.tsx index 542a12a9f6..e8098c4a2f 100644 --- a/examples/react/start-basic-react-query/src/routes/posts.$postId.tsx +++ b/examples/react/start-basic-react-query/src/routes/posts.$postId.tsx @@ -1,10 +1,10 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postQueryOptions } from '../utils/posts' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId }, context }) => { const data = await context.queryClient.ensureQueryData( postQueryOptions(postId), @@ -42,7 +42,7 @@ function PostComponent() { postId: postQuery.data.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/examples/react/start-basic-react-query/src/routes/posts.index.tsx b/examples/react/start-basic-react-query/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/examples/react/start-basic-react-query/src/routes/posts.index.tsx +++ b/examples/react/start-basic-react-query/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-basic-react-query/src/routes/posts.route.tsx b/examples/react/start-basic-react-query/src/routes/posts.route.tsx index b545663be2..4fbfb471c1 100644 --- a/examples/react/start-basic-react-query/src/routes/posts.route.tsx +++ b/examples/react/start-basic-react-query/src/routes/posts.route.tsx @@ -1,8 +1,8 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { postsQueryOptions } from '../utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async ({ context }) => { await context.queryClient.ensureQueryData(postsQueryOptions()) }, diff --git a/examples/react/start-basic-react-query/src/routes/posts_.$postId.deep.tsx b/examples/react/start-basic-react-query/src/routes/posts_.$postId.deep.tsx index 33f6475a55..4d91776273 100644 --- a/examples/react/start-basic-react-query/src/routes/posts_.$postId.deep.tsx +++ b/examples/react/start-basic-react-query/src/routes/posts_.$postId.deep.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postQueryOptions } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId }, context }) => { const data = await context.queryClient.ensureQueryData( postQueryOptions(postId), diff --git a/examples/react/start-basic-react-query/src/routes/redirect.tsx b/examples/react/start-basic-react-query/src/routes/redirect.tsx index c9286de13d..68a98d5683 100644 --- a/examples/react/start-basic-react-query/src/routes/redirect.tsx +++ b/examples/react/start-basic-react-query/src/routes/redirect.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect')({ +export const Route = createFileRoute({ beforeLoad: async () => { throw redirect({ to: '/posts', diff --git a/examples/react/start-basic-react-query/src/routes/users.$userId.tsx b/examples/react/start-basic-react-query/src/routes/users.$userId.tsx index 0750a01568..176be186e0 100644 --- a/examples/react/start-basic-react-query/src/routes/users.$userId.tsx +++ b/examples/react/start-basic-react-query/src/routes/users.$userId.tsx @@ -1,10 +1,10 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' import { userQueryOptions } from '~/utils/users' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ context, params: { userId } }) => { await context.queryClient.ensureQueryData(userQueryOptions(userId)) }, diff --git a/examples/react/start-basic-react-query/src/routes/users.index.tsx b/examples/react/start-basic-react-query/src/routes/users.index.tsx index b6b0ee67fb..662e8b6c68 100644 --- a/examples/react/start-basic-react-query/src/routes/users.index.tsx +++ b/examples/react/start-basic-react-query/src/routes/users.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/examples/react/start-basic-react-query/src/routes/users.route.tsx b/examples/react/start-basic-react-query/src/routes/users.route.tsx index 2f3c72cb7b..80ce468130 100644 --- a/examples/react/start-basic-react-query/src/routes/users.route.tsx +++ b/examples/react/start-basic-react-query/src/routes/users.route.tsx @@ -1,8 +1,8 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { usersQueryOptions } from '../utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async ({ context }) => { await context.queryClient.ensureQueryData(usersQueryOptions()) }, diff --git a/e2e/react-start/basic-react-query/src/ssr.tsx b/examples/react/start-basic-react-query/src/server.ts similarity index 100% rename from e2e/react-start/basic-react-query/src/ssr.tsx rename to examples/react/start-basic-react-query/src/server.ts diff --git a/examples/react/start-basic-react-query/src/ssr.tsx b/examples/react/start-basic-react-query/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-basic-react-query/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-react-query/src/tanstack-start.d.ts b/examples/react/start-basic-react-query/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-basic-react-query/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-react-query/vite.config.ts b/examples/react/start-basic-react-query/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-basic-react-query/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-basic-rsc/.gitignore b/examples/react/start-basic-rsc/.gitignore index d3387e00cd..3c8e6870b3 100644 --- a/examples/react/start-basic-rsc/.gitignore +++ b/examples/react/start-basic-rsc/.gitignore @@ -7,12 +7,8 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin diff --git a/examples/react/start-basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-basic-rsc/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-basic-rsc/app.config.ts b/examples/react/start-basic-rsc/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-basic-rsc/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index e526759a5b..48e4b6b5b8 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", @@ -16,8 +16,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "tailwind-merge": "^2.6.0" }, "devDependencies": { "@types/react": "^19.0.8", diff --git a/examples/react/start-basic-rsc/src/client.tsx b/examples/react/start-basic-rsc/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-basic-rsc/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-basic-rsc/src/routeTree.gen.ts b/examples/react/start-basic-rsc/src/routeTree.gen.ts index 1465b03fd1..d59964eeca 100644 --- a/examples/react/start-basic-rsc/src/routeTree.gen.ts +++ b/examples/react/start-basic-rsc/src/routeTree.gen.ts @@ -8,72 +8,73 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -87,68 +88,152 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/react/start-basic-rsc/src/routes/_pathlessLayout.tsx b/examples/react/start-basic-rsc/src/routes/_pathlessLayout.tsx index c3b12442b8..5c4a461d8d 100644 --- a/examples/react/start-basic-rsc/src/routes/_pathlessLayout.tsx +++ b/examples/react/start-basic-rsc/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout.tsx index c5bcffd5a4..abd82a2bf6 100644 --- a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 426a8fe486..a0bd5240b7 100644 --- a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 20facf2daf..2864ec1f28 100644 --- a/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/start-basic-rsc/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/react/start-basic-rsc/src/routes/index.tsx b/examples/react/start-basic-rsc/src/routes/index.tsx index b7b6138529..a693dcbf14 100644 --- a/examples/react/start-basic-rsc/src/routes/index.tsx +++ b/examples/react/start-basic-rsc/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-basic-rsc/src/routes/posts.$postId.tsx b/examples/react/start-basic-rsc/src/routes/posts.$postId.tsx index 5404a690a0..736bb2499d 100644 --- a/examples/react/start-basic-rsc/src/routes/posts.$postId.tsx +++ b/examples/react/start-basic-rsc/src/routes/posts.$postId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { fetchPost } from '../utils/posts' import type { ErrorComponentProps } from '@tanstack/react-router' @@ -27,7 +27,7 @@ const renderPost = createServerFn({ method: 'GET' }) ) }) -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => renderPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/examples/react/start-basic-rsc/src/routes/posts.index.tsx b/examples/react/start-basic-rsc/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/examples/react/start-basic-rsc/src/routes/posts.index.tsx +++ b/examples/react/start-basic-rsc/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-basic-rsc/src/routes/posts.tsx b/examples/react/start-basic-rsc/src/routes/posts.tsx index a3ef2a2e20..131cec4b9b 100644 --- a/examples/react/start-basic-rsc/src/routes/posts.tsx +++ b/examples/react/start-basic-rsc/src/routes/posts.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn, renderRsc } from '@tanstack/react-start' import { renderPosts } from '~/utils/renderPosts' @@ -6,7 +5,7 @@ export const serverRenderPosts = createServerFn({ method: 'GET' }).handler( renderPosts, ) -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => serverRenderPosts(), component: PostsComponent, }) diff --git a/examples/react/start-basic-rsc/src/routes/posts_.$postId.deep.tsx b/examples/react/start-basic-rsc/src/routes/posts_.$postId.deep.tsx index 13d368cf9c..bf2edef3c9 100644 --- a/examples/react/start-basic-rsc/src/routes/posts_.$postId.deep.tsx +++ b/examples/react/start-basic-rsc/src/routes/posts_.$postId.deep.tsx @@ -1,8 +1,8 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, component: PostDeepComponent, diff --git a/e2e/react-start/basic-rsc/src/ssr.tsx b/examples/react/start-basic-rsc/src/server.ts similarity index 100% rename from e2e/react-start/basic-rsc/src/ssr.tsx rename to examples/react/start-basic-rsc/src/server.ts diff --git a/examples/react/start-basic-rsc/src/ssr.tsx b/examples/react/start-basic-rsc/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-basic-rsc/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-rsc/src/tanstack-start.d.ts b/examples/react/start-basic-rsc/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-basic-rsc/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-rsc/vite.config.ts b/examples/react/start-basic-rsc/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-basic-rsc/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-basic-static/.gitignore b/examples/react/start-basic-static/.gitignore index be342025da..ca63f49885 100644 --- a/examples/react/start-basic-static/.gitignore +++ b/examples/react/start-basic-static/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-basic-static/app.config.ts b/examples/react/start-basic-static/app.config.ts deleted file mode 100644 index e6854562f8..0000000000 --- a/examples/react/start-basic-static/app.config.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, - server: { - preset: 'netlify', - prerender: { - routes: ['/'], - crawlLinks: true, - }, - }, -}) diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 5481062895..52b94fa281 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-router": "^1.120.3", @@ -15,8 +15,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "tailwind-merge": "^2.5.5", - "vinxi": "0.5.1" + "tailwind-merge": "^2.5.5" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-basic-static/src/client.tsx b/examples/react/start-basic-static/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-basic-static/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-basic-static/src/routeTree.gen.ts b/examples/react/start-basic-static/src/routeTree.gen.ts index 762ce1516f..a3ca3d53c4 100644 --- a/examples/react/start-basic-static/src/routeTree.gen.ts +++ b/examples/react/start-basic-static/src/routeTree.gen.ts @@ -8,107 +8,108 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as UsersImport } from './routes/users' -import { Route as RedirectImport } from './routes/redirect' -import { Route as PostsImport } from './routes/posts' -import { Route as DeferredImport } from './routes/deferred' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as UsersRouteImport } from './routes/users' +import { Route as RedirectRouteImport } from './routes/redirect' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const UsersRoute = UsersImport.update({ +const UsersRoute = UsersRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => rootRoute, } as any) -const RedirectRoute = RedirectImport.update({ +const RedirectRoute = RedirectRouteImport.update({ id: '/redirect', path: '/redirect', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -122,103 +123,232 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/redirect': { id: '/redirect' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectImport + preLoaderRoute: typeof RedirectRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersImport + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/react/start-basic-static/src/routes/_pathlessLayout.tsx b/examples/react/start-basic-static/src/routes/_pathlessLayout.tsx index 29d3477145..ed5b364c94 100644 --- a/examples/react/start-basic-static/src/routes/_pathlessLayout.tsx +++ b/examples/react/start-basic-static/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx index 9a48b73a46..1e1400f5a7 100644 --- a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 426a8fe486..a0bd5240b7 100644 --- a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 20facf2daf..2864ec1f28 100644 --- a/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/react/start-basic-static/src/routes/deferred.tsx b/examples/react/start-basic-static/src/routes/deferred.tsx index e59a871e7b..f99f2236fb 100644 --- a/examples/react/start-basic-static/src/routes/deferred.tsx +++ b/examples/react/start-basic-static/src/routes/deferred.tsx @@ -1,4 +1,4 @@ -import { Await, createFileRoute } from '@tanstack/react-router' +import { Await } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense, useState } from 'react' @@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET', type: 'static' }) return { name, randomNumber: Math.floor(Math.random() * 100) } }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: async () => { return { deferredStuff: new Promise((r) => diff --git a/examples/react/start-basic-static/src/routes/index.tsx b/examples/react/start-basic-static/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/examples/react/start-basic-static/src/routes/index.tsx +++ b/examples/react/start-basic-static/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-basic-static/src/routes/posts.$postId.tsx b/examples/react/start-basic-static/src/routes/posts.$postId.tsx index 0d4d2de8eb..821c8b5fa9 100644 --- a/examples/react/start-basic-static/src/routes/posts.$postId.tsx +++ b/examples/react/start-basic-static/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent, Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, @@ -29,7 +29,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/examples/react/start-basic-static/src/routes/posts.index.tsx b/examples/react/start-basic-static/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/examples/react/start-basic-static/src/routes/posts.index.tsx +++ b/examples/react/start-basic-static/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-basic-static/src/routes/posts.tsx b/examples/react/start-basic-static/src/routes/posts.tsx index ae49032459..5bcd320911 100644 --- a/examples/react/start-basic-static/src/routes/posts.tsx +++ b/examples/react/start-basic-static/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/react/start-basic-static/src/routes/posts_.$postId.deep.tsx b/examples/react/start-basic-static/src/routes/posts_.$postId.deep.tsx index a82d2e3211..a26a03b7b8 100644 --- a/examples/react/start-basic-static/src/routes/posts_.$postId.deep.tsx +++ b/examples/react/start-basic-static/src/routes/posts_.$postId.deep.tsx @@ -1,8 +1,8 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId, diff --git a/examples/react/start-basic-static/src/routes/redirect.tsx b/examples/react/start-basic-static/src/routes/redirect.tsx index c9286de13d..68a98d5683 100644 --- a/examples/react/start-basic-static/src/routes/redirect.tsx +++ b/examples/react/start-basic-static/src/routes/redirect.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect')({ +export const Route = createFileRoute({ beforeLoad: async () => { throw redirect({ to: '/posts', diff --git a/examples/react/start-basic-static/src/routes/users.$userId.tsx b/examples/react/start-basic-static/src/routes/users.$userId.tsx index d166885e29..b7066bd00d 100644 --- a/examples/react/start-basic-static/src/routes/users.$userId.tsx +++ b/examples/react/start-basic-static/src/routes/users.$userId.tsx @@ -1,4 +1,4 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import axios from 'redaxios' import { createServerFn } from '@tanstack/react-start' import type { ErrorComponentProps } from '@tanstack/react-router' @@ -20,7 +20,7 @@ const fetchUser = createServerFn({ method: 'GET', type: 'static' }) }) }) -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: ({ params: { userId } }) => fetchUser({ data: userId }), errorComponent: UserErrorComponent, component: UserComponent, diff --git a/examples/react/start-basic-static/src/routes/users.index.tsx b/examples/react/start-basic-static/src/routes/users.index.tsx index b6b0ee67fb..662e8b6c68 100644 --- a/examples/react/start-basic-static/src/routes/users.index.tsx +++ b/examples/react/start-basic-static/src/routes/users.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/examples/react/start-basic-static/src/routes/users.tsx b/examples/react/start-basic-static/src/routes/users.tsx index 95eeacaf63..8799830d36 100644 --- a/examples/react/start-basic-static/src/routes/users.tsx +++ b/examples/react/start-basic-static/src/routes/users.tsx @@ -1,4 +1,4 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import axios from 'redaxios' import { createServerFn } from '@tanstack/react-start' import type { User } from '../utils/users' @@ -16,7 +16,7 @@ const fetchUsers = createServerFn({ method: 'GET', type: 'static' }).handler( }, ) -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async () => fetchUsers(), component: UsersComponent, }) diff --git a/e2e/react-start/scroll-restoration/src/ssr.tsx b/examples/react/start-basic-static/src/server.ts similarity index 100% rename from e2e/react-start/scroll-restoration/src/ssr.tsx rename to examples/react/start-basic-static/src/server.ts diff --git a/examples/react/start-basic-static/src/ssr.tsx b/examples/react/start-basic-static/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-basic-static/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-static/src/tanstack-start.d.ts b/examples/react/start-basic-static/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-basic-static/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-static/src/utils/loggingMiddleware.tsx b/examples/react/start-basic-static/src/utils/loggingMiddleware.tsx index e64b1516da..80ef49b306 100644 --- a/examples/react/start-basic-static/src/utils/loggingMiddleware.tsx +++ b/examples/react/start-basic-static/src/utils/loggingMiddleware.tsx @@ -1,8 +1,8 @@ import { createMiddleware } from '@tanstack/react-start' -export const logMiddleware = createMiddleware() +export const logMiddleware = createMiddleware({ type: 'function' }) .middleware([ - createMiddleware() + createMiddleware({ type: 'function' }) .client(async (ctx) => { const clientTime = new Date() diff --git a/examples/react/start-basic-static/vite.config.ts b/examples/react/start-basic-static/vite.config.ts new file mode 100644 index 0000000000..094ff074ae --- /dev/null +++ b/examples/react/start-basic-static/vite.config.ts @@ -0,0 +1,19 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({ + prerender: { + enabled: true, + }, + }), + ], +}) diff --git a/examples/react/start-basic/.gitignore b/examples/react/start-basic/.gitignore index be342025da..0bb5a583db 100644 --- a/examples/react/start-basic/.gitignore +++ b/examples/react/start-basic/.gitignore @@ -7,16 +7,14 @@ yarn.lock .env .vercel .output -.vinxi - +.nitro /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ /blob-report/ /playwright/.cache/ +.tanstack-start/build \ No newline at end of file diff --git a/examples/react/start-basic/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..7972e1ecfd --- /dev/null +++ b/examples/react/start-basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,187 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as CustomScriptDotjsRouteImport } from './../../src/routes/customScript[.]js' +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api/users' +import { ServerRoute as ApiUsersUserIdRouteImport } from './../../src/routes/api/users.$userId' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const CustomScriptDotjsRoute = CustomScriptDotjsRouteImport.update({ + id: '/customScript.js', + path: '/customScript.js', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersUserIdRoute = ApiUsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/customScript.js': { + id: '/customScript.js' + path: '/customScript.js' + fullPath: '/customScript.js' + preLoaderRoute: typeof CustomScriptDotjsRouteImport + parentRoute: typeof rootRoute + } + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$userId': { + id: '/api/users/$userId' + path: '/$userId' + fullPath: '/api/users/$userId' + preLoaderRoute: typeof ApiUsersUserIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/customScript[.]js' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/customScript.js']['parentRoute'], + FileRoutesByPath['/customScript.js']['id'], + FileRoutesByPath['/customScript.js']['path'], + FileRoutesByPath['/customScript.js']['fullPath'], + unknown + > +} +declare module './../../src/routes/api/users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$userId' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$userId']['parentRoute'], + FileRoutesByPath['/api/users/$userId']['id'], + FileRoutesByPath['/api/users/$userId']['path'], + FileRoutesByPath['/api/users/$userId']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersUserIdRoute: typeof ApiUsersUserIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersUserIdRoute: ApiUsersUserIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/customScript.js': typeof CustomScriptDotjsRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesByTo { + '/customScript.js': typeof CustomScriptDotjsRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/customScript.js': typeof CustomScriptDotjsRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/customScript.js' | '/api/users' | '/api/users/$userId' + fileRoutesByTo: FileRoutesByTo + to: '/customScript.js' | '/api/users' | '/api/users/$userId' + id: '__root__' | '/customScript.js' | '/api/users' | '/api/users/$userId' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + CustomScriptDotjsRoute: typeof CustomScriptDotjsRoute + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + CustomScriptDotjsRoute: CustomScriptDotjsRoute, + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/customScript.js", + "/api/users" + ] + }, + "/customScript.js": { + "filePath": "customScript[.]js.ts" + }, + "/api/users": { + "filePath": "api/users.ts", + "children": [ + "/api/users/$userId" + ] + }, + "/api/users/$userId": { + "filePath": "api/users.$userId.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-basic/app.config.ts b/examples/react/start-basic/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index b7475e12c3..ee8b44b416 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs" }, "dependencies": { "@tanstack/react-router": "^1.120.3", @@ -15,7 +15,8 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "vite": "6.1.0", + "zod": "^3.24.2" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-basic/src/api.ts b/examples/react/start-basic/src/api.ts deleted file mode 100644 index 8b9fef1667..0000000000 --- a/examples/react/start-basic/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/react-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/examples/react/start-basic/src/client.tsx b/examples/react/start-basic/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-basic/src/global-middleware.ts b/examples/react/start-basic/src/global-middleware.ts deleted file mode 100644 index c7e7af599f..0000000000 --- a/examples/react/start-basic/src/global-middleware.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { registerGlobalMiddleware } from '@tanstack/react-start' -import { logMiddleware } from './utils/loggingMiddleware' - -registerGlobalMiddleware({ - middleware: [logMiddleware], -}) diff --git a/examples/react/start-basic/src/routeTree.gen.ts b/examples/react/start-basic/src/routeTree.gen.ts index 4dca20ee9c..a3ca3d53c4 100644 --- a/examples/react/start-basic/src/routeTree.gen.ts +++ b/examples/react/start-basic/src/routeTree.gen.ts @@ -8,107 +8,108 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as RedirectImport } from './routes/redirect' -import { Route as DeferredImport } from './routes/deferred' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as UsersRouteImport } from './routes/users.route' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as UsersIndexImport } from './routes/users.index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PostsPostIdDeepImport } from './routes/posts_.$postId.deep' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as UsersRouteImport } from './routes/users' +import { Route as RedirectRouteImport } from './routes/redirect' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const RedirectRoute = RedirectImport.update({ - id: '/redirect', - path: '/redirect', +const UsersRoute = UsersRouteImport.update({ + id: '/users', + path: '/users', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ - id: '/deferred', - path: '/deferred', +const RedirectRoute = RedirectRouteImport.update({ + id: '/redirect', + path: '/redirect', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ - id: '/_pathlessLayout', +const PostsRoute = PostsRouteImport.update({ + id: '/posts', + path: '/posts', getParentRoute: () => rootRoute, } as any) -const UsersRouteRoute = UsersRouteImport.update({ - id: '/users', - path: '/users', +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ - id: '/posts', - path: '/posts', +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ + id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => UsersRouteRoute, + getParentRoute: () => UsersRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => PostsRouteRoute, + getParentRoute: () => PostsRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', - getParentRoute: () => UsersRouteRoute, + getParentRoute: () => UsersRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', - getParentRoute: () => PostsRouteRoute, + getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -122,132 +123,233 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport - parentRoute: typeof rootRoute - } - '/posts': { - id: '/posts' - path: '/posts' - fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport - parentRoute: typeof rootRoute - } - '/users': { - id: '/users' - path: '/users' - fullPath: '/users' - preLoaderRoute: typeof UsersRouteImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRoute + } + '/posts': { + id: '/posts' + path: '/posts' + fullPath: '/posts' + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/redirect': { id: '/redirect' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectImport + preLoaderRoute: typeof RedirectRouteImport + parentRoute: typeof rootRoute + } + '/users': { + id: '/users' + path: '/users' + fullPath: '/users' + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport + preLoaderRoute: typeof PostsPostIdRouteImport parentRoute: typeof PostsRouteImport } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport + preLoaderRoute: typeof UsersUserIdRouteImport parentRoute: typeof UsersRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport + preLoaderRoute: typeof PostsIndexRouteImport parentRoute: typeof PostsRouteImport } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport + preLoaderRoute: typeof UsersIndexRouteImport parentRoute: typeof UsersRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } -// Create and export the route tree +// Add type-safety to the createFileRoute function across the route tree -interface PostsRouteRouteChildren { - PostsPostIdRoute: typeof PostsPostIdRoute - PostsIndexRoute: typeof PostsIndexRoute +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > } - -const PostsRouteRouteChildren: PostsRouteRouteChildren = { - PostsPostIdRoute: PostsPostIdRoute, - PostsIndexRoute: PostsIndexRoute, +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > } - -const PostsRouteRouteWithChildren = PostsRouteRoute._addFileChildren( - PostsRouteRouteChildren, -) - -interface UsersRouteRouteChildren { - UsersUserIdRoute: typeof UsersUserIdRoute - UsersIndexRoute: typeof UsersIndexRoute +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > } - -const UsersRouteRouteChildren: UsersRouteRouteChildren = { - UsersUserIdRoute: UsersUserIdRoute, - UsersIndexRoute: UsersIndexRoute, +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > } -const UsersRouteRouteWithChildren = UsersRouteRoute._addFileChildren( - UsersRouteRouteChildren, -) +// Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { PathlessLayoutNestedLayoutRouteARoute: typeof PathlessLayoutNestedLayoutRouteARoute @@ -279,13 +381,37 @@ const PathlessLayoutRouteWithChildren = PathlessLayoutRoute._addFileChildren( PathlessLayoutRouteChildren, ) +interface PostsRouteChildren { + PostsPostIdRoute: typeof PostsPostIdRoute + PostsIndexRoute: typeof PostsIndexRoute +} + +const PostsRouteChildren: PostsRouteChildren = { + PostsPostIdRoute: PostsPostIdRoute, + PostsIndexRoute: PostsIndexRoute, +} + +const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) + +interface UsersRouteChildren { + UsersUserIdRoute: typeof UsersUserIdRoute + UsersIndexRoute: typeof UsersIndexRoute +} + +const UsersRouteChildren: UsersRouteChildren = { + UsersUserIdRoute: UsersUserIdRoute, + UsersIndexRoute: UsersIndexRoute, +} + +const UsersRouteWithChildren = UsersRoute._addFileChildren(UsersRouteChildren) + export interface FileRoutesByFullPath { '/': typeof IndexRoute - '/posts': typeof PostsRouteRouteWithChildren - '/users': typeof UsersRouteRouteWithChildren '': typeof PathlessLayoutNestedLayoutRouteWithChildren '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren '/redirect': typeof RedirectRoute + '/users': typeof UsersRouteWithChildren '/posts/$postId': typeof PostsPostIdRoute '/users/$userId': typeof UsersUserIdRoute '/posts/': typeof PostsIndexRoute @@ -312,11 +438,11 @@ export interface FileRoutesByTo { export interface FileRoutesById { __root__: typeof rootRoute '/': typeof IndexRoute - '/posts': typeof PostsRouteRouteWithChildren - '/users': typeof UsersRouteRouteWithChildren '/_pathlessLayout': typeof PathlessLayoutRouteWithChildren '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren '/redirect': typeof RedirectRoute + '/users': typeof UsersRouteWithChildren '/_pathlessLayout/_nested-layout': typeof PathlessLayoutNestedLayoutRouteWithChildren '/posts/$postId': typeof PostsPostIdRoute '/users/$userId': typeof UsersUserIdRoute @@ -331,11 +457,11 @@ export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: | '/' - | '/posts' - | '/users' | '' | '/deferred' + | '/posts' | '/redirect' + | '/users' | '/posts/$postId' | '/users/$userId' | '/posts/' @@ -359,11 +485,11 @@ export interface FileRouteTypes { id: | '__root__' | '/' - | '/posts' - | '/users' | '/_pathlessLayout' | '/deferred' + | '/posts' | '/redirect' + | '/users' | '/_pathlessLayout/_nested-layout' | '/posts/$postId' | '/users/$userId' @@ -377,21 +503,21 @@ export interface FileRouteTypes { export interface RootRouteChildren { IndexRoute: typeof IndexRoute - PostsRouteRoute: typeof PostsRouteRouteWithChildren - UsersRouteRoute: typeof UsersRouteRouteWithChildren PathlessLayoutRoute: typeof PathlessLayoutRouteWithChildren DeferredRoute: typeof DeferredRoute + PostsRoute: typeof PostsRouteWithChildren RedirectRoute: typeof RedirectRoute + UsersRoute: typeof UsersRouteWithChildren PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute } const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, - PostsRouteRoute: PostsRouteRouteWithChildren, - UsersRouteRoute: UsersRouteRouteWithChildren, PathlessLayoutRoute: PathlessLayoutRouteWithChildren, DeferredRoute: DeferredRoute, + PostsRoute: PostsRouteWithChildren, RedirectRoute: RedirectRoute, + UsersRoute: UsersRouteWithChildren, PostsPostIdDeepRoute: PostsPostIdDeepRoute, } @@ -406,31 +532,17 @@ export const routeTree = rootRoute "filePath": "__root.tsx", "children": [ "/", - "/posts", - "/users", "/_pathlessLayout", "/deferred", + "/posts", "/redirect", + "/users", "/posts_/$postId/deep" ] }, "/": { "filePath": "index.tsx" }, - "/posts": { - "filePath": "posts.route.tsx", - "children": [ - "/posts/$postId", - "/posts/" - ] - }, - "/users": { - "filePath": "users.route.tsx", - "children": [ - "/users/$userId", - "/users/" - ] - }, "/_pathlessLayout": { "filePath": "_pathlessLayout.tsx", "children": [ @@ -440,9 +552,23 @@ export const routeTree = rootRoute "/deferred": { "filePath": "deferred.tsx" }, + "/posts": { + "filePath": "posts.tsx", + "children": [ + "/posts/$postId", + "/posts/" + ] + }, "/redirect": { "filePath": "redirect.tsx" }, + "/users": { + "filePath": "users.tsx", + "children": [ + "/users/$userId", + "/users/" + ] + }, "/_pathlessLayout/_nested-layout": { "filePath": "_pathlessLayout/_nested-layout.tsx", "parent": "/_pathlessLayout", diff --git a/examples/react/start-basic/src/routes/__root.tsx b/examples/react/start-basic/src/routes/__root.tsx index 70140f2306..407f04b58a 100644 --- a/examples/react/start-basic/src/routes/__root.tsx +++ b/examples/react/start-basic/src/routes/__root.tsx @@ -50,6 +50,12 @@ export const Route = createRootRoute({ { rel: 'manifest', href: '/site.webmanifest', color: '#fffff' }, { rel: 'icon', href: '/favicon.ico' }, ], + scripts: [ + { + src: '/customScript.js', + type: 'text/javascript', + }, + ], }), errorComponent: (props) => { return ( diff --git a/examples/react/start-basic/src/routes/_pathlessLayout.tsx b/examples/react/start-basic/src/routes/_pathlessLayout.tsx index c3b12442b8..5c4a461d8d 100644 --- a/examples/react/start-basic/src/routes/_pathlessLayout.tsx +++ b/examples/react/start-basic/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/react-router' +import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx index 9a48b73a46..1e1400f5a7 100644 --- a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index 426a8fe486..a0bd5240b7 100644 --- a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 20facf2daf..2864ec1f28 100644 --- a/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/react/start-basic/src/routes/api/users.$id.ts b/examples/react/start-basic/src/routes/api/users.$userId.ts similarity index 55% rename from examples/react/start-basic/src/routes/api/users.$id.ts rename to examples/react/start-basic/src/routes/api/users.$userId.ts index 1332a2cd07..f0575c881c 100644 --- a/examples/react/start-basic/src/routes/api/users.$id.ts +++ b/examples/react/start-basic/src/routes/api/users.$userId.ts @@ -1,13 +1,12 @@ import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' -import type { User } from '../../utils/users' +import type { User } from '~/utils/users' -export const APIRoute = createAPIFileRoute('/api/users/$id')({ - GET: async ({ request, params }) => { - console.info(`Fetching users by id=${params.id}... @`, request.url) +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params, request }) => { + console.info(`Fetching users by id=${params.userId}... @`, request.url) try { const res = await fetch( - 'https://jsonplaceholder.typicode.com/users/' + params.id, + 'https://jsonplaceholder.typicode.com/users/' + params.userId, ) if (!res.ok) { throw new Error('Failed to fetch user') diff --git a/examples/react/start-basic/src/routes/api/users.ts b/examples/react/start-basic/src/routes/api/users.ts index 61ad3e5bf4..dd8e36bfab 100644 --- a/examples/react/start-basic/src/routes/api/users.ts +++ b/examples/react/start-basic/src/routes/api/users.ts @@ -1,19 +1,58 @@ -import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' -import type { User } from '../../utils/users' +import { createMiddleware, json } from '@tanstack/react-start' +import type { User } from '~/utils/users' -export const APIRoute = createAPIFileRoute('/api/users')({ - GET: async ({ request }) => { - console.info('Fetching users... @', request.url) - const res = await fetch('https://jsonplaceholder.typicode.com/users') - if (!res.ok) { - throw new Error('Failed to fetch users') - } +const userLoggerMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: /users') + const result = await next() + result.response.headers.set('x-users', 'true') + console.info('Out: /users') + return result + }, +) + +const testParentMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: testParentMiddleware') + const result = await next() + result.response.headers.set('x-test-parent', 'true') + console.info('Out: testParentMiddleware') + return result + }, +) - const data = (await res.json()) as Array +const testMiddleware = createMiddleware({ type: 'request' }) + .middleware([testParentMiddleware]) + .server(async ({ next, request }) => { + console.info('In: testMiddleware') + const result = await next() + result.response.headers.set('x-test', 'true') - const list = data.slice(0, 10) + // if (Math.random() > 0.5) { + // throw new Response(null, { + // status: 302, + // headers: { Location: 'https://www.google.com' }, + // }) + // } - return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) - }, -}) + console.info('Out: testMiddleware') + return result + }) + +export const ServerRoute = createServerFileRoute() + .middleware([testMiddleware, userLoggerMiddleware, testParentMiddleware]) + .methods({ + GET: async ({ request }) => { + console.info('Fetching users... @', request.url) + const res = await fetch('https://jsonplaceholder.typicode.com/users') + if (!res.ok) { + throw new Error('Failed to fetch users') + } + + const data = (await res.json()) as Array + + const list = data.slice(0, 10) + + return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) + }, + }) diff --git a/examples/react/start-basic/src/routes/customScript[.]js.ts b/examples/react/start-basic/src/routes/customScript[.]js.ts new file mode 100644 index 0000000000..6966a3379d --- /dev/null +++ b/examples/react/start-basic/src/routes/customScript[.]js.ts @@ -0,0 +1,9 @@ +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + return new Response('console.log("Hello from customScript.js!")', { + headers: { + 'Content-Type': 'application/javascript', + }, + }) + }, +}) diff --git a/examples/react/start-basic/src/routes/deferred.tsx b/examples/react/start-basic/src/routes/deferred.tsx index f3e09d1d4e..da895081df 100644 --- a/examples/react/start-basic/src/routes/deferred.tsx +++ b/examples/react/start-basic/src/routes/deferred.tsx @@ -1,4 +1,4 @@ -import { Await, createFileRoute } from '@tanstack/react-router' +import { Await } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense, useState } from 'react' @@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET' }) return { name, randomNumber: Math.floor(Math.random() * 100) } }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: async () => { return { deferredStuff: new Promise((r) => diff --git a/examples/react/start-basic/src/routes/index.tsx b/examples/react/start-basic/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/examples/react/start-basic/src/routes/index.tsx +++ b/examples/react/start-basic/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-basic/src/routes/posts.$postId.tsx b/examples/react/start-basic/src/routes/posts.$postId.tsx index d6de7c9dc3..f4184852e0 100644 --- a/examples/react/start-basic/src/routes/posts.$postId.tsx +++ b/examples/react/start-basic/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import { NotFound } from '~/components/NotFound' import { PostErrorComponent } from '~/components/PostError' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, @@ -25,7 +25,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/examples/react/start-basic/src/routes/posts.index.tsx b/examples/react/start-basic/src/routes/posts.index.tsx index 5b5f08f95b..13529228bb 100644 --- a/examples/react/start-basic/src/routes/posts.index.tsx +++ b/examples/react/start-basic/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-basic/src/routes/posts.route.tsx b/examples/react/start-basic/src/routes/posts.tsx similarity index 82% rename from examples/react/start-basic/src/routes/posts.route.tsx rename to examples/react/start-basic/src/routes/posts.tsx index f29619363e..5bcd320911 100644 --- a/examples/react/start-basic/src/routes/posts.route.tsx +++ b/examples/react/start-basic/src/routes/posts.tsx @@ -1,12 +1,12 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => fetchPosts(), - component: PostsLayoutComponent, + component: PostsComponent, }) -function PostsLayoutComponent() { +function PostsComponent() { const posts = Route.useLoaderData() return ( diff --git a/examples/react/start-basic/src/routes/posts_.$postId.deep.tsx b/examples/react/start-basic/src/routes/posts_.$postId.deep.tsx index 29e6c39b5a..624b76a6c1 100644 --- a/examples/react/start-basic/src/routes/posts_.$postId.deep.tsx +++ b/examples/react/start-basic/src/routes/posts_.$postId.deep.tsx @@ -1,8 +1,8 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { fetchPost } from '../utils/posts' import { PostErrorComponent } from '~/components/PostError' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId, diff --git a/examples/react/start-basic/src/routes/redirect.tsx b/examples/react/start-basic/src/routes/redirect.tsx index c9286de13d..68a98d5683 100644 --- a/examples/react/start-basic/src/routes/redirect.tsx +++ b/examples/react/start-basic/src/routes/redirect.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/redirect')({ +export const Route = createFileRoute({ beforeLoad: async () => { throw redirect({ to: '/posts', diff --git a/examples/react/start-basic/src/routes/users.$userId.tsx b/examples/react/start-basic/src/routes/users.$userId.tsx index 186b1c64e7..1f493d2945 100644 --- a/examples/react/start-basic/src/routes/users.$userId.tsx +++ b/examples/react/start-basic/src/routes/users.$userId.tsx @@ -1,18 +1,15 @@ -import { createFileRoute } from '@tanstack/react-router' -import type { User } from '~/utils/users' -import { DEPLOY_URL } from '~/utils/users' -import { NotFound } from '~/components/NotFound' -import { UserErrorComponent } from '~/components/UserError' +import { NotFound } from 'src/components/NotFound' +import { UserErrorComponent } from 'src/components/UserError' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ params: { userId } }) => { try { - const res = await fetch(DEPLOY_URL + '/api/users/' + userId) + const res = await fetch('/api/users/' + userId) if (!res.ok) { throw new Error('Unexpected status code') } - const data = (await res.json()) as User + const data = await res.json() return data } catch { @@ -33,6 +30,14 @@ function UserComponent() {

{user.name}

{user.email}
+
) } diff --git a/examples/react/start-basic/src/routes/users.index.tsx b/examples/react/start-basic/src/routes/users.index.tsx index b6b0ee67fb..31d070db1f 100644 --- a/examples/react/start-basic/src/routes/users.index.tsx +++ b/examples/react/start-basic/src/routes/users.index.tsx @@ -1,9 +1,17 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) function UsersIndexComponent() { - return
Select a user.
+ return ( +
+ Select a user or{' '} + + view as JSON + +
+ ) } diff --git a/examples/react/start-basic/src/routes/users.route.tsx b/examples/react/start-basic/src/routes/users.tsx similarity index 63% rename from examples/react/start-basic/src/routes/users.route.tsx rename to examples/react/start-basic/src/routes/users.tsx index ebc930e4da..9d1548980a 100644 --- a/examples/react/start-basic/src/routes/users.route.tsx +++ b/examples/react/start-basic/src/routes/users.tsx @@ -1,26 +1,22 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' -import { DEPLOY_URL } from '../utils/users' +import { Link, Outlet } from '@tanstack/react-router' import type { User } from '../utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async () => { - try { - const res = await fetch(DEPLOY_URL + '/api/users') - if (!res.ok) { - throw new Error('Unexpected status code') - } + const res = await fetch('/api/users') - const data = (await res.json()) as Array - - return data - } catch { - throw new Error('Failed to fetch users') + if (!res.ok) { + throw new Error('Unexpected status code') } + + const data = (await res.json()) as Array + + return data }, - component: UsersLayoutComponent, + component: UsersComponent, }) -function UsersLayoutComponent() { +function UsersComponent() { const users = Route.useLoaderData() return ( diff --git a/examples/react/start-basic/src/ssr.tsx b/examples/react/start-basic/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-basic/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic/src/tanstack-start.d.ts b/examples/react/start-basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic/src/utils/loggingMiddleware.tsx b/examples/react/start-basic/src/utils/loggingMiddleware.tsx index 3944490725..3ea9a06439 100644 --- a/examples/react/start-basic/src/utils/loggingMiddleware.tsx +++ b/examples/react/start-basic/src/utils/loggingMiddleware.tsx @@ -1,6 +1,6 @@ import { createMiddleware } from '@tanstack/react-start' -const preLogMiddleware = createMiddleware() +const preLogMiddleware = createMiddleware({ type: 'function' }) .client(async (ctx) => { const clientTime = new Date() @@ -25,14 +25,14 @@ const preLogMiddleware = createMiddleware() }) }) -export const logMiddleware = createMiddleware() +export const logMiddleware = createMiddleware({ type: 'function' }) .middleware([preLogMiddleware]) .client(async (ctx) => { const res = await ctx.next() const now = new Date() console.log('Client Req/Res:', { - duration: res.context.clientTime.getTime() - now.getTime(), + duration: now.getTime() - res.context.clientTime.getTime(), durationToServer: res.context.durationToServer, durationFromServer: now.getTime() - res.context.serverTime.getTime(), }) diff --git a/examples/react/start-basic/src/utils/posts.tsx b/examples/react/start-basic/src/utils/posts.tsx index d12abb30ab..52877be68c 100644 --- a/examples/react/start-basic/src/utils/posts.tsx +++ b/examples/react/start-basic/src/utils/posts.tsx @@ -7,7 +7,7 @@ export type PostType = { body: string } -export const fetchPost = createServerFn({ method: 'GET' }) +export const fetchPost = createServerFn() .validator((d: string) => d) .handler(async ({ data }) => { console.info(`Fetching post with id ${data}...`) @@ -27,16 +27,14 @@ export const fetchPost = createServerFn({ method: 'GET' }) return post }) -export const fetchPosts = createServerFn({ method: 'GET' }).handler( - async () => { - console.info('Fetching posts...') - const res = await fetch('https://jsonplaceholder.typicode.com/posts') - if (!res.ok) { - throw new Error('Failed to fetch posts') - } +export const fetchPosts = createServerFn().handler(async () => { + console.info('Fetching posts...') + const res = await fetch('https://jsonplaceholder.typicode.com/posts') + if (!res.ok) { + throw new Error('Failed to fetch posts') + } - const posts = (await res.json()) as Array + const posts = (await res.json()) as Array - return posts - }, -) + return posts.slice(0, 10) +}) diff --git a/examples/react/start-basic/src/utils/users.tsx b/examples/react/start-basic/src/utils/users.tsx index b810f455fe..7ba645b383 100644 --- a/examples/react/start-basic/src/utils/users.tsx +++ b/examples/react/start-basic/src/utils/users.tsx @@ -3,5 +3,3 @@ export type User = { name: string email: string } - -export const DEPLOY_URL = 'http://localhost:3000' diff --git a/examples/react/start-basic/vite.config.ts b/examples/react/start-basic/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-basic/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-clerk-basic/.gitignore b/examples/react/start-clerk-basic/.gitignore index b15fed94e2..2818549158 100644 --- a/examples/react/start-clerk-basic/.gitignore +++ b/examples/react/start-clerk-basic/.gitignore @@ -7,14 +7,10 @@ yarn.lock .cache .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-clerk-basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-clerk-basic/app.config.ts b/examples/react/start-clerk-basic/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-clerk-basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 81c2bb8456..c3a9a49fa5 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", @@ -16,8 +16,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3" + "tailwind-merge": "^2.6.0" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-clerk-basic/src/client.tsx b/examples/react/start-clerk-basic/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-clerk-basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-clerk-basic/src/routeTree.gen.ts b/examples/react/start-clerk-basic/src/routeTree.gen.ts index b4b4f459a8..00f53c8623 100644 --- a/examples/react/start-clerk-basic/src/routeTree.gen.ts +++ b/examples/react/start-clerk-basic/src/routeTree.gen.ts @@ -8,48 +8,50 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AuthedImport } from './routes/_authed' -import { Route as IndexImport } from './routes/index' -import { Route as AuthedPostsImport } from './routes/_authed/posts' -import { Route as AuthedPostsIndexImport } from './routes/_authed/posts.index' -import { Route as AuthedProfileSplatImport } from './routes/_authed/profile.$' -import { Route as AuthedPostsPostIdImport } from './routes/_authed/posts.$postId' +import { Route as AuthedRouteImport } from './routes/_authed' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthedPostsRouteImport } from './routes/_authed/posts' +import { Route as AuthedPostsIndexRouteImport } from './routes/_authed/posts.index' +import { Route as AuthedProfileSplatRouteImport } from './routes/_authed/profile.$' +import { Route as AuthedPostsPostIdRouteImport } from './routes/_authed/posts.$postId' // Create/Update Routes -const AuthedRoute = AuthedImport.update({ +const AuthedRoute = AuthedRouteImport.update({ id: '/_authed', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthedPostsRoute = AuthedPostsImport.update({ +const AuthedPostsRoute = AuthedPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsIndexRoute = AuthedPostsIndexImport.update({ +const AuthedPostsIndexRoute = AuthedPostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthedPostsRoute, } as any) -const AuthedProfileSplatRoute = AuthedProfileSplatImport.update({ +const AuthedProfileSplatRoute = AuthedProfileSplatRouteImport.update({ id: '/profile/$', path: '/profile/$', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsPostIdRoute = AuthedPostsPostIdImport.update({ +const AuthedPostsPostIdRoute = AuthedPostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => AuthedPostsRoute, @@ -63,47 +65,104 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_authed': { id: '/_authed' path: '' fullPath: '' - preLoaderRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedRouteImport parentRoute: typeof rootRoute } '/_authed/posts': { id: '/_authed/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof AuthedPostsImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedPostsRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/$postId': { id: '/_authed/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof AuthedPostsPostIdImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsPostIdRouteImport + parentRoute: typeof AuthedPostsRouteImport } '/_authed/profile/$': { id: '/_authed/profile/$' path: '/profile/$' fullPath: '/profile/$' - preLoaderRoute: typeof AuthedProfileSplatImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedProfileSplatRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/': { id: '/_authed/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof AuthedPostsIndexImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsIndexRouteImport + parentRoute: typeof AuthedPostsRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_authed' { + const createFileRoute: CreateFileRoute< + '/_authed', + FileRoutesByPath['/_authed']['parentRoute'], + FileRoutesByPath['/_authed']['id'], + FileRoutesByPath['/_authed']['path'], + FileRoutesByPath['/_authed']['fullPath'] + > +} +declare module './routes/_authed/posts' { + const createFileRoute: CreateFileRoute< + '/_authed/posts', + FileRoutesByPath['/_authed/posts']['parentRoute'], + FileRoutesByPath['/_authed/posts']['id'], + FileRoutesByPath['/_authed/posts']['path'], + FileRoutesByPath['/_authed/posts']['fullPath'] + > +} +declare module './routes/_authed/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/$postId', + FileRoutesByPath['/_authed/posts/$postId']['parentRoute'], + FileRoutesByPath['/_authed/posts/$postId']['id'], + FileRoutesByPath['/_authed/posts/$postId']['path'], + FileRoutesByPath['/_authed/posts/$postId']['fullPath'] + > +} +declare module './routes/_authed/profile.$' { + const createFileRoute: CreateFileRoute< + '/_authed/profile/$', + FileRoutesByPath['/_authed/profile/$']['parentRoute'], + FileRoutesByPath['/_authed/profile/$']['id'], + FileRoutesByPath['/_authed/profile/$']['path'], + FileRoutesByPath['/_authed/profile/$']['fullPath'] + > +} +declare module './routes/_authed/posts.index' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/', + FileRoutesByPath['/_authed/posts/']['parentRoute'], + FileRoutesByPath['/_authed/posts/']['id'], + FileRoutesByPath['/_authed/posts/']['path'], + FileRoutesByPath['/_authed/posts/']['fullPath'] + > +} + // Create and export the route tree interface AuthedPostsRouteChildren { diff --git a/examples/react/start-clerk-basic/src/routes/_authed.tsx b/examples/react/start-clerk-basic/src/routes/_authed.tsx index 1f68471a91..7e56fea09b 100644 --- a/examples/react/start-clerk-basic/src/routes/_authed.tsx +++ b/examples/react/start-clerk-basic/src/routes/_authed.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { SignIn } from '@clerk/tanstack-react-start' -export const Route = createFileRoute('/_authed')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { if (!context.userId) { throw new Error('Not authenticated') diff --git a/examples/react/start-clerk-basic/src/routes/_authed/posts.$postId.tsx b/examples/react/start-clerk-basic/src/routes/_authed/posts.$postId.tsx index 039271bb89..c6c36f3ea4 100644 --- a/examples/react/start-clerk-basic/src/routes/_authed/posts.$postId.tsx +++ b/examples/react/start-clerk-basic/src/routes/_authed/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound.js' import { fetchPost } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/examples/react/start-clerk-basic/src/routes/_authed/posts.index.tsx b/examples/react/start-clerk-basic/src/routes/_authed/posts.index.tsx index ea9e667e54..13529228bb 100644 --- a/examples/react/start-clerk-basic/src/routes/_authed/posts.index.tsx +++ b/examples/react/start-clerk-basic/src/routes/_authed/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_authed/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-clerk-basic/src/routes/_authed/posts.tsx b/examples/react/start-clerk-basic/src/routes/_authed/posts.tsx index 86c8ef4138..f9b50197cf 100644 --- a/examples/react/start-clerk-basic/src/routes/_authed/posts.tsx +++ b/examples/react/start-clerk-basic/src/routes/_authed/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/posts')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/react/start-clerk-basic/src/routes/_authed/profile.$.tsx b/examples/react/start-clerk-basic/src/routes/_authed/profile.$.tsx index 208a38e230..f9b50197cf 100644 --- a/examples/react/start-clerk-basic/src/routes/_authed/profile.$.tsx +++ b/examples/react/start-clerk-basic/src/routes/_authed/profile.$.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '~/utils/posts.js' -export const Route = createFileRoute('/_authed/profile/$')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/react/start-clerk-basic/src/routes/index.tsx b/examples/react/start-clerk-basic/src/routes/index.tsx index 6ae388a178..66baf1e9f1 100644 --- a/examples/react/start-clerk-basic/src/routes/index.tsx +++ b/examples/react/start-clerk-basic/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/e2e/react-start/clerk-basic/src/ssr.tsx b/examples/react/start-clerk-basic/src/server.ts similarity index 100% rename from e2e/react-start/clerk-basic/src/ssr.tsx rename to examples/react/start-clerk-basic/src/server.ts diff --git a/examples/react/start-clerk-basic/src/ssr.tsx b/examples/react/start-clerk-basic/src/ssr.tsx deleted file mode 100644 index 060cd4816b..0000000000 --- a/examples/react/start-clerk-basic/src/ssr.tsx +++ /dev/null @@ -1,17 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' -import { createClerkHandler } from '@clerk/tanstack-react-start/server' -import { createRouter } from './router' - -const handler = createStartHandler({ - createRouter, - getRouterManifest, -}) - -const clerkHandler = createClerkHandler(handler) - -export default clerkHandler(defaultStreamHandler) diff --git a/examples/react/start-clerk-basic/src/tanstack-start.d.ts b/examples/react/start-clerk-basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-clerk-basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-clerk-basic/vite.config.ts b/examples/react/start-clerk-basic/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-clerk-basic/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-convex-trellaux/.gitignore b/examples/react/start-convex-trellaux/.gitignore index 30518e7416..ba7dbddfbe 100644 --- a/examples/react/start-convex-trellaux/.gitignore +++ b/examples/react/start-convex-trellaux/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin .env.local diff --git a/examples/react/start-convex-trellaux/.stackblitzrc b/examples/react/start-convex-trellaux/.stackblitzrc index 2f76846e62..e616ee3a78 100644 --- a/examples/react/start-convex-trellaux/.stackblitzrc +++ b/examples/react/start-convex-trellaux/.stackblitzrc @@ -1,3 +1,3 @@ { - "startCommand": "cp .env.local.example .env.local && npx vinxi dev" + "startCommand": "cp .env.local.example .env.local && npx vite dev" } diff --git a/examples/react/start-convex-trellaux/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-convex-trellaux/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-convex-trellaux/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-convex-trellaux/app.config.ts b/examples/react/start-convex-trellaux/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-convex-trellaux/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index ab54a780df..57539d28f8 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -5,10 +5,10 @@ "type": "module", "scripts": { "dev": "npx convex dev --once && concurrently -r npm:dev:web npm:dev:db", - "dev:web": "vinxi dev", + "dev:web": "vite dev", "dev:db": "convex dev --run board:seed", - "build": "vinxi build", - "start": "vinxi start" + "build": "vite build", + "start": "vite start" }, "dependencies": { "@convex-dev/react-query": "0.0.0-alpha.8", @@ -28,7 +28,6 @@ "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", "tiny-invariant": "^1.3.3", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/start-convex-trellaux/src/client.tsx b/examples/react/start-convex-trellaux/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-convex-trellaux/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-convex-trellaux/src/routeTree.gen.ts b/examples/react/start-convex-trellaux/src/routeTree.gen.ts index 7ee57387dc..e8cc65e620 100644 --- a/examples/react/start-convex-trellaux/src/routeTree.gen.ts +++ b/examples/react/start-convex-trellaux/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as BoardsBoardIdImport } from './routes/boards.$boardId' +import { Route as IndexRouteImport } from './routes/index' +import { Route as BoardsBoardIdRouteImport } from './routes/boards.$boardId' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const BoardsBoardIdRoute = BoardsBoardIdImport.update({ +const BoardsBoardIdRoute = BoardsBoardIdRouteImport.update({ id: '/boards/$boardId', path: '/boards/$boardId', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/boards/$boardId': { id: '/boards/$boardId' path: '/boards/$boardId' fullPath: '/boards/$boardId' - preLoaderRoute: typeof BoardsBoardIdImport + preLoaderRoute: typeof BoardsBoardIdRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/boards.$boardId' { + const createFileRoute: CreateFileRoute< + '/boards/$boardId', + FileRoutesByPath['/boards/$boardId']['parentRoute'], + FileRoutesByPath['/boards/$boardId']['id'], + FileRoutesByPath['/boards/$boardId']['path'], + FileRoutesByPath['/boards/$boardId']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/start-convex-trellaux/src/routes/boards.$boardId.tsx b/examples/react/start-convex-trellaux/src/routes/boards.$boardId.tsx index 36896cbb02..19400b89f6 100644 --- a/examples/react/start-convex-trellaux/src/routes/boards.$boardId.tsx +++ b/examples/react/start-convex-trellaux/src/routes/boards.$boardId.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/react-router' import { Board } from '~/components/Board' import { Loader } from '~/components/Loader' import { boardQueries } from '~/queries' -export const Route = createFileRoute('/boards/$boardId')({ +export const Route = createFileRoute({ component: Home, pendingComponent: () => , loader: async ({ params, context: { queryClient } }) => { diff --git a/examples/react/start-convex-trellaux/src/routes/index.tsx b/examples/react/start-convex-trellaux/src/routes/index.tsx index 154fc22e70..212bf2f5f8 100644 --- a/examples/react/start-convex-trellaux/src/routes/index.tsx +++ b/examples/react/start-convex-trellaux/src/routes/index.tsx @@ -1,10 +1,10 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { convexQuery } from '@convex-dev/react-query' import { api } from 'convex/_generated/api' import { Loader } from '~/components/Loader' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, pendingComponent: () => , }) diff --git a/e2e/react-start/server-functions/src/ssr.tsx b/examples/react/start-convex-trellaux/src/server.ts similarity index 100% rename from e2e/react-start/server-functions/src/ssr.tsx rename to examples/react/start-convex-trellaux/src/server.ts diff --git a/examples/react/start-convex-trellaux/src/ssr.tsx b/examples/react/start-convex-trellaux/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-convex-trellaux/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-convex-trellaux/src/tanstack-start.d.ts b/examples/react/start-convex-trellaux/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-convex-trellaux/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-convex-trellaux/vite.config.ts b/examples/react/start-convex-trellaux/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-convex-trellaux/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-counter/.gitignore b/examples/react/start-counter/.gitignore index 2b76174be5..08eba9e706 100644 --- a/examples/react/start-counter/.gitignore +++ b/examples/react/start-counter/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-counter/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-counter/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-counter/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-counter/app.config.ts b/examples/react/start-counter/app.config.ts deleted file mode 100644 index 83ec1302eb..0000000000 --- a/examples/react/start-counter/app.config.ts +++ /dev/null @@ -1,8 +0,0 @@ -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, -}) diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 5597354b06..cd7bbbb50b 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -4,17 +4,16 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-router": "^1.120.3", "@tanstack/react-router-devtools": "^1.120.3", "@tanstack/react-start": "^1.120.3", "react": "^19.0.0", - "react-dom": "^19.0.0", - "vinxi": "0.5.3" + "react-dom": "^19.0.0" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-counter/src/client.tsx b/examples/react/start-counter/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-counter/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-counter/src/routeTree.gen.ts b/examples/react/start-counter/src/routeTree.gen.ts index 5e682936ba..dd5eda94a9 100644 --- a/examples/react/start-counter/src/routeTree.gen.ts +++ b/examples/react/start-counter/src/routeTree.gen.ts @@ -8,14 +8,16 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -29,12 +31,24 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/start-counter/src/routes/index.tsx b/examples/react/start-counter/src/routes/index.tsx index 5a02f33eba..04431b1329 100644 --- a/examples/react/start-counter/src/routes/index.tsx +++ b/examples/react/start-counter/src/routes/index.tsx @@ -1,5 +1,5 @@ import * as fs from 'node:fs' -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { useRouter } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' const filePath = 'count.txt' @@ -21,7 +21,7 @@ const updateCount = createServerFn({ method: 'POST' }) await fs.promises.writeFile(filePath, `${count + data}`) }) -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async () => await getCount(), }) diff --git a/examples/react/start-bare/src/ssr.tsx b/examples/react/start-counter/src/server.ts similarity index 100% rename from examples/react/start-bare/src/ssr.tsx rename to examples/react/start-counter/src/server.ts diff --git a/examples/react/start-counter/src/ssr.tsx b/examples/react/start-counter/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-counter/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-counter/src/tanstack-start.d.ts b/examples/react/start-counter/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-counter/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-counter/vite.config.ts b/examples/react/start-counter/vite.config.ts new file mode 100644 index 0000000000..86790438cf --- /dev/null +++ b/examples/react/start-counter/vite.config.ts @@ -0,0 +1,9 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [tanstackStart()], +}) diff --git a/examples/react/start-large/.gitignore b/examples/react/start-large/.gitignore index cb9991202d..ca4ef70bc0 100644 --- a/examples/react/start-large/.gitignore +++ b/examples/react/start-large/.gitignore @@ -13,10 +13,7 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi \ No newline at end of file +/public/build \ No newline at end of file diff --git a/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..280045c302 --- /dev/null +++ b/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,3614 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as SearchSearchPlaceholderRouteImport } from './../../src/routes/search/searchPlaceholder' +import { ServerRoute as genSearchSearch99RouteImport } from './../../src/routes/(gen)/search/search99' +import { ServerRoute as genSearchSearch98RouteImport } from './../../src/routes/(gen)/search/search98' +import { ServerRoute as genSearchSearch97RouteImport } from './../../src/routes/(gen)/search/search97' +import { ServerRoute as genSearchSearch96RouteImport } from './../../src/routes/(gen)/search/search96' +import { ServerRoute as genSearchSearch95RouteImport } from './../../src/routes/(gen)/search/search95' +import { ServerRoute as genSearchSearch94RouteImport } from './../../src/routes/(gen)/search/search94' +import { ServerRoute as genSearchSearch93RouteImport } from './../../src/routes/(gen)/search/search93' +import { ServerRoute as genSearchSearch92RouteImport } from './../../src/routes/(gen)/search/search92' +import { ServerRoute as genSearchSearch91RouteImport } from './../../src/routes/(gen)/search/search91' +import { ServerRoute as genSearchSearch90RouteImport } from './../../src/routes/(gen)/search/search90' +import { ServerRoute as genSearchSearch9RouteImport } from './../../src/routes/(gen)/search/search9' +import { ServerRoute as genSearchSearch89RouteImport } from './../../src/routes/(gen)/search/search89' +import { ServerRoute as genSearchSearch88RouteImport } from './../../src/routes/(gen)/search/search88' +import { ServerRoute as genSearchSearch87RouteImport } from './../../src/routes/(gen)/search/search87' +import { ServerRoute as genSearchSearch86RouteImport } from './../../src/routes/(gen)/search/search86' +import { ServerRoute as genSearchSearch85RouteImport } from './../../src/routes/(gen)/search/search85' +import { ServerRoute as genSearchSearch84RouteImport } from './../../src/routes/(gen)/search/search84' +import { ServerRoute as genSearchSearch83RouteImport } from './../../src/routes/(gen)/search/search83' +import { ServerRoute as genSearchSearch82RouteImport } from './../../src/routes/(gen)/search/search82' +import { ServerRoute as genSearchSearch81RouteImport } from './../../src/routes/(gen)/search/search81' +import { ServerRoute as genSearchSearch80RouteImport } from './../../src/routes/(gen)/search/search80' +import { ServerRoute as genSearchSearch8RouteImport } from './../../src/routes/(gen)/search/search8' +import { ServerRoute as genSearchSearch79RouteImport } from './../../src/routes/(gen)/search/search79' +import { ServerRoute as genSearchSearch78RouteImport } from './../../src/routes/(gen)/search/search78' +import { ServerRoute as genSearchSearch77RouteImport } from './../../src/routes/(gen)/search/search77' +import { ServerRoute as genSearchSearch76RouteImport } from './../../src/routes/(gen)/search/search76' +import { ServerRoute as genSearchSearch75RouteImport } from './../../src/routes/(gen)/search/search75' +import { ServerRoute as genSearchSearch74RouteImport } from './../../src/routes/(gen)/search/search74' +import { ServerRoute as genSearchSearch73RouteImport } from './../../src/routes/(gen)/search/search73' +import { ServerRoute as genSearchSearch72RouteImport } from './../../src/routes/(gen)/search/search72' +import { ServerRoute as genSearchSearch71RouteImport } from './../../src/routes/(gen)/search/search71' +import { ServerRoute as genSearchSearch70RouteImport } from './../../src/routes/(gen)/search/search70' +import { ServerRoute as genSearchSearch7RouteImport } from './../../src/routes/(gen)/search/search7' +import { ServerRoute as genSearchSearch69RouteImport } from './../../src/routes/(gen)/search/search69' +import { ServerRoute as genSearchSearch68RouteImport } from './../../src/routes/(gen)/search/search68' +import { ServerRoute as genSearchSearch67RouteImport } from './../../src/routes/(gen)/search/search67' +import { ServerRoute as genSearchSearch66RouteImport } from './../../src/routes/(gen)/search/search66' +import { ServerRoute as genSearchSearch65RouteImport } from './../../src/routes/(gen)/search/search65' +import { ServerRoute as genSearchSearch64RouteImport } from './../../src/routes/(gen)/search/search64' +import { ServerRoute as genSearchSearch63RouteImport } from './../../src/routes/(gen)/search/search63' +import { ServerRoute as genSearchSearch62RouteImport } from './../../src/routes/(gen)/search/search62' +import { ServerRoute as genSearchSearch61RouteImport } from './../../src/routes/(gen)/search/search61' +import { ServerRoute as genSearchSearch60RouteImport } from './../../src/routes/(gen)/search/search60' +import { ServerRoute as genSearchSearch6RouteImport } from './../../src/routes/(gen)/search/search6' +import { ServerRoute as genSearchSearch59RouteImport } from './../../src/routes/(gen)/search/search59' +import { ServerRoute as genSearchSearch58RouteImport } from './../../src/routes/(gen)/search/search58' +import { ServerRoute as genSearchSearch57RouteImport } from './../../src/routes/(gen)/search/search57' +import { ServerRoute as genSearchSearch56RouteImport } from './../../src/routes/(gen)/search/search56' +import { ServerRoute as genSearchSearch55RouteImport } from './../../src/routes/(gen)/search/search55' +import { ServerRoute as genSearchSearch54RouteImport } from './../../src/routes/(gen)/search/search54' +import { ServerRoute as genSearchSearch53RouteImport } from './../../src/routes/(gen)/search/search53' +import { ServerRoute as genSearchSearch52RouteImport } from './../../src/routes/(gen)/search/search52' +import { ServerRoute as genSearchSearch51RouteImport } from './../../src/routes/(gen)/search/search51' +import { ServerRoute as genSearchSearch50RouteImport } from './../../src/routes/(gen)/search/search50' +import { ServerRoute as genSearchSearch5RouteImport } from './../../src/routes/(gen)/search/search5' +import { ServerRoute as genSearchSearch49RouteImport } from './../../src/routes/(gen)/search/search49' +import { ServerRoute as genSearchSearch48RouteImport } from './../../src/routes/(gen)/search/search48' +import { ServerRoute as genSearchSearch47RouteImport } from './../../src/routes/(gen)/search/search47' +import { ServerRoute as genSearchSearch46RouteImport } from './../../src/routes/(gen)/search/search46' +import { ServerRoute as genSearchSearch45RouteImport } from './../../src/routes/(gen)/search/search45' +import { ServerRoute as genSearchSearch44RouteImport } from './../../src/routes/(gen)/search/search44' +import { ServerRoute as genSearchSearch43RouteImport } from './../../src/routes/(gen)/search/search43' +import { ServerRoute as genSearchSearch42RouteImport } from './../../src/routes/(gen)/search/search42' +import { ServerRoute as genSearchSearch41RouteImport } from './../../src/routes/(gen)/search/search41' +import { ServerRoute as genSearchSearch40RouteImport } from './../../src/routes/(gen)/search/search40' +import { ServerRoute as genSearchSearch4RouteImport } from './../../src/routes/(gen)/search/search4' +import { ServerRoute as genSearchSearch39RouteImport } from './../../src/routes/(gen)/search/search39' +import { ServerRoute as genSearchSearch38RouteImport } from './../../src/routes/(gen)/search/search38' +import { ServerRoute as genSearchSearch37RouteImport } from './../../src/routes/(gen)/search/search37' +import { ServerRoute as genSearchSearch36RouteImport } from './../../src/routes/(gen)/search/search36' +import { ServerRoute as genSearchSearch35RouteImport } from './../../src/routes/(gen)/search/search35' +import { ServerRoute as genSearchSearch34RouteImport } from './../../src/routes/(gen)/search/search34' +import { ServerRoute as genSearchSearch33RouteImport } from './../../src/routes/(gen)/search/search33' +import { ServerRoute as genSearchSearch32RouteImport } from './../../src/routes/(gen)/search/search32' +import { ServerRoute as genSearchSearch31RouteImport } from './../../src/routes/(gen)/search/search31' +import { ServerRoute as genSearchSearch30RouteImport } from './../../src/routes/(gen)/search/search30' +import { ServerRoute as genSearchSearch3RouteImport } from './../../src/routes/(gen)/search/search3' +import { ServerRoute as genSearchSearch29RouteImport } from './../../src/routes/(gen)/search/search29' +import { ServerRoute as genSearchSearch28RouteImport } from './../../src/routes/(gen)/search/search28' +import { ServerRoute as genSearchSearch27RouteImport } from './../../src/routes/(gen)/search/search27' +import { ServerRoute as genSearchSearch26RouteImport } from './../../src/routes/(gen)/search/search26' +import { ServerRoute as genSearchSearch25RouteImport } from './../../src/routes/(gen)/search/search25' +import { ServerRoute as genSearchSearch24RouteImport } from './../../src/routes/(gen)/search/search24' +import { ServerRoute as genSearchSearch23RouteImport } from './../../src/routes/(gen)/search/search23' +import { ServerRoute as genSearchSearch22RouteImport } from './../../src/routes/(gen)/search/search22' +import { ServerRoute as genSearchSearch21RouteImport } from './../../src/routes/(gen)/search/search21' +import { ServerRoute as genSearchSearch20RouteImport } from './../../src/routes/(gen)/search/search20' +import { ServerRoute as genSearchSearch2RouteImport } from './../../src/routes/(gen)/search/search2' +import { ServerRoute as genSearchSearch19RouteImport } from './../../src/routes/(gen)/search/search19' +import { ServerRoute as genSearchSearch18RouteImport } from './../../src/routes/(gen)/search/search18' +import { ServerRoute as genSearchSearch17RouteImport } from './../../src/routes/(gen)/search/search17' +import { ServerRoute as genSearchSearch16RouteImport } from './../../src/routes/(gen)/search/search16' +import { ServerRoute as genSearchSearch15RouteImport } from './../../src/routes/(gen)/search/search15' +import { ServerRoute as genSearchSearch14RouteImport } from './../../src/routes/(gen)/search/search14' +import { ServerRoute as genSearchSearch13RouteImport } from './../../src/routes/(gen)/search/search13' +import { ServerRoute as genSearchSearch12RouteImport } from './../../src/routes/(gen)/search/search12' +import { ServerRoute as genSearchSearch11RouteImport } from './../../src/routes/(gen)/search/search11' +import { ServerRoute as genSearchSearch10RouteImport } from './../../src/routes/(gen)/search/search10' +import { ServerRoute as genSearchSearch1RouteImport } from './../../src/routes/(gen)/search/search1' +import { ServerRoute as genSearchSearch0RouteImport } from './../../src/routes/(gen)/search/search0' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const SearchSearchPlaceholderRoute = SearchSearchPlaceholderRouteImport.update({ + id: '/search/searchPlaceholder', + path: '/search/searchPlaceholder', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch99Route = genSearchSearch99RouteImport.update({ + id: '/(gen)/search/search99', + path: '/search/search99', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch98Route = genSearchSearch98RouteImport.update({ + id: '/(gen)/search/search98', + path: '/search/search98', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch97Route = genSearchSearch97RouteImport.update({ + id: '/(gen)/search/search97', + path: '/search/search97', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch96Route = genSearchSearch96RouteImport.update({ + id: '/(gen)/search/search96', + path: '/search/search96', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch95Route = genSearchSearch95RouteImport.update({ + id: '/(gen)/search/search95', + path: '/search/search95', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch94Route = genSearchSearch94RouteImport.update({ + id: '/(gen)/search/search94', + path: '/search/search94', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch93Route = genSearchSearch93RouteImport.update({ + id: '/(gen)/search/search93', + path: '/search/search93', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch92Route = genSearchSearch92RouteImport.update({ + id: '/(gen)/search/search92', + path: '/search/search92', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch91Route = genSearchSearch91RouteImport.update({ + id: '/(gen)/search/search91', + path: '/search/search91', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch90Route = genSearchSearch90RouteImport.update({ + id: '/(gen)/search/search90', + path: '/search/search90', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch9Route = genSearchSearch9RouteImport.update({ + id: '/(gen)/search/search9', + path: '/search/search9', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch89Route = genSearchSearch89RouteImport.update({ + id: '/(gen)/search/search89', + path: '/search/search89', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch88Route = genSearchSearch88RouteImport.update({ + id: '/(gen)/search/search88', + path: '/search/search88', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch87Route = genSearchSearch87RouteImport.update({ + id: '/(gen)/search/search87', + path: '/search/search87', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch86Route = genSearchSearch86RouteImport.update({ + id: '/(gen)/search/search86', + path: '/search/search86', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch85Route = genSearchSearch85RouteImport.update({ + id: '/(gen)/search/search85', + path: '/search/search85', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch84Route = genSearchSearch84RouteImport.update({ + id: '/(gen)/search/search84', + path: '/search/search84', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch83Route = genSearchSearch83RouteImport.update({ + id: '/(gen)/search/search83', + path: '/search/search83', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch82Route = genSearchSearch82RouteImport.update({ + id: '/(gen)/search/search82', + path: '/search/search82', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch81Route = genSearchSearch81RouteImport.update({ + id: '/(gen)/search/search81', + path: '/search/search81', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch80Route = genSearchSearch80RouteImport.update({ + id: '/(gen)/search/search80', + path: '/search/search80', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch8Route = genSearchSearch8RouteImport.update({ + id: '/(gen)/search/search8', + path: '/search/search8', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch79Route = genSearchSearch79RouteImport.update({ + id: '/(gen)/search/search79', + path: '/search/search79', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch78Route = genSearchSearch78RouteImport.update({ + id: '/(gen)/search/search78', + path: '/search/search78', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch77Route = genSearchSearch77RouteImport.update({ + id: '/(gen)/search/search77', + path: '/search/search77', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch76Route = genSearchSearch76RouteImport.update({ + id: '/(gen)/search/search76', + path: '/search/search76', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch75Route = genSearchSearch75RouteImport.update({ + id: '/(gen)/search/search75', + path: '/search/search75', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch74Route = genSearchSearch74RouteImport.update({ + id: '/(gen)/search/search74', + path: '/search/search74', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch73Route = genSearchSearch73RouteImport.update({ + id: '/(gen)/search/search73', + path: '/search/search73', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch72Route = genSearchSearch72RouteImport.update({ + id: '/(gen)/search/search72', + path: '/search/search72', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch71Route = genSearchSearch71RouteImport.update({ + id: '/(gen)/search/search71', + path: '/search/search71', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch70Route = genSearchSearch70RouteImport.update({ + id: '/(gen)/search/search70', + path: '/search/search70', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch7Route = genSearchSearch7RouteImport.update({ + id: '/(gen)/search/search7', + path: '/search/search7', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch69Route = genSearchSearch69RouteImport.update({ + id: '/(gen)/search/search69', + path: '/search/search69', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch68Route = genSearchSearch68RouteImport.update({ + id: '/(gen)/search/search68', + path: '/search/search68', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch67Route = genSearchSearch67RouteImport.update({ + id: '/(gen)/search/search67', + path: '/search/search67', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch66Route = genSearchSearch66RouteImport.update({ + id: '/(gen)/search/search66', + path: '/search/search66', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch65Route = genSearchSearch65RouteImport.update({ + id: '/(gen)/search/search65', + path: '/search/search65', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch64Route = genSearchSearch64RouteImport.update({ + id: '/(gen)/search/search64', + path: '/search/search64', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch63Route = genSearchSearch63RouteImport.update({ + id: '/(gen)/search/search63', + path: '/search/search63', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch62Route = genSearchSearch62RouteImport.update({ + id: '/(gen)/search/search62', + path: '/search/search62', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch61Route = genSearchSearch61RouteImport.update({ + id: '/(gen)/search/search61', + path: '/search/search61', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch60Route = genSearchSearch60RouteImport.update({ + id: '/(gen)/search/search60', + path: '/search/search60', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch6Route = genSearchSearch6RouteImport.update({ + id: '/(gen)/search/search6', + path: '/search/search6', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch59Route = genSearchSearch59RouteImport.update({ + id: '/(gen)/search/search59', + path: '/search/search59', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch58Route = genSearchSearch58RouteImport.update({ + id: '/(gen)/search/search58', + path: '/search/search58', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch57Route = genSearchSearch57RouteImport.update({ + id: '/(gen)/search/search57', + path: '/search/search57', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch56Route = genSearchSearch56RouteImport.update({ + id: '/(gen)/search/search56', + path: '/search/search56', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch55Route = genSearchSearch55RouteImport.update({ + id: '/(gen)/search/search55', + path: '/search/search55', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch54Route = genSearchSearch54RouteImport.update({ + id: '/(gen)/search/search54', + path: '/search/search54', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch53Route = genSearchSearch53RouteImport.update({ + id: '/(gen)/search/search53', + path: '/search/search53', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch52Route = genSearchSearch52RouteImport.update({ + id: '/(gen)/search/search52', + path: '/search/search52', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch51Route = genSearchSearch51RouteImport.update({ + id: '/(gen)/search/search51', + path: '/search/search51', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch50Route = genSearchSearch50RouteImport.update({ + id: '/(gen)/search/search50', + path: '/search/search50', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch5Route = genSearchSearch5RouteImport.update({ + id: '/(gen)/search/search5', + path: '/search/search5', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch49Route = genSearchSearch49RouteImport.update({ + id: '/(gen)/search/search49', + path: '/search/search49', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch48Route = genSearchSearch48RouteImport.update({ + id: '/(gen)/search/search48', + path: '/search/search48', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch47Route = genSearchSearch47RouteImport.update({ + id: '/(gen)/search/search47', + path: '/search/search47', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch46Route = genSearchSearch46RouteImport.update({ + id: '/(gen)/search/search46', + path: '/search/search46', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch45Route = genSearchSearch45RouteImport.update({ + id: '/(gen)/search/search45', + path: '/search/search45', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch44Route = genSearchSearch44RouteImport.update({ + id: '/(gen)/search/search44', + path: '/search/search44', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch43Route = genSearchSearch43RouteImport.update({ + id: '/(gen)/search/search43', + path: '/search/search43', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch42Route = genSearchSearch42RouteImport.update({ + id: '/(gen)/search/search42', + path: '/search/search42', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch41Route = genSearchSearch41RouteImport.update({ + id: '/(gen)/search/search41', + path: '/search/search41', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch40Route = genSearchSearch40RouteImport.update({ + id: '/(gen)/search/search40', + path: '/search/search40', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch4Route = genSearchSearch4RouteImport.update({ + id: '/(gen)/search/search4', + path: '/search/search4', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch39Route = genSearchSearch39RouteImport.update({ + id: '/(gen)/search/search39', + path: '/search/search39', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch38Route = genSearchSearch38RouteImport.update({ + id: '/(gen)/search/search38', + path: '/search/search38', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch37Route = genSearchSearch37RouteImport.update({ + id: '/(gen)/search/search37', + path: '/search/search37', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch36Route = genSearchSearch36RouteImport.update({ + id: '/(gen)/search/search36', + path: '/search/search36', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch35Route = genSearchSearch35RouteImport.update({ + id: '/(gen)/search/search35', + path: '/search/search35', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch34Route = genSearchSearch34RouteImport.update({ + id: '/(gen)/search/search34', + path: '/search/search34', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch33Route = genSearchSearch33RouteImport.update({ + id: '/(gen)/search/search33', + path: '/search/search33', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch32Route = genSearchSearch32RouteImport.update({ + id: '/(gen)/search/search32', + path: '/search/search32', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch31Route = genSearchSearch31RouteImport.update({ + id: '/(gen)/search/search31', + path: '/search/search31', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch30Route = genSearchSearch30RouteImport.update({ + id: '/(gen)/search/search30', + path: '/search/search30', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch3Route = genSearchSearch3RouteImport.update({ + id: '/(gen)/search/search3', + path: '/search/search3', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch29Route = genSearchSearch29RouteImport.update({ + id: '/(gen)/search/search29', + path: '/search/search29', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch28Route = genSearchSearch28RouteImport.update({ + id: '/(gen)/search/search28', + path: '/search/search28', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch27Route = genSearchSearch27RouteImport.update({ + id: '/(gen)/search/search27', + path: '/search/search27', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch26Route = genSearchSearch26RouteImport.update({ + id: '/(gen)/search/search26', + path: '/search/search26', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch25Route = genSearchSearch25RouteImport.update({ + id: '/(gen)/search/search25', + path: '/search/search25', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch24Route = genSearchSearch24RouteImport.update({ + id: '/(gen)/search/search24', + path: '/search/search24', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch23Route = genSearchSearch23RouteImport.update({ + id: '/(gen)/search/search23', + path: '/search/search23', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch22Route = genSearchSearch22RouteImport.update({ + id: '/(gen)/search/search22', + path: '/search/search22', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch21Route = genSearchSearch21RouteImport.update({ + id: '/(gen)/search/search21', + path: '/search/search21', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch20Route = genSearchSearch20RouteImport.update({ + id: '/(gen)/search/search20', + path: '/search/search20', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch2Route = genSearchSearch2RouteImport.update({ + id: '/(gen)/search/search2', + path: '/search/search2', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch19Route = genSearchSearch19RouteImport.update({ + id: '/(gen)/search/search19', + path: '/search/search19', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch18Route = genSearchSearch18RouteImport.update({ + id: '/(gen)/search/search18', + path: '/search/search18', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch17Route = genSearchSearch17RouteImport.update({ + id: '/(gen)/search/search17', + path: '/search/search17', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch16Route = genSearchSearch16RouteImport.update({ + id: '/(gen)/search/search16', + path: '/search/search16', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch15Route = genSearchSearch15RouteImport.update({ + id: '/(gen)/search/search15', + path: '/search/search15', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch14Route = genSearchSearch14RouteImport.update({ + id: '/(gen)/search/search14', + path: '/search/search14', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch13Route = genSearchSearch13RouteImport.update({ + id: '/(gen)/search/search13', + path: '/search/search13', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch12Route = genSearchSearch12RouteImport.update({ + id: '/(gen)/search/search12', + path: '/search/search12', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch11Route = genSearchSearch11RouteImport.update({ + id: '/(gen)/search/search11', + path: '/search/search11', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch10Route = genSearchSearch10RouteImport.update({ + id: '/(gen)/search/search10', + path: '/search/search10', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch1Route = genSearchSearch1RouteImport.update({ + id: '/(gen)/search/search1', + path: '/search/search1', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch0Route = genSearchSearch0RouteImport.update({ + id: '/(gen)/search/search0', + path: '/search/search0', + getParentRoute: () => rootRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/search/searchPlaceholder': { + id: '/search/searchPlaceholder' + path: '/search/searchPlaceholder' + fullPath: '/search/searchPlaceholder' + preLoaderRoute: typeof SearchSearchPlaceholderRouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search0': { + id: '/(gen)/search/search0' + path: '/search/search0' + fullPath: '/search/search0' + preLoaderRoute: typeof genSearchSearch0RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search1': { + id: '/(gen)/search/search1' + path: '/search/search1' + fullPath: '/search/search1' + preLoaderRoute: typeof genSearchSearch1RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search10': { + id: '/(gen)/search/search10' + path: '/search/search10' + fullPath: '/search/search10' + preLoaderRoute: typeof genSearchSearch10RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search11': { + id: '/(gen)/search/search11' + path: '/search/search11' + fullPath: '/search/search11' + preLoaderRoute: typeof genSearchSearch11RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search12': { + id: '/(gen)/search/search12' + path: '/search/search12' + fullPath: '/search/search12' + preLoaderRoute: typeof genSearchSearch12RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search13': { + id: '/(gen)/search/search13' + path: '/search/search13' + fullPath: '/search/search13' + preLoaderRoute: typeof genSearchSearch13RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search14': { + id: '/(gen)/search/search14' + path: '/search/search14' + fullPath: '/search/search14' + preLoaderRoute: typeof genSearchSearch14RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search15': { + id: '/(gen)/search/search15' + path: '/search/search15' + fullPath: '/search/search15' + preLoaderRoute: typeof genSearchSearch15RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search16': { + id: '/(gen)/search/search16' + path: '/search/search16' + fullPath: '/search/search16' + preLoaderRoute: typeof genSearchSearch16RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search17': { + id: '/(gen)/search/search17' + path: '/search/search17' + fullPath: '/search/search17' + preLoaderRoute: typeof genSearchSearch17RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search18': { + id: '/(gen)/search/search18' + path: '/search/search18' + fullPath: '/search/search18' + preLoaderRoute: typeof genSearchSearch18RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search19': { + id: '/(gen)/search/search19' + path: '/search/search19' + fullPath: '/search/search19' + preLoaderRoute: typeof genSearchSearch19RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search2': { + id: '/(gen)/search/search2' + path: '/search/search2' + fullPath: '/search/search2' + preLoaderRoute: typeof genSearchSearch2RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search20': { + id: '/(gen)/search/search20' + path: '/search/search20' + fullPath: '/search/search20' + preLoaderRoute: typeof genSearchSearch20RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search21': { + id: '/(gen)/search/search21' + path: '/search/search21' + fullPath: '/search/search21' + preLoaderRoute: typeof genSearchSearch21RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search22': { + id: '/(gen)/search/search22' + path: '/search/search22' + fullPath: '/search/search22' + preLoaderRoute: typeof genSearchSearch22RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search23': { + id: '/(gen)/search/search23' + path: '/search/search23' + fullPath: '/search/search23' + preLoaderRoute: typeof genSearchSearch23RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search24': { + id: '/(gen)/search/search24' + path: '/search/search24' + fullPath: '/search/search24' + preLoaderRoute: typeof genSearchSearch24RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search25': { + id: '/(gen)/search/search25' + path: '/search/search25' + fullPath: '/search/search25' + preLoaderRoute: typeof genSearchSearch25RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search26': { + id: '/(gen)/search/search26' + path: '/search/search26' + fullPath: '/search/search26' + preLoaderRoute: typeof genSearchSearch26RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search27': { + id: '/(gen)/search/search27' + path: '/search/search27' + fullPath: '/search/search27' + preLoaderRoute: typeof genSearchSearch27RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search28': { + id: '/(gen)/search/search28' + path: '/search/search28' + fullPath: '/search/search28' + preLoaderRoute: typeof genSearchSearch28RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search29': { + id: '/(gen)/search/search29' + path: '/search/search29' + fullPath: '/search/search29' + preLoaderRoute: typeof genSearchSearch29RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search3': { + id: '/(gen)/search/search3' + path: '/search/search3' + fullPath: '/search/search3' + preLoaderRoute: typeof genSearchSearch3RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search30': { + id: '/(gen)/search/search30' + path: '/search/search30' + fullPath: '/search/search30' + preLoaderRoute: typeof genSearchSearch30RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search31': { + id: '/(gen)/search/search31' + path: '/search/search31' + fullPath: '/search/search31' + preLoaderRoute: typeof genSearchSearch31RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search32': { + id: '/(gen)/search/search32' + path: '/search/search32' + fullPath: '/search/search32' + preLoaderRoute: typeof genSearchSearch32RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search33': { + id: '/(gen)/search/search33' + path: '/search/search33' + fullPath: '/search/search33' + preLoaderRoute: typeof genSearchSearch33RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search34': { + id: '/(gen)/search/search34' + path: '/search/search34' + fullPath: '/search/search34' + preLoaderRoute: typeof genSearchSearch34RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search35': { + id: '/(gen)/search/search35' + path: '/search/search35' + fullPath: '/search/search35' + preLoaderRoute: typeof genSearchSearch35RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search36': { + id: '/(gen)/search/search36' + path: '/search/search36' + fullPath: '/search/search36' + preLoaderRoute: typeof genSearchSearch36RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search37': { + id: '/(gen)/search/search37' + path: '/search/search37' + fullPath: '/search/search37' + preLoaderRoute: typeof genSearchSearch37RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search38': { + id: '/(gen)/search/search38' + path: '/search/search38' + fullPath: '/search/search38' + preLoaderRoute: typeof genSearchSearch38RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search39': { + id: '/(gen)/search/search39' + path: '/search/search39' + fullPath: '/search/search39' + preLoaderRoute: typeof genSearchSearch39RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search4': { + id: '/(gen)/search/search4' + path: '/search/search4' + fullPath: '/search/search4' + preLoaderRoute: typeof genSearchSearch4RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search40': { + id: '/(gen)/search/search40' + path: '/search/search40' + fullPath: '/search/search40' + preLoaderRoute: typeof genSearchSearch40RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search41': { + id: '/(gen)/search/search41' + path: '/search/search41' + fullPath: '/search/search41' + preLoaderRoute: typeof genSearchSearch41RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search42': { + id: '/(gen)/search/search42' + path: '/search/search42' + fullPath: '/search/search42' + preLoaderRoute: typeof genSearchSearch42RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search43': { + id: '/(gen)/search/search43' + path: '/search/search43' + fullPath: '/search/search43' + preLoaderRoute: typeof genSearchSearch43RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search44': { + id: '/(gen)/search/search44' + path: '/search/search44' + fullPath: '/search/search44' + preLoaderRoute: typeof genSearchSearch44RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search45': { + id: '/(gen)/search/search45' + path: '/search/search45' + fullPath: '/search/search45' + preLoaderRoute: typeof genSearchSearch45RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search46': { + id: '/(gen)/search/search46' + path: '/search/search46' + fullPath: '/search/search46' + preLoaderRoute: typeof genSearchSearch46RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search47': { + id: '/(gen)/search/search47' + path: '/search/search47' + fullPath: '/search/search47' + preLoaderRoute: typeof genSearchSearch47RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search48': { + id: '/(gen)/search/search48' + path: '/search/search48' + fullPath: '/search/search48' + preLoaderRoute: typeof genSearchSearch48RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search49': { + id: '/(gen)/search/search49' + path: '/search/search49' + fullPath: '/search/search49' + preLoaderRoute: typeof genSearchSearch49RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search5': { + id: '/(gen)/search/search5' + path: '/search/search5' + fullPath: '/search/search5' + preLoaderRoute: typeof genSearchSearch5RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search50': { + id: '/(gen)/search/search50' + path: '/search/search50' + fullPath: '/search/search50' + preLoaderRoute: typeof genSearchSearch50RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search51': { + id: '/(gen)/search/search51' + path: '/search/search51' + fullPath: '/search/search51' + preLoaderRoute: typeof genSearchSearch51RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search52': { + id: '/(gen)/search/search52' + path: '/search/search52' + fullPath: '/search/search52' + preLoaderRoute: typeof genSearchSearch52RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search53': { + id: '/(gen)/search/search53' + path: '/search/search53' + fullPath: '/search/search53' + preLoaderRoute: typeof genSearchSearch53RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search54': { + id: '/(gen)/search/search54' + path: '/search/search54' + fullPath: '/search/search54' + preLoaderRoute: typeof genSearchSearch54RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search55': { + id: '/(gen)/search/search55' + path: '/search/search55' + fullPath: '/search/search55' + preLoaderRoute: typeof genSearchSearch55RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search56': { + id: '/(gen)/search/search56' + path: '/search/search56' + fullPath: '/search/search56' + preLoaderRoute: typeof genSearchSearch56RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search57': { + id: '/(gen)/search/search57' + path: '/search/search57' + fullPath: '/search/search57' + preLoaderRoute: typeof genSearchSearch57RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search58': { + id: '/(gen)/search/search58' + path: '/search/search58' + fullPath: '/search/search58' + preLoaderRoute: typeof genSearchSearch58RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search59': { + id: '/(gen)/search/search59' + path: '/search/search59' + fullPath: '/search/search59' + preLoaderRoute: typeof genSearchSearch59RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search6': { + id: '/(gen)/search/search6' + path: '/search/search6' + fullPath: '/search/search6' + preLoaderRoute: typeof genSearchSearch6RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search60': { + id: '/(gen)/search/search60' + path: '/search/search60' + fullPath: '/search/search60' + preLoaderRoute: typeof genSearchSearch60RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search61': { + id: '/(gen)/search/search61' + path: '/search/search61' + fullPath: '/search/search61' + preLoaderRoute: typeof genSearchSearch61RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search62': { + id: '/(gen)/search/search62' + path: '/search/search62' + fullPath: '/search/search62' + preLoaderRoute: typeof genSearchSearch62RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search63': { + id: '/(gen)/search/search63' + path: '/search/search63' + fullPath: '/search/search63' + preLoaderRoute: typeof genSearchSearch63RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search64': { + id: '/(gen)/search/search64' + path: '/search/search64' + fullPath: '/search/search64' + preLoaderRoute: typeof genSearchSearch64RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search65': { + id: '/(gen)/search/search65' + path: '/search/search65' + fullPath: '/search/search65' + preLoaderRoute: typeof genSearchSearch65RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search66': { + id: '/(gen)/search/search66' + path: '/search/search66' + fullPath: '/search/search66' + preLoaderRoute: typeof genSearchSearch66RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search67': { + id: '/(gen)/search/search67' + path: '/search/search67' + fullPath: '/search/search67' + preLoaderRoute: typeof genSearchSearch67RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search68': { + id: '/(gen)/search/search68' + path: '/search/search68' + fullPath: '/search/search68' + preLoaderRoute: typeof genSearchSearch68RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search69': { + id: '/(gen)/search/search69' + path: '/search/search69' + fullPath: '/search/search69' + preLoaderRoute: typeof genSearchSearch69RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search7': { + id: '/(gen)/search/search7' + path: '/search/search7' + fullPath: '/search/search7' + preLoaderRoute: typeof genSearchSearch7RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search70': { + id: '/(gen)/search/search70' + path: '/search/search70' + fullPath: '/search/search70' + preLoaderRoute: typeof genSearchSearch70RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search71': { + id: '/(gen)/search/search71' + path: '/search/search71' + fullPath: '/search/search71' + preLoaderRoute: typeof genSearchSearch71RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search72': { + id: '/(gen)/search/search72' + path: '/search/search72' + fullPath: '/search/search72' + preLoaderRoute: typeof genSearchSearch72RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search73': { + id: '/(gen)/search/search73' + path: '/search/search73' + fullPath: '/search/search73' + preLoaderRoute: typeof genSearchSearch73RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search74': { + id: '/(gen)/search/search74' + path: '/search/search74' + fullPath: '/search/search74' + preLoaderRoute: typeof genSearchSearch74RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search75': { + id: '/(gen)/search/search75' + path: '/search/search75' + fullPath: '/search/search75' + preLoaderRoute: typeof genSearchSearch75RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search76': { + id: '/(gen)/search/search76' + path: '/search/search76' + fullPath: '/search/search76' + preLoaderRoute: typeof genSearchSearch76RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search77': { + id: '/(gen)/search/search77' + path: '/search/search77' + fullPath: '/search/search77' + preLoaderRoute: typeof genSearchSearch77RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search78': { + id: '/(gen)/search/search78' + path: '/search/search78' + fullPath: '/search/search78' + preLoaderRoute: typeof genSearchSearch78RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search79': { + id: '/(gen)/search/search79' + path: '/search/search79' + fullPath: '/search/search79' + preLoaderRoute: typeof genSearchSearch79RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search8': { + id: '/(gen)/search/search8' + path: '/search/search8' + fullPath: '/search/search8' + preLoaderRoute: typeof genSearchSearch8RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search80': { + id: '/(gen)/search/search80' + path: '/search/search80' + fullPath: '/search/search80' + preLoaderRoute: typeof genSearchSearch80RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search81': { + id: '/(gen)/search/search81' + path: '/search/search81' + fullPath: '/search/search81' + preLoaderRoute: typeof genSearchSearch81RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search82': { + id: '/(gen)/search/search82' + path: '/search/search82' + fullPath: '/search/search82' + preLoaderRoute: typeof genSearchSearch82RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search83': { + id: '/(gen)/search/search83' + path: '/search/search83' + fullPath: '/search/search83' + preLoaderRoute: typeof genSearchSearch83RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search84': { + id: '/(gen)/search/search84' + path: '/search/search84' + fullPath: '/search/search84' + preLoaderRoute: typeof genSearchSearch84RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search85': { + id: '/(gen)/search/search85' + path: '/search/search85' + fullPath: '/search/search85' + preLoaderRoute: typeof genSearchSearch85RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search86': { + id: '/(gen)/search/search86' + path: '/search/search86' + fullPath: '/search/search86' + preLoaderRoute: typeof genSearchSearch86RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search87': { + id: '/(gen)/search/search87' + path: '/search/search87' + fullPath: '/search/search87' + preLoaderRoute: typeof genSearchSearch87RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search88': { + id: '/(gen)/search/search88' + path: '/search/search88' + fullPath: '/search/search88' + preLoaderRoute: typeof genSearchSearch88RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search89': { + id: '/(gen)/search/search89' + path: '/search/search89' + fullPath: '/search/search89' + preLoaderRoute: typeof genSearchSearch89RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search9': { + id: '/(gen)/search/search9' + path: '/search/search9' + fullPath: '/search/search9' + preLoaderRoute: typeof genSearchSearch9RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search90': { + id: '/(gen)/search/search90' + path: '/search/search90' + fullPath: '/search/search90' + preLoaderRoute: typeof genSearchSearch90RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search91': { + id: '/(gen)/search/search91' + path: '/search/search91' + fullPath: '/search/search91' + preLoaderRoute: typeof genSearchSearch91RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search92': { + id: '/(gen)/search/search92' + path: '/search/search92' + fullPath: '/search/search92' + preLoaderRoute: typeof genSearchSearch92RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search93': { + id: '/(gen)/search/search93' + path: '/search/search93' + fullPath: '/search/search93' + preLoaderRoute: typeof genSearchSearch93RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search94': { + id: '/(gen)/search/search94' + path: '/search/search94' + fullPath: '/search/search94' + preLoaderRoute: typeof genSearchSearch94RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search95': { + id: '/(gen)/search/search95' + path: '/search/search95' + fullPath: '/search/search95' + preLoaderRoute: typeof genSearchSearch95RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search96': { + id: '/(gen)/search/search96' + path: '/search/search96' + fullPath: '/search/search96' + preLoaderRoute: typeof genSearchSearch96RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search97': { + id: '/(gen)/search/search97' + path: '/search/search97' + fullPath: '/search/search97' + preLoaderRoute: typeof genSearchSearch97RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search98': { + id: '/(gen)/search/search98' + path: '/search/search98' + fullPath: '/search/search98' + preLoaderRoute: typeof genSearchSearch98RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search/search99': { + id: '/(gen)/search/search99' + path: '/search/search99' + fullPath: '/search/search99' + preLoaderRoute: typeof genSearchSearch99RouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/search/searchPlaceholder' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], + FileRoutesByPath['/search/searchPlaceholder']['id'], + FileRoutesByPath['/search/searchPlaceholder']['path'], + FileRoutesByPath['/search/searchPlaceholder']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search0' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search0']['parentRoute'], + FileRoutesByPath['/(gen)/search/search0']['id'], + FileRoutesByPath['/(gen)/search/search0']['path'], + FileRoutesByPath['/(gen)/search/search0']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search1' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search1']['parentRoute'], + FileRoutesByPath['/(gen)/search/search1']['id'], + FileRoutesByPath['/(gen)/search/search1']['path'], + FileRoutesByPath['/(gen)/search/search1']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search10' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search10']['parentRoute'], + FileRoutesByPath['/(gen)/search/search10']['id'], + FileRoutesByPath['/(gen)/search/search10']['path'], + FileRoutesByPath['/(gen)/search/search10']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search11' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search11']['parentRoute'], + FileRoutesByPath['/(gen)/search/search11']['id'], + FileRoutesByPath['/(gen)/search/search11']['path'], + FileRoutesByPath['/(gen)/search/search11']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search12' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search12']['parentRoute'], + FileRoutesByPath['/(gen)/search/search12']['id'], + FileRoutesByPath['/(gen)/search/search12']['path'], + FileRoutesByPath['/(gen)/search/search12']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search13' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search13']['parentRoute'], + FileRoutesByPath['/(gen)/search/search13']['id'], + FileRoutesByPath['/(gen)/search/search13']['path'], + FileRoutesByPath['/(gen)/search/search13']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search14' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search14']['parentRoute'], + FileRoutesByPath['/(gen)/search/search14']['id'], + FileRoutesByPath['/(gen)/search/search14']['path'], + FileRoutesByPath['/(gen)/search/search14']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search15' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search15']['parentRoute'], + FileRoutesByPath['/(gen)/search/search15']['id'], + FileRoutesByPath['/(gen)/search/search15']['path'], + FileRoutesByPath['/(gen)/search/search15']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search16' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search16']['parentRoute'], + FileRoutesByPath['/(gen)/search/search16']['id'], + FileRoutesByPath['/(gen)/search/search16']['path'], + FileRoutesByPath['/(gen)/search/search16']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search17' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search17']['parentRoute'], + FileRoutesByPath['/(gen)/search/search17']['id'], + FileRoutesByPath['/(gen)/search/search17']['path'], + FileRoutesByPath['/(gen)/search/search17']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search18' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search18']['parentRoute'], + FileRoutesByPath['/(gen)/search/search18']['id'], + FileRoutesByPath['/(gen)/search/search18']['path'], + FileRoutesByPath['/(gen)/search/search18']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search19' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search19']['parentRoute'], + FileRoutesByPath['/(gen)/search/search19']['id'], + FileRoutesByPath['/(gen)/search/search19']['path'], + FileRoutesByPath['/(gen)/search/search19']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search2' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search2']['parentRoute'], + FileRoutesByPath['/(gen)/search/search2']['id'], + FileRoutesByPath['/(gen)/search/search2']['path'], + FileRoutesByPath['/(gen)/search/search2']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search20' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search20']['parentRoute'], + FileRoutesByPath['/(gen)/search/search20']['id'], + FileRoutesByPath['/(gen)/search/search20']['path'], + FileRoutesByPath['/(gen)/search/search20']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search21' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search21']['parentRoute'], + FileRoutesByPath['/(gen)/search/search21']['id'], + FileRoutesByPath['/(gen)/search/search21']['path'], + FileRoutesByPath['/(gen)/search/search21']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search22' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search22']['parentRoute'], + FileRoutesByPath['/(gen)/search/search22']['id'], + FileRoutesByPath['/(gen)/search/search22']['path'], + FileRoutesByPath['/(gen)/search/search22']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search23' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search23']['parentRoute'], + FileRoutesByPath['/(gen)/search/search23']['id'], + FileRoutesByPath['/(gen)/search/search23']['path'], + FileRoutesByPath['/(gen)/search/search23']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search24' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search24']['parentRoute'], + FileRoutesByPath['/(gen)/search/search24']['id'], + FileRoutesByPath['/(gen)/search/search24']['path'], + FileRoutesByPath['/(gen)/search/search24']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search25' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search25']['parentRoute'], + FileRoutesByPath['/(gen)/search/search25']['id'], + FileRoutesByPath['/(gen)/search/search25']['path'], + FileRoutesByPath['/(gen)/search/search25']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search26' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search26']['parentRoute'], + FileRoutesByPath['/(gen)/search/search26']['id'], + FileRoutesByPath['/(gen)/search/search26']['path'], + FileRoutesByPath['/(gen)/search/search26']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search27' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search27']['parentRoute'], + FileRoutesByPath['/(gen)/search/search27']['id'], + FileRoutesByPath['/(gen)/search/search27']['path'], + FileRoutesByPath['/(gen)/search/search27']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search28' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search28']['parentRoute'], + FileRoutesByPath['/(gen)/search/search28']['id'], + FileRoutesByPath['/(gen)/search/search28']['path'], + FileRoutesByPath['/(gen)/search/search28']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search29' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search29']['parentRoute'], + FileRoutesByPath['/(gen)/search/search29']['id'], + FileRoutesByPath['/(gen)/search/search29']['path'], + FileRoutesByPath['/(gen)/search/search29']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search3' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search3']['parentRoute'], + FileRoutesByPath['/(gen)/search/search3']['id'], + FileRoutesByPath['/(gen)/search/search3']['path'], + FileRoutesByPath['/(gen)/search/search3']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search30' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search30']['parentRoute'], + FileRoutesByPath['/(gen)/search/search30']['id'], + FileRoutesByPath['/(gen)/search/search30']['path'], + FileRoutesByPath['/(gen)/search/search30']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search31' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search31']['parentRoute'], + FileRoutesByPath['/(gen)/search/search31']['id'], + FileRoutesByPath['/(gen)/search/search31']['path'], + FileRoutesByPath['/(gen)/search/search31']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search32' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search32']['parentRoute'], + FileRoutesByPath['/(gen)/search/search32']['id'], + FileRoutesByPath['/(gen)/search/search32']['path'], + FileRoutesByPath['/(gen)/search/search32']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search33' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search33']['parentRoute'], + FileRoutesByPath['/(gen)/search/search33']['id'], + FileRoutesByPath['/(gen)/search/search33']['path'], + FileRoutesByPath['/(gen)/search/search33']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search34' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search34']['parentRoute'], + FileRoutesByPath['/(gen)/search/search34']['id'], + FileRoutesByPath['/(gen)/search/search34']['path'], + FileRoutesByPath['/(gen)/search/search34']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search35' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search35']['parentRoute'], + FileRoutesByPath['/(gen)/search/search35']['id'], + FileRoutesByPath['/(gen)/search/search35']['path'], + FileRoutesByPath['/(gen)/search/search35']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search36' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search36']['parentRoute'], + FileRoutesByPath['/(gen)/search/search36']['id'], + FileRoutesByPath['/(gen)/search/search36']['path'], + FileRoutesByPath['/(gen)/search/search36']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search37' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search37']['parentRoute'], + FileRoutesByPath['/(gen)/search/search37']['id'], + FileRoutesByPath['/(gen)/search/search37']['path'], + FileRoutesByPath['/(gen)/search/search37']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search38' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search38']['parentRoute'], + FileRoutesByPath['/(gen)/search/search38']['id'], + FileRoutesByPath['/(gen)/search/search38']['path'], + FileRoutesByPath['/(gen)/search/search38']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search39' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search39']['parentRoute'], + FileRoutesByPath['/(gen)/search/search39']['id'], + FileRoutesByPath['/(gen)/search/search39']['path'], + FileRoutesByPath['/(gen)/search/search39']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search4' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search4']['parentRoute'], + FileRoutesByPath['/(gen)/search/search4']['id'], + FileRoutesByPath['/(gen)/search/search4']['path'], + FileRoutesByPath['/(gen)/search/search4']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search40' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search40']['parentRoute'], + FileRoutesByPath['/(gen)/search/search40']['id'], + FileRoutesByPath['/(gen)/search/search40']['path'], + FileRoutesByPath['/(gen)/search/search40']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search41' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search41']['parentRoute'], + FileRoutesByPath['/(gen)/search/search41']['id'], + FileRoutesByPath['/(gen)/search/search41']['path'], + FileRoutesByPath['/(gen)/search/search41']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search42' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search42']['parentRoute'], + FileRoutesByPath['/(gen)/search/search42']['id'], + FileRoutesByPath['/(gen)/search/search42']['path'], + FileRoutesByPath['/(gen)/search/search42']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search43' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search43']['parentRoute'], + FileRoutesByPath['/(gen)/search/search43']['id'], + FileRoutesByPath['/(gen)/search/search43']['path'], + FileRoutesByPath['/(gen)/search/search43']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search44' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search44']['parentRoute'], + FileRoutesByPath['/(gen)/search/search44']['id'], + FileRoutesByPath['/(gen)/search/search44']['path'], + FileRoutesByPath['/(gen)/search/search44']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search45' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search45']['parentRoute'], + FileRoutesByPath['/(gen)/search/search45']['id'], + FileRoutesByPath['/(gen)/search/search45']['path'], + FileRoutesByPath['/(gen)/search/search45']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search46' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search46']['parentRoute'], + FileRoutesByPath['/(gen)/search/search46']['id'], + FileRoutesByPath['/(gen)/search/search46']['path'], + FileRoutesByPath['/(gen)/search/search46']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search47' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search47']['parentRoute'], + FileRoutesByPath['/(gen)/search/search47']['id'], + FileRoutesByPath['/(gen)/search/search47']['path'], + FileRoutesByPath['/(gen)/search/search47']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search48' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search48']['parentRoute'], + FileRoutesByPath['/(gen)/search/search48']['id'], + FileRoutesByPath['/(gen)/search/search48']['path'], + FileRoutesByPath['/(gen)/search/search48']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search49' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search49']['parentRoute'], + FileRoutesByPath['/(gen)/search/search49']['id'], + FileRoutesByPath['/(gen)/search/search49']['path'], + FileRoutesByPath['/(gen)/search/search49']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search5' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search5']['parentRoute'], + FileRoutesByPath['/(gen)/search/search5']['id'], + FileRoutesByPath['/(gen)/search/search5']['path'], + FileRoutesByPath['/(gen)/search/search5']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search50' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search50']['parentRoute'], + FileRoutesByPath['/(gen)/search/search50']['id'], + FileRoutesByPath['/(gen)/search/search50']['path'], + FileRoutesByPath['/(gen)/search/search50']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search51' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search51']['parentRoute'], + FileRoutesByPath['/(gen)/search/search51']['id'], + FileRoutesByPath['/(gen)/search/search51']['path'], + FileRoutesByPath['/(gen)/search/search51']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search52' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search52']['parentRoute'], + FileRoutesByPath['/(gen)/search/search52']['id'], + FileRoutesByPath['/(gen)/search/search52']['path'], + FileRoutesByPath['/(gen)/search/search52']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search53' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search53']['parentRoute'], + FileRoutesByPath['/(gen)/search/search53']['id'], + FileRoutesByPath['/(gen)/search/search53']['path'], + FileRoutesByPath['/(gen)/search/search53']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search54' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search54']['parentRoute'], + FileRoutesByPath['/(gen)/search/search54']['id'], + FileRoutesByPath['/(gen)/search/search54']['path'], + FileRoutesByPath['/(gen)/search/search54']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search55' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search55']['parentRoute'], + FileRoutesByPath['/(gen)/search/search55']['id'], + FileRoutesByPath['/(gen)/search/search55']['path'], + FileRoutesByPath['/(gen)/search/search55']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search56' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search56']['parentRoute'], + FileRoutesByPath['/(gen)/search/search56']['id'], + FileRoutesByPath['/(gen)/search/search56']['path'], + FileRoutesByPath['/(gen)/search/search56']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search57' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search57']['parentRoute'], + FileRoutesByPath['/(gen)/search/search57']['id'], + FileRoutesByPath['/(gen)/search/search57']['path'], + FileRoutesByPath['/(gen)/search/search57']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search58' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search58']['parentRoute'], + FileRoutesByPath['/(gen)/search/search58']['id'], + FileRoutesByPath['/(gen)/search/search58']['path'], + FileRoutesByPath['/(gen)/search/search58']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search59' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search59']['parentRoute'], + FileRoutesByPath['/(gen)/search/search59']['id'], + FileRoutesByPath['/(gen)/search/search59']['path'], + FileRoutesByPath['/(gen)/search/search59']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search6' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search6']['parentRoute'], + FileRoutesByPath['/(gen)/search/search6']['id'], + FileRoutesByPath['/(gen)/search/search6']['path'], + FileRoutesByPath['/(gen)/search/search6']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search60' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search60']['parentRoute'], + FileRoutesByPath['/(gen)/search/search60']['id'], + FileRoutesByPath['/(gen)/search/search60']['path'], + FileRoutesByPath['/(gen)/search/search60']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search61' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search61']['parentRoute'], + FileRoutesByPath['/(gen)/search/search61']['id'], + FileRoutesByPath['/(gen)/search/search61']['path'], + FileRoutesByPath['/(gen)/search/search61']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search62' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search62']['parentRoute'], + FileRoutesByPath['/(gen)/search/search62']['id'], + FileRoutesByPath['/(gen)/search/search62']['path'], + FileRoutesByPath['/(gen)/search/search62']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search63' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search63']['parentRoute'], + FileRoutesByPath['/(gen)/search/search63']['id'], + FileRoutesByPath['/(gen)/search/search63']['path'], + FileRoutesByPath['/(gen)/search/search63']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search64' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search64']['parentRoute'], + FileRoutesByPath['/(gen)/search/search64']['id'], + FileRoutesByPath['/(gen)/search/search64']['path'], + FileRoutesByPath['/(gen)/search/search64']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search65' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search65']['parentRoute'], + FileRoutesByPath['/(gen)/search/search65']['id'], + FileRoutesByPath['/(gen)/search/search65']['path'], + FileRoutesByPath['/(gen)/search/search65']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search66' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search66']['parentRoute'], + FileRoutesByPath['/(gen)/search/search66']['id'], + FileRoutesByPath['/(gen)/search/search66']['path'], + FileRoutesByPath['/(gen)/search/search66']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search67' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search67']['parentRoute'], + FileRoutesByPath['/(gen)/search/search67']['id'], + FileRoutesByPath['/(gen)/search/search67']['path'], + FileRoutesByPath['/(gen)/search/search67']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search68' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search68']['parentRoute'], + FileRoutesByPath['/(gen)/search/search68']['id'], + FileRoutesByPath['/(gen)/search/search68']['path'], + FileRoutesByPath['/(gen)/search/search68']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search69' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search69']['parentRoute'], + FileRoutesByPath['/(gen)/search/search69']['id'], + FileRoutesByPath['/(gen)/search/search69']['path'], + FileRoutesByPath['/(gen)/search/search69']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search7' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search7']['parentRoute'], + FileRoutesByPath['/(gen)/search/search7']['id'], + FileRoutesByPath['/(gen)/search/search7']['path'], + FileRoutesByPath['/(gen)/search/search7']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search70' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search70']['parentRoute'], + FileRoutesByPath['/(gen)/search/search70']['id'], + FileRoutesByPath['/(gen)/search/search70']['path'], + FileRoutesByPath['/(gen)/search/search70']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search71' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search71']['parentRoute'], + FileRoutesByPath['/(gen)/search/search71']['id'], + FileRoutesByPath['/(gen)/search/search71']['path'], + FileRoutesByPath['/(gen)/search/search71']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search72' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search72']['parentRoute'], + FileRoutesByPath['/(gen)/search/search72']['id'], + FileRoutesByPath['/(gen)/search/search72']['path'], + FileRoutesByPath['/(gen)/search/search72']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search73' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search73']['parentRoute'], + FileRoutesByPath['/(gen)/search/search73']['id'], + FileRoutesByPath['/(gen)/search/search73']['path'], + FileRoutesByPath['/(gen)/search/search73']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search74' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search74']['parentRoute'], + FileRoutesByPath['/(gen)/search/search74']['id'], + FileRoutesByPath['/(gen)/search/search74']['path'], + FileRoutesByPath['/(gen)/search/search74']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search75' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search75']['parentRoute'], + FileRoutesByPath['/(gen)/search/search75']['id'], + FileRoutesByPath['/(gen)/search/search75']['path'], + FileRoutesByPath['/(gen)/search/search75']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search76' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search76']['parentRoute'], + FileRoutesByPath['/(gen)/search/search76']['id'], + FileRoutesByPath['/(gen)/search/search76']['path'], + FileRoutesByPath['/(gen)/search/search76']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search77' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search77']['parentRoute'], + FileRoutesByPath['/(gen)/search/search77']['id'], + FileRoutesByPath['/(gen)/search/search77']['path'], + FileRoutesByPath['/(gen)/search/search77']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search78' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search78']['parentRoute'], + FileRoutesByPath['/(gen)/search/search78']['id'], + FileRoutesByPath['/(gen)/search/search78']['path'], + FileRoutesByPath['/(gen)/search/search78']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search79' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search79']['parentRoute'], + FileRoutesByPath['/(gen)/search/search79']['id'], + FileRoutesByPath['/(gen)/search/search79']['path'], + FileRoutesByPath['/(gen)/search/search79']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search8' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search8']['parentRoute'], + FileRoutesByPath['/(gen)/search/search8']['id'], + FileRoutesByPath['/(gen)/search/search8']['path'], + FileRoutesByPath['/(gen)/search/search8']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search80' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search80']['parentRoute'], + FileRoutesByPath['/(gen)/search/search80']['id'], + FileRoutesByPath['/(gen)/search/search80']['path'], + FileRoutesByPath['/(gen)/search/search80']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search81' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search81']['parentRoute'], + FileRoutesByPath['/(gen)/search/search81']['id'], + FileRoutesByPath['/(gen)/search/search81']['path'], + FileRoutesByPath['/(gen)/search/search81']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search82' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search82']['parentRoute'], + FileRoutesByPath['/(gen)/search/search82']['id'], + FileRoutesByPath['/(gen)/search/search82']['path'], + FileRoutesByPath['/(gen)/search/search82']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search83' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search83']['parentRoute'], + FileRoutesByPath['/(gen)/search/search83']['id'], + FileRoutesByPath['/(gen)/search/search83']['path'], + FileRoutesByPath['/(gen)/search/search83']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search84' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search84']['parentRoute'], + FileRoutesByPath['/(gen)/search/search84']['id'], + FileRoutesByPath['/(gen)/search/search84']['path'], + FileRoutesByPath['/(gen)/search/search84']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search85' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search85']['parentRoute'], + FileRoutesByPath['/(gen)/search/search85']['id'], + FileRoutesByPath['/(gen)/search/search85']['path'], + FileRoutesByPath['/(gen)/search/search85']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search86' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search86']['parentRoute'], + FileRoutesByPath['/(gen)/search/search86']['id'], + FileRoutesByPath['/(gen)/search/search86']['path'], + FileRoutesByPath['/(gen)/search/search86']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search87' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search87']['parentRoute'], + FileRoutesByPath['/(gen)/search/search87']['id'], + FileRoutesByPath['/(gen)/search/search87']['path'], + FileRoutesByPath['/(gen)/search/search87']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search88' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search88']['parentRoute'], + FileRoutesByPath['/(gen)/search/search88']['id'], + FileRoutesByPath['/(gen)/search/search88']['path'], + FileRoutesByPath['/(gen)/search/search88']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search89' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search89']['parentRoute'], + FileRoutesByPath['/(gen)/search/search89']['id'], + FileRoutesByPath['/(gen)/search/search89']['path'], + FileRoutesByPath['/(gen)/search/search89']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search9' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search9']['parentRoute'], + FileRoutesByPath['/(gen)/search/search9']['id'], + FileRoutesByPath['/(gen)/search/search9']['path'], + FileRoutesByPath['/(gen)/search/search9']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search90' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search90']['parentRoute'], + FileRoutesByPath['/(gen)/search/search90']['id'], + FileRoutesByPath['/(gen)/search/search90']['path'], + FileRoutesByPath['/(gen)/search/search90']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search91' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search91']['parentRoute'], + FileRoutesByPath['/(gen)/search/search91']['id'], + FileRoutesByPath['/(gen)/search/search91']['path'], + FileRoutesByPath['/(gen)/search/search91']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search92' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search92']['parentRoute'], + FileRoutesByPath['/(gen)/search/search92']['id'], + FileRoutesByPath['/(gen)/search/search92']['path'], + FileRoutesByPath['/(gen)/search/search92']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search93' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search93']['parentRoute'], + FileRoutesByPath['/(gen)/search/search93']['id'], + FileRoutesByPath['/(gen)/search/search93']['path'], + FileRoutesByPath['/(gen)/search/search93']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search94' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search94']['parentRoute'], + FileRoutesByPath['/(gen)/search/search94']['id'], + FileRoutesByPath['/(gen)/search/search94']['path'], + FileRoutesByPath['/(gen)/search/search94']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search95' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search95']['parentRoute'], + FileRoutesByPath['/(gen)/search/search95']['id'], + FileRoutesByPath['/(gen)/search/search95']['path'], + FileRoutesByPath['/(gen)/search/search95']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search96' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search96']['parentRoute'], + FileRoutesByPath['/(gen)/search/search96']['id'], + FileRoutesByPath['/(gen)/search/search96']['path'], + FileRoutesByPath['/(gen)/search/search96']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search97' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search97']['parentRoute'], + FileRoutesByPath['/(gen)/search/search97']['id'], + FileRoutesByPath['/(gen)/search/search97']['path'], + FileRoutesByPath['/(gen)/search/search97']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search98' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search98']['parentRoute'], + FileRoutesByPath['/(gen)/search/search98']['id'], + FileRoutesByPath['/(gen)/search/search98']['path'], + FileRoutesByPath['/(gen)/search/search98']['fullPath'], + unknown + > +} +declare module './../../src/routes/(gen)/search/search99' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/(gen)/search/search99']['parentRoute'], + FileRoutesByPath['/(gen)/search/search99']['id'], + FileRoutesByPath['/(gen)/search/search99']['path'], + FileRoutesByPath['/(gen)/search/search99']['fullPath'], + unknown + > +} + +// Create and export the route tree + +export interface FileRoutesByFullPath { + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/search/search0': typeof genSearchSearch0Route + '/search/search1': typeof genSearchSearch1Route + '/search/search10': typeof genSearchSearch10Route + '/search/search11': typeof genSearchSearch11Route + '/search/search12': typeof genSearchSearch12Route + '/search/search13': typeof genSearchSearch13Route + '/search/search14': typeof genSearchSearch14Route + '/search/search15': typeof genSearchSearch15Route + '/search/search16': typeof genSearchSearch16Route + '/search/search17': typeof genSearchSearch17Route + '/search/search18': typeof genSearchSearch18Route + '/search/search19': typeof genSearchSearch19Route + '/search/search2': typeof genSearchSearch2Route + '/search/search20': typeof genSearchSearch20Route + '/search/search21': typeof genSearchSearch21Route + '/search/search22': typeof genSearchSearch22Route + '/search/search23': typeof genSearchSearch23Route + '/search/search24': typeof genSearchSearch24Route + '/search/search25': typeof genSearchSearch25Route + '/search/search26': typeof genSearchSearch26Route + '/search/search27': typeof genSearchSearch27Route + '/search/search28': typeof genSearchSearch28Route + '/search/search29': typeof genSearchSearch29Route + '/search/search3': typeof genSearchSearch3Route + '/search/search30': typeof genSearchSearch30Route + '/search/search31': typeof genSearchSearch31Route + '/search/search32': typeof genSearchSearch32Route + '/search/search33': typeof genSearchSearch33Route + '/search/search34': typeof genSearchSearch34Route + '/search/search35': typeof genSearchSearch35Route + '/search/search36': typeof genSearchSearch36Route + '/search/search37': typeof genSearchSearch37Route + '/search/search38': typeof genSearchSearch38Route + '/search/search39': typeof genSearchSearch39Route + '/search/search4': typeof genSearchSearch4Route + '/search/search40': typeof genSearchSearch40Route + '/search/search41': typeof genSearchSearch41Route + '/search/search42': typeof genSearchSearch42Route + '/search/search43': typeof genSearchSearch43Route + '/search/search44': typeof genSearchSearch44Route + '/search/search45': typeof genSearchSearch45Route + '/search/search46': typeof genSearchSearch46Route + '/search/search47': typeof genSearchSearch47Route + '/search/search48': typeof genSearchSearch48Route + '/search/search49': typeof genSearchSearch49Route + '/search/search5': typeof genSearchSearch5Route + '/search/search50': typeof genSearchSearch50Route + '/search/search51': typeof genSearchSearch51Route + '/search/search52': typeof genSearchSearch52Route + '/search/search53': typeof genSearchSearch53Route + '/search/search54': typeof genSearchSearch54Route + '/search/search55': typeof genSearchSearch55Route + '/search/search56': typeof genSearchSearch56Route + '/search/search57': typeof genSearchSearch57Route + '/search/search58': typeof genSearchSearch58Route + '/search/search59': typeof genSearchSearch59Route + '/search/search6': typeof genSearchSearch6Route + '/search/search60': typeof genSearchSearch60Route + '/search/search61': typeof genSearchSearch61Route + '/search/search62': typeof genSearchSearch62Route + '/search/search63': typeof genSearchSearch63Route + '/search/search64': typeof genSearchSearch64Route + '/search/search65': typeof genSearchSearch65Route + '/search/search66': typeof genSearchSearch66Route + '/search/search67': typeof genSearchSearch67Route + '/search/search68': typeof genSearchSearch68Route + '/search/search69': typeof genSearchSearch69Route + '/search/search7': typeof genSearchSearch7Route + '/search/search70': typeof genSearchSearch70Route + '/search/search71': typeof genSearchSearch71Route + '/search/search72': typeof genSearchSearch72Route + '/search/search73': typeof genSearchSearch73Route + '/search/search74': typeof genSearchSearch74Route + '/search/search75': typeof genSearchSearch75Route + '/search/search76': typeof genSearchSearch76Route + '/search/search77': typeof genSearchSearch77Route + '/search/search78': typeof genSearchSearch78Route + '/search/search79': typeof genSearchSearch79Route + '/search/search8': typeof genSearchSearch8Route + '/search/search80': typeof genSearchSearch80Route + '/search/search81': typeof genSearchSearch81Route + '/search/search82': typeof genSearchSearch82Route + '/search/search83': typeof genSearchSearch83Route + '/search/search84': typeof genSearchSearch84Route + '/search/search85': typeof genSearchSearch85Route + '/search/search86': typeof genSearchSearch86Route + '/search/search87': typeof genSearchSearch87Route + '/search/search88': typeof genSearchSearch88Route + '/search/search89': typeof genSearchSearch89Route + '/search/search9': typeof genSearchSearch9Route + '/search/search90': typeof genSearchSearch90Route + '/search/search91': typeof genSearchSearch91Route + '/search/search92': typeof genSearchSearch92Route + '/search/search93': typeof genSearchSearch93Route + '/search/search94': typeof genSearchSearch94Route + '/search/search95': typeof genSearchSearch95Route + '/search/search96': typeof genSearchSearch96Route + '/search/search97': typeof genSearchSearch97Route + '/search/search98': typeof genSearchSearch98Route + '/search/search99': typeof genSearchSearch99Route +} + +export interface FileRoutesByTo { + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/search/search0': typeof genSearchSearch0Route + '/search/search1': typeof genSearchSearch1Route + '/search/search10': typeof genSearchSearch10Route + '/search/search11': typeof genSearchSearch11Route + '/search/search12': typeof genSearchSearch12Route + '/search/search13': typeof genSearchSearch13Route + '/search/search14': typeof genSearchSearch14Route + '/search/search15': typeof genSearchSearch15Route + '/search/search16': typeof genSearchSearch16Route + '/search/search17': typeof genSearchSearch17Route + '/search/search18': typeof genSearchSearch18Route + '/search/search19': typeof genSearchSearch19Route + '/search/search2': typeof genSearchSearch2Route + '/search/search20': typeof genSearchSearch20Route + '/search/search21': typeof genSearchSearch21Route + '/search/search22': typeof genSearchSearch22Route + '/search/search23': typeof genSearchSearch23Route + '/search/search24': typeof genSearchSearch24Route + '/search/search25': typeof genSearchSearch25Route + '/search/search26': typeof genSearchSearch26Route + '/search/search27': typeof genSearchSearch27Route + '/search/search28': typeof genSearchSearch28Route + '/search/search29': typeof genSearchSearch29Route + '/search/search3': typeof genSearchSearch3Route + '/search/search30': typeof genSearchSearch30Route + '/search/search31': typeof genSearchSearch31Route + '/search/search32': typeof genSearchSearch32Route + '/search/search33': typeof genSearchSearch33Route + '/search/search34': typeof genSearchSearch34Route + '/search/search35': typeof genSearchSearch35Route + '/search/search36': typeof genSearchSearch36Route + '/search/search37': typeof genSearchSearch37Route + '/search/search38': typeof genSearchSearch38Route + '/search/search39': typeof genSearchSearch39Route + '/search/search4': typeof genSearchSearch4Route + '/search/search40': typeof genSearchSearch40Route + '/search/search41': typeof genSearchSearch41Route + '/search/search42': typeof genSearchSearch42Route + '/search/search43': typeof genSearchSearch43Route + '/search/search44': typeof genSearchSearch44Route + '/search/search45': typeof genSearchSearch45Route + '/search/search46': typeof genSearchSearch46Route + '/search/search47': typeof genSearchSearch47Route + '/search/search48': typeof genSearchSearch48Route + '/search/search49': typeof genSearchSearch49Route + '/search/search5': typeof genSearchSearch5Route + '/search/search50': typeof genSearchSearch50Route + '/search/search51': typeof genSearchSearch51Route + '/search/search52': typeof genSearchSearch52Route + '/search/search53': typeof genSearchSearch53Route + '/search/search54': typeof genSearchSearch54Route + '/search/search55': typeof genSearchSearch55Route + '/search/search56': typeof genSearchSearch56Route + '/search/search57': typeof genSearchSearch57Route + '/search/search58': typeof genSearchSearch58Route + '/search/search59': typeof genSearchSearch59Route + '/search/search6': typeof genSearchSearch6Route + '/search/search60': typeof genSearchSearch60Route + '/search/search61': typeof genSearchSearch61Route + '/search/search62': typeof genSearchSearch62Route + '/search/search63': typeof genSearchSearch63Route + '/search/search64': typeof genSearchSearch64Route + '/search/search65': typeof genSearchSearch65Route + '/search/search66': typeof genSearchSearch66Route + '/search/search67': typeof genSearchSearch67Route + '/search/search68': typeof genSearchSearch68Route + '/search/search69': typeof genSearchSearch69Route + '/search/search7': typeof genSearchSearch7Route + '/search/search70': typeof genSearchSearch70Route + '/search/search71': typeof genSearchSearch71Route + '/search/search72': typeof genSearchSearch72Route + '/search/search73': typeof genSearchSearch73Route + '/search/search74': typeof genSearchSearch74Route + '/search/search75': typeof genSearchSearch75Route + '/search/search76': typeof genSearchSearch76Route + '/search/search77': typeof genSearchSearch77Route + '/search/search78': typeof genSearchSearch78Route + '/search/search79': typeof genSearchSearch79Route + '/search/search8': typeof genSearchSearch8Route + '/search/search80': typeof genSearchSearch80Route + '/search/search81': typeof genSearchSearch81Route + '/search/search82': typeof genSearchSearch82Route + '/search/search83': typeof genSearchSearch83Route + '/search/search84': typeof genSearchSearch84Route + '/search/search85': typeof genSearchSearch85Route + '/search/search86': typeof genSearchSearch86Route + '/search/search87': typeof genSearchSearch87Route + '/search/search88': typeof genSearchSearch88Route + '/search/search89': typeof genSearchSearch89Route + '/search/search9': typeof genSearchSearch9Route + '/search/search90': typeof genSearchSearch90Route + '/search/search91': typeof genSearchSearch91Route + '/search/search92': typeof genSearchSearch92Route + '/search/search93': typeof genSearchSearch93Route + '/search/search94': typeof genSearchSearch94Route + '/search/search95': typeof genSearchSearch95Route + '/search/search96': typeof genSearchSearch96Route + '/search/search97': typeof genSearchSearch97Route + '/search/search98': typeof genSearchSearch98Route + '/search/search99': typeof genSearchSearch99Route +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/(gen)/search/search0': typeof genSearchSearch0Route + '/(gen)/search/search1': typeof genSearchSearch1Route + '/(gen)/search/search10': typeof genSearchSearch10Route + '/(gen)/search/search11': typeof genSearchSearch11Route + '/(gen)/search/search12': typeof genSearchSearch12Route + '/(gen)/search/search13': typeof genSearchSearch13Route + '/(gen)/search/search14': typeof genSearchSearch14Route + '/(gen)/search/search15': typeof genSearchSearch15Route + '/(gen)/search/search16': typeof genSearchSearch16Route + '/(gen)/search/search17': typeof genSearchSearch17Route + '/(gen)/search/search18': typeof genSearchSearch18Route + '/(gen)/search/search19': typeof genSearchSearch19Route + '/(gen)/search/search2': typeof genSearchSearch2Route + '/(gen)/search/search20': typeof genSearchSearch20Route + '/(gen)/search/search21': typeof genSearchSearch21Route + '/(gen)/search/search22': typeof genSearchSearch22Route + '/(gen)/search/search23': typeof genSearchSearch23Route + '/(gen)/search/search24': typeof genSearchSearch24Route + '/(gen)/search/search25': typeof genSearchSearch25Route + '/(gen)/search/search26': typeof genSearchSearch26Route + '/(gen)/search/search27': typeof genSearchSearch27Route + '/(gen)/search/search28': typeof genSearchSearch28Route + '/(gen)/search/search29': typeof genSearchSearch29Route + '/(gen)/search/search3': typeof genSearchSearch3Route + '/(gen)/search/search30': typeof genSearchSearch30Route + '/(gen)/search/search31': typeof genSearchSearch31Route + '/(gen)/search/search32': typeof genSearchSearch32Route + '/(gen)/search/search33': typeof genSearchSearch33Route + '/(gen)/search/search34': typeof genSearchSearch34Route + '/(gen)/search/search35': typeof genSearchSearch35Route + '/(gen)/search/search36': typeof genSearchSearch36Route + '/(gen)/search/search37': typeof genSearchSearch37Route + '/(gen)/search/search38': typeof genSearchSearch38Route + '/(gen)/search/search39': typeof genSearchSearch39Route + '/(gen)/search/search4': typeof genSearchSearch4Route + '/(gen)/search/search40': typeof genSearchSearch40Route + '/(gen)/search/search41': typeof genSearchSearch41Route + '/(gen)/search/search42': typeof genSearchSearch42Route + '/(gen)/search/search43': typeof genSearchSearch43Route + '/(gen)/search/search44': typeof genSearchSearch44Route + '/(gen)/search/search45': typeof genSearchSearch45Route + '/(gen)/search/search46': typeof genSearchSearch46Route + '/(gen)/search/search47': typeof genSearchSearch47Route + '/(gen)/search/search48': typeof genSearchSearch48Route + '/(gen)/search/search49': typeof genSearchSearch49Route + '/(gen)/search/search5': typeof genSearchSearch5Route + '/(gen)/search/search50': typeof genSearchSearch50Route + '/(gen)/search/search51': typeof genSearchSearch51Route + '/(gen)/search/search52': typeof genSearchSearch52Route + '/(gen)/search/search53': typeof genSearchSearch53Route + '/(gen)/search/search54': typeof genSearchSearch54Route + '/(gen)/search/search55': typeof genSearchSearch55Route + '/(gen)/search/search56': typeof genSearchSearch56Route + '/(gen)/search/search57': typeof genSearchSearch57Route + '/(gen)/search/search58': typeof genSearchSearch58Route + '/(gen)/search/search59': typeof genSearchSearch59Route + '/(gen)/search/search6': typeof genSearchSearch6Route + '/(gen)/search/search60': typeof genSearchSearch60Route + '/(gen)/search/search61': typeof genSearchSearch61Route + '/(gen)/search/search62': typeof genSearchSearch62Route + '/(gen)/search/search63': typeof genSearchSearch63Route + '/(gen)/search/search64': typeof genSearchSearch64Route + '/(gen)/search/search65': typeof genSearchSearch65Route + '/(gen)/search/search66': typeof genSearchSearch66Route + '/(gen)/search/search67': typeof genSearchSearch67Route + '/(gen)/search/search68': typeof genSearchSearch68Route + '/(gen)/search/search69': typeof genSearchSearch69Route + '/(gen)/search/search7': typeof genSearchSearch7Route + '/(gen)/search/search70': typeof genSearchSearch70Route + '/(gen)/search/search71': typeof genSearchSearch71Route + '/(gen)/search/search72': typeof genSearchSearch72Route + '/(gen)/search/search73': typeof genSearchSearch73Route + '/(gen)/search/search74': typeof genSearchSearch74Route + '/(gen)/search/search75': typeof genSearchSearch75Route + '/(gen)/search/search76': typeof genSearchSearch76Route + '/(gen)/search/search77': typeof genSearchSearch77Route + '/(gen)/search/search78': typeof genSearchSearch78Route + '/(gen)/search/search79': typeof genSearchSearch79Route + '/(gen)/search/search8': typeof genSearchSearch8Route + '/(gen)/search/search80': typeof genSearchSearch80Route + '/(gen)/search/search81': typeof genSearchSearch81Route + '/(gen)/search/search82': typeof genSearchSearch82Route + '/(gen)/search/search83': typeof genSearchSearch83Route + '/(gen)/search/search84': typeof genSearchSearch84Route + '/(gen)/search/search85': typeof genSearchSearch85Route + '/(gen)/search/search86': typeof genSearchSearch86Route + '/(gen)/search/search87': typeof genSearchSearch87Route + '/(gen)/search/search88': typeof genSearchSearch88Route + '/(gen)/search/search89': typeof genSearchSearch89Route + '/(gen)/search/search9': typeof genSearchSearch9Route + '/(gen)/search/search90': typeof genSearchSearch90Route + '/(gen)/search/search91': typeof genSearchSearch91Route + '/(gen)/search/search92': typeof genSearchSearch92Route + '/(gen)/search/search93': typeof genSearchSearch93Route + '/(gen)/search/search94': typeof genSearchSearch94Route + '/(gen)/search/search95': typeof genSearchSearch95Route + '/(gen)/search/search96': typeof genSearchSearch96Route + '/(gen)/search/search97': typeof genSearchSearch97Route + '/(gen)/search/search98': typeof genSearchSearch98Route + '/(gen)/search/search99': typeof genSearchSearch99Route +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/search/searchPlaceholder' + | '/search/search0' + | '/search/search1' + | '/search/search10' + | '/search/search11' + | '/search/search12' + | '/search/search13' + | '/search/search14' + | '/search/search15' + | '/search/search16' + | '/search/search17' + | '/search/search18' + | '/search/search19' + | '/search/search2' + | '/search/search20' + | '/search/search21' + | '/search/search22' + | '/search/search23' + | '/search/search24' + | '/search/search25' + | '/search/search26' + | '/search/search27' + | '/search/search28' + | '/search/search29' + | '/search/search3' + | '/search/search30' + | '/search/search31' + | '/search/search32' + | '/search/search33' + | '/search/search34' + | '/search/search35' + | '/search/search36' + | '/search/search37' + | '/search/search38' + | '/search/search39' + | '/search/search4' + | '/search/search40' + | '/search/search41' + | '/search/search42' + | '/search/search43' + | '/search/search44' + | '/search/search45' + | '/search/search46' + | '/search/search47' + | '/search/search48' + | '/search/search49' + | '/search/search5' + | '/search/search50' + | '/search/search51' + | '/search/search52' + | '/search/search53' + | '/search/search54' + | '/search/search55' + | '/search/search56' + | '/search/search57' + | '/search/search58' + | '/search/search59' + | '/search/search6' + | '/search/search60' + | '/search/search61' + | '/search/search62' + | '/search/search63' + | '/search/search64' + | '/search/search65' + | '/search/search66' + | '/search/search67' + | '/search/search68' + | '/search/search69' + | '/search/search7' + | '/search/search70' + | '/search/search71' + | '/search/search72' + | '/search/search73' + | '/search/search74' + | '/search/search75' + | '/search/search76' + | '/search/search77' + | '/search/search78' + | '/search/search79' + | '/search/search8' + | '/search/search80' + | '/search/search81' + | '/search/search82' + | '/search/search83' + | '/search/search84' + | '/search/search85' + | '/search/search86' + | '/search/search87' + | '/search/search88' + | '/search/search89' + | '/search/search9' + | '/search/search90' + | '/search/search91' + | '/search/search92' + | '/search/search93' + | '/search/search94' + | '/search/search95' + | '/search/search96' + | '/search/search97' + | '/search/search98' + | '/search/search99' + fileRoutesByTo: FileRoutesByTo + to: + | '/search/searchPlaceholder' + | '/search/search0' + | '/search/search1' + | '/search/search10' + | '/search/search11' + | '/search/search12' + | '/search/search13' + | '/search/search14' + | '/search/search15' + | '/search/search16' + | '/search/search17' + | '/search/search18' + | '/search/search19' + | '/search/search2' + | '/search/search20' + | '/search/search21' + | '/search/search22' + | '/search/search23' + | '/search/search24' + | '/search/search25' + | '/search/search26' + | '/search/search27' + | '/search/search28' + | '/search/search29' + | '/search/search3' + | '/search/search30' + | '/search/search31' + | '/search/search32' + | '/search/search33' + | '/search/search34' + | '/search/search35' + | '/search/search36' + | '/search/search37' + | '/search/search38' + | '/search/search39' + | '/search/search4' + | '/search/search40' + | '/search/search41' + | '/search/search42' + | '/search/search43' + | '/search/search44' + | '/search/search45' + | '/search/search46' + | '/search/search47' + | '/search/search48' + | '/search/search49' + | '/search/search5' + | '/search/search50' + | '/search/search51' + | '/search/search52' + | '/search/search53' + | '/search/search54' + | '/search/search55' + | '/search/search56' + | '/search/search57' + | '/search/search58' + | '/search/search59' + | '/search/search6' + | '/search/search60' + | '/search/search61' + | '/search/search62' + | '/search/search63' + | '/search/search64' + | '/search/search65' + | '/search/search66' + | '/search/search67' + | '/search/search68' + | '/search/search69' + | '/search/search7' + | '/search/search70' + | '/search/search71' + | '/search/search72' + | '/search/search73' + | '/search/search74' + | '/search/search75' + | '/search/search76' + | '/search/search77' + | '/search/search78' + | '/search/search79' + | '/search/search8' + | '/search/search80' + | '/search/search81' + | '/search/search82' + | '/search/search83' + | '/search/search84' + | '/search/search85' + | '/search/search86' + | '/search/search87' + | '/search/search88' + | '/search/search89' + | '/search/search9' + | '/search/search90' + | '/search/search91' + | '/search/search92' + | '/search/search93' + | '/search/search94' + | '/search/search95' + | '/search/search96' + | '/search/search97' + | '/search/search98' + | '/search/search99' + id: + | '__root__' + | '/search/searchPlaceholder' + | '/(gen)/search/search0' + | '/(gen)/search/search1' + | '/(gen)/search/search10' + | '/(gen)/search/search11' + | '/(gen)/search/search12' + | '/(gen)/search/search13' + | '/(gen)/search/search14' + | '/(gen)/search/search15' + | '/(gen)/search/search16' + | '/(gen)/search/search17' + | '/(gen)/search/search18' + | '/(gen)/search/search19' + | '/(gen)/search/search2' + | '/(gen)/search/search20' + | '/(gen)/search/search21' + | '/(gen)/search/search22' + | '/(gen)/search/search23' + | '/(gen)/search/search24' + | '/(gen)/search/search25' + | '/(gen)/search/search26' + | '/(gen)/search/search27' + | '/(gen)/search/search28' + | '/(gen)/search/search29' + | '/(gen)/search/search3' + | '/(gen)/search/search30' + | '/(gen)/search/search31' + | '/(gen)/search/search32' + | '/(gen)/search/search33' + | '/(gen)/search/search34' + | '/(gen)/search/search35' + | '/(gen)/search/search36' + | '/(gen)/search/search37' + | '/(gen)/search/search38' + | '/(gen)/search/search39' + | '/(gen)/search/search4' + | '/(gen)/search/search40' + | '/(gen)/search/search41' + | '/(gen)/search/search42' + | '/(gen)/search/search43' + | '/(gen)/search/search44' + | '/(gen)/search/search45' + | '/(gen)/search/search46' + | '/(gen)/search/search47' + | '/(gen)/search/search48' + | '/(gen)/search/search49' + | '/(gen)/search/search5' + | '/(gen)/search/search50' + | '/(gen)/search/search51' + | '/(gen)/search/search52' + | '/(gen)/search/search53' + | '/(gen)/search/search54' + | '/(gen)/search/search55' + | '/(gen)/search/search56' + | '/(gen)/search/search57' + | '/(gen)/search/search58' + | '/(gen)/search/search59' + | '/(gen)/search/search6' + | '/(gen)/search/search60' + | '/(gen)/search/search61' + | '/(gen)/search/search62' + | '/(gen)/search/search63' + | '/(gen)/search/search64' + | '/(gen)/search/search65' + | '/(gen)/search/search66' + | '/(gen)/search/search67' + | '/(gen)/search/search68' + | '/(gen)/search/search69' + | '/(gen)/search/search7' + | '/(gen)/search/search70' + | '/(gen)/search/search71' + | '/(gen)/search/search72' + | '/(gen)/search/search73' + | '/(gen)/search/search74' + | '/(gen)/search/search75' + | '/(gen)/search/search76' + | '/(gen)/search/search77' + | '/(gen)/search/search78' + | '/(gen)/search/search79' + | '/(gen)/search/search8' + | '/(gen)/search/search80' + | '/(gen)/search/search81' + | '/(gen)/search/search82' + | '/(gen)/search/search83' + | '/(gen)/search/search84' + | '/(gen)/search/search85' + | '/(gen)/search/search86' + | '/(gen)/search/search87' + | '/(gen)/search/search88' + | '/(gen)/search/search89' + | '/(gen)/search/search9' + | '/(gen)/search/search90' + | '/(gen)/search/search91' + | '/(gen)/search/search92' + | '/(gen)/search/search93' + | '/(gen)/search/search94' + | '/(gen)/search/search95' + | '/(gen)/search/search96' + | '/(gen)/search/search97' + | '/(gen)/search/search98' + | '/(gen)/search/search99' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute + genSearchSearch0Route: typeof genSearchSearch0Route + genSearchSearch1Route: typeof genSearchSearch1Route + genSearchSearch10Route: typeof genSearchSearch10Route + genSearchSearch11Route: typeof genSearchSearch11Route + genSearchSearch12Route: typeof genSearchSearch12Route + genSearchSearch13Route: typeof genSearchSearch13Route + genSearchSearch14Route: typeof genSearchSearch14Route + genSearchSearch15Route: typeof genSearchSearch15Route + genSearchSearch16Route: typeof genSearchSearch16Route + genSearchSearch17Route: typeof genSearchSearch17Route + genSearchSearch18Route: typeof genSearchSearch18Route + genSearchSearch19Route: typeof genSearchSearch19Route + genSearchSearch2Route: typeof genSearchSearch2Route + genSearchSearch20Route: typeof genSearchSearch20Route + genSearchSearch21Route: typeof genSearchSearch21Route + genSearchSearch22Route: typeof genSearchSearch22Route + genSearchSearch23Route: typeof genSearchSearch23Route + genSearchSearch24Route: typeof genSearchSearch24Route + genSearchSearch25Route: typeof genSearchSearch25Route + genSearchSearch26Route: typeof genSearchSearch26Route + genSearchSearch27Route: typeof genSearchSearch27Route + genSearchSearch28Route: typeof genSearchSearch28Route + genSearchSearch29Route: typeof genSearchSearch29Route + genSearchSearch3Route: typeof genSearchSearch3Route + genSearchSearch30Route: typeof genSearchSearch30Route + genSearchSearch31Route: typeof genSearchSearch31Route + genSearchSearch32Route: typeof genSearchSearch32Route + genSearchSearch33Route: typeof genSearchSearch33Route + genSearchSearch34Route: typeof genSearchSearch34Route + genSearchSearch35Route: typeof genSearchSearch35Route + genSearchSearch36Route: typeof genSearchSearch36Route + genSearchSearch37Route: typeof genSearchSearch37Route + genSearchSearch38Route: typeof genSearchSearch38Route + genSearchSearch39Route: typeof genSearchSearch39Route + genSearchSearch4Route: typeof genSearchSearch4Route + genSearchSearch40Route: typeof genSearchSearch40Route + genSearchSearch41Route: typeof genSearchSearch41Route + genSearchSearch42Route: typeof genSearchSearch42Route + genSearchSearch43Route: typeof genSearchSearch43Route + genSearchSearch44Route: typeof genSearchSearch44Route + genSearchSearch45Route: typeof genSearchSearch45Route + genSearchSearch46Route: typeof genSearchSearch46Route + genSearchSearch47Route: typeof genSearchSearch47Route + genSearchSearch48Route: typeof genSearchSearch48Route + genSearchSearch49Route: typeof genSearchSearch49Route + genSearchSearch5Route: typeof genSearchSearch5Route + genSearchSearch50Route: typeof genSearchSearch50Route + genSearchSearch51Route: typeof genSearchSearch51Route + genSearchSearch52Route: typeof genSearchSearch52Route + genSearchSearch53Route: typeof genSearchSearch53Route + genSearchSearch54Route: typeof genSearchSearch54Route + genSearchSearch55Route: typeof genSearchSearch55Route + genSearchSearch56Route: typeof genSearchSearch56Route + genSearchSearch57Route: typeof genSearchSearch57Route + genSearchSearch58Route: typeof genSearchSearch58Route + genSearchSearch59Route: typeof genSearchSearch59Route + genSearchSearch6Route: typeof genSearchSearch6Route + genSearchSearch60Route: typeof genSearchSearch60Route + genSearchSearch61Route: typeof genSearchSearch61Route + genSearchSearch62Route: typeof genSearchSearch62Route + genSearchSearch63Route: typeof genSearchSearch63Route + genSearchSearch64Route: typeof genSearchSearch64Route + genSearchSearch65Route: typeof genSearchSearch65Route + genSearchSearch66Route: typeof genSearchSearch66Route + genSearchSearch67Route: typeof genSearchSearch67Route + genSearchSearch68Route: typeof genSearchSearch68Route + genSearchSearch69Route: typeof genSearchSearch69Route + genSearchSearch7Route: typeof genSearchSearch7Route + genSearchSearch70Route: typeof genSearchSearch70Route + genSearchSearch71Route: typeof genSearchSearch71Route + genSearchSearch72Route: typeof genSearchSearch72Route + genSearchSearch73Route: typeof genSearchSearch73Route + genSearchSearch74Route: typeof genSearchSearch74Route + genSearchSearch75Route: typeof genSearchSearch75Route + genSearchSearch76Route: typeof genSearchSearch76Route + genSearchSearch77Route: typeof genSearchSearch77Route + genSearchSearch78Route: typeof genSearchSearch78Route + genSearchSearch79Route: typeof genSearchSearch79Route + genSearchSearch8Route: typeof genSearchSearch8Route + genSearchSearch80Route: typeof genSearchSearch80Route + genSearchSearch81Route: typeof genSearchSearch81Route + genSearchSearch82Route: typeof genSearchSearch82Route + genSearchSearch83Route: typeof genSearchSearch83Route + genSearchSearch84Route: typeof genSearchSearch84Route + genSearchSearch85Route: typeof genSearchSearch85Route + genSearchSearch86Route: typeof genSearchSearch86Route + genSearchSearch87Route: typeof genSearchSearch87Route + genSearchSearch88Route: typeof genSearchSearch88Route + genSearchSearch89Route: typeof genSearchSearch89Route + genSearchSearch9Route: typeof genSearchSearch9Route + genSearchSearch90Route: typeof genSearchSearch90Route + genSearchSearch91Route: typeof genSearchSearch91Route + genSearchSearch92Route: typeof genSearchSearch92Route + genSearchSearch93Route: typeof genSearchSearch93Route + genSearchSearch94Route: typeof genSearchSearch94Route + genSearchSearch95Route: typeof genSearchSearch95Route + genSearchSearch96Route: typeof genSearchSearch96Route + genSearchSearch97Route: typeof genSearchSearch97Route + genSearchSearch98Route: typeof genSearchSearch98Route + genSearchSearch99Route: typeof genSearchSearch99Route +} + +const rootRouteChildren: RootRouteChildren = { + SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, + genSearchSearch0Route: genSearchSearch0Route, + genSearchSearch1Route: genSearchSearch1Route, + genSearchSearch10Route: genSearchSearch10Route, + genSearchSearch11Route: genSearchSearch11Route, + genSearchSearch12Route: genSearchSearch12Route, + genSearchSearch13Route: genSearchSearch13Route, + genSearchSearch14Route: genSearchSearch14Route, + genSearchSearch15Route: genSearchSearch15Route, + genSearchSearch16Route: genSearchSearch16Route, + genSearchSearch17Route: genSearchSearch17Route, + genSearchSearch18Route: genSearchSearch18Route, + genSearchSearch19Route: genSearchSearch19Route, + genSearchSearch2Route: genSearchSearch2Route, + genSearchSearch20Route: genSearchSearch20Route, + genSearchSearch21Route: genSearchSearch21Route, + genSearchSearch22Route: genSearchSearch22Route, + genSearchSearch23Route: genSearchSearch23Route, + genSearchSearch24Route: genSearchSearch24Route, + genSearchSearch25Route: genSearchSearch25Route, + genSearchSearch26Route: genSearchSearch26Route, + genSearchSearch27Route: genSearchSearch27Route, + genSearchSearch28Route: genSearchSearch28Route, + genSearchSearch29Route: genSearchSearch29Route, + genSearchSearch3Route: genSearchSearch3Route, + genSearchSearch30Route: genSearchSearch30Route, + genSearchSearch31Route: genSearchSearch31Route, + genSearchSearch32Route: genSearchSearch32Route, + genSearchSearch33Route: genSearchSearch33Route, + genSearchSearch34Route: genSearchSearch34Route, + genSearchSearch35Route: genSearchSearch35Route, + genSearchSearch36Route: genSearchSearch36Route, + genSearchSearch37Route: genSearchSearch37Route, + genSearchSearch38Route: genSearchSearch38Route, + genSearchSearch39Route: genSearchSearch39Route, + genSearchSearch4Route: genSearchSearch4Route, + genSearchSearch40Route: genSearchSearch40Route, + genSearchSearch41Route: genSearchSearch41Route, + genSearchSearch42Route: genSearchSearch42Route, + genSearchSearch43Route: genSearchSearch43Route, + genSearchSearch44Route: genSearchSearch44Route, + genSearchSearch45Route: genSearchSearch45Route, + genSearchSearch46Route: genSearchSearch46Route, + genSearchSearch47Route: genSearchSearch47Route, + genSearchSearch48Route: genSearchSearch48Route, + genSearchSearch49Route: genSearchSearch49Route, + genSearchSearch5Route: genSearchSearch5Route, + genSearchSearch50Route: genSearchSearch50Route, + genSearchSearch51Route: genSearchSearch51Route, + genSearchSearch52Route: genSearchSearch52Route, + genSearchSearch53Route: genSearchSearch53Route, + genSearchSearch54Route: genSearchSearch54Route, + genSearchSearch55Route: genSearchSearch55Route, + genSearchSearch56Route: genSearchSearch56Route, + genSearchSearch57Route: genSearchSearch57Route, + genSearchSearch58Route: genSearchSearch58Route, + genSearchSearch59Route: genSearchSearch59Route, + genSearchSearch6Route: genSearchSearch6Route, + genSearchSearch60Route: genSearchSearch60Route, + genSearchSearch61Route: genSearchSearch61Route, + genSearchSearch62Route: genSearchSearch62Route, + genSearchSearch63Route: genSearchSearch63Route, + genSearchSearch64Route: genSearchSearch64Route, + genSearchSearch65Route: genSearchSearch65Route, + genSearchSearch66Route: genSearchSearch66Route, + genSearchSearch67Route: genSearchSearch67Route, + genSearchSearch68Route: genSearchSearch68Route, + genSearchSearch69Route: genSearchSearch69Route, + genSearchSearch7Route: genSearchSearch7Route, + genSearchSearch70Route: genSearchSearch70Route, + genSearchSearch71Route: genSearchSearch71Route, + genSearchSearch72Route: genSearchSearch72Route, + genSearchSearch73Route: genSearchSearch73Route, + genSearchSearch74Route: genSearchSearch74Route, + genSearchSearch75Route: genSearchSearch75Route, + genSearchSearch76Route: genSearchSearch76Route, + genSearchSearch77Route: genSearchSearch77Route, + genSearchSearch78Route: genSearchSearch78Route, + genSearchSearch79Route: genSearchSearch79Route, + genSearchSearch8Route: genSearchSearch8Route, + genSearchSearch80Route: genSearchSearch80Route, + genSearchSearch81Route: genSearchSearch81Route, + genSearchSearch82Route: genSearchSearch82Route, + genSearchSearch83Route: genSearchSearch83Route, + genSearchSearch84Route: genSearchSearch84Route, + genSearchSearch85Route: genSearchSearch85Route, + genSearchSearch86Route: genSearchSearch86Route, + genSearchSearch87Route: genSearchSearch87Route, + genSearchSearch88Route: genSearchSearch88Route, + genSearchSearch89Route: genSearchSearch89Route, + genSearchSearch9Route: genSearchSearch9Route, + genSearchSearch90Route: genSearchSearch90Route, + genSearchSearch91Route: genSearchSearch91Route, + genSearchSearch92Route: genSearchSearch92Route, + genSearchSearch93Route: genSearchSearch93Route, + genSearchSearch94Route: genSearchSearch94Route, + genSearchSearch95Route: genSearchSearch95Route, + genSearchSearch96Route: genSearchSearch96Route, + genSearchSearch97Route: genSearchSearch97Route, + genSearchSearch98Route: genSearchSearch98Route, + genSearchSearch99Route: genSearchSearch99Route, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/search/searchPlaceholder", + "/(gen)/search/search0", + "/(gen)/search/search1", + "/(gen)/search/search10", + "/(gen)/search/search11", + "/(gen)/search/search12", + "/(gen)/search/search13", + "/(gen)/search/search14", + "/(gen)/search/search15", + "/(gen)/search/search16", + "/(gen)/search/search17", + "/(gen)/search/search18", + "/(gen)/search/search19", + "/(gen)/search/search2", + "/(gen)/search/search20", + "/(gen)/search/search21", + "/(gen)/search/search22", + "/(gen)/search/search23", + "/(gen)/search/search24", + "/(gen)/search/search25", + "/(gen)/search/search26", + "/(gen)/search/search27", + "/(gen)/search/search28", + "/(gen)/search/search29", + "/(gen)/search/search3", + "/(gen)/search/search30", + "/(gen)/search/search31", + "/(gen)/search/search32", + "/(gen)/search/search33", + "/(gen)/search/search34", + "/(gen)/search/search35", + "/(gen)/search/search36", + "/(gen)/search/search37", + "/(gen)/search/search38", + "/(gen)/search/search39", + "/(gen)/search/search4", + "/(gen)/search/search40", + "/(gen)/search/search41", + "/(gen)/search/search42", + "/(gen)/search/search43", + "/(gen)/search/search44", + "/(gen)/search/search45", + "/(gen)/search/search46", + "/(gen)/search/search47", + "/(gen)/search/search48", + "/(gen)/search/search49", + "/(gen)/search/search5", + "/(gen)/search/search50", + "/(gen)/search/search51", + "/(gen)/search/search52", + "/(gen)/search/search53", + "/(gen)/search/search54", + "/(gen)/search/search55", + "/(gen)/search/search56", + "/(gen)/search/search57", + "/(gen)/search/search58", + "/(gen)/search/search59", + "/(gen)/search/search6", + "/(gen)/search/search60", + "/(gen)/search/search61", + "/(gen)/search/search62", + "/(gen)/search/search63", + "/(gen)/search/search64", + "/(gen)/search/search65", + "/(gen)/search/search66", + "/(gen)/search/search67", + "/(gen)/search/search68", + "/(gen)/search/search69", + "/(gen)/search/search7", + "/(gen)/search/search70", + "/(gen)/search/search71", + "/(gen)/search/search72", + "/(gen)/search/search73", + "/(gen)/search/search74", + "/(gen)/search/search75", + "/(gen)/search/search76", + "/(gen)/search/search77", + "/(gen)/search/search78", + "/(gen)/search/search79", + "/(gen)/search/search8", + "/(gen)/search/search80", + "/(gen)/search/search81", + "/(gen)/search/search82", + "/(gen)/search/search83", + "/(gen)/search/search84", + "/(gen)/search/search85", + "/(gen)/search/search86", + "/(gen)/search/search87", + "/(gen)/search/search88", + "/(gen)/search/search89", + "/(gen)/search/search9", + "/(gen)/search/search90", + "/(gen)/search/search91", + "/(gen)/search/search92", + "/(gen)/search/search93", + "/(gen)/search/search94", + "/(gen)/search/search95", + "/(gen)/search/search96", + "/(gen)/search/search97", + "/(gen)/search/search98", + "/(gen)/search/search99" + ] + }, + "/search/searchPlaceholder": { + "filePath": "search/searchPlaceholder.tsx" + }, + "/(gen)/search/search0": { + "filePath": "(gen)/search/search0.tsx" + }, + "/(gen)/search/search1": { + "filePath": "(gen)/search/search1.tsx" + }, + "/(gen)/search/search10": { + "filePath": "(gen)/search/search10.tsx" + }, + "/(gen)/search/search11": { + "filePath": "(gen)/search/search11.tsx" + }, + "/(gen)/search/search12": { + "filePath": "(gen)/search/search12.tsx" + }, + "/(gen)/search/search13": { + "filePath": "(gen)/search/search13.tsx" + }, + "/(gen)/search/search14": { + "filePath": "(gen)/search/search14.tsx" + }, + "/(gen)/search/search15": { + "filePath": "(gen)/search/search15.tsx" + }, + "/(gen)/search/search16": { + "filePath": "(gen)/search/search16.tsx" + }, + "/(gen)/search/search17": { + "filePath": "(gen)/search/search17.tsx" + }, + "/(gen)/search/search18": { + "filePath": "(gen)/search/search18.tsx" + }, + "/(gen)/search/search19": { + "filePath": "(gen)/search/search19.tsx" + }, + "/(gen)/search/search2": { + "filePath": "(gen)/search/search2.tsx" + }, + "/(gen)/search/search20": { + "filePath": "(gen)/search/search20.tsx" + }, + "/(gen)/search/search21": { + "filePath": "(gen)/search/search21.tsx" + }, + "/(gen)/search/search22": { + "filePath": "(gen)/search/search22.tsx" + }, + "/(gen)/search/search23": { + "filePath": "(gen)/search/search23.tsx" + }, + "/(gen)/search/search24": { + "filePath": "(gen)/search/search24.tsx" + }, + "/(gen)/search/search25": { + "filePath": "(gen)/search/search25.tsx" + }, + "/(gen)/search/search26": { + "filePath": "(gen)/search/search26.tsx" + }, + "/(gen)/search/search27": { + "filePath": "(gen)/search/search27.tsx" + }, + "/(gen)/search/search28": { + "filePath": "(gen)/search/search28.tsx" + }, + "/(gen)/search/search29": { + "filePath": "(gen)/search/search29.tsx" + }, + "/(gen)/search/search3": { + "filePath": "(gen)/search/search3.tsx" + }, + "/(gen)/search/search30": { + "filePath": "(gen)/search/search30.tsx" + }, + "/(gen)/search/search31": { + "filePath": "(gen)/search/search31.tsx" + }, + "/(gen)/search/search32": { + "filePath": "(gen)/search/search32.tsx" + }, + "/(gen)/search/search33": { + "filePath": "(gen)/search/search33.tsx" + }, + "/(gen)/search/search34": { + "filePath": "(gen)/search/search34.tsx" + }, + "/(gen)/search/search35": { + "filePath": "(gen)/search/search35.tsx" + }, + "/(gen)/search/search36": { + "filePath": "(gen)/search/search36.tsx" + }, + "/(gen)/search/search37": { + "filePath": "(gen)/search/search37.tsx" + }, + "/(gen)/search/search38": { + "filePath": "(gen)/search/search38.tsx" + }, + "/(gen)/search/search39": { + "filePath": "(gen)/search/search39.tsx" + }, + "/(gen)/search/search4": { + "filePath": "(gen)/search/search4.tsx" + }, + "/(gen)/search/search40": { + "filePath": "(gen)/search/search40.tsx" + }, + "/(gen)/search/search41": { + "filePath": "(gen)/search/search41.tsx" + }, + "/(gen)/search/search42": { + "filePath": "(gen)/search/search42.tsx" + }, + "/(gen)/search/search43": { + "filePath": "(gen)/search/search43.tsx" + }, + "/(gen)/search/search44": { + "filePath": "(gen)/search/search44.tsx" + }, + "/(gen)/search/search45": { + "filePath": "(gen)/search/search45.tsx" + }, + "/(gen)/search/search46": { + "filePath": "(gen)/search/search46.tsx" + }, + "/(gen)/search/search47": { + "filePath": "(gen)/search/search47.tsx" + }, + "/(gen)/search/search48": { + "filePath": "(gen)/search/search48.tsx" + }, + "/(gen)/search/search49": { + "filePath": "(gen)/search/search49.tsx" + }, + "/(gen)/search/search5": { + "filePath": "(gen)/search/search5.tsx" + }, + "/(gen)/search/search50": { + "filePath": "(gen)/search/search50.tsx" + }, + "/(gen)/search/search51": { + "filePath": "(gen)/search/search51.tsx" + }, + "/(gen)/search/search52": { + "filePath": "(gen)/search/search52.tsx" + }, + "/(gen)/search/search53": { + "filePath": "(gen)/search/search53.tsx" + }, + "/(gen)/search/search54": { + "filePath": "(gen)/search/search54.tsx" + }, + "/(gen)/search/search55": { + "filePath": "(gen)/search/search55.tsx" + }, + "/(gen)/search/search56": { + "filePath": "(gen)/search/search56.tsx" + }, + "/(gen)/search/search57": { + "filePath": "(gen)/search/search57.tsx" + }, + "/(gen)/search/search58": { + "filePath": "(gen)/search/search58.tsx" + }, + "/(gen)/search/search59": { + "filePath": "(gen)/search/search59.tsx" + }, + "/(gen)/search/search6": { + "filePath": "(gen)/search/search6.tsx" + }, + "/(gen)/search/search60": { + "filePath": "(gen)/search/search60.tsx" + }, + "/(gen)/search/search61": { + "filePath": "(gen)/search/search61.tsx" + }, + "/(gen)/search/search62": { + "filePath": "(gen)/search/search62.tsx" + }, + "/(gen)/search/search63": { + "filePath": "(gen)/search/search63.tsx" + }, + "/(gen)/search/search64": { + "filePath": "(gen)/search/search64.tsx" + }, + "/(gen)/search/search65": { + "filePath": "(gen)/search/search65.tsx" + }, + "/(gen)/search/search66": { + "filePath": "(gen)/search/search66.tsx" + }, + "/(gen)/search/search67": { + "filePath": "(gen)/search/search67.tsx" + }, + "/(gen)/search/search68": { + "filePath": "(gen)/search/search68.tsx" + }, + "/(gen)/search/search69": { + "filePath": "(gen)/search/search69.tsx" + }, + "/(gen)/search/search7": { + "filePath": "(gen)/search/search7.tsx" + }, + "/(gen)/search/search70": { + "filePath": "(gen)/search/search70.tsx" + }, + "/(gen)/search/search71": { + "filePath": "(gen)/search/search71.tsx" + }, + "/(gen)/search/search72": { + "filePath": "(gen)/search/search72.tsx" + }, + "/(gen)/search/search73": { + "filePath": "(gen)/search/search73.tsx" + }, + "/(gen)/search/search74": { + "filePath": "(gen)/search/search74.tsx" + }, + "/(gen)/search/search75": { + "filePath": "(gen)/search/search75.tsx" + }, + "/(gen)/search/search76": { + "filePath": "(gen)/search/search76.tsx" + }, + "/(gen)/search/search77": { + "filePath": "(gen)/search/search77.tsx" + }, + "/(gen)/search/search78": { + "filePath": "(gen)/search/search78.tsx" + }, + "/(gen)/search/search79": { + "filePath": "(gen)/search/search79.tsx" + }, + "/(gen)/search/search8": { + "filePath": "(gen)/search/search8.tsx" + }, + "/(gen)/search/search80": { + "filePath": "(gen)/search/search80.tsx" + }, + "/(gen)/search/search81": { + "filePath": "(gen)/search/search81.tsx" + }, + "/(gen)/search/search82": { + "filePath": "(gen)/search/search82.tsx" + }, + "/(gen)/search/search83": { + "filePath": "(gen)/search/search83.tsx" + }, + "/(gen)/search/search84": { + "filePath": "(gen)/search/search84.tsx" + }, + "/(gen)/search/search85": { + "filePath": "(gen)/search/search85.tsx" + }, + "/(gen)/search/search86": { + "filePath": "(gen)/search/search86.tsx" + }, + "/(gen)/search/search87": { + "filePath": "(gen)/search/search87.tsx" + }, + "/(gen)/search/search88": { + "filePath": "(gen)/search/search88.tsx" + }, + "/(gen)/search/search89": { + "filePath": "(gen)/search/search89.tsx" + }, + "/(gen)/search/search9": { + "filePath": "(gen)/search/search9.tsx" + }, + "/(gen)/search/search90": { + "filePath": "(gen)/search/search90.tsx" + }, + "/(gen)/search/search91": { + "filePath": "(gen)/search/search91.tsx" + }, + "/(gen)/search/search92": { + "filePath": "(gen)/search/search92.tsx" + }, + "/(gen)/search/search93": { + "filePath": "(gen)/search/search93.tsx" + }, + "/(gen)/search/search94": { + "filePath": "(gen)/search/search94.tsx" + }, + "/(gen)/search/search95": { + "filePath": "(gen)/search/search95.tsx" + }, + "/(gen)/search/search96": { + "filePath": "(gen)/search/search96.tsx" + }, + "/(gen)/search/search97": { + "filePath": "(gen)/search/search97.tsx" + }, + "/(gen)/search/search98": { + "filePath": "(gen)/search/search98.tsx" + }, + "/(gen)/search/search99": { + "filePath": "(gen)/search/search99.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-large/app.config.ts b/examples/react/start-large/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-large/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index a9c4ced79d..fc01526099 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start", + "dev": "vite dev", + "build": "vite build", + "start": "vite start", "gen": "node ./src/createRoutes.mjs", "test:types": "tsc --extendedDiagnostics" }, @@ -19,8 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "valibot": "^1.0.0-beta.15", - "vinxi": "0.5.3" + "valibot": "^1.0.0-beta.15" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/react/start-large/src/client.tsx b/examples/react/start-large/src/client.tsx deleted file mode 100644 index 4d4c49a500..0000000000 --- a/examples/react/start-large/src/client.tsx +++ /dev/null @@ -1,9 +0,0 @@ -// src/client.tsx -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-large/src/routeTree.gen.ts b/examples/react/start-large/src/routeTree.gen.ts index e4f3a85ab1..93ec8b8345 100644 --- a/examples/react/start-large/src/routeTree.gen.ts +++ b/examples/react/start-large/src/routeTree.gen.ts @@ -8,292 +8,14655 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as RelativeImport } from './routes/relative' -import { Route as LinkPropsImport } from './routes/linkProps' -import { Route as AbsoluteImport } from './routes/absolute' -import { Route as SearchRouteImport } from './routes/search/route' -import { Route as ParamsRouteImport } from './routes/params/route' -import { Route as IndexImport } from './routes/index' -import { Route as SearchSearchPlaceholderImport } from './routes/search/searchPlaceholder' -import { Route as ParamsParamsPlaceholderImport } from './routes/params/$paramsPlaceholder' +import { Route as RelativeRouteImport } from './routes/relative' +import { Route as LinkPropsRouteImport } from './routes/linkProps' +import { Route as AbsoluteRouteImport } from './routes/absolute' +import { Route as SearchRouteRouteImport } from './routes/search/route' +import { Route as ParamsRouteRouteImport } from './routes/params/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as SearchSearchPlaceholderRouteImport } from './routes/search/searchPlaceholder' +import { Route as ParamsParamsPlaceholderRouteImport } from './routes/params/$paramsPlaceholder' +import { Route as genRelative99RouteImport } from './routes/(gen)/relative99' +import { Route as genRelative98RouteImport } from './routes/(gen)/relative98' +import { Route as genRelative97RouteImport } from './routes/(gen)/relative97' +import { Route as genRelative96RouteImport } from './routes/(gen)/relative96' +import { Route as genRelative95RouteImport } from './routes/(gen)/relative95' +import { Route as genRelative94RouteImport } from './routes/(gen)/relative94' +import { Route as genRelative93RouteImport } from './routes/(gen)/relative93' +import { Route as genRelative92RouteImport } from './routes/(gen)/relative92' +import { Route as genRelative91RouteImport } from './routes/(gen)/relative91' +import { Route as genRelative90RouteImport } from './routes/(gen)/relative90' +import { Route as genRelative9RouteImport } from './routes/(gen)/relative9' +import { Route as genRelative89RouteImport } from './routes/(gen)/relative89' +import { Route as genRelative88RouteImport } from './routes/(gen)/relative88' +import { Route as genRelative87RouteImport } from './routes/(gen)/relative87' +import { Route as genRelative86RouteImport } from './routes/(gen)/relative86' +import { Route as genRelative85RouteImport } from './routes/(gen)/relative85' +import { Route as genRelative84RouteImport } from './routes/(gen)/relative84' +import { Route as genRelative83RouteImport } from './routes/(gen)/relative83' +import { Route as genRelative82RouteImport } from './routes/(gen)/relative82' +import { Route as genRelative81RouteImport } from './routes/(gen)/relative81' +import { Route as genRelative80RouteImport } from './routes/(gen)/relative80' +import { Route as genRelative8RouteImport } from './routes/(gen)/relative8' +import { Route as genRelative79RouteImport } from './routes/(gen)/relative79' +import { Route as genRelative78RouteImport } from './routes/(gen)/relative78' +import { Route as genRelative77RouteImport } from './routes/(gen)/relative77' +import { Route as genRelative76RouteImport } from './routes/(gen)/relative76' +import { Route as genRelative75RouteImport } from './routes/(gen)/relative75' +import { Route as genRelative74RouteImport } from './routes/(gen)/relative74' +import { Route as genRelative73RouteImport } from './routes/(gen)/relative73' +import { Route as genRelative72RouteImport } from './routes/(gen)/relative72' +import { Route as genRelative71RouteImport } from './routes/(gen)/relative71' +import { Route as genRelative70RouteImport } from './routes/(gen)/relative70' +import { Route as genRelative7RouteImport } from './routes/(gen)/relative7' +import { Route as genRelative69RouteImport } from './routes/(gen)/relative69' +import { Route as genRelative68RouteImport } from './routes/(gen)/relative68' +import { Route as genRelative67RouteImport } from './routes/(gen)/relative67' +import { Route as genRelative66RouteImport } from './routes/(gen)/relative66' +import { Route as genRelative65RouteImport } from './routes/(gen)/relative65' +import { Route as genRelative64RouteImport } from './routes/(gen)/relative64' +import { Route as genRelative63RouteImport } from './routes/(gen)/relative63' +import { Route as genRelative62RouteImport } from './routes/(gen)/relative62' +import { Route as genRelative61RouteImport } from './routes/(gen)/relative61' +import { Route as genRelative60RouteImport } from './routes/(gen)/relative60' +import { Route as genRelative6RouteImport } from './routes/(gen)/relative6' +import { Route as genRelative59RouteImport } from './routes/(gen)/relative59' +import { Route as genRelative58RouteImport } from './routes/(gen)/relative58' +import { Route as genRelative57RouteImport } from './routes/(gen)/relative57' +import { Route as genRelative56RouteImport } from './routes/(gen)/relative56' +import { Route as genRelative55RouteImport } from './routes/(gen)/relative55' +import { Route as genRelative54RouteImport } from './routes/(gen)/relative54' +import { Route as genRelative53RouteImport } from './routes/(gen)/relative53' +import { Route as genRelative52RouteImport } from './routes/(gen)/relative52' +import { Route as genRelative51RouteImport } from './routes/(gen)/relative51' +import { Route as genRelative50RouteImport } from './routes/(gen)/relative50' +import { Route as genRelative5RouteImport } from './routes/(gen)/relative5' +import { Route as genRelative49RouteImport } from './routes/(gen)/relative49' +import { Route as genRelative48RouteImport } from './routes/(gen)/relative48' +import { Route as genRelative47RouteImport } from './routes/(gen)/relative47' +import { Route as genRelative46RouteImport } from './routes/(gen)/relative46' +import { Route as genRelative45RouteImport } from './routes/(gen)/relative45' +import { Route as genRelative44RouteImport } from './routes/(gen)/relative44' +import { Route as genRelative43RouteImport } from './routes/(gen)/relative43' +import { Route as genRelative42RouteImport } from './routes/(gen)/relative42' +import { Route as genRelative41RouteImport } from './routes/(gen)/relative41' +import { Route as genRelative40RouteImport } from './routes/(gen)/relative40' +import { Route as genRelative4RouteImport } from './routes/(gen)/relative4' +import { Route as genRelative39RouteImport } from './routes/(gen)/relative39' +import { Route as genRelative38RouteImport } from './routes/(gen)/relative38' +import { Route as genRelative37RouteImport } from './routes/(gen)/relative37' +import { Route as genRelative36RouteImport } from './routes/(gen)/relative36' +import { Route as genRelative35RouteImport } from './routes/(gen)/relative35' +import { Route as genRelative34RouteImport } from './routes/(gen)/relative34' +import { Route as genRelative33RouteImport } from './routes/(gen)/relative33' +import { Route as genRelative32RouteImport } from './routes/(gen)/relative32' +import { Route as genRelative31RouteImport } from './routes/(gen)/relative31' +import { Route as genRelative30RouteImport } from './routes/(gen)/relative30' +import { Route as genRelative3RouteImport } from './routes/(gen)/relative3' +import { Route as genRelative29RouteImport } from './routes/(gen)/relative29' +import { Route as genRelative28RouteImport } from './routes/(gen)/relative28' +import { Route as genRelative27RouteImport } from './routes/(gen)/relative27' +import { Route as genRelative26RouteImport } from './routes/(gen)/relative26' +import { Route as genRelative25RouteImport } from './routes/(gen)/relative25' +import { Route as genRelative24RouteImport } from './routes/(gen)/relative24' +import { Route as genRelative23RouteImport } from './routes/(gen)/relative23' +import { Route as genRelative22RouteImport } from './routes/(gen)/relative22' +import { Route as genRelative21RouteImport } from './routes/(gen)/relative21' +import { Route as genRelative20RouteImport } from './routes/(gen)/relative20' +import { Route as genRelative2RouteImport } from './routes/(gen)/relative2' +import { Route as genRelative19RouteImport } from './routes/(gen)/relative19' +import { Route as genRelative18RouteImport } from './routes/(gen)/relative18' +import { Route as genRelative17RouteImport } from './routes/(gen)/relative17' +import { Route as genRelative16RouteImport } from './routes/(gen)/relative16' +import { Route as genRelative15RouteImport } from './routes/(gen)/relative15' +import { Route as genRelative14RouteImport } from './routes/(gen)/relative14' +import { Route as genRelative13RouteImport } from './routes/(gen)/relative13' +import { Route as genRelative12RouteImport } from './routes/(gen)/relative12' +import { Route as genRelative11RouteImport } from './routes/(gen)/relative11' +import { Route as genRelative10RouteImport } from './routes/(gen)/relative10' +import { Route as genRelative1RouteImport } from './routes/(gen)/relative1' +import { Route as genRelative0RouteImport } from './routes/(gen)/relative0' +import { Route as genAbsolute99RouteImport } from './routes/(gen)/absolute99' +import { Route as genAbsolute98RouteImport } from './routes/(gen)/absolute98' +import { Route as genAbsolute97RouteImport } from './routes/(gen)/absolute97' +import { Route as genAbsolute96RouteImport } from './routes/(gen)/absolute96' +import { Route as genAbsolute95RouteImport } from './routes/(gen)/absolute95' +import { Route as genAbsolute94RouteImport } from './routes/(gen)/absolute94' +import { Route as genAbsolute93RouteImport } from './routes/(gen)/absolute93' +import { Route as genAbsolute92RouteImport } from './routes/(gen)/absolute92' +import { Route as genAbsolute91RouteImport } from './routes/(gen)/absolute91' +import { Route as genAbsolute90RouteImport } from './routes/(gen)/absolute90' +import { Route as genAbsolute9RouteImport } from './routes/(gen)/absolute9' +import { Route as genAbsolute89RouteImport } from './routes/(gen)/absolute89' +import { Route as genAbsolute88RouteImport } from './routes/(gen)/absolute88' +import { Route as genAbsolute87RouteImport } from './routes/(gen)/absolute87' +import { Route as genAbsolute86RouteImport } from './routes/(gen)/absolute86' +import { Route as genAbsolute85RouteImport } from './routes/(gen)/absolute85' +import { Route as genAbsolute84RouteImport } from './routes/(gen)/absolute84' +import { Route as genAbsolute83RouteImport } from './routes/(gen)/absolute83' +import { Route as genAbsolute82RouteImport } from './routes/(gen)/absolute82' +import { Route as genAbsolute81RouteImport } from './routes/(gen)/absolute81' +import { Route as genAbsolute80RouteImport } from './routes/(gen)/absolute80' +import { Route as genAbsolute8RouteImport } from './routes/(gen)/absolute8' +import { Route as genAbsolute79RouteImport } from './routes/(gen)/absolute79' +import { Route as genAbsolute78RouteImport } from './routes/(gen)/absolute78' +import { Route as genAbsolute77RouteImport } from './routes/(gen)/absolute77' +import { Route as genAbsolute76RouteImport } from './routes/(gen)/absolute76' +import { Route as genAbsolute75RouteImport } from './routes/(gen)/absolute75' +import { Route as genAbsolute74RouteImport } from './routes/(gen)/absolute74' +import { Route as genAbsolute73RouteImport } from './routes/(gen)/absolute73' +import { Route as genAbsolute72RouteImport } from './routes/(gen)/absolute72' +import { Route as genAbsolute71RouteImport } from './routes/(gen)/absolute71' +import { Route as genAbsolute70RouteImport } from './routes/(gen)/absolute70' +import { Route as genAbsolute7RouteImport } from './routes/(gen)/absolute7' +import { Route as genAbsolute69RouteImport } from './routes/(gen)/absolute69' +import { Route as genAbsolute68RouteImport } from './routes/(gen)/absolute68' +import { Route as genAbsolute67RouteImport } from './routes/(gen)/absolute67' +import { Route as genAbsolute66RouteImport } from './routes/(gen)/absolute66' +import { Route as genAbsolute65RouteImport } from './routes/(gen)/absolute65' +import { Route as genAbsolute64RouteImport } from './routes/(gen)/absolute64' +import { Route as genAbsolute63RouteImport } from './routes/(gen)/absolute63' +import { Route as genAbsolute62RouteImport } from './routes/(gen)/absolute62' +import { Route as genAbsolute61RouteImport } from './routes/(gen)/absolute61' +import { Route as genAbsolute60RouteImport } from './routes/(gen)/absolute60' +import { Route as genAbsolute6RouteImport } from './routes/(gen)/absolute6' +import { Route as genAbsolute59RouteImport } from './routes/(gen)/absolute59' +import { Route as genAbsolute58RouteImport } from './routes/(gen)/absolute58' +import { Route as genAbsolute57RouteImport } from './routes/(gen)/absolute57' +import { Route as genAbsolute56RouteImport } from './routes/(gen)/absolute56' +import { Route as genAbsolute55RouteImport } from './routes/(gen)/absolute55' +import { Route as genAbsolute54RouteImport } from './routes/(gen)/absolute54' +import { Route as genAbsolute53RouteImport } from './routes/(gen)/absolute53' +import { Route as genAbsolute52RouteImport } from './routes/(gen)/absolute52' +import { Route as genAbsolute51RouteImport } from './routes/(gen)/absolute51' +import { Route as genAbsolute50RouteImport } from './routes/(gen)/absolute50' +import { Route as genAbsolute5RouteImport } from './routes/(gen)/absolute5' +import { Route as genAbsolute49RouteImport } from './routes/(gen)/absolute49' +import { Route as genAbsolute48RouteImport } from './routes/(gen)/absolute48' +import { Route as genAbsolute47RouteImport } from './routes/(gen)/absolute47' +import { Route as genAbsolute46RouteImport } from './routes/(gen)/absolute46' +import { Route as genAbsolute45RouteImport } from './routes/(gen)/absolute45' +import { Route as genAbsolute44RouteImport } from './routes/(gen)/absolute44' +import { Route as genAbsolute43RouteImport } from './routes/(gen)/absolute43' +import { Route as genAbsolute42RouteImport } from './routes/(gen)/absolute42' +import { Route as genAbsolute41RouteImport } from './routes/(gen)/absolute41' +import { Route as genAbsolute40RouteImport } from './routes/(gen)/absolute40' +import { Route as genAbsolute4RouteImport } from './routes/(gen)/absolute4' +import { Route as genAbsolute39RouteImport } from './routes/(gen)/absolute39' +import { Route as genAbsolute38RouteImport } from './routes/(gen)/absolute38' +import { Route as genAbsolute37RouteImport } from './routes/(gen)/absolute37' +import { Route as genAbsolute36RouteImport } from './routes/(gen)/absolute36' +import { Route as genAbsolute35RouteImport } from './routes/(gen)/absolute35' +import { Route as genAbsolute34RouteImport } from './routes/(gen)/absolute34' +import { Route as genAbsolute33RouteImport } from './routes/(gen)/absolute33' +import { Route as genAbsolute32RouteImport } from './routes/(gen)/absolute32' +import { Route as genAbsolute31RouteImport } from './routes/(gen)/absolute31' +import { Route as genAbsolute30RouteImport } from './routes/(gen)/absolute30' +import { Route as genAbsolute3RouteImport } from './routes/(gen)/absolute3' +import { Route as genAbsolute29RouteImport } from './routes/(gen)/absolute29' +import { Route as genAbsolute28RouteImport } from './routes/(gen)/absolute28' +import { Route as genAbsolute27RouteImport } from './routes/(gen)/absolute27' +import { Route as genAbsolute26RouteImport } from './routes/(gen)/absolute26' +import { Route as genAbsolute25RouteImport } from './routes/(gen)/absolute25' +import { Route as genAbsolute24RouteImport } from './routes/(gen)/absolute24' +import { Route as genAbsolute23RouteImport } from './routes/(gen)/absolute23' +import { Route as genAbsolute22RouteImport } from './routes/(gen)/absolute22' +import { Route as genAbsolute21RouteImport } from './routes/(gen)/absolute21' +import { Route as genAbsolute20RouteImport } from './routes/(gen)/absolute20' +import { Route as genAbsolute2RouteImport } from './routes/(gen)/absolute2' +import { Route as genAbsolute19RouteImport } from './routes/(gen)/absolute19' +import { Route as genAbsolute18RouteImport } from './routes/(gen)/absolute18' +import { Route as genAbsolute17RouteImport } from './routes/(gen)/absolute17' +import { Route as genAbsolute16RouteImport } from './routes/(gen)/absolute16' +import { Route as genAbsolute15RouteImport } from './routes/(gen)/absolute15' +import { Route as genAbsolute14RouteImport } from './routes/(gen)/absolute14' +import { Route as genAbsolute13RouteImport } from './routes/(gen)/absolute13' +import { Route as genAbsolute12RouteImport } from './routes/(gen)/absolute12' +import { Route as genAbsolute11RouteImport } from './routes/(gen)/absolute11' +import { Route as genAbsolute10RouteImport } from './routes/(gen)/absolute10' +import { Route as genAbsolute1RouteImport } from './routes/(gen)/absolute1' +import { Route as genAbsolute0RouteImport } from './routes/(gen)/absolute0' +import { Route as genSearchRouteRouteImport } from './routes/(gen)/search/route' +import { Route as genParamsRouteRouteImport } from './routes/(gen)/params/route' +import { Route as genSearchSearch99RouteImport } from './routes/(gen)/search/search99' +import { Route as genSearchSearch98RouteImport } from './routes/(gen)/search/search98' +import { Route as genSearchSearch97RouteImport } from './routes/(gen)/search/search97' +import { Route as genSearchSearch96RouteImport } from './routes/(gen)/search/search96' +import { Route as genSearchSearch95RouteImport } from './routes/(gen)/search/search95' +import { Route as genSearchSearch94RouteImport } from './routes/(gen)/search/search94' +import { Route as genSearchSearch93RouteImport } from './routes/(gen)/search/search93' +import { Route as genSearchSearch92RouteImport } from './routes/(gen)/search/search92' +import { Route as genSearchSearch91RouteImport } from './routes/(gen)/search/search91' +import { Route as genSearchSearch90RouteImport } from './routes/(gen)/search/search90' +import { Route as genSearchSearch9RouteImport } from './routes/(gen)/search/search9' +import { Route as genSearchSearch89RouteImport } from './routes/(gen)/search/search89' +import { Route as genSearchSearch88RouteImport } from './routes/(gen)/search/search88' +import { Route as genSearchSearch87RouteImport } from './routes/(gen)/search/search87' +import { Route as genSearchSearch86RouteImport } from './routes/(gen)/search/search86' +import { Route as genSearchSearch85RouteImport } from './routes/(gen)/search/search85' +import { Route as genSearchSearch84RouteImport } from './routes/(gen)/search/search84' +import { Route as genSearchSearch83RouteImport } from './routes/(gen)/search/search83' +import { Route as genSearchSearch82RouteImport } from './routes/(gen)/search/search82' +import { Route as genSearchSearch81RouteImport } from './routes/(gen)/search/search81' +import { Route as genSearchSearch80RouteImport } from './routes/(gen)/search/search80' +import { Route as genSearchSearch8RouteImport } from './routes/(gen)/search/search8' +import { Route as genSearchSearch79RouteImport } from './routes/(gen)/search/search79' +import { Route as genSearchSearch78RouteImport } from './routes/(gen)/search/search78' +import { Route as genSearchSearch77RouteImport } from './routes/(gen)/search/search77' +import { Route as genSearchSearch76RouteImport } from './routes/(gen)/search/search76' +import { Route as genSearchSearch75RouteImport } from './routes/(gen)/search/search75' +import { Route as genSearchSearch74RouteImport } from './routes/(gen)/search/search74' +import { Route as genSearchSearch73RouteImport } from './routes/(gen)/search/search73' +import { Route as genSearchSearch72RouteImport } from './routes/(gen)/search/search72' +import { Route as genSearchSearch71RouteImport } from './routes/(gen)/search/search71' +import { Route as genSearchSearch70RouteImport } from './routes/(gen)/search/search70' +import { Route as genSearchSearch7RouteImport } from './routes/(gen)/search/search7' +import { Route as genSearchSearch69RouteImport } from './routes/(gen)/search/search69' +import { Route as genSearchSearch68RouteImport } from './routes/(gen)/search/search68' +import { Route as genSearchSearch67RouteImport } from './routes/(gen)/search/search67' +import { Route as genSearchSearch66RouteImport } from './routes/(gen)/search/search66' +import { Route as genSearchSearch65RouteImport } from './routes/(gen)/search/search65' +import { Route as genSearchSearch64RouteImport } from './routes/(gen)/search/search64' +import { Route as genSearchSearch63RouteImport } from './routes/(gen)/search/search63' +import { Route as genSearchSearch62RouteImport } from './routes/(gen)/search/search62' +import { Route as genSearchSearch61RouteImport } from './routes/(gen)/search/search61' +import { Route as genSearchSearch60RouteImport } from './routes/(gen)/search/search60' +import { Route as genSearchSearch6RouteImport } from './routes/(gen)/search/search6' +import { Route as genSearchSearch59RouteImport } from './routes/(gen)/search/search59' +import { Route as genSearchSearch58RouteImport } from './routes/(gen)/search/search58' +import { Route as genSearchSearch57RouteImport } from './routes/(gen)/search/search57' +import { Route as genSearchSearch56RouteImport } from './routes/(gen)/search/search56' +import { Route as genSearchSearch55RouteImport } from './routes/(gen)/search/search55' +import { Route as genSearchSearch54RouteImport } from './routes/(gen)/search/search54' +import { Route as genSearchSearch53RouteImport } from './routes/(gen)/search/search53' +import { Route as genSearchSearch52RouteImport } from './routes/(gen)/search/search52' +import { Route as genSearchSearch51RouteImport } from './routes/(gen)/search/search51' +import { Route as genSearchSearch50RouteImport } from './routes/(gen)/search/search50' +import { Route as genSearchSearch5RouteImport } from './routes/(gen)/search/search5' +import { Route as genSearchSearch49RouteImport } from './routes/(gen)/search/search49' +import { Route as genSearchSearch48RouteImport } from './routes/(gen)/search/search48' +import { Route as genSearchSearch47RouteImport } from './routes/(gen)/search/search47' +import { Route as genSearchSearch46RouteImport } from './routes/(gen)/search/search46' +import { Route as genSearchSearch45RouteImport } from './routes/(gen)/search/search45' +import { Route as genSearchSearch44RouteImport } from './routes/(gen)/search/search44' +import { Route as genSearchSearch43RouteImport } from './routes/(gen)/search/search43' +import { Route as genSearchSearch42RouteImport } from './routes/(gen)/search/search42' +import { Route as genSearchSearch41RouteImport } from './routes/(gen)/search/search41' +import { Route as genSearchSearch40RouteImport } from './routes/(gen)/search/search40' +import { Route as genSearchSearch4RouteImport } from './routes/(gen)/search/search4' +import { Route as genSearchSearch39RouteImport } from './routes/(gen)/search/search39' +import { Route as genSearchSearch38RouteImport } from './routes/(gen)/search/search38' +import { Route as genSearchSearch37RouteImport } from './routes/(gen)/search/search37' +import { Route as genSearchSearch36RouteImport } from './routes/(gen)/search/search36' +import { Route as genSearchSearch35RouteImport } from './routes/(gen)/search/search35' +import { Route as genSearchSearch34RouteImport } from './routes/(gen)/search/search34' +import { Route as genSearchSearch33RouteImport } from './routes/(gen)/search/search33' +import { Route as genSearchSearch32RouteImport } from './routes/(gen)/search/search32' +import { Route as genSearchSearch31RouteImport } from './routes/(gen)/search/search31' +import { Route as genSearchSearch30RouteImport } from './routes/(gen)/search/search30' +import { Route as genSearchSearch3RouteImport } from './routes/(gen)/search/search3' +import { Route as genSearchSearch29RouteImport } from './routes/(gen)/search/search29' +import { Route as genSearchSearch28RouteImport } from './routes/(gen)/search/search28' +import { Route as genSearchSearch27RouteImport } from './routes/(gen)/search/search27' +import { Route as genSearchSearch26RouteImport } from './routes/(gen)/search/search26' +import { Route as genSearchSearch25RouteImport } from './routes/(gen)/search/search25' +import { Route as genSearchSearch24RouteImport } from './routes/(gen)/search/search24' +import { Route as genSearchSearch23RouteImport } from './routes/(gen)/search/search23' +import { Route as genSearchSearch22RouteImport } from './routes/(gen)/search/search22' +import { Route as genSearchSearch21RouteImport } from './routes/(gen)/search/search21' +import { Route as genSearchSearch20RouteImport } from './routes/(gen)/search/search20' +import { Route as genSearchSearch2RouteImport } from './routes/(gen)/search/search2' +import { Route as genSearchSearch19RouteImport } from './routes/(gen)/search/search19' +import { Route as genSearchSearch18RouteImport } from './routes/(gen)/search/search18' +import { Route as genSearchSearch17RouteImport } from './routes/(gen)/search/search17' +import { Route as genSearchSearch16RouteImport } from './routes/(gen)/search/search16' +import { Route as genSearchSearch15RouteImport } from './routes/(gen)/search/search15' +import { Route as genSearchSearch14RouteImport } from './routes/(gen)/search/search14' +import { Route as genSearchSearch13RouteImport } from './routes/(gen)/search/search13' +import { Route as genSearchSearch12RouteImport } from './routes/(gen)/search/search12' +import { Route as genSearchSearch11RouteImport } from './routes/(gen)/search/search11' +import { Route as genSearchSearch10RouteImport } from './routes/(gen)/search/search10' +import { Route as genSearchSearch1RouteImport } from './routes/(gen)/search/search1' +import { Route as genSearchSearch0RouteImport } from './routes/(gen)/search/search0' +import { Route as genParamsParam99RouteImport } from './routes/(gen)/params/$param99' +import { Route as genParamsParam98RouteImport } from './routes/(gen)/params/$param98' +import { Route as genParamsParam97RouteImport } from './routes/(gen)/params/$param97' +import { Route as genParamsParam96RouteImport } from './routes/(gen)/params/$param96' +import { Route as genParamsParam95RouteImport } from './routes/(gen)/params/$param95' +import { Route as genParamsParam94RouteImport } from './routes/(gen)/params/$param94' +import { Route as genParamsParam93RouteImport } from './routes/(gen)/params/$param93' +import { Route as genParamsParam92RouteImport } from './routes/(gen)/params/$param92' +import { Route as genParamsParam91RouteImport } from './routes/(gen)/params/$param91' +import { Route as genParamsParam90RouteImport } from './routes/(gen)/params/$param90' +import { Route as genParamsParam9RouteImport } from './routes/(gen)/params/$param9' +import { Route as genParamsParam89RouteImport } from './routes/(gen)/params/$param89' +import { Route as genParamsParam88RouteImport } from './routes/(gen)/params/$param88' +import { Route as genParamsParam87RouteImport } from './routes/(gen)/params/$param87' +import { Route as genParamsParam86RouteImport } from './routes/(gen)/params/$param86' +import { Route as genParamsParam85RouteImport } from './routes/(gen)/params/$param85' +import { Route as genParamsParam84RouteImport } from './routes/(gen)/params/$param84' +import { Route as genParamsParam83RouteImport } from './routes/(gen)/params/$param83' +import { Route as genParamsParam82RouteImport } from './routes/(gen)/params/$param82' +import { Route as genParamsParam81RouteImport } from './routes/(gen)/params/$param81' +import { Route as genParamsParam80RouteImport } from './routes/(gen)/params/$param80' +import { Route as genParamsParam8RouteImport } from './routes/(gen)/params/$param8' +import { Route as genParamsParam79RouteImport } from './routes/(gen)/params/$param79' +import { Route as genParamsParam78RouteImport } from './routes/(gen)/params/$param78' +import { Route as genParamsParam77RouteImport } from './routes/(gen)/params/$param77' +import { Route as genParamsParam76RouteImport } from './routes/(gen)/params/$param76' +import { Route as genParamsParam75RouteImport } from './routes/(gen)/params/$param75' +import { Route as genParamsParam74RouteImport } from './routes/(gen)/params/$param74' +import { Route as genParamsParam73RouteImport } from './routes/(gen)/params/$param73' +import { Route as genParamsParam72RouteImport } from './routes/(gen)/params/$param72' +import { Route as genParamsParam71RouteImport } from './routes/(gen)/params/$param71' +import { Route as genParamsParam70RouteImport } from './routes/(gen)/params/$param70' +import { Route as genParamsParam7RouteImport } from './routes/(gen)/params/$param7' +import { Route as genParamsParam69RouteImport } from './routes/(gen)/params/$param69' +import { Route as genParamsParam68RouteImport } from './routes/(gen)/params/$param68' +import { Route as genParamsParam67RouteImport } from './routes/(gen)/params/$param67' +import { Route as genParamsParam66RouteImport } from './routes/(gen)/params/$param66' +import { Route as genParamsParam65RouteImport } from './routes/(gen)/params/$param65' +import { Route as genParamsParam64RouteImport } from './routes/(gen)/params/$param64' +import { Route as genParamsParam63RouteImport } from './routes/(gen)/params/$param63' +import { Route as genParamsParam62RouteImport } from './routes/(gen)/params/$param62' +import { Route as genParamsParam61RouteImport } from './routes/(gen)/params/$param61' +import { Route as genParamsParam60RouteImport } from './routes/(gen)/params/$param60' +import { Route as genParamsParam6RouteImport } from './routes/(gen)/params/$param6' +import { Route as genParamsParam59RouteImport } from './routes/(gen)/params/$param59' +import { Route as genParamsParam58RouteImport } from './routes/(gen)/params/$param58' +import { Route as genParamsParam57RouteImport } from './routes/(gen)/params/$param57' +import { Route as genParamsParam56RouteImport } from './routes/(gen)/params/$param56' +import { Route as genParamsParam55RouteImport } from './routes/(gen)/params/$param55' +import { Route as genParamsParam54RouteImport } from './routes/(gen)/params/$param54' +import { Route as genParamsParam53RouteImport } from './routes/(gen)/params/$param53' +import { Route as genParamsParam52RouteImport } from './routes/(gen)/params/$param52' +import { Route as genParamsParam51RouteImport } from './routes/(gen)/params/$param51' +import { Route as genParamsParam50RouteImport } from './routes/(gen)/params/$param50' +import { Route as genParamsParam5RouteImport } from './routes/(gen)/params/$param5' +import { Route as genParamsParam49RouteImport } from './routes/(gen)/params/$param49' +import { Route as genParamsParam48RouteImport } from './routes/(gen)/params/$param48' +import { Route as genParamsParam47RouteImport } from './routes/(gen)/params/$param47' +import { Route as genParamsParam46RouteImport } from './routes/(gen)/params/$param46' +import { Route as genParamsParam45RouteImport } from './routes/(gen)/params/$param45' +import { Route as genParamsParam44RouteImport } from './routes/(gen)/params/$param44' +import { Route as genParamsParam43RouteImport } from './routes/(gen)/params/$param43' +import { Route as genParamsParam42RouteImport } from './routes/(gen)/params/$param42' +import { Route as genParamsParam41RouteImport } from './routes/(gen)/params/$param41' +import { Route as genParamsParam40RouteImport } from './routes/(gen)/params/$param40' +import { Route as genParamsParam4RouteImport } from './routes/(gen)/params/$param4' +import { Route as genParamsParam39RouteImport } from './routes/(gen)/params/$param39' +import { Route as genParamsParam38RouteImport } from './routes/(gen)/params/$param38' +import { Route as genParamsParam37RouteImport } from './routes/(gen)/params/$param37' +import { Route as genParamsParam36RouteImport } from './routes/(gen)/params/$param36' +import { Route as genParamsParam35RouteImport } from './routes/(gen)/params/$param35' +import { Route as genParamsParam34RouteImport } from './routes/(gen)/params/$param34' +import { Route as genParamsParam33RouteImport } from './routes/(gen)/params/$param33' +import { Route as genParamsParam32RouteImport } from './routes/(gen)/params/$param32' +import { Route as genParamsParam31RouteImport } from './routes/(gen)/params/$param31' +import { Route as genParamsParam30RouteImport } from './routes/(gen)/params/$param30' +import { Route as genParamsParam3RouteImport } from './routes/(gen)/params/$param3' +import { Route as genParamsParam29RouteImport } from './routes/(gen)/params/$param29' +import { Route as genParamsParam28RouteImport } from './routes/(gen)/params/$param28' +import { Route as genParamsParam27RouteImport } from './routes/(gen)/params/$param27' +import { Route as genParamsParam26RouteImport } from './routes/(gen)/params/$param26' +import { Route as genParamsParam25RouteImport } from './routes/(gen)/params/$param25' +import { Route as genParamsParam24RouteImport } from './routes/(gen)/params/$param24' +import { Route as genParamsParam23RouteImport } from './routes/(gen)/params/$param23' +import { Route as genParamsParam22RouteImport } from './routes/(gen)/params/$param22' +import { Route as genParamsParam21RouteImport } from './routes/(gen)/params/$param21' +import { Route as genParamsParam20RouteImport } from './routes/(gen)/params/$param20' +import { Route as genParamsParam2RouteImport } from './routes/(gen)/params/$param2' +import { Route as genParamsParam19RouteImport } from './routes/(gen)/params/$param19' +import { Route as genParamsParam18RouteImport } from './routes/(gen)/params/$param18' +import { Route as genParamsParam17RouteImport } from './routes/(gen)/params/$param17' +import { Route as genParamsParam16RouteImport } from './routes/(gen)/params/$param16' +import { Route as genParamsParam15RouteImport } from './routes/(gen)/params/$param15' +import { Route as genParamsParam14RouteImport } from './routes/(gen)/params/$param14' +import { Route as genParamsParam13RouteImport } from './routes/(gen)/params/$param13' +import { Route as genParamsParam12RouteImport } from './routes/(gen)/params/$param12' +import { Route as genParamsParam11RouteImport } from './routes/(gen)/params/$param11' +import { Route as genParamsParam10RouteImport } from './routes/(gen)/params/$param10' +import { Route as genParamsParam1RouteImport } from './routes/(gen)/params/$param1' +import { Route as genParamsParam0RouteImport } from './routes/(gen)/params/$param0' // Create/Update Routes -const RelativeRoute = RelativeImport.update({ +const RelativeRoute = RelativeRouteImport.update({ id: '/relative', path: '/relative', getParentRoute: () => rootRoute, } as any) -const LinkPropsRoute = LinkPropsImport.update({ +const LinkPropsRoute = LinkPropsRouteImport.update({ id: '/linkProps', path: '/linkProps', getParentRoute: () => rootRoute, } as any) -const AbsoluteRoute = AbsoluteImport.update({ +const AbsoluteRoute = AbsoluteRouteImport.update({ id: '/absolute', path: '/absolute', getParentRoute: () => rootRoute, } as any) -const SearchRouteRoute = SearchRouteImport.update({ +const SearchRouteRoute = SearchRouteRouteImport.update({ id: '/search', path: '/search', getParentRoute: () => rootRoute, } as any) -const ParamsRouteRoute = ParamsRouteImport.update({ +const ParamsRouteRoute = ParamsRouteRouteImport.update({ id: '/params', path: '/params', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const SearchSearchPlaceholderRoute = SearchSearchPlaceholderImport.update({ +const SearchSearchPlaceholderRoute = SearchSearchPlaceholderRouteImport.update({ id: '/searchPlaceholder', path: '/searchPlaceholder', getParentRoute: () => SearchRouteRoute, } as any) -const ParamsParamsPlaceholderRoute = ParamsParamsPlaceholderImport.update({ +const ParamsParamsPlaceholderRoute = ParamsParamsPlaceholderRouteImport.update({ id: '/$paramsPlaceholder', path: '/$paramsPlaceholder', getParentRoute: () => ParamsRouteRoute, } as any) -// Populate the FileRoutesByPath interface +const genRelative99Route = genRelative99RouteImport.update({ + id: '/(gen)/relative99', + path: '/relative99', + getParentRoute: () => rootRoute, +} as any) -declare module '@tanstack/react-router' { - interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexImport - parentRoute: typeof rootRoute - } - '/params': { - id: '/params' - path: '/params' - fullPath: '/params' - preLoaderRoute: typeof ParamsRouteImport - parentRoute: typeof rootRoute - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport - parentRoute: typeof rootRoute - } - '/absolute': { - id: '/absolute' - path: '/absolute' - fullPath: '/absolute' - preLoaderRoute: typeof AbsoluteImport - parentRoute: typeof rootRoute - } - '/linkProps': { - id: '/linkProps' - path: '/linkProps' - fullPath: '/linkProps' - preLoaderRoute: typeof LinkPropsImport - parentRoute: typeof rootRoute - } - '/relative': { - id: '/relative' - path: '/relative' - fullPath: '/relative' - preLoaderRoute: typeof RelativeImport - parentRoute: typeof rootRoute - } - '/params/$paramsPlaceholder': { - id: '/params/$paramsPlaceholder' - path: '/$paramsPlaceholder' - fullPath: '/params/$paramsPlaceholder' - preLoaderRoute: typeof ParamsParamsPlaceholderImport - parentRoute: typeof ParamsRouteImport - } - '/search/searchPlaceholder': { - id: '/search/searchPlaceholder' - path: '/searchPlaceholder' - fullPath: '/search/searchPlaceholder' - preLoaderRoute: typeof SearchSearchPlaceholderImport - parentRoute: typeof SearchRouteImport - } - } -} +const genRelative98Route = genRelative98RouteImport.update({ + id: '/(gen)/relative98', + path: '/relative98', + getParentRoute: () => rootRoute, +} as any) -// Create and export the route tree +const genRelative97Route = genRelative97RouteImport.update({ + id: '/(gen)/relative97', + path: '/relative97', + getParentRoute: () => rootRoute, +} as any) -interface ParamsRouteRouteChildren { - ParamsParamsPlaceholderRoute: typeof ParamsParamsPlaceholderRoute -} +const genRelative96Route = genRelative96RouteImport.update({ + id: '/(gen)/relative96', + path: '/relative96', + getParentRoute: () => rootRoute, +} as any) -const ParamsRouteRouteChildren: ParamsRouteRouteChildren = { - ParamsParamsPlaceholderRoute: ParamsParamsPlaceholderRoute, -} +const genRelative95Route = genRelative95RouteImport.update({ + id: '/(gen)/relative95', + path: '/relative95', + getParentRoute: () => rootRoute, +} as any) -const ParamsRouteRouteWithChildren = ParamsRouteRoute._addFileChildren( - ParamsRouteRouteChildren, -) +const genRelative94Route = genRelative94RouteImport.update({ + id: '/(gen)/relative94', + path: '/relative94', + getParentRoute: () => rootRoute, +} as any) -interface SearchRouteRouteChildren { - SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute -} +const genRelative93Route = genRelative93RouteImport.update({ + id: '/(gen)/relative93', + path: '/relative93', + getParentRoute: () => rootRoute, +} as any) -const SearchRouteRouteChildren: SearchRouteRouteChildren = { - SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, -} +const genRelative92Route = genRelative92RouteImport.update({ + id: '/(gen)/relative92', + path: '/relative92', + getParentRoute: () => rootRoute, +} as any) -const SearchRouteRouteWithChildren = SearchRouteRoute._addFileChildren( - SearchRouteRouteChildren, -) +const genRelative91Route = genRelative91RouteImport.update({ + id: '/(gen)/relative91', + path: '/relative91', + getParentRoute: () => rootRoute, +} as any) -export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/params': typeof ParamsRouteRouteWithChildren - '/search': typeof SearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute -} +const genRelative90Route = genRelative90RouteImport.update({ + id: '/(gen)/relative90', + path: '/relative90', + getParentRoute: () => rootRoute, +} as any) -export interface FileRoutesByTo { - '/': typeof IndexRoute - '/params': typeof ParamsRouteRouteWithChildren - '/search': typeof SearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute -} +const genRelative9Route = genRelative9RouteImport.update({ + id: '/(gen)/relative9', + path: '/relative9', + getParentRoute: () => rootRoute, +} as any) -export interface FileRoutesById { - __root__: typeof rootRoute - '/': typeof IndexRoute - '/params': typeof ParamsRouteRouteWithChildren - '/search': typeof SearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute -} +const genRelative89Route = genRelative89RouteImport.update({ + id: '/(gen)/relative89', + path: '/relative89', + getParentRoute: () => rootRoute, +} as any) -export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - fileRoutesByTo: FileRoutesByTo - to: - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - id: - | '__root__' - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - fileRoutesById: FileRoutesById -} +const genRelative88Route = genRelative88RouteImport.update({ + id: '/(gen)/relative88', + path: '/relative88', + getParentRoute: () => rootRoute, +} as any) -export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - ParamsRouteRoute: typeof ParamsRouteRouteWithChildren - SearchRouteRoute: typeof SearchRouteRouteWithChildren - AbsoluteRoute: typeof AbsoluteRoute - LinkPropsRoute: typeof LinkPropsRoute - RelativeRoute: typeof RelativeRoute -} +const genRelative87Route = genRelative87RouteImport.update({ + id: '/(gen)/relative87', + path: '/relative87', + getParentRoute: () => rootRoute, +} as any) -const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - ParamsRouteRoute: ParamsRouteRouteWithChildren, - SearchRouteRoute: SearchRouteRouteWithChildren, - AbsoluteRoute: AbsoluteRoute, - LinkPropsRoute: LinkPropsRoute, - RelativeRoute: RelativeRoute, -} +const genRelative86Route = genRelative86RouteImport.update({ + id: '/(gen)/relative86', + path: '/relative86', + getParentRoute: () => rootRoute, +} as any) -export const routeTree = rootRoute - ._addFileChildren(rootRouteChildren) - ._addFileTypes() +const genRelative85Route = genRelative85RouteImport.update({ + id: '/(gen)/relative85', + path: '/relative85', + getParentRoute: () => rootRoute, +} as any) -/* ROUTE_MANIFEST_START -{ - "routes": { - "__root__": { - "filePath": "__root.tsx", - "children": [ - "/", - "/params", - "/search", - "/absolute", - "/linkProps", - "/relative" - ] - }, - "/": { - "filePath": "index.tsx" - }, - "/params": { - "filePath": "params/route.tsx", - "children": [ - "/params/$paramsPlaceholder" - ] - }, - "/search": { - "filePath": "search/route.tsx", - "children": [ - "/search/searchPlaceholder" - ] - }, - "/absolute": { - "filePath": "absolute.tsx" - }, - "/linkProps": { - "filePath": "linkProps.tsx" - }, - "/relative": { - "filePath": "relative.tsx" - }, - "/params/$paramsPlaceholder": { - "filePath": "params/$paramsPlaceholder.tsx", - "parent": "/params" - }, - "/search/searchPlaceholder": { - "filePath": "search/searchPlaceholder.tsx", - "parent": "/search" +const genRelative84Route = genRelative84RouteImport.update({ + id: '/(gen)/relative84', + path: '/relative84', + getParentRoute: () => rootRoute, +} as any) + +const genRelative83Route = genRelative83RouteImport.update({ + id: '/(gen)/relative83', + path: '/relative83', + getParentRoute: () => rootRoute, +} as any) + +const genRelative82Route = genRelative82RouteImport.update({ + id: '/(gen)/relative82', + path: '/relative82', + getParentRoute: () => rootRoute, +} as any) + +const genRelative81Route = genRelative81RouteImport.update({ + id: '/(gen)/relative81', + path: '/relative81', + getParentRoute: () => rootRoute, +} as any) + +const genRelative80Route = genRelative80RouteImport.update({ + id: '/(gen)/relative80', + path: '/relative80', + getParentRoute: () => rootRoute, +} as any) + +const genRelative8Route = genRelative8RouteImport.update({ + id: '/(gen)/relative8', + path: '/relative8', + getParentRoute: () => rootRoute, +} as any) + +const genRelative79Route = genRelative79RouteImport.update({ + id: '/(gen)/relative79', + path: '/relative79', + getParentRoute: () => rootRoute, +} as any) + +const genRelative78Route = genRelative78RouteImport.update({ + id: '/(gen)/relative78', + path: '/relative78', + getParentRoute: () => rootRoute, +} as any) + +const genRelative77Route = genRelative77RouteImport.update({ + id: '/(gen)/relative77', + path: '/relative77', + getParentRoute: () => rootRoute, +} as any) + +const genRelative76Route = genRelative76RouteImport.update({ + id: '/(gen)/relative76', + path: '/relative76', + getParentRoute: () => rootRoute, +} as any) + +const genRelative75Route = genRelative75RouteImport.update({ + id: '/(gen)/relative75', + path: '/relative75', + getParentRoute: () => rootRoute, +} as any) + +const genRelative74Route = genRelative74RouteImport.update({ + id: '/(gen)/relative74', + path: '/relative74', + getParentRoute: () => rootRoute, +} as any) + +const genRelative73Route = genRelative73RouteImport.update({ + id: '/(gen)/relative73', + path: '/relative73', + getParentRoute: () => rootRoute, +} as any) + +const genRelative72Route = genRelative72RouteImport.update({ + id: '/(gen)/relative72', + path: '/relative72', + getParentRoute: () => rootRoute, +} as any) + +const genRelative71Route = genRelative71RouteImport.update({ + id: '/(gen)/relative71', + path: '/relative71', + getParentRoute: () => rootRoute, +} as any) + +const genRelative70Route = genRelative70RouteImport.update({ + id: '/(gen)/relative70', + path: '/relative70', + getParentRoute: () => rootRoute, +} as any) + +const genRelative7Route = genRelative7RouteImport.update({ + id: '/(gen)/relative7', + path: '/relative7', + getParentRoute: () => rootRoute, +} as any) + +const genRelative69Route = genRelative69RouteImport.update({ + id: '/(gen)/relative69', + path: '/relative69', + getParentRoute: () => rootRoute, +} as any) + +const genRelative68Route = genRelative68RouteImport.update({ + id: '/(gen)/relative68', + path: '/relative68', + getParentRoute: () => rootRoute, +} as any) + +const genRelative67Route = genRelative67RouteImport.update({ + id: '/(gen)/relative67', + path: '/relative67', + getParentRoute: () => rootRoute, +} as any) + +const genRelative66Route = genRelative66RouteImport.update({ + id: '/(gen)/relative66', + path: '/relative66', + getParentRoute: () => rootRoute, +} as any) + +const genRelative65Route = genRelative65RouteImport.update({ + id: '/(gen)/relative65', + path: '/relative65', + getParentRoute: () => rootRoute, +} as any) + +const genRelative64Route = genRelative64RouteImport.update({ + id: '/(gen)/relative64', + path: '/relative64', + getParentRoute: () => rootRoute, +} as any) + +const genRelative63Route = genRelative63RouteImport.update({ + id: '/(gen)/relative63', + path: '/relative63', + getParentRoute: () => rootRoute, +} as any) + +const genRelative62Route = genRelative62RouteImport.update({ + id: '/(gen)/relative62', + path: '/relative62', + getParentRoute: () => rootRoute, +} as any) + +const genRelative61Route = genRelative61RouteImport.update({ + id: '/(gen)/relative61', + path: '/relative61', + getParentRoute: () => rootRoute, +} as any) + +const genRelative60Route = genRelative60RouteImport.update({ + id: '/(gen)/relative60', + path: '/relative60', + getParentRoute: () => rootRoute, +} as any) + +const genRelative6Route = genRelative6RouteImport.update({ + id: '/(gen)/relative6', + path: '/relative6', + getParentRoute: () => rootRoute, +} as any) + +const genRelative59Route = genRelative59RouteImport.update({ + id: '/(gen)/relative59', + path: '/relative59', + getParentRoute: () => rootRoute, +} as any) + +const genRelative58Route = genRelative58RouteImport.update({ + id: '/(gen)/relative58', + path: '/relative58', + getParentRoute: () => rootRoute, +} as any) + +const genRelative57Route = genRelative57RouteImport.update({ + id: '/(gen)/relative57', + path: '/relative57', + getParentRoute: () => rootRoute, +} as any) + +const genRelative56Route = genRelative56RouteImport.update({ + id: '/(gen)/relative56', + path: '/relative56', + getParentRoute: () => rootRoute, +} as any) + +const genRelative55Route = genRelative55RouteImport.update({ + id: '/(gen)/relative55', + path: '/relative55', + getParentRoute: () => rootRoute, +} as any) + +const genRelative54Route = genRelative54RouteImport.update({ + id: '/(gen)/relative54', + path: '/relative54', + getParentRoute: () => rootRoute, +} as any) + +const genRelative53Route = genRelative53RouteImport.update({ + id: '/(gen)/relative53', + path: '/relative53', + getParentRoute: () => rootRoute, +} as any) + +const genRelative52Route = genRelative52RouteImport.update({ + id: '/(gen)/relative52', + path: '/relative52', + getParentRoute: () => rootRoute, +} as any) + +const genRelative51Route = genRelative51RouteImport.update({ + id: '/(gen)/relative51', + path: '/relative51', + getParentRoute: () => rootRoute, +} as any) + +const genRelative50Route = genRelative50RouteImport.update({ + id: '/(gen)/relative50', + path: '/relative50', + getParentRoute: () => rootRoute, +} as any) + +const genRelative5Route = genRelative5RouteImport.update({ + id: '/(gen)/relative5', + path: '/relative5', + getParentRoute: () => rootRoute, +} as any) + +const genRelative49Route = genRelative49RouteImport.update({ + id: '/(gen)/relative49', + path: '/relative49', + getParentRoute: () => rootRoute, +} as any) + +const genRelative48Route = genRelative48RouteImport.update({ + id: '/(gen)/relative48', + path: '/relative48', + getParentRoute: () => rootRoute, +} as any) + +const genRelative47Route = genRelative47RouteImport.update({ + id: '/(gen)/relative47', + path: '/relative47', + getParentRoute: () => rootRoute, +} as any) + +const genRelative46Route = genRelative46RouteImport.update({ + id: '/(gen)/relative46', + path: '/relative46', + getParentRoute: () => rootRoute, +} as any) + +const genRelative45Route = genRelative45RouteImport.update({ + id: '/(gen)/relative45', + path: '/relative45', + getParentRoute: () => rootRoute, +} as any) + +const genRelative44Route = genRelative44RouteImport.update({ + id: '/(gen)/relative44', + path: '/relative44', + getParentRoute: () => rootRoute, +} as any) + +const genRelative43Route = genRelative43RouteImport.update({ + id: '/(gen)/relative43', + path: '/relative43', + getParentRoute: () => rootRoute, +} as any) + +const genRelative42Route = genRelative42RouteImport.update({ + id: '/(gen)/relative42', + path: '/relative42', + getParentRoute: () => rootRoute, +} as any) + +const genRelative41Route = genRelative41RouteImport.update({ + id: '/(gen)/relative41', + path: '/relative41', + getParentRoute: () => rootRoute, +} as any) + +const genRelative40Route = genRelative40RouteImport.update({ + id: '/(gen)/relative40', + path: '/relative40', + getParentRoute: () => rootRoute, +} as any) + +const genRelative4Route = genRelative4RouteImport.update({ + id: '/(gen)/relative4', + path: '/relative4', + getParentRoute: () => rootRoute, +} as any) + +const genRelative39Route = genRelative39RouteImport.update({ + id: '/(gen)/relative39', + path: '/relative39', + getParentRoute: () => rootRoute, +} as any) + +const genRelative38Route = genRelative38RouteImport.update({ + id: '/(gen)/relative38', + path: '/relative38', + getParentRoute: () => rootRoute, +} as any) + +const genRelative37Route = genRelative37RouteImport.update({ + id: '/(gen)/relative37', + path: '/relative37', + getParentRoute: () => rootRoute, +} as any) + +const genRelative36Route = genRelative36RouteImport.update({ + id: '/(gen)/relative36', + path: '/relative36', + getParentRoute: () => rootRoute, +} as any) + +const genRelative35Route = genRelative35RouteImport.update({ + id: '/(gen)/relative35', + path: '/relative35', + getParentRoute: () => rootRoute, +} as any) + +const genRelative34Route = genRelative34RouteImport.update({ + id: '/(gen)/relative34', + path: '/relative34', + getParentRoute: () => rootRoute, +} as any) + +const genRelative33Route = genRelative33RouteImport.update({ + id: '/(gen)/relative33', + path: '/relative33', + getParentRoute: () => rootRoute, +} as any) + +const genRelative32Route = genRelative32RouteImport.update({ + id: '/(gen)/relative32', + path: '/relative32', + getParentRoute: () => rootRoute, +} as any) + +const genRelative31Route = genRelative31RouteImport.update({ + id: '/(gen)/relative31', + path: '/relative31', + getParentRoute: () => rootRoute, +} as any) + +const genRelative30Route = genRelative30RouteImport.update({ + id: '/(gen)/relative30', + path: '/relative30', + getParentRoute: () => rootRoute, +} as any) + +const genRelative3Route = genRelative3RouteImport.update({ + id: '/(gen)/relative3', + path: '/relative3', + getParentRoute: () => rootRoute, +} as any) + +const genRelative29Route = genRelative29RouteImport.update({ + id: '/(gen)/relative29', + path: '/relative29', + getParentRoute: () => rootRoute, +} as any) + +const genRelative28Route = genRelative28RouteImport.update({ + id: '/(gen)/relative28', + path: '/relative28', + getParentRoute: () => rootRoute, +} as any) + +const genRelative27Route = genRelative27RouteImport.update({ + id: '/(gen)/relative27', + path: '/relative27', + getParentRoute: () => rootRoute, +} as any) + +const genRelative26Route = genRelative26RouteImport.update({ + id: '/(gen)/relative26', + path: '/relative26', + getParentRoute: () => rootRoute, +} as any) + +const genRelative25Route = genRelative25RouteImport.update({ + id: '/(gen)/relative25', + path: '/relative25', + getParentRoute: () => rootRoute, +} as any) + +const genRelative24Route = genRelative24RouteImport.update({ + id: '/(gen)/relative24', + path: '/relative24', + getParentRoute: () => rootRoute, +} as any) + +const genRelative23Route = genRelative23RouteImport.update({ + id: '/(gen)/relative23', + path: '/relative23', + getParentRoute: () => rootRoute, +} as any) + +const genRelative22Route = genRelative22RouteImport.update({ + id: '/(gen)/relative22', + path: '/relative22', + getParentRoute: () => rootRoute, +} as any) + +const genRelative21Route = genRelative21RouteImport.update({ + id: '/(gen)/relative21', + path: '/relative21', + getParentRoute: () => rootRoute, +} as any) + +const genRelative20Route = genRelative20RouteImport.update({ + id: '/(gen)/relative20', + path: '/relative20', + getParentRoute: () => rootRoute, +} as any) + +const genRelative2Route = genRelative2RouteImport.update({ + id: '/(gen)/relative2', + path: '/relative2', + getParentRoute: () => rootRoute, +} as any) + +const genRelative19Route = genRelative19RouteImport.update({ + id: '/(gen)/relative19', + path: '/relative19', + getParentRoute: () => rootRoute, +} as any) + +const genRelative18Route = genRelative18RouteImport.update({ + id: '/(gen)/relative18', + path: '/relative18', + getParentRoute: () => rootRoute, +} as any) + +const genRelative17Route = genRelative17RouteImport.update({ + id: '/(gen)/relative17', + path: '/relative17', + getParentRoute: () => rootRoute, +} as any) + +const genRelative16Route = genRelative16RouteImport.update({ + id: '/(gen)/relative16', + path: '/relative16', + getParentRoute: () => rootRoute, +} as any) + +const genRelative15Route = genRelative15RouteImport.update({ + id: '/(gen)/relative15', + path: '/relative15', + getParentRoute: () => rootRoute, +} as any) + +const genRelative14Route = genRelative14RouteImport.update({ + id: '/(gen)/relative14', + path: '/relative14', + getParentRoute: () => rootRoute, +} as any) + +const genRelative13Route = genRelative13RouteImport.update({ + id: '/(gen)/relative13', + path: '/relative13', + getParentRoute: () => rootRoute, +} as any) + +const genRelative12Route = genRelative12RouteImport.update({ + id: '/(gen)/relative12', + path: '/relative12', + getParentRoute: () => rootRoute, +} as any) + +const genRelative11Route = genRelative11RouteImport.update({ + id: '/(gen)/relative11', + path: '/relative11', + getParentRoute: () => rootRoute, +} as any) + +const genRelative10Route = genRelative10RouteImport.update({ + id: '/(gen)/relative10', + path: '/relative10', + getParentRoute: () => rootRoute, +} as any) + +const genRelative1Route = genRelative1RouteImport.update({ + id: '/(gen)/relative1', + path: '/relative1', + getParentRoute: () => rootRoute, +} as any) + +const genRelative0Route = genRelative0RouteImport.update({ + id: '/(gen)/relative0', + path: '/relative0', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute99Route = genAbsolute99RouteImport.update({ + id: '/(gen)/absolute99', + path: '/absolute99', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute98Route = genAbsolute98RouteImport.update({ + id: '/(gen)/absolute98', + path: '/absolute98', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute97Route = genAbsolute97RouteImport.update({ + id: '/(gen)/absolute97', + path: '/absolute97', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute96Route = genAbsolute96RouteImport.update({ + id: '/(gen)/absolute96', + path: '/absolute96', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute95Route = genAbsolute95RouteImport.update({ + id: '/(gen)/absolute95', + path: '/absolute95', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute94Route = genAbsolute94RouteImport.update({ + id: '/(gen)/absolute94', + path: '/absolute94', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute93Route = genAbsolute93RouteImport.update({ + id: '/(gen)/absolute93', + path: '/absolute93', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute92Route = genAbsolute92RouteImport.update({ + id: '/(gen)/absolute92', + path: '/absolute92', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute91Route = genAbsolute91RouteImport.update({ + id: '/(gen)/absolute91', + path: '/absolute91', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute90Route = genAbsolute90RouteImport.update({ + id: '/(gen)/absolute90', + path: '/absolute90', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute9Route = genAbsolute9RouteImport.update({ + id: '/(gen)/absolute9', + path: '/absolute9', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute89Route = genAbsolute89RouteImport.update({ + id: '/(gen)/absolute89', + path: '/absolute89', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute88Route = genAbsolute88RouteImport.update({ + id: '/(gen)/absolute88', + path: '/absolute88', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute87Route = genAbsolute87RouteImport.update({ + id: '/(gen)/absolute87', + path: '/absolute87', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute86Route = genAbsolute86RouteImport.update({ + id: '/(gen)/absolute86', + path: '/absolute86', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute85Route = genAbsolute85RouteImport.update({ + id: '/(gen)/absolute85', + path: '/absolute85', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute84Route = genAbsolute84RouteImport.update({ + id: '/(gen)/absolute84', + path: '/absolute84', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute83Route = genAbsolute83RouteImport.update({ + id: '/(gen)/absolute83', + path: '/absolute83', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute82Route = genAbsolute82RouteImport.update({ + id: '/(gen)/absolute82', + path: '/absolute82', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute81Route = genAbsolute81RouteImport.update({ + id: '/(gen)/absolute81', + path: '/absolute81', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute80Route = genAbsolute80RouteImport.update({ + id: '/(gen)/absolute80', + path: '/absolute80', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute8Route = genAbsolute8RouteImport.update({ + id: '/(gen)/absolute8', + path: '/absolute8', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute79Route = genAbsolute79RouteImport.update({ + id: '/(gen)/absolute79', + path: '/absolute79', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute78Route = genAbsolute78RouteImport.update({ + id: '/(gen)/absolute78', + path: '/absolute78', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute77Route = genAbsolute77RouteImport.update({ + id: '/(gen)/absolute77', + path: '/absolute77', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute76Route = genAbsolute76RouteImport.update({ + id: '/(gen)/absolute76', + path: '/absolute76', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute75Route = genAbsolute75RouteImport.update({ + id: '/(gen)/absolute75', + path: '/absolute75', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute74Route = genAbsolute74RouteImport.update({ + id: '/(gen)/absolute74', + path: '/absolute74', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute73Route = genAbsolute73RouteImport.update({ + id: '/(gen)/absolute73', + path: '/absolute73', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute72Route = genAbsolute72RouteImport.update({ + id: '/(gen)/absolute72', + path: '/absolute72', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute71Route = genAbsolute71RouteImport.update({ + id: '/(gen)/absolute71', + path: '/absolute71', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute70Route = genAbsolute70RouteImport.update({ + id: '/(gen)/absolute70', + path: '/absolute70', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute7Route = genAbsolute7RouteImport.update({ + id: '/(gen)/absolute7', + path: '/absolute7', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute69Route = genAbsolute69RouteImport.update({ + id: '/(gen)/absolute69', + path: '/absolute69', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute68Route = genAbsolute68RouteImport.update({ + id: '/(gen)/absolute68', + path: '/absolute68', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute67Route = genAbsolute67RouteImport.update({ + id: '/(gen)/absolute67', + path: '/absolute67', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute66Route = genAbsolute66RouteImport.update({ + id: '/(gen)/absolute66', + path: '/absolute66', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute65Route = genAbsolute65RouteImport.update({ + id: '/(gen)/absolute65', + path: '/absolute65', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute64Route = genAbsolute64RouteImport.update({ + id: '/(gen)/absolute64', + path: '/absolute64', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute63Route = genAbsolute63RouteImport.update({ + id: '/(gen)/absolute63', + path: '/absolute63', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute62Route = genAbsolute62RouteImport.update({ + id: '/(gen)/absolute62', + path: '/absolute62', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute61Route = genAbsolute61RouteImport.update({ + id: '/(gen)/absolute61', + path: '/absolute61', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute60Route = genAbsolute60RouteImport.update({ + id: '/(gen)/absolute60', + path: '/absolute60', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute6Route = genAbsolute6RouteImport.update({ + id: '/(gen)/absolute6', + path: '/absolute6', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute59Route = genAbsolute59RouteImport.update({ + id: '/(gen)/absolute59', + path: '/absolute59', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute58Route = genAbsolute58RouteImport.update({ + id: '/(gen)/absolute58', + path: '/absolute58', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute57Route = genAbsolute57RouteImport.update({ + id: '/(gen)/absolute57', + path: '/absolute57', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute56Route = genAbsolute56RouteImport.update({ + id: '/(gen)/absolute56', + path: '/absolute56', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute55Route = genAbsolute55RouteImport.update({ + id: '/(gen)/absolute55', + path: '/absolute55', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute54Route = genAbsolute54RouteImport.update({ + id: '/(gen)/absolute54', + path: '/absolute54', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute53Route = genAbsolute53RouteImport.update({ + id: '/(gen)/absolute53', + path: '/absolute53', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute52Route = genAbsolute52RouteImport.update({ + id: '/(gen)/absolute52', + path: '/absolute52', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute51Route = genAbsolute51RouteImport.update({ + id: '/(gen)/absolute51', + path: '/absolute51', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute50Route = genAbsolute50RouteImport.update({ + id: '/(gen)/absolute50', + path: '/absolute50', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute5Route = genAbsolute5RouteImport.update({ + id: '/(gen)/absolute5', + path: '/absolute5', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute49Route = genAbsolute49RouteImport.update({ + id: '/(gen)/absolute49', + path: '/absolute49', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute48Route = genAbsolute48RouteImport.update({ + id: '/(gen)/absolute48', + path: '/absolute48', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute47Route = genAbsolute47RouteImport.update({ + id: '/(gen)/absolute47', + path: '/absolute47', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute46Route = genAbsolute46RouteImport.update({ + id: '/(gen)/absolute46', + path: '/absolute46', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute45Route = genAbsolute45RouteImport.update({ + id: '/(gen)/absolute45', + path: '/absolute45', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute44Route = genAbsolute44RouteImport.update({ + id: '/(gen)/absolute44', + path: '/absolute44', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute43Route = genAbsolute43RouteImport.update({ + id: '/(gen)/absolute43', + path: '/absolute43', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute42Route = genAbsolute42RouteImport.update({ + id: '/(gen)/absolute42', + path: '/absolute42', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute41Route = genAbsolute41RouteImport.update({ + id: '/(gen)/absolute41', + path: '/absolute41', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute40Route = genAbsolute40RouteImport.update({ + id: '/(gen)/absolute40', + path: '/absolute40', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute4Route = genAbsolute4RouteImport.update({ + id: '/(gen)/absolute4', + path: '/absolute4', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute39Route = genAbsolute39RouteImport.update({ + id: '/(gen)/absolute39', + path: '/absolute39', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute38Route = genAbsolute38RouteImport.update({ + id: '/(gen)/absolute38', + path: '/absolute38', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute37Route = genAbsolute37RouteImport.update({ + id: '/(gen)/absolute37', + path: '/absolute37', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute36Route = genAbsolute36RouteImport.update({ + id: '/(gen)/absolute36', + path: '/absolute36', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute35Route = genAbsolute35RouteImport.update({ + id: '/(gen)/absolute35', + path: '/absolute35', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute34Route = genAbsolute34RouteImport.update({ + id: '/(gen)/absolute34', + path: '/absolute34', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute33Route = genAbsolute33RouteImport.update({ + id: '/(gen)/absolute33', + path: '/absolute33', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute32Route = genAbsolute32RouteImport.update({ + id: '/(gen)/absolute32', + path: '/absolute32', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute31Route = genAbsolute31RouteImport.update({ + id: '/(gen)/absolute31', + path: '/absolute31', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute30Route = genAbsolute30RouteImport.update({ + id: '/(gen)/absolute30', + path: '/absolute30', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute3Route = genAbsolute3RouteImport.update({ + id: '/(gen)/absolute3', + path: '/absolute3', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute29Route = genAbsolute29RouteImport.update({ + id: '/(gen)/absolute29', + path: '/absolute29', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute28Route = genAbsolute28RouteImport.update({ + id: '/(gen)/absolute28', + path: '/absolute28', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute27Route = genAbsolute27RouteImport.update({ + id: '/(gen)/absolute27', + path: '/absolute27', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute26Route = genAbsolute26RouteImport.update({ + id: '/(gen)/absolute26', + path: '/absolute26', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute25Route = genAbsolute25RouteImport.update({ + id: '/(gen)/absolute25', + path: '/absolute25', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute24Route = genAbsolute24RouteImport.update({ + id: '/(gen)/absolute24', + path: '/absolute24', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute23Route = genAbsolute23RouteImport.update({ + id: '/(gen)/absolute23', + path: '/absolute23', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute22Route = genAbsolute22RouteImport.update({ + id: '/(gen)/absolute22', + path: '/absolute22', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute21Route = genAbsolute21RouteImport.update({ + id: '/(gen)/absolute21', + path: '/absolute21', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute20Route = genAbsolute20RouteImport.update({ + id: '/(gen)/absolute20', + path: '/absolute20', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute2Route = genAbsolute2RouteImport.update({ + id: '/(gen)/absolute2', + path: '/absolute2', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute19Route = genAbsolute19RouteImport.update({ + id: '/(gen)/absolute19', + path: '/absolute19', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute18Route = genAbsolute18RouteImport.update({ + id: '/(gen)/absolute18', + path: '/absolute18', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute17Route = genAbsolute17RouteImport.update({ + id: '/(gen)/absolute17', + path: '/absolute17', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute16Route = genAbsolute16RouteImport.update({ + id: '/(gen)/absolute16', + path: '/absolute16', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute15Route = genAbsolute15RouteImport.update({ + id: '/(gen)/absolute15', + path: '/absolute15', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute14Route = genAbsolute14RouteImport.update({ + id: '/(gen)/absolute14', + path: '/absolute14', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute13Route = genAbsolute13RouteImport.update({ + id: '/(gen)/absolute13', + path: '/absolute13', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute12Route = genAbsolute12RouteImport.update({ + id: '/(gen)/absolute12', + path: '/absolute12', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute11Route = genAbsolute11RouteImport.update({ + id: '/(gen)/absolute11', + path: '/absolute11', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute10Route = genAbsolute10RouteImport.update({ + id: '/(gen)/absolute10', + path: '/absolute10', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute1Route = genAbsolute1RouteImport.update({ + id: '/(gen)/absolute1', + path: '/absolute1', + getParentRoute: () => rootRoute, +} as any) + +const genAbsolute0Route = genAbsolute0RouteImport.update({ + id: '/(gen)/absolute0', + path: '/absolute0', + getParentRoute: () => rootRoute, +} as any) + +const genSearchRouteRoute = genSearchRouteRouteImport.update({ + id: '/(gen)/search', + path: '/search', + getParentRoute: () => rootRoute, +} as any) + +const genParamsRouteRoute = genParamsRouteRouteImport.update({ + id: '/(gen)/params', + path: '/params', + getParentRoute: () => rootRoute, +} as any) + +const genSearchSearch99Route = genSearchSearch99RouteImport.update({ + id: '/search99', + path: '/search99', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch98Route = genSearchSearch98RouteImport.update({ + id: '/search98', + path: '/search98', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch97Route = genSearchSearch97RouteImport.update({ + id: '/search97', + path: '/search97', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch96Route = genSearchSearch96RouteImport.update({ + id: '/search96', + path: '/search96', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch95Route = genSearchSearch95RouteImport.update({ + id: '/search95', + path: '/search95', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch94Route = genSearchSearch94RouteImport.update({ + id: '/search94', + path: '/search94', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch93Route = genSearchSearch93RouteImport.update({ + id: '/search93', + path: '/search93', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch92Route = genSearchSearch92RouteImport.update({ + id: '/search92', + path: '/search92', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch91Route = genSearchSearch91RouteImport.update({ + id: '/search91', + path: '/search91', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch90Route = genSearchSearch90RouteImport.update({ + id: '/search90', + path: '/search90', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch9Route = genSearchSearch9RouteImport.update({ + id: '/search9', + path: '/search9', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch89Route = genSearchSearch89RouteImport.update({ + id: '/search89', + path: '/search89', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch88Route = genSearchSearch88RouteImport.update({ + id: '/search88', + path: '/search88', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch87Route = genSearchSearch87RouteImport.update({ + id: '/search87', + path: '/search87', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch86Route = genSearchSearch86RouteImport.update({ + id: '/search86', + path: '/search86', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch85Route = genSearchSearch85RouteImport.update({ + id: '/search85', + path: '/search85', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch84Route = genSearchSearch84RouteImport.update({ + id: '/search84', + path: '/search84', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch83Route = genSearchSearch83RouteImport.update({ + id: '/search83', + path: '/search83', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch82Route = genSearchSearch82RouteImport.update({ + id: '/search82', + path: '/search82', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch81Route = genSearchSearch81RouteImport.update({ + id: '/search81', + path: '/search81', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch80Route = genSearchSearch80RouteImport.update({ + id: '/search80', + path: '/search80', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch8Route = genSearchSearch8RouteImport.update({ + id: '/search8', + path: '/search8', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch79Route = genSearchSearch79RouteImport.update({ + id: '/search79', + path: '/search79', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch78Route = genSearchSearch78RouteImport.update({ + id: '/search78', + path: '/search78', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch77Route = genSearchSearch77RouteImport.update({ + id: '/search77', + path: '/search77', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch76Route = genSearchSearch76RouteImport.update({ + id: '/search76', + path: '/search76', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch75Route = genSearchSearch75RouteImport.update({ + id: '/search75', + path: '/search75', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch74Route = genSearchSearch74RouteImport.update({ + id: '/search74', + path: '/search74', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch73Route = genSearchSearch73RouteImport.update({ + id: '/search73', + path: '/search73', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch72Route = genSearchSearch72RouteImport.update({ + id: '/search72', + path: '/search72', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch71Route = genSearchSearch71RouteImport.update({ + id: '/search71', + path: '/search71', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch70Route = genSearchSearch70RouteImport.update({ + id: '/search70', + path: '/search70', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch7Route = genSearchSearch7RouteImport.update({ + id: '/search7', + path: '/search7', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch69Route = genSearchSearch69RouteImport.update({ + id: '/search69', + path: '/search69', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch68Route = genSearchSearch68RouteImport.update({ + id: '/search68', + path: '/search68', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch67Route = genSearchSearch67RouteImport.update({ + id: '/search67', + path: '/search67', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch66Route = genSearchSearch66RouteImport.update({ + id: '/search66', + path: '/search66', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch65Route = genSearchSearch65RouteImport.update({ + id: '/search65', + path: '/search65', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch64Route = genSearchSearch64RouteImport.update({ + id: '/search64', + path: '/search64', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch63Route = genSearchSearch63RouteImport.update({ + id: '/search63', + path: '/search63', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch62Route = genSearchSearch62RouteImport.update({ + id: '/search62', + path: '/search62', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch61Route = genSearchSearch61RouteImport.update({ + id: '/search61', + path: '/search61', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch60Route = genSearchSearch60RouteImport.update({ + id: '/search60', + path: '/search60', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch6Route = genSearchSearch6RouteImport.update({ + id: '/search6', + path: '/search6', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch59Route = genSearchSearch59RouteImport.update({ + id: '/search59', + path: '/search59', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch58Route = genSearchSearch58RouteImport.update({ + id: '/search58', + path: '/search58', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch57Route = genSearchSearch57RouteImport.update({ + id: '/search57', + path: '/search57', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch56Route = genSearchSearch56RouteImport.update({ + id: '/search56', + path: '/search56', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch55Route = genSearchSearch55RouteImport.update({ + id: '/search55', + path: '/search55', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch54Route = genSearchSearch54RouteImport.update({ + id: '/search54', + path: '/search54', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch53Route = genSearchSearch53RouteImport.update({ + id: '/search53', + path: '/search53', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch52Route = genSearchSearch52RouteImport.update({ + id: '/search52', + path: '/search52', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch51Route = genSearchSearch51RouteImport.update({ + id: '/search51', + path: '/search51', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch50Route = genSearchSearch50RouteImport.update({ + id: '/search50', + path: '/search50', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch5Route = genSearchSearch5RouteImport.update({ + id: '/search5', + path: '/search5', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch49Route = genSearchSearch49RouteImport.update({ + id: '/search49', + path: '/search49', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch48Route = genSearchSearch48RouteImport.update({ + id: '/search48', + path: '/search48', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch47Route = genSearchSearch47RouteImport.update({ + id: '/search47', + path: '/search47', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch46Route = genSearchSearch46RouteImport.update({ + id: '/search46', + path: '/search46', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch45Route = genSearchSearch45RouteImport.update({ + id: '/search45', + path: '/search45', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch44Route = genSearchSearch44RouteImport.update({ + id: '/search44', + path: '/search44', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch43Route = genSearchSearch43RouteImport.update({ + id: '/search43', + path: '/search43', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch42Route = genSearchSearch42RouteImport.update({ + id: '/search42', + path: '/search42', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch41Route = genSearchSearch41RouteImport.update({ + id: '/search41', + path: '/search41', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch40Route = genSearchSearch40RouteImport.update({ + id: '/search40', + path: '/search40', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch4Route = genSearchSearch4RouteImport.update({ + id: '/search4', + path: '/search4', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch39Route = genSearchSearch39RouteImport.update({ + id: '/search39', + path: '/search39', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch38Route = genSearchSearch38RouteImport.update({ + id: '/search38', + path: '/search38', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch37Route = genSearchSearch37RouteImport.update({ + id: '/search37', + path: '/search37', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch36Route = genSearchSearch36RouteImport.update({ + id: '/search36', + path: '/search36', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch35Route = genSearchSearch35RouteImport.update({ + id: '/search35', + path: '/search35', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch34Route = genSearchSearch34RouteImport.update({ + id: '/search34', + path: '/search34', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch33Route = genSearchSearch33RouteImport.update({ + id: '/search33', + path: '/search33', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch32Route = genSearchSearch32RouteImport.update({ + id: '/search32', + path: '/search32', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch31Route = genSearchSearch31RouteImport.update({ + id: '/search31', + path: '/search31', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch30Route = genSearchSearch30RouteImport.update({ + id: '/search30', + path: '/search30', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch3Route = genSearchSearch3RouteImport.update({ + id: '/search3', + path: '/search3', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch29Route = genSearchSearch29RouteImport.update({ + id: '/search29', + path: '/search29', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch28Route = genSearchSearch28RouteImport.update({ + id: '/search28', + path: '/search28', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch27Route = genSearchSearch27RouteImport.update({ + id: '/search27', + path: '/search27', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch26Route = genSearchSearch26RouteImport.update({ + id: '/search26', + path: '/search26', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch25Route = genSearchSearch25RouteImport.update({ + id: '/search25', + path: '/search25', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch24Route = genSearchSearch24RouteImport.update({ + id: '/search24', + path: '/search24', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch23Route = genSearchSearch23RouteImport.update({ + id: '/search23', + path: '/search23', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch22Route = genSearchSearch22RouteImport.update({ + id: '/search22', + path: '/search22', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch21Route = genSearchSearch21RouteImport.update({ + id: '/search21', + path: '/search21', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch20Route = genSearchSearch20RouteImport.update({ + id: '/search20', + path: '/search20', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch2Route = genSearchSearch2RouteImport.update({ + id: '/search2', + path: '/search2', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch19Route = genSearchSearch19RouteImport.update({ + id: '/search19', + path: '/search19', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch18Route = genSearchSearch18RouteImport.update({ + id: '/search18', + path: '/search18', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch17Route = genSearchSearch17RouteImport.update({ + id: '/search17', + path: '/search17', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch16Route = genSearchSearch16RouteImport.update({ + id: '/search16', + path: '/search16', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch15Route = genSearchSearch15RouteImport.update({ + id: '/search15', + path: '/search15', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch14Route = genSearchSearch14RouteImport.update({ + id: '/search14', + path: '/search14', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch13Route = genSearchSearch13RouteImport.update({ + id: '/search13', + path: '/search13', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch12Route = genSearchSearch12RouteImport.update({ + id: '/search12', + path: '/search12', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch11Route = genSearchSearch11RouteImport.update({ + id: '/search11', + path: '/search11', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch10Route = genSearchSearch10RouteImport.update({ + id: '/search10', + path: '/search10', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch1Route = genSearchSearch1RouteImport.update({ + id: '/search1', + path: '/search1', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genSearchSearch0Route = genSearchSearch0RouteImport.update({ + id: '/search0', + path: '/search0', + getParentRoute: () => genSearchRouteRoute, +} as any) + +const genParamsParam99Route = genParamsParam99RouteImport.update({ + id: '/$param99', + path: '/$param99', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam98Route = genParamsParam98RouteImport.update({ + id: '/$param98', + path: '/$param98', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam97Route = genParamsParam97RouteImport.update({ + id: '/$param97', + path: '/$param97', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam96Route = genParamsParam96RouteImport.update({ + id: '/$param96', + path: '/$param96', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam95Route = genParamsParam95RouteImport.update({ + id: '/$param95', + path: '/$param95', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam94Route = genParamsParam94RouteImport.update({ + id: '/$param94', + path: '/$param94', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam93Route = genParamsParam93RouteImport.update({ + id: '/$param93', + path: '/$param93', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam92Route = genParamsParam92RouteImport.update({ + id: '/$param92', + path: '/$param92', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam91Route = genParamsParam91RouteImport.update({ + id: '/$param91', + path: '/$param91', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam90Route = genParamsParam90RouteImport.update({ + id: '/$param90', + path: '/$param90', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam9Route = genParamsParam9RouteImport.update({ + id: '/$param9', + path: '/$param9', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam89Route = genParamsParam89RouteImport.update({ + id: '/$param89', + path: '/$param89', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam88Route = genParamsParam88RouteImport.update({ + id: '/$param88', + path: '/$param88', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam87Route = genParamsParam87RouteImport.update({ + id: '/$param87', + path: '/$param87', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam86Route = genParamsParam86RouteImport.update({ + id: '/$param86', + path: '/$param86', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam85Route = genParamsParam85RouteImport.update({ + id: '/$param85', + path: '/$param85', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam84Route = genParamsParam84RouteImport.update({ + id: '/$param84', + path: '/$param84', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam83Route = genParamsParam83RouteImport.update({ + id: '/$param83', + path: '/$param83', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam82Route = genParamsParam82RouteImport.update({ + id: '/$param82', + path: '/$param82', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam81Route = genParamsParam81RouteImport.update({ + id: '/$param81', + path: '/$param81', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam80Route = genParamsParam80RouteImport.update({ + id: '/$param80', + path: '/$param80', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam8Route = genParamsParam8RouteImport.update({ + id: '/$param8', + path: '/$param8', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam79Route = genParamsParam79RouteImport.update({ + id: '/$param79', + path: '/$param79', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam78Route = genParamsParam78RouteImport.update({ + id: '/$param78', + path: '/$param78', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam77Route = genParamsParam77RouteImport.update({ + id: '/$param77', + path: '/$param77', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam76Route = genParamsParam76RouteImport.update({ + id: '/$param76', + path: '/$param76', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam75Route = genParamsParam75RouteImport.update({ + id: '/$param75', + path: '/$param75', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam74Route = genParamsParam74RouteImport.update({ + id: '/$param74', + path: '/$param74', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam73Route = genParamsParam73RouteImport.update({ + id: '/$param73', + path: '/$param73', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam72Route = genParamsParam72RouteImport.update({ + id: '/$param72', + path: '/$param72', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam71Route = genParamsParam71RouteImport.update({ + id: '/$param71', + path: '/$param71', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam70Route = genParamsParam70RouteImport.update({ + id: '/$param70', + path: '/$param70', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam7Route = genParamsParam7RouteImport.update({ + id: '/$param7', + path: '/$param7', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam69Route = genParamsParam69RouteImport.update({ + id: '/$param69', + path: '/$param69', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam68Route = genParamsParam68RouteImport.update({ + id: '/$param68', + path: '/$param68', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam67Route = genParamsParam67RouteImport.update({ + id: '/$param67', + path: '/$param67', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam66Route = genParamsParam66RouteImport.update({ + id: '/$param66', + path: '/$param66', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam65Route = genParamsParam65RouteImport.update({ + id: '/$param65', + path: '/$param65', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam64Route = genParamsParam64RouteImport.update({ + id: '/$param64', + path: '/$param64', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam63Route = genParamsParam63RouteImport.update({ + id: '/$param63', + path: '/$param63', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam62Route = genParamsParam62RouteImport.update({ + id: '/$param62', + path: '/$param62', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam61Route = genParamsParam61RouteImport.update({ + id: '/$param61', + path: '/$param61', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam60Route = genParamsParam60RouteImport.update({ + id: '/$param60', + path: '/$param60', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam6Route = genParamsParam6RouteImport.update({ + id: '/$param6', + path: '/$param6', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam59Route = genParamsParam59RouteImport.update({ + id: '/$param59', + path: '/$param59', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam58Route = genParamsParam58RouteImport.update({ + id: '/$param58', + path: '/$param58', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam57Route = genParamsParam57RouteImport.update({ + id: '/$param57', + path: '/$param57', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam56Route = genParamsParam56RouteImport.update({ + id: '/$param56', + path: '/$param56', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam55Route = genParamsParam55RouteImport.update({ + id: '/$param55', + path: '/$param55', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam54Route = genParamsParam54RouteImport.update({ + id: '/$param54', + path: '/$param54', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam53Route = genParamsParam53RouteImport.update({ + id: '/$param53', + path: '/$param53', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam52Route = genParamsParam52RouteImport.update({ + id: '/$param52', + path: '/$param52', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam51Route = genParamsParam51RouteImport.update({ + id: '/$param51', + path: '/$param51', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam50Route = genParamsParam50RouteImport.update({ + id: '/$param50', + path: '/$param50', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam5Route = genParamsParam5RouteImport.update({ + id: '/$param5', + path: '/$param5', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam49Route = genParamsParam49RouteImport.update({ + id: '/$param49', + path: '/$param49', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam48Route = genParamsParam48RouteImport.update({ + id: '/$param48', + path: '/$param48', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam47Route = genParamsParam47RouteImport.update({ + id: '/$param47', + path: '/$param47', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam46Route = genParamsParam46RouteImport.update({ + id: '/$param46', + path: '/$param46', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam45Route = genParamsParam45RouteImport.update({ + id: '/$param45', + path: '/$param45', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam44Route = genParamsParam44RouteImport.update({ + id: '/$param44', + path: '/$param44', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam43Route = genParamsParam43RouteImport.update({ + id: '/$param43', + path: '/$param43', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam42Route = genParamsParam42RouteImport.update({ + id: '/$param42', + path: '/$param42', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam41Route = genParamsParam41RouteImport.update({ + id: '/$param41', + path: '/$param41', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam40Route = genParamsParam40RouteImport.update({ + id: '/$param40', + path: '/$param40', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam4Route = genParamsParam4RouteImport.update({ + id: '/$param4', + path: '/$param4', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam39Route = genParamsParam39RouteImport.update({ + id: '/$param39', + path: '/$param39', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam38Route = genParamsParam38RouteImport.update({ + id: '/$param38', + path: '/$param38', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam37Route = genParamsParam37RouteImport.update({ + id: '/$param37', + path: '/$param37', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam36Route = genParamsParam36RouteImport.update({ + id: '/$param36', + path: '/$param36', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam35Route = genParamsParam35RouteImport.update({ + id: '/$param35', + path: '/$param35', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam34Route = genParamsParam34RouteImport.update({ + id: '/$param34', + path: '/$param34', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam33Route = genParamsParam33RouteImport.update({ + id: '/$param33', + path: '/$param33', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam32Route = genParamsParam32RouteImport.update({ + id: '/$param32', + path: '/$param32', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam31Route = genParamsParam31RouteImport.update({ + id: '/$param31', + path: '/$param31', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam30Route = genParamsParam30RouteImport.update({ + id: '/$param30', + path: '/$param30', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam3Route = genParamsParam3RouteImport.update({ + id: '/$param3', + path: '/$param3', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam29Route = genParamsParam29RouteImport.update({ + id: '/$param29', + path: '/$param29', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam28Route = genParamsParam28RouteImport.update({ + id: '/$param28', + path: '/$param28', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam27Route = genParamsParam27RouteImport.update({ + id: '/$param27', + path: '/$param27', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam26Route = genParamsParam26RouteImport.update({ + id: '/$param26', + path: '/$param26', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam25Route = genParamsParam25RouteImport.update({ + id: '/$param25', + path: '/$param25', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam24Route = genParamsParam24RouteImport.update({ + id: '/$param24', + path: '/$param24', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam23Route = genParamsParam23RouteImport.update({ + id: '/$param23', + path: '/$param23', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam22Route = genParamsParam22RouteImport.update({ + id: '/$param22', + path: '/$param22', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam21Route = genParamsParam21RouteImport.update({ + id: '/$param21', + path: '/$param21', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam20Route = genParamsParam20RouteImport.update({ + id: '/$param20', + path: '/$param20', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam2Route = genParamsParam2RouteImport.update({ + id: '/$param2', + path: '/$param2', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam19Route = genParamsParam19RouteImport.update({ + id: '/$param19', + path: '/$param19', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam18Route = genParamsParam18RouteImport.update({ + id: '/$param18', + path: '/$param18', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam17Route = genParamsParam17RouteImport.update({ + id: '/$param17', + path: '/$param17', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam16Route = genParamsParam16RouteImport.update({ + id: '/$param16', + path: '/$param16', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam15Route = genParamsParam15RouteImport.update({ + id: '/$param15', + path: '/$param15', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam14Route = genParamsParam14RouteImport.update({ + id: '/$param14', + path: '/$param14', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam13Route = genParamsParam13RouteImport.update({ + id: '/$param13', + path: '/$param13', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam12Route = genParamsParam12RouteImport.update({ + id: '/$param12', + path: '/$param12', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam11Route = genParamsParam11RouteImport.update({ + id: '/$param11', + path: '/$param11', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam10Route = genParamsParam10RouteImport.update({ + id: '/$param10', + path: '/$param10', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam1Route = genParamsParam1RouteImport.update({ + id: '/$param1', + path: '/$param1', + getParentRoute: () => genParamsRouteRoute, +} as any) + +const genParamsParam0Route = genParamsParam0RouteImport.update({ + id: '/$param0', + path: '/$param0', + getParentRoute: () => genParamsRouteRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + '/params': { + id: '/params' + path: '/params' + fullPath: '/params' + preLoaderRoute: typeof ParamsRouteRouteImport + parentRoute: typeof rootRoute + } + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteRouteImport + parentRoute: typeof rootRoute + } + '/absolute': { + id: '/absolute' + path: '/absolute' + fullPath: '/absolute' + preLoaderRoute: typeof AbsoluteRouteImport + parentRoute: typeof rootRoute + } + '/linkProps': { + id: '/linkProps' + path: '/linkProps' + fullPath: '/linkProps' + preLoaderRoute: typeof LinkPropsRouteImport + parentRoute: typeof rootRoute + } + '/relative': { + id: '/relative' + path: '/relative' + fullPath: '/relative' + preLoaderRoute: typeof RelativeRouteImport + parentRoute: typeof rootRoute + } + '/(gen)/params': { + id: '/(gen)/params' + path: '/params' + fullPath: '/params' + preLoaderRoute: typeof genParamsRouteRouteImport + parentRoute: typeof rootRoute + } + '/(gen)/search': { + id: '/(gen)/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof genSearchRouteRouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute0': { + id: '/(gen)/absolute0' + path: '/absolute0' + fullPath: '/absolute0' + preLoaderRoute: typeof genAbsolute0RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute1': { + id: '/(gen)/absolute1' + path: '/absolute1' + fullPath: '/absolute1' + preLoaderRoute: typeof genAbsolute1RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute10': { + id: '/(gen)/absolute10' + path: '/absolute10' + fullPath: '/absolute10' + preLoaderRoute: typeof genAbsolute10RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute11': { + id: '/(gen)/absolute11' + path: '/absolute11' + fullPath: '/absolute11' + preLoaderRoute: typeof genAbsolute11RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute12': { + id: '/(gen)/absolute12' + path: '/absolute12' + fullPath: '/absolute12' + preLoaderRoute: typeof genAbsolute12RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute13': { + id: '/(gen)/absolute13' + path: '/absolute13' + fullPath: '/absolute13' + preLoaderRoute: typeof genAbsolute13RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute14': { + id: '/(gen)/absolute14' + path: '/absolute14' + fullPath: '/absolute14' + preLoaderRoute: typeof genAbsolute14RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute15': { + id: '/(gen)/absolute15' + path: '/absolute15' + fullPath: '/absolute15' + preLoaderRoute: typeof genAbsolute15RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute16': { + id: '/(gen)/absolute16' + path: '/absolute16' + fullPath: '/absolute16' + preLoaderRoute: typeof genAbsolute16RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute17': { + id: '/(gen)/absolute17' + path: '/absolute17' + fullPath: '/absolute17' + preLoaderRoute: typeof genAbsolute17RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute18': { + id: '/(gen)/absolute18' + path: '/absolute18' + fullPath: '/absolute18' + preLoaderRoute: typeof genAbsolute18RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute19': { + id: '/(gen)/absolute19' + path: '/absolute19' + fullPath: '/absolute19' + preLoaderRoute: typeof genAbsolute19RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute2': { + id: '/(gen)/absolute2' + path: '/absolute2' + fullPath: '/absolute2' + preLoaderRoute: typeof genAbsolute2RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute20': { + id: '/(gen)/absolute20' + path: '/absolute20' + fullPath: '/absolute20' + preLoaderRoute: typeof genAbsolute20RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute21': { + id: '/(gen)/absolute21' + path: '/absolute21' + fullPath: '/absolute21' + preLoaderRoute: typeof genAbsolute21RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute22': { + id: '/(gen)/absolute22' + path: '/absolute22' + fullPath: '/absolute22' + preLoaderRoute: typeof genAbsolute22RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute23': { + id: '/(gen)/absolute23' + path: '/absolute23' + fullPath: '/absolute23' + preLoaderRoute: typeof genAbsolute23RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute24': { + id: '/(gen)/absolute24' + path: '/absolute24' + fullPath: '/absolute24' + preLoaderRoute: typeof genAbsolute24RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute25': { + id: '/(gen)/absolute25' + path: '/absolute25' + fullPath: '/absolute25' + preLoaderRoute: typeof genAbsolute25RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute26': { + id: '/(gen)/absolute26' + path: '/absolute26' + fullPath: '/absolute26' + preLoaderRoute: typeof genAbsolute26RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute27': { + id: '/(gen)/absolute27' + path: '/absolute27' + fullPath: '/absolute27' + preLoaderRoute: typeof genAbsolute27RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute28': { + id: '/(gen)/absolute28' + path: '/absolute28' + fullPath: '/absolute28' + preLoaderRoute: typeof genAbsolute28RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute29': { + id: '/(gen)/absolute29' + path: '/absolute29' + fullPath: '/absolute29' + preLoaderRoute: typeof genAbsolute29RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute3': { + id: '/(gen)/absolute3' + path: '/absolute3' + fullPath: '/absolute3' + preLoaderRoute: typeof genAbsolute3RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute30': { + id: '/(gen)/absolute30' + path: '/absolute30' + fullPath: '/absolute30' + preLoaderRoute: typeof genAbsolute30RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute31': { + id: '/(gen)/absolute31' + path: '/absolute31' + fullPath: '/absolute31' + preLoaderRoute: typeof genAbsolute31RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute32': { + id: '/(gen)/absolute32' + path: '/absolute32' + fullPath: '/absolute32' + preLoaderRoute: typeof genAbsolute32RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute33': { + id: '/(gen)/absolute33' + path: '/absolute33' + fullPath: '/absolute33' + preLoaderRoute: typeof genAbsolute33RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute34': { + id: '/(gen)/absolute34' + path: '/absolute34' + fullPath: '/absolute34' + preLoaderRoute: typeof genAbsolute34RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute35': { + id: '/(gen)/absolute35' + path: '/absolute35' + fullPath: '/absolute35' + preLoaderRoute: typeof genAbsolute35RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute36': { + id: '/(gen)/absolute36' + path: '/absolute36' + fullPath: '/absolute36' + preLoaderRoute: typeof genAbsolute36RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute37': { + id: '/(gen)/absolute37' + path: '/absolute37' + fullPath: '/absolute37' + preLoaderRoute: typeof genAbsolute37RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute38': { + id: '/(gen)/absolute38' + path: '/absolute38' + fullPath: '/absolute38' + preLoaderRoute: typeof genAbsolute38RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute39': { + id: '/(gen)/absolute39' + path: '/absolute39' + fullPath: '/absolute39' + preLoaderRoute: typeof genAbsolute39RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute4': { + id: '/(gen)/absolute4' + path: '/absolute4' + fullPath: '/absolute4' + preLoaderRoute: typeof genAbsolute4RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute40': { + id: '/(gen)/absolute40' + path: '/absolute40' + fullPath: '/absolute40' + preLoaderRoute: typeof genAbsolute40RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute41': { + id: '/(gen)/absolute41' + path: '/absolute41' + fullPath: '/absolute41' + preLoaderRoute: typeof genAbsolute41RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute42': { + id: '/(gen)/absolute42' + path: '/absolute42' + fullPath: '/absolute42' + preLoaderRoute: typeof genAbsolute42RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute43': { + id: '/(gen)/absolute43' + path: '/absolute43' + fullPath: '/absolute43' + preLoaderRoute: typeof genAbsolute43RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute44': { + id: '/(gen)/absolute44' + path: '/absolute44' + fullPath: '/absolute44' + preLoaderRoute: typeof genAbsolute44RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute45': { + id: '/(gen)/absolute45' + path: '/absolute45' + fullPath: '/absolute45' + preLoaderRoute: typeof genAbsolute45RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute46': { + id: '/(gen)/absolute46' + path: '/absolute46' + fullPath: '/absolute46' + preLoaderRoute: typeof genAbsolute46RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute47': { + id: '/(gen)/absolute47' + path: '/absolute47' + fullPath: '/absolute47' + preLoaderRoute: typeof genAbsolute47RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute48': { + id: '/(gen)/absolute48' + path: '/absolute48' + fullPath: '/absolute48' + preLoaderRoute: typeof genAbsolute48RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute49': { + id: '/(gen)/absolute49' + path: '/absolute49' + fullPath: '/absolute49' + preLoaderRoute: typeof genAbsolute49RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute5': { + id: '/(gen)/absolute5' + path: '/absolute5' + fullPath: '/absolute5' + preLoaderRoute: typeof genAbsolute5RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute50': { + id: '/(gen)/absolute50' + path: '/absolute50' + fullPath: '/absolute50' + preLoaderRoute: typeof genAbsolute50RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute51': { + id: '/(gen)/absolute51' + path: '/absolute51' + fullPath: '/absolute51' + preLoaderRoute: typeof genAbsolute51RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute52': { + id: '/(gen)/absolute52' + path: '/absolute52' + fullPath: '/absolute52' + preLoaderRoute: typeof genAbsolute52RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute53': { + id: '/(gen)/absolute53' + path: '/absolute53' + fullPath: '/absolute53' + preLoaderRoute: typeof genAbsolute53RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute54': { + id: '/(gen)/absolute54' + path: '/absolute54' + fullPath: '/absolute54' + preLoaderRoute: typeof genAbsolute54RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute55': { + id: '/(gen)/absolute55' + path: '/absolute55' + fullPath: '/absolute55' + preLoaderRoute: typeof genAbsolute55RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute56': { + id: '/(gen)/absolute56' + path: '/absolute56' + fullPath: '/absolute56' + preLoaderRoute: typeof genAbsolute56RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute57': { + id: '/(gen)/absolute57' + path: '/absolute57' + fullPath: '/absolute57' + preLoaderRoute: typeof genAbsolute57RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute58': { + id: '/(gen)/absolute58' + path: '/absolute58' + fullPath: '/absolute58' + preLoaderRoute: typeof genAbsolute58RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute59': { + id: '/(gen)/absolute59' + path: '/absolute59' + fullPath: '/absolute59' + preLoaderRoute: typeof genAbsolute59RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute6': { + id: '/(gen)/absolute6' + path: '/absolute6' + fullPath: '/absolute6' + preLoaderRoute: typeof genAbsolute6RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute60': { + id: '/(gen)/absolute60' + path: '/absolute60' + fullPath: '/absolute60' + preLoaderRoute: typeof genAbsolute60RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute61': { + id: '/(gen)/absolute61' + path: '/absolute61' + fullPath: '/absolute61' + preLoaderRoute: typeof genAbsolute61RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute62': { + id: '/(gen)/absolute62' + path: '/absolute62' + fullPath: '/absolute62' + preLoaderRoute: typeof genAbsolute62RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute63': { + id: '/(gen)/absolute63' + path: '/absolute63' + fullPath: '/absolute63' + preLoaderRoute: typeof genAbsolute63RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute64': { + id: '/(gen)/absolute64' + path: '/absolute64' + fullPath: '/absolute64' + preLoaderRoute: typeof genAbsolute64RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute65': { + id: '/(gen)/absolute65' + path: '/absolute65' + fullPath: '/absolute65' + preLoaderRoute: typeof genAbsolute65RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute66': { + id: '/(gen)/absolute66' + path: '/absolute66' + fullPath: '/absolute66' + preLoaderRoute: typeof genAbsolute66RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute67': { + id: '/(gen)/absolute67' + path: '/absolute67' + fullPath: '/absolute67' + preLoaderRoute: typeof genAbsolute67RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute68': { + id: '/(gen)/absolute68' + path: '/absolute68' + fullPath: '/absolute68' + preLoaderRoute: typeof genAbsolute68RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute69': { + id: '/(gen)/absolute69' + path: '/absolute69' + fullPath: '/absolute69' + preLoaderRoute: typeof genAbsolute69RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute7': { + id: '/(gen)/absolute7' + path: '/absolute7' + fullPath: '/absolute7' + preLoaderRoute: typeof genAbsolute7RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute70': { + id: '/(gen)/absolute70' + path: '/absolute70' + fullPath: '/absolute70' + preLoaderRoute: typeof genAbsolute70RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute71': { + id: '/(gen)/absolute71' + path: '/absolute71' + fullPath: '/absolute71' + preLoaderRoute: typeof genAbsolute71RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute72': { + id: '/(gen)/absolute72' + path: '/absolute72' + fullPath: '/absolute72' + preLoaderRoute: typeof genAbsolute72RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute73': { + id: '/(gen)/absolute73' + path: '/absolute73' + fullPath: '/absolute73' + preLoaderRoute: typeof genAbsolute73RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute74': { + id: '/(gen)/absolute74' + path: '/absolute74' + fullPath: '/absolute74' + preLoaderRoute: typeof genAbsolute74RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute75': { + id: '/(gen)/absolute75' + path: '/absolute75' + fullPath: '/absolute75' + preLoaderRoute: typeof genAbsolute75RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute76': { + id: '/(gen)/absolute76' + path: '/absolute76' + fullPath: '/absolute76' + preLoaderRoute: typeof genAbsolute76RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute77': { + id: '/(gen)/absolute77' + path: '/absolute77' + fullPath: '/absolute77' + preLoaderRoute: typeof genAbsolute77RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute78': { + id: '/(gen)/absolute78' + path: '/absolute78' + fullPath: '/absolute78' + preLoaderRoute: typeof genAbsolute78RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute79': { + id: '/(gen)/absolute79' + path: '/absolute79' + fullPath: '/absolute79' + preLoaderRoute: typeof genAbsolute79RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute8': { + id: '/(gen)/absolute8' + path: '/absolute8' + fullPath: '/absolute8' + preLoaderRoute: typeof genAbsolute8RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute80': { + id: '/(gen)/absolute80' + path: '/absolute80' + fullPath: '/absolute80' + preLoaderRoute: typeof genAbsolute80RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute81': { + id: '/(gen)/absolute81' + path: '/absolute81' + fullPath: '/absolute81' + preLoaderRoute: typeof genAbsolute81RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute82': { + id: '/(gen)/absolute82' + path: '/absolute82' + fullPath: '/absolute82' + preLoaderRoute: typeof genAbsolute82RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute83': { + id: '/(gen)/absolute83' + path: '/absolute83' + fullPath: '/absolute83' + preLoaderRoute: typeof genAbsolute83RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute84': { + id: '/(gen)/absolute84' + path: '/absolute84' + fullPath: '/absolute84' + preLoaderRoute: typeof genAbsolute84RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute85': { + id: '/(gen)/absolute85' + path: '/absolute85' + fullPath: '/absolute85' + preLoaderRoute: typeof genAbsolute85RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute86': { + id: '/(gen)/absolute86' + path: '/absolute86' + fullPath: '/absolute86' + preLoaderRoute: typeof genAbsolute86RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute87': { + id: '/(gen)/absolute87' + path: '/absolute87' + fullPath: '/absolute87' + preLoaderRoute: typeof genAbsolute87RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute88': { + id: '/(gen)/absolute88' + path: '/absolute88' + fullPath: '/absolute88' + preLoaderRoute: typeof genAbsolute88RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute89': { + id: '/(gen)/absolute89' + path: '/absolute89' + fullPath: '/absolute89' + preLoaderRoute: typeof genAbsolute89RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute9': { + id: '/(gen)/absolute9' + path: '/absolute9' + fullPath: '/absolute9' + preLoaderRoute: typeof genAbsolute9RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute90': { + id: '/(gen)/absolute90' + path: '/absolute90' + fullPath: '/absolute90' + preLoaderRoute: typeof genAbsolute90RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute91': { + id: '/(gen)/absolute91' + path: '/absolute91' + fullPath: '/absolute91' + preLoaderRoute: typeof genAbsolute91RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute92': { + id: '/(gen)/absolute92' + path: '/absolute92' + fullPath: '/absolute92' + preLoaderRoute: typeof genAbsolute92RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute93': { + id: '/(gen)/absolute93' + path: '/absolute93' + fullPath: '/absolute93' + preLoaderRoute: typeof genAbsolute93RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute94': { + id: '/(gen)/absolute94' + path: '/absolute94' + fullPath: '/absolute94' + preLoaderRoute: typeof genAbsolute94RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute95': { + id: '/(gen)/absolute95' + path: '/absolute95' + fullPath: '/absolute95' + preLoaderRoute: typeof genAbsolute95RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute96': { + id: '/(gen)/absolute96' + path: '/absolute96' + fullPath: '/absolute96' + preLoaderRoute: typeof genAbsolute96RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute97': { + id: '/(gen)/absolute97' + path: '/absolute97' + fullPath: '/absolute97' + preLoaderRoute: typeof genAbsolute97RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute98': { + id: '/(gen)/absolute98' + path: '/absolute98' + fullPath: '/absolute98' + preLoaderRoute: typeof genAbsolute98RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/absolute99': { + id: '/(gen)/absolute99' + path: '/absolute99' + fullPath: '/absolute99' + preLoaderRoute: typeof genAbsolute99RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative0': { + id: '/(gen)/relative0' + path: '/relative0' + fullPath: '/relative0' + preLoaderRoute: typeof genRelative0RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative1': { + id: '/(gen)/relative1' + path: '/relative1' + fullPath: '/relative1' + preLoaderRoute: typeof genRelative1RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative10': { + id: '/(gen)/relative10' + path: '/relative10' + fullPath: '/relative10' + preLoaderRoute: typeof genRelative10RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative11': { + id: '/(gen)/relative11' + path: '/relative11' + fullPath: '/relative11' + preLoaderRoute: typeof genRelative11RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative12': { + id: '/(gen)/relative12' + path: '/relative12' + fullPath: '/relative12' + preLoaderRoute: typeof genRelative12RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative13': { + id: '/(gen)/relative13' + path: '/relative13' + fullPath: '/relative13' + preLoaderRoute: typeof genRelative13RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative14': { + id: '/(gen)/relative14' + path: '/relative14' + fullPath: '/relative14' + preLoaderRoute: typeof genRelative14RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative15': { + id: '/(gen)/relative15' + path: '/relative15' + fullPath: '/relative15' + preLoaderRoute: typeof genRelative15RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative16': { + id: '/(gen)/relative16' + path: '/relative16' + fullPath: '/relative16' + preLoaderRoute: typeof genRelative16RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative17': { + id: '/(gen)/relative17' + path: '/relative17' + fullPath: '/relative17' + preLoaderRoute: typeof genRelative17RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative18': { + id: '/(gen)/relative18' + path: '/relative18' + fullPath: '/relative18' + preLoaderRoute: typeof genRelative18RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative19': { + id: '/(gen)/relative19' + path: '/relative19' + fullPath: '/relative19' + preLoaderRoute: typeof genRelative19RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative2': { + id: '/(gen)/relative2' + path: '/relative2' + fullPath: '/relative2' + preLoaderRoute: typeof genRelative2RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative20': { + id: '/(gen)/relative20' + path: '/relative20' + fullPath: '/relative20' + preLoaderRoute: typeof genRelative20RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative21': { + id: '/(gen)/relative21' + path: '/relative21' + fullPath: '/relative21' + preLoaderRoute: typeof genRelative21RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative22': { + id: '/(gen)/relative22' + path: '/relative22' + fullPath: '/relative22' + preLoaderRoute: typeof genRelative22RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative23': { + id: '/(gen)/relative23' + path: '/relative23' + fullPath: '/relative23' + preLoaderRoute: typeof genRelative23RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative24': { + id: '/(gen)/relative24' + path: '/relative24' + fullPath: '/relative24' + preLoaderRoute: typeof genRelative24RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative25': { + id: '/(gen)/relative25' + path: '/relative25' + fullPath: '/relative25' + preLoaderRoute: typeof genRelative25RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative26': { + id: '/(gen)/relative26' + path: '/relative26' + fullPath: '/relative26' + preLoaderRoute: typeof genRelative26RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative27': { + id: '/(gen)/relative27' + path: '/relative27' + fullPath: '/relative27' + preLoaderRoute: typeof genRelative27RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative28': { + id: '/(gen)/relative28' + path: '/relative28' + fullPath: '/relative28' + preLoaderRoute: typeof genRelative28RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative29': { + id: '/(gen)/relative29' + path: '/relative29' + fullPath: '/relative29' + preLoaderRoute: typeof genRelative29RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative3': { + id: '/(gen)/relative3' + path: '/relative3' + fullPath: '/relative3' + preLoaderRoute: typeof genRelative3RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative30': { + id: '/(gen)/relative30' + path: '/relative30' + fullPath: '/relative30' + preLoaderRoute: typeof genRelative30RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative31': { + id: '/(gen)/relative31' + path: '/relative31' + fullPath: '/relative31' + preLoaderRoute: typeof genRelative31RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative32': { + id: '/(gen)/relative32' + path: '/relative32' + fullPath: '/relative32' + preLoaderRoute: typeof genRelative32RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative33': { + id: '/(gen)/relative33' + path: '/relative33' + fullPath: '/relative33' + preLoaderRoute: typeof genRelative33RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative34': { + id: '/(gen)/relative34' + path: '/relative34' + fullPath: '/relative34' + preLoaderRoute: typeof genRelative34RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative35': { + id: '/(gen)/relative35' + path: '/relative35' + fullPath: '/relative35' + preLoaderRoute: typeof genRelative35RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative36': { + id: '/(gen)/relative36' + path: '/relative36' + fullPath: '/relative36' + preLoaderRoute: typeof genRelative36RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative37': { + id: '/(gen)/relative37' + path: '/relative37' + fullPath: '/relative37' + preLoaderRoute: typeof genRelative37RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative38': { + id: '/(gen)/relative38' + path: '/relative38' + fullPath: '/relative38' + preLoaderRoute: typeof genRelative38RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative39': { + id: '/(gen)/relative39' + path: '/relative39' + fullPath: '/relative39' + preLoaderRoute: typeof genRelative39RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative4': { + id: '/(gen)/relative4' + path: '/relative4' + fullPath: '/relative4' + preLoaderRoute: typeof genRelative4RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative40': { + id: '/(gen)/relative40' + path: '/relative40' + fullPath: '/relative40' + preLoaderRoute: typeof genRelative40RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative41': { + id: '/(gen)/relative41' + path: '/relative41' + fullPath: '/relative41' + preLoaderRoute: typeof genRelative41RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative42': { + id: '/(gen)/relative42' + path: '/relative42' + fullPath: '/relative42' + preLoaderRoute: typeof genRelative42RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative43': { + id: '/(gen)/relative43' + path: '/relative43' + fullPath: '/relative43' + preLoaderRoute: typeof genRelative43RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative44': { + id: '/(gen)/relative44' + path: '/relative44' + fullPath: '/relative44' + preLoaderRoute: typeof genRelative44RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative45': { + id: '/(gen)/relative45' + path: '/relative45' + fullPath: '/relative45' + preLoaderRoute: typeof genRelative45RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative46': { + id: '/(gen)/relative46' + path: '/relative46' + fullPath: '/relative46' + preLoaderRoute: typeof genRelative46RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative47': { + id: '/(gen)/relative47' + path: '/relative47' + fullPath: '/relative47' + preLoaderRoute: typeof genRelative47RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative48': { + id: '/(gen)/relative48' + path: '/relative48' + fullPath: '/relative48' + preLoaderRoute: typeof genRelative48RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative49': { + id: '/(gen)/relative49' + path: '/relative49' + fullPath: '/relative49' + preLoaderRoute: typeof genRelative49RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative5': { + id: '/(gen)/relative5' + path: '/relative5' + fullPath: '/relative5' + preLoaderRoute: typeof genRelative5RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative50': { + id: '/(gen)/relative50' + path: '/relative50' + fullPath: '/relative50' + preLoaderRoute: typeof genRelative50RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative51': { + id: '/(gen)/relative51' + path: '/relative51' + fullPath: '/relative51' + preLoaderRoute: typeof genRelative51RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative52': { + id: '/(gen)/relative52' + path: '/relative52' + fullPath: '/relative52' + preLoaderRoute: typeof genRelative52RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative53': { + id: '/(gen)/relative53' + path: '/relative53' + fullPath: '/relative53' + preLoaderRoute: typeof genRelative53RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative54': { + id: '/(gen)/relative54' + path: '/relative54' + fullPath: '/relative54' + preLoaderRoute: typeof genRelative54RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative55': { + id: '/(gen)/relative55' + path: '/relative55' + fullPath: '/relative55' + preLoaderRoute: typeof genRelative55RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative56': { + id: '/(gen)/relative56' + path: '/relative56' + fullPath: '/relative56' + preLoaderRoute: typeof genRelative56RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative57': { + id: '/(gen)/relative57' + path: '/relative57' + fullPath: '/relative57' + preLoaderRoute: typeof genRelative57RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative58': { + id: '/(gen)/relative58' + path: '/relative58' + fullPath: '/relative58' + preLoaderRoute: typeof genRelative58RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative59': { + id: '/(gen)/relative59' + path: '/relative59' + fullPath: '/relative59' + preLoaderRoute: typeof genRelative59RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative6': { + id: '/(gen)/relative6' + path: '/relative6' + fullPath: '/relative6' + preLoaderRoute: typeof genRelative6RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative60': { + id: '/(gen)/relative60' + path: '/relative60' + fullPath: '/relative60' + preLoaderRoute: typeof genRelative60RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative61': { + id: '/(gen)/relative61' + path: '/relative61' + fullPath: '/relative61' + preLoaderRoute: typeof genRelative61RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative62': { + id: '/(gen)/relative62' + path: '/relative62' + fullPath: '/relative62' + preLoaderRoute: typeof genRelative62RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative63': { + id: '/(gen)/relative63' + path: '/relative63' + fullPath: '/relative63' + preLoaderRoute: typeof genRelative63RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative64': { + id: '/(gen)/relative64' + path: '/relative64' + fullPath: '/relative64' + preLoaderRoute: typeof genRelative64RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative65': { + id: '/(gen)/relative65' + path: '/relative65' + fullPath: '/relative65' + preLoaderRoute: typeof genRelative65RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative66': { + id: '/(gen)/relative66' + path: '/relative66' + fullPath: '/relative66' + preLoaderRoute: typeof genRelative66RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative67': { + id: '/(gen)/relative67' + path: '/relative67' + fullPath: '/relative67' + preLoaderRoute: typeof genRelative67RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative68': { + id: '/(gen)/relative68' + path: '/relative68' + fullPath: '/relative68' + preLoaderRoute: typeof genRelative68RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative69': { + id: '/(gen)/relative69' + path: '/relative69' + fullPath: '/relative69' + preLoaderRoute: typeof genRelative69RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative7': { + id: '/(gen)/relative7' + path: '/relative7' + fullPath: '/relative7' + preLoaderRoute: typeof genRelative7RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative70': { + id: '/(gen)/relative70' + path: '/relative70' + fullPath: '/relative70' + preLoaderRoute: typeof genRelative70RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative71': { + id: '/(gen)/relative71' + path: '/relative71' + fullPath: '/relative71' + preLoaderRoute: typeof genRelative71RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative72': { + id: '/(gen)/relative72' + path: '/relative72' + fullPath: '/relative72' + preLoaderRoute: typeof genRelative72RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative73': { + id: '/(gen)/relative73' + path: '/relative73' + fullPath: '/relative73' + preLoaderRoute: typeof genRelative73RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative74': { + id: '/(gen)/relative74' + path: '/relative74' + fullPath: '/relative74' + preLoaderRoute: typeof genRelative74RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative75': { + id: '/(gen)/relative75' + path: '/relative75' + fullPath: '/relative75' + preLoaderRoute: typeof genRelative75RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative76': { + id: '/(gen)/relative76' + path: '/relative76' + fullPath: '/relative76' + preLoaderRoute: typeof genRelative76RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative77': { + id: '/(gen)/relative77' + path: '/relative77' + fullPath: '/relative77' + preLoaderRoute: typeof genRelative77RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative78': { + id: '/(gen)/relative78' + path: '/relative78' + fullPath: '/relative78' + preLoaderRoute: typeof genRelative78RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative79': { + id: '/(gen)/relative79' + path: '/relative79' + fullPath: '/relative79' + preLoaderRoute: typeof genRelative79RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative8': { + id: '/(gen)/relative8' + path: '/relative8' + fullPath: '/relative8' + preLoaderRoute: typeof genRelative8RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative80': { + id: '/(gen)/relative80' + path: '/relative80' + fullPath: '/relative80' + preLoaderRoute: typeof genRelative80RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative81': { + id: '/(gen)/relative81' + path: '/relative81' + fullPath: '/relative81' + preLoaderRoute: typeof genRelative81RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative82': { + id: '/(gen)/relative82' + path: '/relative82' + fullPath: '/relative82' + preLoaderRoute: typeof genRelative82RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative83': { + id: '/(gen)/relative83' + path: '/relative83' + fullPath: '/relative83' + preLoaderRoute: typeof genRelative83RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative84': { + id: '/(gen)/relative84' + path: '/relative84' + fullPath: '/relative84' + preLoaderRoute: typeof genRelative84RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative85': { + id: '/(gen)/relative85' + path: '/relative85' + fullPath: '/relative85' + preLoaderRoute: typeof genRelative85RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative86': { + id: '/(gen)/relative86' + path: '/relative86' + fullPath: '/relative86' + preLoaderRoute: typeof genRelative86RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative87': { + id: '/(gen)/relative87' + path: '/relative87' + fullPath: '/relative87' + preLoaderRoute: typeof genRelative87RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative88': { + id: '/(gen)/relative88' + path: '/relative88' + fullPath: '/relative88' + preLoaderRoute: typeof genRelative88RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative89': { + id: '/(gen)/relative89' + path: '/relative89' + fullPath: '/relative89' + preLoaderRoute: typeof genRelative89RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative9': { + id: '/(gen)/relative9' + path: '/relative9' + fullPath: '/relative9' + preLoaderRoute: typeof genRelative9RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative90': { + id: '/(gen)/relative90' + path: '/relative90' + fullPath: '/relative90' + preLoaderRoute: typeof genRelative90RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative91': { + id: '/(gen)/relative91' + path: '/relative91' + fullPath: '/relative91' + preLoaderRoute: typeof genRelative91RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative92': { + id: '/(gen)/relative92' + path: '/relative92' + fullPath: '/relative92' + preLoaderRoute: typeof genRelative92RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative93': { + id: '/(gen)/relative93' + path: '/relative93' + fullPath: '/relative93' + preLoaderRoute: typeof genRelative93RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative94': { + id: '/(gen)/relative94' + path: '/relative94' + fullPath: '/relative94' + preLoaderRoute: typeof genRelative94RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative95': { + id: '/(gen)/relative95' + path: '/relative95' + fullPath: '/relative95' + preLoaderRoute: typeof genRelative95RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative96': { + id: '/(gen)/relative96' + path: '/relative96' + fullPath: '/relative96' + preLoaderRoute: typeof genRelative96RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative97': { + id: '/(gen)/relative97' + path: '/relative97' + fullPath: '/relative97' + preLoaderRoute: typeof genRelative97RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative98': { + id: '/(gen)/relative98' + path: '/relative98' + fullPath: '/relative98' + preLoaderRoute: typeof genRelative98RouteImport + parentRoute: typeof rootRoute + } + '/(gen)/relative99': { + id: '/(gen)/relative99' + path: '/relative99' + fullPath: '/relative99' + preLoaderRoute: typeof genRelative99RouteImport + parentRoute: typeof rootRoute + } + '/params/$paramsPlaceholder': { + id: '/params/$paramsPlaceholder' + path: '/$paramsPlaceholder' + fullPath: '/params/$paramsPlaceholder' + preLoaderRoute: typeof ParamsParamsPlaceholderRouteImport + parentRoute: typeof ParamsRouteRouteImport + } + '/search/searchPlaceholder': { + id: '/search/searchPlaceholder' + path: '/searchPlaceholder' + fullPath: '/search/searchPlaceholder' + preLoaderRoute: typeof SearchSearchPlaceholderRouteImport + parentRoute: typeof SearchRouteRouteImport + } + '/(gen)/params/$param0': { + id: '/(gen)/params/$param0' + path: '/$param0' + fullPath: '/params/$param0' + preLoaderRoute: typeof genParamsParam0RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param1': { + id: '/(gen)/params/$param1' + path: '/$param1' + fullPath: '/params/$param1' + preLoaderRoute: typeof genParamsParam1RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param10': { + id: '/(gen)/params/$param10' + path: '/$param10' + fullPath: '/params/$param10' + preLoaderRoute: typeof genParamsParam10RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param11': { + id: '/(gen)/params/$param11' + path: '/$param11' + fullPath: '/params/$param11' + preLoaderRoute: typeof genParamsParam11RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param12': { + id: '/(gen)/params/$param12' + path: '/$param12' + fullPath: '/params/$param12' + preLoaderRoute: typeof genParamsParam12RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param13': { + id: '/(gen)/params/$param13' + path: '/$param13' + fullPath: '/params/$param13' + preLoaderRoute: typeof genParamsParam13RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param14': { + id: '/(gen)/params/$param14' + path: '/$param14' + fullPath: '/params/$param14' + preLoaderRoute: typeof genParamsParam14RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param15': { + id: '/(gen)/params/$param15' + path: '/$param15' + fullPath: '/params/$param15' + preLoaderRoute: typeof genParamsParam15RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param16': { + id: '/(gen)/params/$param16' + path: '/$param16' + fullPath: '/params/$param16' + preLoaderRoute: typeof genParamsParam16RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param17': { + id: '/(gen)/params/$param17' + path: '/$param17' + fullPath: '/params/$param17' + preLoaderRoute: typeof genParamsParam17RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param18': { + id: '/(gen)/params/$param18' + path: '/$param18' + fullPath: '/params/$param18' + preLoaderRoute: typeof genParamsParam18RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param19': { + id: '/(gen)/params/$param19' + path: '/$param19' + fullPath: '/params/$param19' + preLoaderRoute: typeof genParamsParam19RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param2': { + id: '/(gen)/params/$param2' + path: '/$param2' + fullPath: '/params/$param2' + preLoaderRoute: typeof genParamsParam2RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param20': { + id: '/(gen)/params/$param20' + path: '/$param20' + fullPath: '/params/$param20' + preLoaderRoute: typeof genParamsParam20RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param21': { + id: '/(gen)/params/$param21' + path: '/$param21' + fullPath: '/params/$param21' + preLoaderRoute: typeof genParamsParam21RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param22': { + id: '/(gen)/params/$param22' + path: '/$param22' + fullPath: '/params/$param22' + preLoaderRoute: typeof genParamsParam22RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param23': { + id: '/(gen)/params/$param23' + path: '/$param23' + fullPath: '/params/$param23' + preLoaderRoute: typeof genParamsParam23RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param24': { + id: '/(gen)/params/$param24' + path: '/$param24' + fullPath: '/params/$param24' + preLoaderRoute: typeof genParamsParam24RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param25': { + id: '/(gen)/params/$param25' + path: '/$param25' + fullPath: '/params/$param25' + preLoaderRoute: typeof genParamsParam25RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param26': { + id: '/(gen)/params/$param26' + path: '/$param26' + fullPath: '/params/$param26' + preLoaderRoute: typeof genParamsParam26RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param27': { + id: '/(gen)/params/$param27' + path: '/$param27' + fullPath: '/params/$param27' + preLoaderRoute: typeof genParamsParam27RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param28': { + id: '/(gen)/params/$param28' + path: '/$param28' + fullPath: '/params/$param28' + preLoaderRoute: typeof genParamsParam28RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param29': { + id: '/(gen)/params/$param29' + path: '/$param29' + fullPath: '/params/$param29' + preLoaderRoute: typeof genParamsParam29RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param3': { + id: '/(gen)/params/$param3' + path: '/$param3' + fullPath: '/params/$param3' + preLoaderRoute: typeof genParamsParam3RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param30': { + id: '/(gen)/params/$param30' + path: '/$param30' + fullPath: '/params/$param30' + preLoaderRoute: typeof genParamsParam30RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param31': { + id: '/(gen)/params/$param31' + path: '/$param31' + fullPath: '/params/$param31' + preLoaderRoute: typeof genParamsParam31RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param32': { + id: '/(gen)/params/$param32' + path: '/$param32' + fullPath: '/params/$param32' + preLoaderRoute: typeof genParamsParam32RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param33': { + id: '/(gen)/params/$param33' + path: '/$param33' + fullPath: '/params/$param33' + preLoaderRoute: typeof genParamsParam33RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param34': { + id: '/(gen)/params/$param34' + path: '/$param34' + fullPath: '/params/$param34' + preLoaderRoute: typeof genParamsParam34RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param35': { + id: '/(gen)/params/$param35' + path: '/$param35' + fullPath: '/params/$param35' + preLoaderRoute: typeof genParamsParam35RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param36': { + id: '/(gen)/params/$param36' + path: '/$param36' + fullPath: '/params/$param36' + preLoaderRoute: typeof genParamsParam36RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param37': { + id: '/(gen)/params/$param37' + path: '/$param37' + fullPath: '/params/$param37' + preLoaderRoute: typeof genParamsParam37RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param38': { + id: '/(gen)/params/$param38' + path: '/$param38' + fullPath: '/params/$param38' + preLoaderRoute: typeof genParamsParam38RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param39': { + id: '/(gen)/params/$param39' + path: '/$param39' + fullPath: '/params/$param39' + preLoaderRoute: typeof genParamsParam39RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param4': { + id: '/(gen)/params/$param4' + path: '/$param4' + fullPath: '/params/$param4' + preLoaderRoute: typeof genParamsParam4RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param40': { + id: '/(gen)/params/$param40' + path: '/$param40' + fullPath: '/params/$param40' + preLoaderRoute: typeof genParamsParam40RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param41': { + id: '/(gen)/params/$param41' + path: '/$param41' + fullPath: '/params/$param41' + preLoaderRoute: typeof genParamsParam41RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param42': { + id: '/(gen)/params/$param42' + path: '/$param42' + fullPath: '/params/$param42' + preLoaderRoute: typeof genParamsParam42RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param43': { + id: '/(gen)/params/$param43' + path: '/$param43' + fullPath: '/params/$param43' + preLoaderRoute: typeof genParamsParam43RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param44': { + id: '/(gen)/params/$param44' + path: '/$param44' + fullPath: '/params/$param44' + preLoaderRoute: typeof genParamsParam44RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param45': { + id: '/(gen)/params/$param45' + path: '/$param45' + fullPath: '/params/$param45' + preLoaderRoute: typeof genParamsParam45RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param46': { + id: '/(gen)/params/$param46' + path: '/$param46' + fullPath: '/params/$param46' + preLoaderRoute: typeof genParamsParam46RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param47': { + id: '/(gen)/params/$param47' + path: '/$param47' + fullPath: '/params/$param47' + preLoaderRoute: typeof genParamsParam47RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param48': { + id: '/(gen)/params/$param48' + path: '/$param48' + fullPath: '/params/$param48' + preLoaderRoute: typeof genParamsParam48RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param49': { + id: '/(gen)/params/$param49' + path: '/$param49' + fullPath: '/params/$param49' + preLoaderRoute: typeof genParamsParam49RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param5': { + id: '/(gen)/params/$param5' + path: '/$param5' + fullPath: '/params/$param5' + preLoaderRoute: typeof genParamsParam5RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param50': { + id: '/(gen)/params/$param50' + path: '/$param50' + fullPath: '/params/$param50' + preLoaderRoute: typeof genParamsParam50RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param51': { + id: '/(gen)/params/$param51' + path: '/$param51' + fullPath: '/params/$param51' + preLoaderRoute: typeof genParamsParam51RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param52': { + id: '/(gen)/params/$param52' + path: '/$param52' + fullPath: '/params/$param52' + preLoaderRoute: typeof genParamsParam52RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param53': { + id: '/(gen)/params/$param53' + path: '/$param53' + fullPath: '/params/$param53' + preLoaderRoute: typeof genParamsParam53RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param54': { + id: '/(gen)/params/$param54' + path: '/$param54' + fullPath: '/params/$param54' + preLoaderRoute: typeof genParamsParam54RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param55': { + id: '/(gen)/params/$param55' + path: '/$param55' + fullPath: '/params/$param55' + preLoaderRoute: typeof genParamsParam55RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param56': { + id: '/(gen)/params/$param56' + path: '/$param56' + fullPath: '/params/$param56' + preLoaderRoute: typeof genParamsParam56RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param57': { + id: '/(gen)/params/$param57' + path: '/$param57' + fullPath: '/params/$param57' + preLoaderRoute: typeof genParamsParam57RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param58': { + id: '/(gen)/params/$param58' + path: '/$param58' + fullPath: '/params/$param58' + preLoaderRoute: typeof genParamsParam58RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param59': { + id: '/(gen)/params/$param59' + path: '/$param59' + fullPath: '/params/$param59' + preLoaderRoute: typeof genParamsParam59RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param6': { + id: '/(gen)/params/$param6' + path: '/$param6' + fullPath: '/params/$param6' + preLoaderRoute: typeof genParamsParam6RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param60': { + id: '/(gen)/params/$param60' + path: '/$param60' + fullPath: '/params/$param60' + preLoaderRoute: typeof genParamsParam60RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param61': { + id: '/(gen)/params/$param61' + path: '/$param61' + fullPath: '/params/$param61' + preLoaderRoute: typeof genParamsParam61RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param62': { + id: '/(gen)/params/$param62' + path: '/$param62' + fullPath: '/params/$param62' + preLoaderRoute: typeof genParamsParam62RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param63': { + id: '/(gen)/params/$param63' + path: '/$param63' + fullPath: '/params/$param63' + preLoaderRoute: typeof genParamsParam63RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param64': { + id: '/(gen)/params/$param64' + path: '/$param64' + fullPath: '/params/$param64' + preLoaderRoute: typeof genParamsParam64RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param65': { + id: '/(gen)/params/$param65' + path: '/$param65' + fullPath: '/params/$param65' + preLoaderRoute: typeof genParamsParam65RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param66': { + id: '/(gen)/params/$param66' + path: '/$param66' + fullPath: '/params/$param66' + preLoaderRoute: typeof genParamsParam66RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param67': { + id: '/(gen)/params/$param67' + path: '/$param67' + fullPath: '/params/$param67' + preLoaderRoute: typeof genParamsParam67RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param68': { + id: '/(gen)/params/$param68' + path: '/$param68' + fullPath: '/params/$param68' + preLoaderRoute: typeof genParamsParam68RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param69': { + id: '/(gen)/params/$param69' + path: '/$param69' + fullPath: '/params/$param69' + preLoaderRoute: typeof genParamsParam69RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param7': { + id: '/(gen)/params/$param7' + path: '/$param7' + fullPath: '/params/$param7' + preLoaderRoute: typeof genParamsParam7RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param70': { + id: '/(gen)/params/$param70' + path: '/$param70' + fullPath: '/params/$param70' + preLoaderRoute: typeof genParamsParam70RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param71': { + id: '/(gen)/params/$param71' + path: '/$param71' + fullPath: '/params/$param71' + preLoaderRoute: typeof genParamsParam71RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param72': { + id: '/(gen)/params/$param72' + path: '/$param72' + fullPath: '/params/$param72' + preLoaderRoute: typeof genParamsParam72RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param73': { + id: '/(gen)/params/$param73' + path: '/$param73' + fullPath: '/params/$param73' + preLoaderRoute: typeof genParamsParam73RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param74': { + id: '/(gen)/params/$param74' + path: '/$param74' + fullPath: '/params/$param74' + preLoaderRoute: typeof genParamsParam74RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param75': { + id: '/(gen)/params/$param75' + path: '/$param75' + fullPath: '/params/$param75' + preLoaderRoute: typeof genParamsParam75RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param76': { + id: '/(gen)/params/$param76' + path: '/$param76' + fullPath: '/params/$param76' + preLoaderRoute: typeof genParamsParam76RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param77': { + id: '/(gen)/params/$param77' + path: '/$param77' + fullPath: '/params/$param77' + preLoaderRoute: typeof genParamsParam77RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param78': { + id: '/(gen)/params/$param78' + path: '/$param78' + fullPath: '/params/$param78' + preLoaderRoute: typeof genParamsParam78RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param79': { + id: '/(gen)/params/$param79' + path: '/$param79' + fullPath: '/params/$param79' + preLoaderRoute: typeof genParamsParam79RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param8': { + id: '/(gen)/params/$param8' + path: '/$param8' + fullPath: '/params/$param8' + preLoaderRoute: typeof genParamsParam8RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param80': { + id: '/(gen)/params/$param80' + path: '/$param80' + fullPath: '/params/$param80' + preLoaderRoute: typeof genParamsParam80RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param81': { + id: '/(gen)/params/$param81' + path: '/$param81' + fullPath: '/params/$param81' + preLoaderRoute: typeof genParamsParam81RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param82': { + id: '/(gen)/params/$param82' + path: '/$param82' + fullPath: '/params/$param82' + preLoaderRoute: typeof genParamsParam82RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param83': { + id: '/(gen)/params/$param83' + path: '/$param83' + fullPath: '/params/$param83' + preLoaderRoute: typeof genParamsParam83RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param84': { + id: '/(gen)/params/$param84' + path: '/$param84' + fullPath: '/params/$param84' + preLoaderRoute: typeof genParamsParam84RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param85': { + id: '/(gen)/params/$param85' + path: '/$param85' + fullPath: '/params/$param85' + preLoaderRoute: typeof genParamsParam85RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param86': { + id: '/(gen)/params/$param86' + path: '/$param86' + fullPath: '/params/$param86' + preLoaderRoute: typeof genParamsParam86RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param87': { + id: '/(gen)/params/$param87' + path: '/$param87' + fullPath: '/params/$param87' + preLoaderRoute: typeof genParamsParam87RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param88': { + id: '/(gen)/params/$param88' + path: '/$param88' + fullPath: '/params/$param88' + preLoaderRoute: typeof genParamsParam88RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param89': { + id: '/(gen)/params/$param89' + path: '/$param89' + fullPath: '/params/$param89' + preLoaderRoute: typeof genParamsParam89RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param9': { + id: '/(gen)/params/$param9' + path: '/$param9' + fullPath: '/params/$param9' + preLoaderRoute: typeof genParamsParam9RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param90': { + id: '/(gen)/params/$param90' + path: '/$param90' + fullPath: '/params/$param90' + preLoaderRoute: typeof genParamsParam90RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param91': { + id: '/(gen)/params/$param91' + path: '/$param91' + fullPath: '/params/$param91' + preLoaderRoute: typeof genParamsParam91RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param92': { + id: '/(gen)/params/$param92' + path: '/$param92' + fullPath: '/params/$param92' + preLoaderRoute: typeof genParamsParam92RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param93': { + id: '/(gen)/params/$param93' + path: '/$param93' + fullPath: '/params/$param93' + preLoaderRoute: typeof genParamsParam93RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param94': { + id: '/(gen)/params/$param94' + path: '/$param94' + fullPath: '/params/$param94' + preLoaderRoute: typeof genParamsParam94RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param95': { + id: '/(gen)/params/$param95' + path: '/$param95' + fullPath: '/params/$param95' + preLoaderRoute: typeof genParamsParam95RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param96': { + id: '/(gen)/params/$param96' + path: '/$param96' + fullPath: '/params/$param96' + preLoaderRoute: typeof genParamsParam96RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param97': { + id: '/(gen)/params/$param97' + path: '/$param97' + fullPath: '/params/$param97' + preLoaderRoute: typeof genParamsParam97RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param98': { + id: '/(gen)/params/$param98' + path: '/$param98' + fullPath: '/params/$param98' + preLoaderRoute: typeof genParamsParam98RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/params/$param99': { + id: '/(gen)/params/$param99' + path: '/$param99' + fullPath: '/params/$param99' + preLoaderRoute: typeof genParamsParam99RouteImport + parentRoute: typeof genParamsRouteRouteImport + } + '/(gen)/search/search0': { + id: '/(gen)/search/search0' + path: '/search0' + fullPath: '/search/search0' + preLoaderRoute: typeof genSearchSearch0RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search1': { + id: '/(gen)/search/search1' + path: '/search1' + fullPath: '/search/search1' + preLoaderRoute: typeof genSearchSearch1RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search10': { + id: '/(gen)/search/search10' + path: '/search10' + fullPath: '/search/search10' + preLoaderRoute: typeof genSearchSearch10RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search11': { + id: '/(gen)/search/search11' + path: '/search11' + fullPath: '/search/search11' + preLoaderRoute: typeof genSearchSearch11RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search12': { + id: '/(gen)/search/search12' + path: '/search12' + fullPath: '/search/search12' + preLoaderRoute: typeof genSearchSearch12RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search13': { + id: '/(gen)/search/search13' + path: '/search13' + fullPath: '/search/search13' + preLoaderRoute: typeof genSearchSearch13RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search14': { + id: '/(gen)/search/search14' + path: '/search14' + fullPath: '/search/search14' + preLoaderRoute: typeof genSearchSearch14RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search15': { + id: '/(gen)/search/search15' + path: '/search15' + fullPath: '/search/search15' + preLoaderRoute: typeof genSearchSearch15RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search16': { + id: '/(gen)/search/search16' + path: '/search16' + fullPath: '/search/search16' + preLoaderRoute: typeof genSearchSearch16RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search17': { + id: '/(gen)/search/search17' + path: '/search17' + fullPath: '/search/search17' + preLoaderRoute: typeof genSearchSearch17RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search18': { + id: '/(gen)/search/search18' + path: '/search18' + fullPath: '/search/search18' + preLoaderRoute: typeof genSearchSearch18RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search19': { + id: '/(gen)/search/search19' + path: '/search19' + fullPath: '/search/search19' + preLoaderRoute: typeof genSearchSearch19RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search2': { + id: '/(gen)/search/search2' + path: '/search2' + fullPath: '/search/search2' + preLoaderRoute: typeof genSearchSearch2RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search20': { + id: '/(gen)/search/search20' + path: '/search20' + fullPath: '/search/search20' + preLoaderRoute: typeof genSearchSearch20RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search21': { + id: '/(gen)/search/search21' + path: '/search21' + fullPath: '/search/search21' + preLoaderRoute: typeof genSearchSearch21RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search22': { + id: '/(gen)/search/search22' + path: '/search22' + fullPath: '/search/search22' + preLoaderRoute: typeof genSearchSearch22RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search23': { + id: '/(gen)/search/search23' + path: '/search23' + fullPath: '/search/search23' + preLoaderRoute: typeof genSearchSearch23RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search24': { + id: '/(gen)/search/search24' + path: '/search24' + fullPath: '/search/search24' + preLoaderRoute: typeof genSearchSearch24RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search25': { + id: '/(gen)/search/search25' + path: '/search25' + fullPath: '/search/search25' + preLoaderRoute: typeof genSearchSearch25RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search26': { + id: '/(gen)/search/search26' + path: '/search26' + fullPath: '/search/search26' + preLoaderRoute: typeof genSearchSearch26RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search27': { + id: '/(gen)/search/search27' + path: '/search27' + fullPath: '/search/search27' + preLoaderRoute: typeof genSearchSearch27RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search28': { + id: '/(gen)/search/search28' + path: '/search28' + fullPath: '/search/search28' + preLoaderRoute: typeof genSearchSearch28RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search29': { + id: '/(gen)/search/search29' + path: '/search29' + fullPath: '/search/search29' + preLoaderRoute: typeof genSearchSearch29RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search3': { + id: '/(gen)/search/search3' + path: '/search3' + fullPath: '/search/search3' + preLoaderRoute: typeof genSearchSearch3RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search30': { + id: '/(gen)/search/search30' + path: '/search30' + fullPath: '/search/search30' + preLoaderRoute: typeof genSearchSearch30RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search31': { + id: '/(gen)/search/search31' + path: '/search31' + fullPath: '/search/search31' + preLoaderRoute: typeof genSearchSearch31RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search32': { + id: '/(gen)/search/search32' + path: '/search32' + fullPath: '/search/search32' + preLoaderRoute: typeof genSearchSearch32RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search33': { + id: '/(gen)/search/search33' + path: '/search33' + fullPath: '/search/search33' + preLoaderRoute: typeof genSearchSearch33RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search34': { + id: '/(gen)/search/search34' + path: '/search34' + fullPath: '/search/search34' + preLoaderRoute: typeof genSearchSearch34RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search35': { + id: '/(gen)/search/search35' + path: '/search35' + fullPath: '/search/search35' + preLoaderRoute: typeof genSearchSearch35RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search36': { + id: '/(gen)/search/search36' + path: '/search36' + fullPath: '/search/search36' + preLoaderRoute: typeof genSearchSearch36RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search37': { + id: '/(gen)/search/search37' + path: '/search37' + fullPath: '/search/search37' + preLoaderRoute: typeof genSearchSearch37RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search38': { + id: '/(gen)/search/search38' + path: '/search38' + fullPath: '/search/search38' + preLoaderRoute: typeof genSearchSearch38RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search39': { + id: '/(gen)/search/search39' + path: '/search39' + fullPath: '/search/search39' + preLoaderRoute: typeof genSearchSearch39RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search4': { + id: '/(gen)/search/search4' + path: '/search4' + fullPath: '/search/search4' + preLoaderRoute: typeof genSearchSearch4RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search40': { + id: '/(gen)/search/search40' + path: '/search40' + fullPath: '/search/search40' + preLoaderRoute: typeof genSearchSearch40RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search41': { + id: '/(gen)/search/search41' + path: '/search41' + fullPath: '/search/search41' + preLoaderRoute: typeof genSearchSearch41RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search42': { + id: '/(gen)/search/search42' + path: '/search42' + fullPath: '/search/search42' + preLoaderRoute: typeof genSearchSearch42RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search43': { + id: '/(gen)/search/search43' + path: '/search43' + fullPath: '/search/search43' + preLoaderRoute: typeof genSearchSearch43RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search44': { + id: '/(gen)/search/search44' + path: '/search44' + fullPath: '/search/search44' + preLoaderRoute: typeof genSearchSearch44RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search45': { + id: '/(gen)/search/search45' + path: '/search45' + fullPath: '/search/search45' + preLoaderRoute: typeof genSearchSearch45RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search46': { + id: '/(gen)/search/search46' + path: '/search46' + fullPath: '/search/search46' + preLoaderRoute: typeof genSearchSearch46RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search47': { + id: '/(gen)/search/search47' + path: '/search47' + fullPath: '/search/search47' + preLoaderRoute: typeof genSearchSearch47RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search48': { + id: '/(gen)/search/search48' + path: '/search48' + fullPath: '/search/search48' + preLoaderRoute: typeof genSearchSearch48RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search49': { + id: '/(gen)/search/search49' + path: '/search49' + fullPath: '/search/search49' + preLoaderRoute: typeof genSearchSearch49RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search5': { + id: '/(gen)/search/search5' + path: '/search5' + fullPath: '/search/search5' + preLoaderRoute: typeof genSearchSearch5RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search50': { + id: '/(gen)/search/search50' + path: '/search50' + fullPath: '/search/search50' + preLoaderRoute: typeof genSearchSearch50RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search51': { + id: '/(gen)/search/search51' + path: '/search51' + fullPath: '/search/search51' + preLoaderRoute: typeof genSearchSearch51RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search52': { + id: '/(gen)/search/search52' + path: '/search52' + fullPath: '/search/search52' + preLoaderRoute: typeof genSearchSearch52RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search53': { + id: '/(gen)/search/search53' + path: '/search53' + fullPath: '/search/search53' + preLoaderRoute: typeof genSearchSearch53RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search54': { + id: '/(gen)/search/search54' + path: '/search54' + fullPath: '/search/search54' + preLoaderRoute: typeof genSearchSearch54RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search55': { + id: '/(gen)/search/search55' + path: '/search55' + fullPath: '/search/search55' + preLoaderRoute: typeof genSearchSearch55RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search56': { + id: '/(gen)/search/search56' + path: '/search56' + fullPath: '/search/search56' + preLoaderRoute: typeof genSearchSearch56RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search57': { + id: '/(gen)/search/search57' + path: '/search57' + fullPath: '/search/search57' + preLoaderRoute: typeof genSearchSearch57RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search58': { + id: '/(gen)/search/search58' + path: '/search58' + fullPath: '/search/search58' + preLoaderRoute: typeof genSearchSearch58RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search59': { + id: '/(gen)/search/search59' + path: '/search59' + fullPath: '/search/search59' + preLoaderRoute: typeof genSearchSearch59RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search6': { + id: '/(gen)/search/search6' + path: '/search6' + fullPath: '/search/search6' + preLoaderRoute: typeof genSearchSearch6RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search60': { + id: '/(gen)/search/search60' + path: '/search60' + fullPath: '/search/search60' + preLoaderRoute: typeof genSearchSearch60RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search61': { + id: '/(gen)/search/search61' + path: '/search61' + fullPath: '/search/search61' + preLoaderRoute: typeof genSearchSearch61RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search62': { + id: '/(gen)/search/search62' + path: '/search62' + fullPath: '/search/search62' + preLoaderRoute: typeof genSearchSearch62RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search63': { + id: '/(gen)/search/search63' + path: '/search63' + fullPath: '/search/search63' + preLoaderRoute: typeof genSearchSearch63RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search64': { + id: '/(gen)/search/search64' + path: '/search64' + fullPath: '/search/search64' + preLoaderRoute: typeof genSearchSearch64RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search65': { + id: '/(gen)/search/search65' + path: '/search65' + fullPath: '/search/search65' + preLoaderRoute: typeof genSearchSearch65RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search66': { + id: '/(gen)/search/search66' + path: '/search66' + fullPath: '/search/search66' + preLoaderRoute: typeof genSearchSearch66RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search67': { + id: '/(gen)/search/search67' + path: '/search67' + fullPath: '/search/search67' + preLoaderRoute: typeof genSearchSearch67RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search68': { + id: '/(gen)/search/search68' + path: '/search68' + fullPath: '/search/search68' + preLoaderRoute: typeof genSearchSearch68RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search69': { + id: '/(gen)/search/search69' + path: '/search69' + fullPath: '/search/search69' + preLoaderRoute: typeof genSearchSearch69RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search7': { + id: '/(gen)/search/search7' + path: '/search7' + fullPath: '/search/search7' + preLoaderRoute: typeof genSearchSearch7RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search70': { + id: '/(gen)/search/search70' + path: '/search70' + fullPath: '/search/search70' + preLoaderRoute: typeof genSearchSearch70RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search71': { + id: '/(gen)/search/search71' + path: '/search71' + fullPath: '/search/search71' + preLoaderRoute: typeof genSearchSearch71RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search72': { + id: '/(gen)/search/search72' + path: '/search72' + fullPath: '/search/search72' + preLoaderRoute: typeof genSearchSearch72RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search73': { + id: '/(gen)/search/search73' + path: '/search73' + fullPath: '/search/search73' + preLoaderRoute: typeof genSearchSearch73RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search74': { + id: '/(gen)/search/search74' + path: '/search74' + fullPath: '/search/search74' + preLoaderRoute: typeof genSearchSearch74RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search75': { + id: '/(gen)/search/search75' + path: '/search75' + fullPath: '/search/search75' + preLoaderRoute: typeof genSearchSearch75RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search76': { + id: '/(gen)/search/search76' + path: '/search76' + fullPath: '/search/search76' + preLoaderRoute: typeof genSearchSearch76RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search77': { + id: '/(gen)/search/search77' + path: '/search77' + fullPath: '/search/search77' + preLoaderRoute: typeof genSearchSearch77RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search78': { + id: '/(gen)/search/search78' + path: '/search78' + fullPath: '/search/search78' + preLoaderRoute: typeof genSearchSearch78RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search79': { + id: '/(gen)/search/search79' + path: '/search79' + fullPath: '/search/search79' + preLoaderRoute: typeof genSearchSearch79RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search8': { + id: '/(gen)/search/search8' + path: '/search8' + fullPath: '/search/search8' + preLoaderRoute: typeof genSearchSearch8RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search80': { + id: '/(gen)/search/search80' + path: '/search80' + fullPath: '/search/search80' + preLoaderRoute: typeof genSearchSearch80RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search81': { + id: '/(gen)/search/search81' + path: '/search81' + fullPath: '/search/search81' + preLoaderRoute: typeof genSearchSearch81RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search82': { + id: '/(gen)/search/search82' + path: '/search82' + fullPath: '/search/search82' + preLoaderRoute: typeof genSearchSearch82RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search83': { + id: '/(gen)/search/search83' + path: '/search83' + fullPath: '/search/search83' + preLoaderRoute: typeof genSearchSearch83RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search84': { + id: '/(gen)/search/search84' + path: '/search84' + fullPath: '/search/search84' + preLoaderRoute: typeof genSearchSearch84RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search85': { + id: '/(gen)/search/search85' + path: '/search85' + fullPath: '/search/search85' + preLoaderRoute: typeof genSearchSearch85RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search86': { + id: '/(gen)/search/search86' + path: '/search86' + fullPath: '/search/search86' + preLoaderRoute: typeof genSearchSearch86RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search87': { + id: '/(gen)/search/search87' + path: '/search87' + fullPath: '/search/search87' + preLoaderRoute: typeof genSearchSearch87RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search88': { + id: '/(gen)/search/search88' + path: '/search88' + fullPath: '/search/search88' + preLoaderRoute: typeof genSearchSearch88RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search89': { + id: '/(gen)/search/search89' + path: '/search89' + fullPath: '/search/search89' + preLoaderRoute: typeof genSearchSearch89RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search9': { + id: '/(gen)/search/search9' + path: '/search9' + fullPath: '/search/search9' + preLoaderRoute: typeof genSearchSearch9RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search90': { + id: '/(gen)/search/search90' + path: '/search90' + fullPath: '/search/search90' + preLoaderRoute: typeof genSearchSearch90RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search91': { + id: '/(gen)/search/search91' + path: '/search91' + fullPath: '/search/search91' + preLoaderRoute: typeof genSearchSearch91RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search92': { + id: '/(gen)/search/search92' + path: '/search92' + fullPath: '/search/search92' + preLoaderRoute: typeof genSearchSearch92RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search93': { + id: '/(gen)/search/search93' + path: '/search93' + fullPath: '/search/search93' + preLoaderRoute: typeof genSearchSearch93RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search94': { + id: '/(gen)/search/search94' + path: '/search94' + fullPath: '/search/search94' + preLoaderRoute: typeof genSearchSearch94RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search95': { + id: '/(gen)/search/search95' + path: '/search95' + fullPath: '/search/search95' + preLoaderRoute: typeof genSearchSearch95RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search96': { + id: '/(gen)/search/search96' + path: '/search96' + fullPath: '/search/search96' + preLoaderRoute: typeof genSearchSearch96RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search97': { + id: '/(gen)/search/search97' + path: '/search97' + fullPath: '/search/search97' + preLoaderRoute: typeof genSearchSearch97RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search98': { + id: '/(gen)/search/search98' + path: '/search98' + fullPath: '/search/search98' + preLoaderRoute: typeof genSearchSearch98RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + '/(gen)/search/search99': { + id: '/(gen)/search/search99' + path: '/search99' + fullPath: '/search/search99' + preLoaderRoute: typeof genSearchSearch99RouteImport + parentRoute: typeof genSearchRouteRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/params/route' { + const createFileRoute: CreateFileRoute< + '/params', + FileRoutesByPath['/params']['parentRoute'], + FileRoutesByPath['/params']['id'], + FileRoutesByPath['/params']['path'], + FileRoutesByPath['/params']['fullPath'] + > +} +declare module './routes/search/route' { + const createFileRoute: CreateFileRoute< + '/search', + FileRoutesByPath['/search']['parentRoute'], + FileRoutesByPath['/search']['id'], + FileRoutesByPath['/search']['path'], + FileRoutesByPath['/search']['fullPath'] + > +} +declare module './routes/absolute' { + const createFileRoute: CreateFileRoute< + '/absolute', + FileRoutesByPath['/absolute']['parentRoute'], + FileRoutesByPath['/absolute']['id'], + FileRoutesByPath['/absolute']['path'], + FileRoutesByPath['/absolute']['fullPath'] + > +} +declare module './routes/linkProps' { + const createFileRoute: CreateFileRoute< + '/linkProps', + FileRoutesByPath['/linkProps']['parentRoute'], + FileRoutesByPath['/linkProps']['id'], + FileRoutesByPath['/linkProps']['path'], + FileRoutesByPath['/linkProps']['fullPath'] + > +} +declare module './routes/relative' { + const createFileRoute: CreateFileRoute< + '/relative', + FileRoutesByPath['/relative']['parentRoute'], + FileRoutesByPath['/relative']['id'], + FileRoutesByPath['/relative']['path'], + FileRoutesByPath['/relative']['fullPath'] + > +} +declare module './routes/(gen)/params/route' { + const createFileRoute: CreateFileRoute< + '/(gen)/params', + FileRoutesByPath['/(gen)/params']['parentRoute'], + FileRoutesByPath['/(gen)/params']['id'], + FileRoutesByPath['/(gen)/params']['path'], + FileRoutesByPath['/(gen)/params']['fullPath'] + > +} +declare module './routes/(gen)/search/route' { + const createFileRoute: CreateFileRoute< + '/(gen)/search', + FileRoutesByPath['/(gen)/search']['parentRoute'], + FileRoutesByPath['/(gen)/search']['id'], + FileRoutesByPath['/(gen)/search']['path'], + FileRoutesByPath['/(gen)/search']['fullPath'] + > +} +declare module './routes/(gen)/absolute0' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute0', + FileRoutesByPath['/(gen)/absolute0']['parentRoute'], + FileRoutesByPath['/(gen)/absolute0']['id'], + FileRoutesByPath['/(gen)/absolute0']['path'], + FileRoutesByPath['/(gen)/absolute0']['fullPath'] + > +} +declare module './routes/(gen)/absolute1' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute1', + FileRoutesByPath['/(gen)/absolute1']['parentRoute'], + FileRoutesByPath['/(gen)/absolute1']['id'], + FileRoutesByPath['/(gen)/absolute1']['path'], + FileRoutesByPath['/(gen)/absolute1']['fullPath'] + > +} +declare module './routes/(gen)/absolute10' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute10', + FileRoutesByPath['/(gen)/absolute10']['parentRoute'], + FileRoutesByPath['/(gen)/absolute10']['id'], + FileRoutesByPath['/(gen)/absolute10']['path'], + FileRoutesByPath['/(gen)/absolute10']['fullPath'] + > +} +declare module './routes/(gen)/absolute11' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute11', + FileRoutesByPath['/(gen)/absolute11']['parentRoute'], + FileRoutesByPath['/(gen)/absolute11']['id'], + FileRoutesByPath['/(gen)/absolute11']['path'], + FileRoutesByPath['/(gen)/absolute11']['fullPath'] + > +} +declare module './routes/(gen)/absolute12' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute12', + FileRoutesByPath['/(gen)/absolute12']['parentRoute'], + FileRoutesByPath['/(gen)/absolute12']['id'], + FileRoutesByPath['/(gen)/absolute12']['path'], + FileRoutesByPath['/(gen)/absolute12']['fullPath'] + > +} +declare module './routes/(gen)/absolute13' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute13', + FileRoutesByPath['/(gen)/absolute13']['parentRoute'], + FileRoutesByPath['/(gen)/absolute13']['id'], + FileRoutesByPath['/(gen)/absolute13']['path'], + FileRoutesByPath['/(gen)/absolute13']['fullPath'] + > +} +declare module './routes/(gen)/absolute14' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute14', + FileRoutesByPath['/(gen)/absolute14']['parentRoute'], + FileRoutesByPath['/(gen)/absolute14']['id'], + FileRoutesByPath['/(gen)/absolute14']['path'], + FileRoutesByPath['/(gen)/absolute14']['fullPath'] + > +} +declare module './routes/(gen)/absolute15' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute15', + FileRoutesByPath['/(gen)/absolute15']['parentRoute'], + FileRoutesByPath['/(gen)/absolute15']['id'], + FileRoutesByPath['/(gen)/absolute15']['path'], + FileRoutesByPath['/(gen)/absolute15']['fullPath'] + > +} +declare module './routes/(gen)/absolute16' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute16', + FileRoutesByPath['/(gen)/absolute16']['parentRoute'], + FileRoutesByPath['/(gen)/absolute16']['id'], + FileRoutesByPath['/(gen)/absolute16']['path'], + FileRoutesByPath['/(gen)/absolute16']['fullPath'] + > +} +declare module './routes/(gen)/absolute17' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute17', + FileRoutesByPath['/(gen)/absolute17']['parentRoute'], + FileRoutesByPath['/(gen)/absolute17']['id'], + FileRoutesByPath['/(gen)/absolute17']['path'], + FileRoutesByPath['/(gen)/absolute17']['fullPath'] + > +} +declare module './routes/(gen)/absolute18' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute18', + FileRoutesByPath['/(gen)/absolute18']['parentRoute'], + FileRoutesByPath['/(gen)/absolute18']['id'], + FileRoutesByPath['/(gen)/absolute18']['path'], + FileRoutesByPath['/(gen)/absolute18']['fullPath'] + > +} +declare module './routes/(gen)/absolute19' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute19', + FileRoutesByPath['/(gen)/absolute19']['parentRoute'], + FileRoutesByPath['/(gen)/absolute19']['id'], + FileRoutesByPath['/(gen)/absolute19']['path'], + FileRoutesByPath['/(gen)/absolute19']['fullPath'] + > +} +declare module './routes/(gen)/absolute2' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute2', + FileRoutesByPath['/(gen)/absolute2']['parentRoute'], + FileRoutesByPath['/(gen)/absolute2']['id'], + FileRoutesByPath['/(gen)/absolute2']['path'], + FileRoutesByPath['/(gen)/absolute2']['fullPath'] + > +} +declare module './routes/(gen)/absolute20' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute20', + FileRoutesByPath['/(gen)/absolute20']['parentRoute'], + FileRoutesByPath['/(gen)/absolute20']['id'], + FileRoutesByPath['/(gen)/absolute20']['path'], + FileRoutesByPath['/(gen)/absolute20']['fullPath'] + > +} +declare module './routes/(gen)/absolute21' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute21', + FileRoutesByPath['/(gen)/absolute21']['parentRoute'], + FileRoutesByPath['/(gen)/absolute21']['id'], + FileRoutesByPath['/(gen)/absolute21']['path'], + FileRoutesByPath['/(gen)/absolute21']['fullPath'] + > +} +declare module './routes/(gen)/absolute22' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute22', + FileRoutesByPath['/(gen)/absolute22']['parentRoute'], + FileRoutesByPath['/(gen)/absolute22']['id'], + FileRoutesByPath['/(gen)/absolute22']['path'], + FileRoutesByPath['/(gen)/absolute22']['fullPath'] + > +} +declare module './routes/(gen)/absolute23' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute23', + FileRoutesByPath['/(gen)/absolute23']['parentRoute'], + FileRoutesByPath['/(gen)/absolute23']['id'], + FileRoutesByPath['/(gen)/absolute23']['path'], + FileRoutesByPath['/(gen)/absolute23']['fullPath'] + > +} +declare module './routes/(gen)/absolute24' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute24', + FileRoutesByPath['/(gen)/absolute24']['parentRoute'], + FileRoutesByPath['/(gen)/absolute24']['id'], + FileRoutesByPath['/(gen)/absolute24']['path'], + FileRoutesByPath['/(gen)/absolute24']['fullPath'] + > +} +declare module './routes/(gen)/absolute25' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute25', + FileRoutesByPath['/(gen)/absolute25']['parentRoute'], + FileRoutesByPath['/(gen)/absolute25']['id'], + FileRoutesByPath['/(gen)/absolute25']['path'], + FileRoutesByPath['/(gen)/absolute25']['fullPath'] + > +} +declare module './routes/(gen)/absolute26' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute26', + FileRoutesByPath['/(gen)/absolute26']['parentRoute'], + FileRoutesByPath['/(gen)/absolute26']['id'], + FileRoutesByPath['/(gen)/absolute26']['path'], + FileRoutesByPath['/(gen)/absolute26']['fullPath'] + > +} +declare module './routes/(gen)/absolute27' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute27', + FileRoutesByPath['/(gen)/absolute27']['parentRoute'], + FileRoutesByPath['/(gen)/absolute27']['id'], + FileRoutesByPath['/(gen)/absolute27']['path'], + FileRoutesByPath['/(gen)/absolute27']['fullPath'] + > +} +declare module './routes/(gen)/absolute28' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute28', + FileRoutesByPath['/(gen)/absolute28']['parentRoute'], + FileRoutesByPath['/(gen)/absolute28']['id'], + FileRoutesByPath['/(gen)/absolute28']['path'], + FileRoutesByPath['/(gen)/absolute28']['fullPath'] + > +} +declare module './routes/(gen)/absolute29' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute29', + FileRoutesByPath['/(gen)/absolute29']['parentRoute'], + FileRoutesByPath['/(gen)/absolute29']['id'], + FileRoutesByPath['/(gen)/absolute29']['path'], + FileRoutesByPath['/(gen)/absolute29']['fullPath'] + > +} +declare module './routes/(gen)/absolute3' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute3', + FileRoutesByPath['/(gen)/absolute3']['parentRoute'], + FileRoutesByPath['/(gen)/absolute3']['id'], + FileRoutesByPath['/(gen)/absolute3']['path'], + FileRoutesByPath['/(gen)/absolute3']['fullPath'] + > +} +declare module './routes/(gen)/absolute30' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute30', + FileRoutesByPath['/(gen)/absolute30']['parentRoute'], + FileRoutesByPath['/(gen)/absolute30']['id'], + FileRoutesByPath['/(gen)/absolute30']['path'], + FileRoutesByPath['/(gen)/absolute30']['fullPath'] + > +} +declare module './routes/(gen)/absolute31' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute31', + FileRoutesByPath['/(gen)/absolute31']['parentRoute'], + FileRoutesByPath['/(gen)/absolute31']['id'], + FileRoutesByPath['/(gen)/absolute31']['path'], + FileRoutesByPath['/(gen)/absolute31']['fullPath'] + > +} +declare module './routes/(gen)/absolute32' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute32', + FileRoutesByPath['/(gen)/absolute32']['parentRoute'], + FileRoutesByPath['/(gen)/absolute32']['id'], + FileRoutesByPath['/(gen)/absolute32']['path'], + FileRoutesByPath['/(gen)/absolute32']['fullPath'] + > +} +declare module './routes/(gen)/absolute33' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute33', + FileRoutesByPath['/(gen)/absolute33']['parentRoute'], + FileRoutesByPath['/(gen)/absolute33']['id'], + FileRoutesByPath['/(gen)/absolute33']['path'], + FileRoutesByPath['/(gen)/absolute33']['fullPath'] + > +} +declare module './routes/(gen)/absolute34' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute34', + FileRoutesByPath['/(gen)/absolute34']['parentRoute'], + FileRoutesByPath['/(gen)/absolute34']['id'], + FileRoutesByPath['/(gen)/absolute34']['path'], + FileRoutesByPath['/(gen)/absolute34']['fullPath'] + > +} +declare module './routes/(gen)/absolute35' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute35', + FileRoutesByPath['/(gen)/absolute35']['parentRoute'], + FileRoutesByPath['/(gen)/absolute35']['id'], + FileRoutesByPath['/(gen)/absolute35']['path'], + FileRoutesByPath['/(gen)/absolute35']['fullPath'] + > +} +declare module './routes/(gen)/absolute36' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute36', + FileRoutesByPath['/(gen)/absolute36']['parentRoute'], + FileRoutesByPath['/(gen)/absolute36']['id'], + FileRoutesByPath['/(gen)/absolute36']['path'], + FileRoutesByPath['/(gen)/absolute36']['fullPath'] + > +} +declare module './routes/(gen)/absolute37' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute37', + FileRoutesByPath['/(gen)/absolute37']['parentRoute'], + FileRoutesByPath['/(gen)/absolute37']['id'], + FileRoutesByPath['/(gen)/absolute37']['path'], + FileRoutesByPath['/(gen)/absolute37']['fullPath'] + > +} +declare module './routes/(gen)/absolute38' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute38', + FileRoutesByPath['/(gen)/absolute38']['parentRoute'], + FileRoutesByPath['/(gen)/absolute38']['id'], + FileRoutesByPath['/(gen)/absolute38']['path'], + FileRoutesByPath['/(gen)/absolute38']['fullPath'] + > +} +declare module './routes/(gen)/absolute39' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute39', + FileRoutesByPath['/(gen)/absolute39']['parentRoute'], + FileRoutesByPath['/(gen)/absolute39']['id'], + FileRoutesByPath['/(gen)/absolute39']['path'], + FileRoutesByPath['/(gen)/absolute39']['fullPath'] + > +} +declare module './routes/(gen)/absolute4' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute4', + FileRoutesByPath['/(gen)/absolute4']['parentRoute'], + FileRoutesByPath['/(gen)/absolute4']['id'], + FileRoutesByPath['/(gen)/absolute4']['path'], + FileRoutesByPath['/(gen)/absolute4']['fullPath'] + > +} +declare module './routes/(gen)/absolute40' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute40', + FileRoutesByPath['/(gen)/absolute40']['parentRoute'], + FileRoutesByPath['/(gen)/absolute40']['id'], + FileRoutesByPath['/(gen)/absolute40']['path'], + FileRoutesByPath['/(gen)/absolute40']['fullPath'] + > +} +declare module './routes/(gen)/absolute41' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute41', + FileRoutesByPath['/(gen)/absolute41']['parentRoute'], + FileRoutesByPath['/(gen)/absolute41']['id'], + FileRoutesByPath['/(gen)/absolute41']['path'], + FileRoutesByPath['/(gen)/absolute41']['fullPath'] + > +} +declare module './routes/(gen)/absolute42' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute42', + FileRoutesByPath['/(gen)/absolute42']['parentRoute'], + FileRoutesByPath['/(gen)/absolute42']['id'], + FileRoutesByPath['/(gen)/absolute42']['path'], + FileRoutesByPath['/(gen)/absolute42']['fullPath'] + > +} +declare module './routes/(gen)/absolute43' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute43', + FileRoutesByPath['/(gen)/absolute43']['parentRoute'], + FileRoutesByPath['/(gen)/absolute43']['id'], + FileRoutesByPath['/(gen)/absolute43']['path'], + FileRoutesByPath['/(gen)/absolute43']['fullPath'] + > +} +declare module './routes/(gen)/absolute44' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute44', + FileRoutesByPath['/(gen)/absolute44']['parentRoute'], + FileRoutesByPath['/(gen)/absolute44']['id'], + FileRoutesByPath['/(gen)/absolute44']['path'], + FileRoutesByPath['/(gen)/absolute44']['fullPath'] + > +} +declare module './routes/(gen)/absolute45' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute45', + FileRoutesByPath['/(gen)/absolute45']['parentRoute'], + FileRoutesByPath['/(gen)/absolute45']['id'], + FileRoutesByPath['/(gen)/absolute45']['path'], + FileRoutesByPath['/(gen)/absolute45']['fullPath'] + > +} +declare module './routes/(gen)/absolute46' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute46', + FileRoutesByPath['/(gen)/absolute46']['parentRoute'], + FileRoutesByPath['/(gen)/absolute46']['id'], + FileRoutesByPath['/(gen)/absolute46']['path'], + FileRoutesByPath['/(gen)/absolute46']['fullPath'] + > +} +declare module './routes/(gen)/absolute47' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute47', + FileRoutesByPath['/(gen)/absolute47']['parentRoute'], + FileRoutesByPath['/(gen)/absolute47']['id'], + FileRoutesByPath['/(gen)/absolute47']['path'], + FileRoutesByPath['/(gen)/absolute47']['fullPath'] + > +} +declare module './routes/(gen)/absolute48' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute48', + FileRoutesByPath['/(gen)/absolute48']['parentRoute'], + FileRoutesByPath['/(gen)/absolute48']['id'], + FileRoutesByPath['/(gen)/absolute48']['path'], + FileRoutesByPath['/(gen)/absolute48']['fullPath'] + > +} +declare module './routes/(gen)/absolute49' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute49', + FileRoutesByPath['/(gen)/absolute49']['parentRoute'], + FileRoutesByPath['/(gen)/absolute49']['id'], + FileRoutesByPath['/(gen)/absolute49']['path'], + FileRoutesByPath['/(gen)/absolute49']['fullPath'] + > +} +declare module './routes/(gen)/absolute5' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute5', + FileRoutesByPath['/(gen)/absolute5']['parentRoute'], + FileRoutesByPath['/(gen)/absolute5']['id'], + FileRoutesByPath['/(gen)/absolute5']['path'], + FileRoutesByPath['/(gen)/absolute5']['fullPath'] + > +} +declare module './routes/(gen)/absolute50' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute50', + FileRoutesByPath['/(gen)/absolute50']['parentRoute'], + FileRoutesByPath['/(gen)/absolute50']['id'], + FileRoutesByPath['/(gen)/absolute50']['path'], + FileRoutesByPath['/(gen)/absolute50']['fullPath'] + > +} +declare module './routes/(gen)/absolute51' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute51', + FileRoutesByPath['/(gen)/absolute51']['parentRoute'], + FileRoutesByPath['/(gen)/absolute51']['id'], + FileRoutesByPath['/(gen)/absolute51']['path'], + FileRoutesByPath['/(gen)/absolute51']['fullPath'] + > +} +declare module './routes/(gen)/absolute52' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute52', + FileRoutesByPath['/(gen)/absolute52']['parentRoute'], + FileRoutesByPath['/(gen)/absolute52']['id'], + FileRoutesByPath['/(gen)/absolute52']['path'], + FileRoutesByPath['/(gen)/absolute52']['fullPath'] + > +} +declare module './routes/(gen)/absolute53' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute53', + FileRoutesByPath['/(gen)/absolute53']['parentRoute'], + FileRoutesByPath['/(gen)/absolute53']['id'], + FileRoutesByPath['/(gen)/absolute53']['path'], + FileRoutesByPath['/(gen)/absolute53']['fullPath'] + > +} +declare module './routes/(gen)/absolute54' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute54', + FileRoutesByPath['/(gen)/absolute54']['parentRoute'], + FileRoutesByPath['/(gen)/absolute54']['id'], + FileRoutesByPath['/(gen)/absolute54']['path'], + FileRoutesByPath['/(gen)/absolute54']['fullPath'] + > +} +declare module './routes/(gen)/absolute55' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute55', + FileRoutesByPath['/(gen)/absolute55']['parentRoute'], + FileRoutesByPath['/(gen)/absolute55']['id'], + FileRoutesByPath['/(gen)/absolute55']['path'], + FileRoutesByPath['/(gen)/absolute55']['fullPath'] + > +} +declare module './routes/(gen)/absolute56' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute56', + FileRoutesByPath['/(gen)/absolute56']['parentRoute'], + FileRoutesByPath['/(gen)/absolute56']['id'], + FileRoutesByPath['/(gen)/absolute56']['path'], + FileRoutesByPath['/(gen)/absolute56']['fullPath'] + > +} +declare module './routes/(gen)/absolute57' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute57', + FileRoutesByPath['/(gen)/absolute57']['parentRoute'], + FileRoutesByPath['/(gen)/absolute57']['id'], + FileRoutesByPath['/(gen)/absolute57']['path'], + FileRoutesByPath['/(gen)/absolute57']['fullPath'] + > +} +declare module './routes/(gen)/absolute58' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute58', + FileRoutesByPath['/(gen)/absolute58']['parentRoute'], + FileRoutesByPath['/(gen)/absolute58']['id'], + FileRoutesByPath['/(gen)/absolute58']['path'], + FileRoutesByPath['/(gen)/absolute58']['fullPath'] + > +} +declare module './routes/(gen)/absolute59' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute59', + FileRoutesByPath['/(gen)/absolute59']['parentRoute'], + FileRoutesByPath['/(gen)/absolute59']['id'], + FileRoutesByPath['/(gen)/absolute59']['path'], + FileRoutesByPath['/(gen)/absolute59']['fullPath'] + > +} +declare module './routes/(gen)/absolute6' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute6', + FileRoutesByPath['/(gen)/absolute6']['parentRoute'], + FileRoutesByPath['/(gen)/absolute6']['id'], + FileRoutesByPath['/(gen)/absolute6']['path'], + FileRoutesByPath['/(gen)/absolute6']['fullPath'] + > +} +declare module './routes/(gen)/absolute60' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute60', + FileRoutesByPath['/(gen)/absolute60']['parentRoute'], + FileRoutesByPath['/(gen)/absolute60']['id'], + FileRoutesByPath['/(gen)/absolute60']['path'], + FileRoutesByPath['/(gen)/absolute60']['fullPath'] + > +} +declare module './routes/(gen)/absolute61' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute61', + FileRoutesByPath['/(gen)/absolute61']['parentRoute'], + FileRoutesByPath['/(gen)/absolute61']['id'], + FileRoutesByPath['/(gen)/absolute61']['path'], + FileRoutesByPath['/(gen)/absolute61']['fullPath'] + > +} +declare module './routes/(gen)/absolute62' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute62', + FileRoutesByPath['/(gen)/absolute62']['parentRoute'], + FileRoutesByPath['/(gen)/absolute62']['id'], + FileRoutesByPath['/(gen)/absolute62']['path'], + FileRoutesByPath['/(gen)/absolute62']['fullPath'] + > +} +declare module './routes/(gen)/absolute63' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute63', + FileRoutesByPath['/(gen)/absolute63']['parentRoute'], + FileRoutesByPath['/(gen)/absolute63']['id'], + FileRoutesByPath['/(gen)/absolute63']['path'], + FileRoutesByPath['/(gen)/absolute63']['fullPath'] + > +} +declare module './routes/(gen)/absolute64' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute64', + FileRoutesByPath['/(gen)/absolute64']['parentRoute'], + FileRoutesByPath['/(gen)/absolute64']['id'], + FileRoutesByPath['/(gen)/absolute64']['path'], + FileRoutesByPath['/(gen)/absolute64']['fullPath'] + > +} +declare module './routes/(gen)/absolute65' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute65', + FileRoutesByPath['/(gen)/absolute65']['parentRoute'], + FileRoutesByPath['/(gen)/absolute65']['id'], + FileRoutesByPath['/(gen)/absolute65']['path'], + FileRoutesByPath['/(gen)/absolute65']['fullPath'] + > +} +declare module './routes/(gen)/absolute66' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute66', + FileRoutesByPath['/(gen)/absolute66']['parentRoute'], + FileRoutesByPath['/(gen)/absolute66']['id'], + FileRoutesByPath['/(gen)/absolute66']['path'], + FileRoutesByPath['/(gen)/absolute66']['fullPath'] + > +} +declare module './routes/(gen)/absolute67' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute67', + FileRoutesByPath['/(gen)/absolute67']['parentRoute'], + FileRoutesByPath['/(gen)/absolute67']['id'], + FileRoutesByPath['/(gen)/absolute67']['path'], + FileRoutesByPath['/(gen)/absolute67']['fullPath'] + > +} +declare module './routes/(gen)/absolute68' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute68', + FileRoutesByPath['/(gen)/absolute68']['parentRoute'], + FileRoutesByPath['/(gen)/absolute68']['id'], + FileRoutesByPath['/(gen)/absolute68']['path'], + FileRoutesByPath['/(gen)/absolute68']['fullPath'] + > +} +declare module './routes/(gen)/absolute69' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute69', + FileRoutesByPath['/(gen)/absolute69']['parentRoute'], + FileRoutesByPath['/(gen)/absolute69']['id'], + FileRoutesByPath['/(gen)/absolute69']['path'], + FileRoutesByPath['/(gen)/absolute69']['fullPath'] + > +} +declare module './routes/(gen)/absolute7' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute7', + FileRoutesByPath['/(gen)/absolute7']['parentRoute'], + FileRoutesByPath['/(gen)/absolute7']['id'], + FileRoutesByPath['/(gen)/absolute7']['path'], + FileRoutesByPath['/(gen)/absolute7']['fullPath'] + > +} +declare module './routes/(gen)/absolute70' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute70', + FileRoutesByPath['/(gen)/absolute70']['parentRoute'], + FileRoutesByPath['/(gen)/absolute70']['id'], + FileRoutesByPath['/(gen)/absolute70']['path'], + FileRoutesByPath['/(gen)/absolute70']['fullPath'] + > +} +declare module './routes/(gen)/absolute71' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute71', + FileRoutesByPath['/(gen)/absolute71']['parentRoute'], + FileRoutesByPath['/(gen)/absolute71']['id'], + FileRoutesByPath['/(gen)/absolute71']['path'], + FileRoutesByPath['/(gen)/absolute71']['fullPath'] + > +} +declare module './routes/(gen)/absolute72' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute72', + FileRoutesByPath['/(gen)/absolute72']['parentRoute'], + FileRoutesByPath['/(gen)/absolute72']['id'], + FileRoutesByPath['/(gen)/absolute72']['path'], + FileRoutesByPath['/(gen)/absolute72']['fullPath'] + > +} +declare module './routes/(gen)/absolute73' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute73', + FileRoutesByPath['/(gen)/absolute73']['parentRoute'], + FileRoutesByPath['/(gen)/absolute73']['id'], + FileRoutesByPath['/(gen)/absolute73']['path'], + FileRoutesByPath['/(gen)/absolute73']['fullPath'] + > +} +declare module './routes/(gen)/absolute74' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute74', + FileRoutesByPath['/(gen)/absolute74']['parentRoute'], + FileRoutesByPath['/(gen)/absolute74']['id'], + FileRoutesByPath['/(gen)/absolute74']['path'], + FileRoutesByPath['/(gen)/absolute74']['fullPath'] + > +} +declare module './routes/(gen)/absolute75' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute75', + FileRoutesByPath['/(gen)/absolute75']['parentRoute'], + FileRoutesByPath['/(gen)/absolute75']['id'], + FileRoutesByPath['/(gen)/absolute75']['path'], + FileRoutesByPath['/(gen)/absolute75']['fullPath'] + > +} +declare module './routes/(gen)/absolute76' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute76', + FileRoutesByPath['/(gen)/absolute76']['parentRoute'], + FileRoutesByPath['/(gen)/absolute76']['id'], + FileRoutesByPath['/(gen)/absolute76']['path'], + FileRoutesByPath['/(gen)/absolute76']['fullPath'] + > +} +declare module './routes/(gen)/absolute77' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute77', + FileRoutesByPath['/(gen)/absolute77']['parentRoute'], + FileRoutesByPath['/(gen)/absolute77']['id'], + FileRoutesByPath['/(gen)/absolute77']['path'], + FileRoutesByPath['/(gen)/absolute77']['fullPath'] + > +} +declare module './routes/(gen)/absolute78' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute78', + FileRoutesByPath['/(gen)/absolute78']['parentRoute'], + FileRoutesByPath['/(gen)/absolute78']['id'], + FileRoutesByPath['/(gen)/absolute78']['path'], + FileRoutesByPath['/(gen)/absolute78']['fullPath'] + > +} +declare module './routes/(gen)/absolute79' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute79', + FileRoutesByPath['/(gen)/absolute79']['parentRoute'], + FileRoutesByPath['/(gen)/absolute79']['id'], + FileRoutesByPath['/(gen)/absolute79']['path'], + FileRoutesByPath['/(gen)/absolute79']['fullPath'] + > +} +declare module './routes/(gen)/absolute8' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute8', + FileRoutesByPath['/(gen)/absolute8']['parentRoute'], + FileRoutesByPath['/(gen)/absolute8']['id'], + FileRoutesByPath['/(gen)/absolute8']['path'], + FileRoutesByPath['/(gen)/absolute8']['fullPath'] + > +} +declare module './routes/(gen)/absolute80' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute80', + FileRoutesByPath['/(gen)/absolute80']['parentRoute'], + FileRoutesByPath['/(gen)/absolute80']['id'], + FileRoutesByPath['/(gen)/absolute80']['path'], + FileRoutesByPath['/(gen)/absolute80']['fullPath'] + > +} +declare module './routes/(gen)/absolute81' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute81', + FileRoutesByPath['/(gen)/absolute81']['parentRoute'], + FileRoutesByPath['/(gen)/absolute81']['id'], + FileRoutesByPath['/(gen)/absolute81']['path'], + FileRoutesByPath['/(gen)/absolute81']['fullPath'] + > +} +declare module './routes/(gen)/absolute82' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute82', + FileRoutesByPath['/(gen)/absolute82']['parentRoute'], + FileRoutesByPath['/(gen)/absolute82']['id'], + FileRoutesByPath['/(gen)/absolute82']['path'], + FileRoutesByPath['/(gen)/absolute82']['fullPath'] + > +} +declare module './routes/(gen)/absolute83' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute83', + FileRoutesByPath['/(gen)/absolute83']['parentRoute'], + FileRoutesByPath['/(gen)/absolute83']['id'], + FileRoutesByPath['/(gen)/absolute83']['path'], + FileRoutesByPath['/(gen)/absolute83']['fullPath'] + > +} +declare module './routes/(gen)/absolute84' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute84', + FileRoutesByPath['/(gen)/absolute84']['parentRoute'], + FileRoutesByPath['/(gen)/absolute84']['id'], + FileRoutesByPath['/(gen)/absolute84']['path'], + FileRoutesByPath['/(gen)/absolute84']['fullPath'] + > +} +declare module './routes/(gen)/absolute85' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute85', + FileRoutesByPath['/(gen)/absolute85']['parentRoute'], + FileRoutesByPath['/(gen)/absolute85']['id'], + FileRoutesByPath['/(gen)/absolute85']['path'], + FileRoutesByPath['/(gen)/absolute85']['fullPath'] + > +} +declare module './routes/(gen)/absolute86' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute86', + FileRoutesByPath['/(gen)/absolute86']['parentRoute'], + FileRoutesByPath['/(gen)/absolute86']['id'], + FileRoutesByPath['/(gen)/absolute86']['path'], + FileRoutesByPath['/(gen)/absolute86']['fullPath'] + > +} +declare module './routes/(gen)/absolute87' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute87', + FileRoutesByPath['/(gen)/absolute87']['parentRoute'], + FileRoutesByPath['/(gen)/absolute87']['id'], + FileRoutesByPath['/(gen)/absolute87']['path'], + FileRoutesByPath['/(gen)/absolute87']['fullPath'] + > +} +declare module './routes/(gen)/absolute88' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute88', + FileRoutesByPath['/(gen)/absolute88']['parentRoute'], + FileRoutesByPath['/(gen)/absolute88']['id'], + FileRoutesByPath['/(gen)/absolute88']['path'], + FileRoutesByPath['/(gen)/absolute88']['fullPath'] + > +} +declare module './routes/(gen)/absolute89' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute89', + FileRoutesByPath['/(gen)/absolute89']['parentRoute'], + FileRoutesByPath['/(gen)/absolute89']['id'], + FileRoutesByPath['/(gen)/absolute89']['path'], + FileRoutesByPath['/(gen)/absolute89']['fullPath'] + > +} +declare module './routes/(gen)/absolute9' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute9', + FileRoutesByPath['/(gen)/absolute9']['parentRoute'], + FileRoutesByPath['/(gen)/absolute9']['id'], + FileRoutesByPath['/(gen)/absolute9']['path'], + FileRoutesByPath['/(gen)/absolute9']['fullPath'] + > +} +declare module './routes/(gen)/absolute90' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute90', + FileRoutesByPath['/(gen)/absolute90']['parentRoute'], + FileRoutesByPath['/(gen)/absolute90']['id'], + FileRoutesByPath['/(gen)/absolute90']['path'], + FileRoutesByPath['/(gen)/absolute90']['fullPath'] + > +} +declare module './routes/(gen)/absolute91' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute91', + FileRoutesByPath['/(gen)/absolute91']['parentRoute'], + FileRoutesByPath['/(gen)/absolute91']['id'], + FileRoutesByPath['/(gen)/absolute91']['path'], + FileRoutesByPath['/(gen)/absolute91']['fullPath'] + > +} +declare module './routes/(gen)/absolute92' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute92', + FileRoutesByPath['/(gen)/absolute92']['parentRoute'], + FileRoutesByPath['/(gen)/absolute92']['id'], + FileRoutesByPath['/(gen)/absolute92']['path'], + FileRoutesByPath['/(gen)/absolute92']['fullPath'] + > +} +declare module './routes/(gen)/absolute93' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute93', + FileRoutesByPath['/(gen)/absolute93']['parentRoute'], + FileRoutesByPath['/(gen)/absolute93']['id'], + FileRoutesByPath['/(gen)/absolute93']['path'], + FileRoutesByPath['/(gen)/absolute93']['fullPath'] + > +} +declare module './routes/(gen)/absolute94' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute94', + FileRoutesByPath['/(gen)/absolute94']['parentRoute'], + FileRoutesByPath['/(gen)/absolute94']['id'], + FileRoutesByPath['/(gen)/absolute94']['path'], + FileRoutesByPath['/(gen)/absolute94']['fullPath'] + > +} +declare module './routes/(gen)/absolute95' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute95', + FileRoutesByPath['/(gen)/absolute95']['parentRoute'], + FileRoutesByPath['/(gen)/absolute95']['id'], + FileRoutesByPath['/(gen)/absolute95']['path'], + FileRoutesByPath['/(gen)/absolute95']['fullPath'] + > +} +declare module './routes/(gen)/absolute96' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute96', + FileRoutesByPath['/(gen)/absolute96']['parentRoute'], + FileRoutesByPath['/(gen)/absolute96']['id'], + FileRoutesByPath['/(gen)/absolute96']['path'], + FileRoutesByPath['/(gen)/absolute96']['fullPath'] + > +} +declare module './routes/(gen)/absolute97' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute97', + FileRoutesByPath['/(gen)/absolute97']['parentRoute'], + FileRoutesByPath['/(gen)/absolute97']['id'], + FileRoutesByPath['/(gen)/absolute97']['path'], + FileRoutesByPath['/(gen)/absolute97']['fullPath'] + > +} +declare module './routes/(gen)/absolute98' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute98', + FileRoutesByPath['/(gen)/absolute98']['parentRoute'], + FileRoutesByPath['/(gen)/absolute98']['id'], + FileRoutesByPath['/(gen)/absolute98']['path'], + FileRoutesByPath['/(gen)/absolute98']['fullPath'] + > +} +declare module './routes/(gen)/absolute99' { + const createFileRoute: CreateFileRoute< + '/(gen)/absolute99', + FileRoutesByPath['/(gen)/absolute99']['parentRoute'], + FileRoutesByPath['/(gen)/absolute99']['id'], + FileRoutesByPath['/(gen)/absolute99']['path'], + FileRoutesByPath['/(gen)/absolute99']['fullPath'] + > +} +declare module './routes/(gen)/relative0' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative0', + FileRoutesByPath['/(gen)/relative0']['parentRoute'], + FileRoutesByPath['/(gen)/relative0']['id'], + FileRoutesByPath['/(gen)/relative0']['path'], + FileRoutesByPath['/(gen)/relative0']['fullPath'] + > +} +declare module './routes/(gen)/relative1' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative1', + FileRoutesByPath['/(gen)/relative1']['parentRoute'], + FileRoutesByPath['/(gen)/relative1']['id'], + FileRoutesByPath['/(gen)/relative1']['path'], + FileRoutesByPath['/(gen)/relative1']['fullPath'] + > +} +declare module './routes/(gen)/relative10' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative10', + FileRoutesByPath['/(gen)/relative10']['parentRoute'], + FileRoutesByPath['/(gen)/relative10']['id'], + FileRoutesByPath['/(gen)/relative10']['path'], + FileRoutesByPath['/(gen)/relative10']['fullPath'] + > +} +declare module './routes/(gen)/relative11' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative11', + FileRoutesByPath['/(gen)/relative11']['parentRoute'], + FileRoutesByPath['/(gen)/relative11']['id'], + FileRoutesByPath['/(gen)/relative11']['path'], + FileRoutesByPath['/(gen)/relative11']['fullPath'] + > +} +declare module './routes/(gen)/relative12' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative12', + FileRoutesByPath['/(gen)/relative12']['parentRoute'], + FileRoutesByPath['/(gen)/relative12']['id'], + FileRoutesByPath['/(gen)/relative12']['path'], + FileRoutesByPath['/(gen)/relative12']['fullPath'] + > +} +declare module './routes/(gen)/relative13' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative13', + FileRoutesByPath['/(gen)/relative13']['parentRoute'], + FileRoutesByPath['/(gen)/relative13']['id'], + FileRoutesByPath['/(gen)/relative13']['path'], + FileRoutesByPath['/(gen)/relative13']['fullPath'] + > +} +declare module './routes/(gen)/relative14' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative14', + FileRoutesByPath['/(gen)/relative14']['parentRoute'], + FileRoutesByPath['/(gen)/relative14']['id'], + FileRoutesByPath['/(gen)/relative14']['path'], + FileRoutesByPath['/(gen)/relative14']['fullPath'] + > +} +declare module './routes/(gen)/relative15' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative15', + FileRoutesByPath['/(gen)/relative15']['parentRoute'], + FileRoutesByPath['/(gen)/relative15']['id'], + FileRoutesByPath['/(gen)/relative15']['path'], + FileRoutesByPath['/(gen)/relative15']['fullPath'] + > +} +declare module './routes/(gen)/relative16' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative16', + FileRoutesByPath['/(gen)/relative16']['parentRoute'], + FileRoutesByPath['/(gen)/relative16']['id'], + FileRoutesByPath['/(gen)/relative16']['path'], + FileRoutesByPath['/(gen)/relative16']['fullPath'] + > +} +declare module './routes/(gen)/relative17' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative17', + FileRoutesByPath['/(gen)/relative17']['parentRoute'], + FileRoutesByPath['/(gen)/relative17']['id'], + FileRoutesByPath['/(gen)/relative17']['path'], + FileRoutesByPath['/(gen)/relative17']['fullPath'] + > +} +declare module './routes/(gen)/relative18' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative18', + FileRoutesByPath['/(gen)/relative18']['parentRoute'], + FileRoutesByPath['/(gen)/relative18']['id'], + FileRoutesByPath['/(gen)/relative18']['path'], + FileRoutesByPath['/(gen)/relative18']['fullPath'] + > +} +declare module './routes/(gen)/relative19' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative19', + FileRoutesByPath['/(gen)/relative19']['parentRoute'], + FileRoutesByPath['/(gen)/relative19']['id'], + FileRoutesByPath['/(gen)/relative19']['path'], + FileRoutesByPath['/(gen)/relative19']['fullPath'] + > +} +declare module './routes/(gen)/relative2' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative2', + FileRoutesByPath['/(gen)/relative2']['parentRoute'], + FileRoutesByPath['/(gen)/relative2']['id'], + FileRoutesByPath['/(gen)/relative2']['path'], + FileRoutesByPath['/(gen)/relative2']['fullPath'] + > +} +declare module './routes/(gen)/relative20' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative20', + FileRoutesByPath['/(gen)/relative20']['parentRoute'], + FileRoutesByPath['/(gen)/relative20']['id'], + FileRoutesByPath['/(gen)/relative20']['path'], + FileRoutesByPath['/(gen)/relative20']['fullPath'] + > +} +declare module './routes/(gen)/relative21' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative21', + FileRoutesByPath['/(gen)/relative21']['parentRoute'], + FileRoutesByPath['/(gen)/relative21']['id'], + FileRoutesByPath['/(gen)/relative21']['path'], + FileRoutesByPath['/(gen)/relative21']['fullPath'] + > +} +declare module './routes/(gen)/relative22' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative22', + FileRoutesByPath['/(gen)/relative22']['parentRoute'], + FileRoutesByPath['/(gen)/relative22']['id'], + FileRoutesByPath['/(gen)/relative22']['path'], + FileRoutesByPath['/(gen)/relative22']['fullPath'] + > +} +declare module './routes/(gen)/relative23' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative23', + FileRoutesByPath['/(gen)/relative23']['parentRoute'], + FileRoutesByPath['/(gen)/relative23']['id'], + FileRoutesByPath['/(gen)/relative23']['path'], + FileRoutesByPath['/(gen)/relative23']['fullPath'] + > +} +declare module './routes/(gen)/relative24' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative24', + FileRoutesByPath['/(gen)/relative24']['parentRoute'], + FileRoutesByPath['/(gen)/relative24']['id'], + FileRoutesByPath['/(gen)/relative24']['path'], + FileRoutesByPath['/(gen)/relative24']['fullPath'] + > +} +declare module './routes/(gen)/relative25' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative25', + FileRoutesByPath['/(gen)/relative25']['parentRoute'], + FileRoutesByPath['/(gen)/relative25']['id'], + FileRoutesByPath['/(gen)/relative25']['path'], + FileRoutesByPath['/(gen)/relative25']['fullPath'] + > +} +declare module './routes/(gen)/relative26' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative26', + FileRoutesByPath['/(gen)/relative26']['parentRoute'], + FileRoutesByPath['/(gen)/relative26']['id'], + FileRoutesByPath['/(gen)/relative26']['path'], + FileRoutesByPath['/(gen)/relative26']['fullPath'] + > +} +declare module './routes/(gen)/relative27' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative27', + FileRoutesByPath['/(gen)/relative27']['parentRoute'], + FileRoutesByPath['/(gen)/relative27']['id'], + FileRoutesByPath['/(gen)/relative27']['path'], + FileRoutesByPath['/(gen)/relative27']['fullPath'] + > +} +declare module './routes/(gen)/relative28' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative28', + FileRoutesByPath['/(gen)/relative28']['parentRoute'], + FileRoutesByPath['/(gen)/relative28']['id'], + FileRoutesByPath['/(gen)/relative28']['path'], + FileRoutesByPath['/(gen)/relative28']['fullPath'] + > +} +declare module './routes/(gen)/relative29' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative29', + FileRoutesByPath['/(gen)/relative29']['parentRoute'], + FileRoutesByPath['/(gen)/relative29']['id'], + FileRoutesByPath['/(gen)/relative29']['path'], + FileRoutesByPath['/(gen)/relative29']['fullPath'] + > +} +declare module './routes/(gen)/relative3' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative3', + FileRoutesByPath['/(gen)/relative3']['parentRoute'], + FileRoutesByPath['/(gen)/relative3']['id'], + FileRoutesByPath['/(gen)/relative3']['path'], + FileRoutesByPath['/(gen)/relative3']['fullPath'] + > +} +declare module './routes/(gen)/relative30' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative30', + FileRoutesByPath['/(gen)/relative30']['parentRoute'], + FileRoutesByPath['/(gen)/relative30']['id'], + FileRoutesByPath['/(gen)/relative30']['path'], + FileRoutesByPath['/(gen)/relative30']['fullPath'] + > +} +declare module './routes/(gen)/relative31' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative31', + FileRoutesByPath['/(gen)/relative31']['parentRoute'], + FileRoutesByPath['/(gen)/relative31']['id'], + FileRoutesByPath['/(gen)/relative31']['path'], + FileRoutesByPath['/(gen)/relative31']['fullPath'] + > +} +declare module './routes/(gen)/relative32' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative32', + FileRoutesByPath['/(gen)/relative32']['parentRoute'], + FileRoutesByPath['/(gen)/relative32']['id'], + FileRoutesByPath['/(gen)/relative32']['path'], + FileRoutesByPath['/(gen)/relative32']['fullPath'] + > +} +declare module './routes/(gen)/relative33' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative33', + FileRoutesByPath['/(gen)/relative33']['parentRoute'], + FileRoutesByPath['/(gen)/relative33']['id'], + FileRoutesByPath['/(gen)/relative33']['path'], + FileRoutesByPath['/(gen)/relative33']['fullPath'] + > +} +declare module './routes/(gen)/relative34' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative34', + FileRoutesByPath['/(gen)/relative34']['parentRoute'], + FileRoutesByPath['/(gen)/relative34']['id'], + FileRoutesByPath['/(gen)/relative34']['path'], + FileRoutesByPath['/(gen)/relative34']['fullPath'] + > +} +declare module './routes/(gen)/relative35' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative35', + FileRoutesByPath['/(gen)/relative35']['parentRoute'], + FileRoutesByPath['/(gen)/relative35']['id'], + FileRoutesByPath['/(gen)/relative35']['path'], + FileRoutesByPath['/(gen)/relative35']['fullPath'] + > +} +declare module './routes/(gen)/relative36' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative36', + FileRoutesByPath['/(gen)/relative36']['parentRoute'], + FileRoutesByPath['/(gen)/relative36']['id'], + FileRoutesByPath['/(gen)/relative36']['path'], + FileRoutesByPath['/(gen)/relative36']['fullPath'] + > +} +declare module './routes/(gen)/relative37' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative37', + FileRoutesByPath['/(gen)/relative37']['parentRoute'], + FileRoutesByPath['/(gen)/relative37']['id'], + FileRoutesByPath['/(gen)/relative37']['path'], + FileRoutesByPath['/(gen)/relative37']['fullPath'] + > +} +declare module './routes/(gen)/relative38' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative38', + FileRoutesByPath['/(gen)/relative38']['parentRoute'], + FileRoutesByPath['/(gen)/relative38']['id'], + FileRoutesByPath['/(gen)/relative38']['path'], + FileRoutesByPath['/(gen)/relative38']['fullPath'] + > +} +declare module './routes/(gen)/relative39' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative39', + FileRoutesByPath['/(gen)/relative39']['parentRoute'], + FileRoutesByPath['/(gen)/relative39']['id'], + FileRoutesByPath['/(gen)/relative39']['path'], + FileRoutesByPath['/(gen)/relative39']['fullPath'] + > +} +declare module './routes/(gen)/relative4' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative4', + FileRoutesByPath['/(gen)/relative4']['parentRoute'], + FileRoutesByPath['/(gen)/relative4']['id'], + FileRoutesByPath['/(gen)/relative4']['path'], + FileRoutesByPath['/(gen)/relative4']['fullPath'] + > +} +declare module './routes/(gen)/relative40' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative40', + FileRoutesByPath['/(gen)/relative40']['parentRoute'], + FileRoutesByPath['/(gen)/relative40']['id'], + FileRoutesByPath['/(gen)/relative40']['path'], + FileRoutesByPath['/(gen)/relative40']['fullPath'] + > +} +declare module './routes/(gen)/relative41' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative41', + FileRoutesByPath['/(gen)/relative41']['parentRoute'], + FileRoutesByPath['/(gen)/relative41']['id'], + FileRoutesByPath['/(gen)/relative41']['path'], + FileRoutesByPath['/(gen)/relative41']['fullPath'] + > +} +declare module './routes/(gen)/relative42' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative42', + FileRoutesByPath['/(gen)/relative42']['parentRoute'], + FileRoutesByPath['/(gen)/relative42']['id'], + FileRoutesByPath['/(gen)/relative42']['path'], + FileRoutesByPath['/(gen)/relative42']['fullPath'] + > +} +declare module './routes/(gen)/relative43' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative43', + FileRoutesByPath['/(gen)/relative43']['parentRoute'], + FileRoutesByPath['/(gen)/relative43']['id'], + FileRoutesByPath['/(gen)/relative43']['path'], + FileRoutesByPath['/(gen)/relative43']['fullPath'] + > +} +declare module './routes/(gen)/relative44' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative44', + FileRoutesByPath['/(gen)/relative44']['parentRoute'], + FileRoutesByPath['/(gen)/relative44']['id'], + FileRoutesByPath['/(gen)/relative44']['path'], + FileRoutesByPath['/(gen)/relative44']['fullPath'] + > +} +declare module './routes/(gen)/relative45' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative45', + FileRoutesByPath['/(gen)/relative45']['parentRoute'], + FileRoutesByPath['/(gen)/relative45']['id'], + FileRoutesByPath['/(gen)/relative45']['path'], + FileRoutesByPath['/(gen)/relative45']['fullPath'] + > +} +declare module './routes/(gen)/relative46' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative46', + FileRoutesByPath['/(gen)/relative46']['parentRoute'], + FileRoutesByPath['/(gen)/relative46']['id'], + FileRoutesByPath['/(gen)/relative46']['path'], + FileRoutesByPath['/(gen)/relative46']['fullPath'] + > +} +declare module './routes/(gen)/relative47' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative47', + FileRoutesByPath['/(gen)/relative47']['parentRoute'], + FileRoutesByPath['/(gen)/relative47']['id'], + FileRoutesByPath['/(gen)/relative47']['path'], + FileRoutesByPath['/(gen)/relative47']['fullPath'] + > +} +declare module './routes/(gen)/relative48' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative48', + FileRoutesByPath['/(gen)/relative48']['parentRoute'], + FileRoutesByPath['/(gen)/relative48']['id'], + FileRoutesByPath['/(gen)/relative48']['path'], + FileRoutesByPath['/(gen)/relative48']['fullPath'] + > +} +declare module './routes/(gen)/relative49' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative49', + FileRoutesByPath['/(gen)/relative49']['parentRoute'], + FileRoutesByPath['/(gen)/relative49']['id'], + FileRoutesByPath['/(gen)/relative49']['path'], + FileRoutesByPath['/(gen)/relative49']['fullPath'] + > +} +declare module './routes/(gen)/relative5' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative5', + FileRoutesByPath['/(gen)/relative5']['parentRoute'], + FileRoutesByPath['/(gen)/relative5']['id'], + FileRoutesByPath['/(gen)/relative5']['path'], + FileRoutesByPath['/(gen)/relative5']['fullPath'] + > +} +declare module './routes/(gen)/relative50' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative50', + FileRoutesByPath['/(gen)/relative50']['parentRoute'], + FileRoutesByPath['/(gen)/relative50']['id'], + FileRoutesByPath['/(gen)/relative50']['path'], + FileRoutesByPath['/(gen)/relative50']['fullPath'] + > +} +declare module './routes/(gen)/relative51' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative51', + FileRoutesByPath['/(gen)/relative51']['parentRoute'], + FileRoutesByPath['/(gen)/relative51']['id'], + FileRoutesByPath['/(gen)/relative51']['path'], + FileRoutesByPath['/(gen)/relative51']['fullPath'] + > +} +declare module './routes/(gen)/relative52' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative52', + FileRoutesByPath['/(gen)/relative52']['parentRoute'], + FileRoutesByPath['/(gen)/relative52']['id'], + FileRoutesByPath['/(gen)/relative52']['path'], + FileRoutesByPath['/(gen)/relative52']['fullPath'] + > +} +declare module './routes/(gen)/relative53' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative53', + FileRoutesByPath['/(gen)/relative53']['parentRoute'], + FileRoutesByPath['/(gen)/relative53']['id'], + FileRoutesByPath['/(gen)/relative53']['path'], + FileRoutesByPath['/(gen)/relative53']['fullPath'] + > +} +declare module './routes/(gen)/relative54' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative54', + FileRoutesByPath['/(gen)/relative54']['parentRoute'], + FileRoutesByPath['/(gen)/relative54']['id'], + FileRoutesByPath['/(gen)/relative54']['path'], + FileRoutesByPath['/(gen)/relative54']['fullPath'] + > +} +declare module './routes/(gen)/relative55' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative55', + FileRoutesByPath['/(gen)/relative55']['parentRoute'], + FileRoutesByPath['/(gen)/relative55']['id'], + FileRoutesByPath['/(gen)/relative55']['path'], + FileRoutesByPath['/(gen)/relative55']['fullPath'] + > +} +declare module './routes/(gen)/relative56' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative56', + FileRoutesByPath['/(gen)/relative56']['parentRoute'], + FileRoutesByPath['/(gen)/relative56']['id'], + FileRoutesByPath['/(gen)/relative56']['path'], + FileRoutesByPath['/(gen)/relative56']['fullPath'] + > +} +declare module './routes/(gen)/relative57' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative57', + FileRoutesByPath['/(gen)/relative57']['parentRoute'], + FileRoutesByPath['/(gen)/relative57']['id'], + FileRoutesByPath['/(gen)/relative57']['path'], + FileRoutesByPath['/(gen)/relative57']['fullPath'] + > +} +declare module './routes/(gen)/relative58' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative58', + FileRoutesByPath['/(gen)/relative58']['parentRoute'], + FileRoutesByPath['/(gen)/relative58']['id'], + FileRoutesByPath['/(gen)/relative58']['path'], + FileRoutesByPath['/(gen)/relative58']['fullPath'] + > +} +declare module './routes/(gen)/relative59' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative59', + FileRoutesByPath['/(gen)/relative59']['parentRoute'], + FileRoutesByPath['/(gen)/relative59']['id'], + FileRoutesByPath['/(gen)/relative59']['path'], + FileRoutesByPath['/(gen)/relative59']['fullPath'] + > +} +declare module './routes/(gen)/relative6' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative6', + FileRoutesByPath['/(gen)/relative6']['parentRoute'], + FileRoutesByPath['/(gen)/relative6']['id'], + FileRoutesByPath['/(gen)/relative6']['path'], + FileRoutesByPath['/(gen)/relative6']['fullPath'] + > +} +declare module './routes/(gen)/relative60' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative60', + FileRoutesByPath['/(gen)/relative60']['parentRoute'], + FileRoutesByPath['/(gen)/relative60']['id'], + FileRoutesByPath['/(gen)/relative60']['path'], + FileRoutesByPath['/(gen)/relative60']['fullPath'] + > +} +declare module './routes/(gen)/relative61' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative61', + FileRoutesByPath['/(gen)/relative61']['parentRoute'], + FileRoutesByPath['/(gen)/relative61']['id'], + FileRoutesByPath['/(gen)/relative61']['path'], + FileRoutesByPath['/(gen)/relative61']['fullPath'] + > +} +declare module './routes/(gen)/relative62' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative62', + FileRoutesByPath['/(gen)/relative62']['parentRoute'], + FileRoutesByPath['/(gen)/relative62']['id'], + FileRoutesByPath['/(gen)/relative62']['path'], + FileRoutesByPath['/(gen)/relative62']['fullPath'] + > +} +declare module './routes/(gen)/relative63' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative63', + FileRoutesByPath['/(gen)/relative63']['parentRoute'], + FileRoutesByPath['/(gen)/relative63']['id'], + FileRoutesByPath['/(gen)/relative63']['path'], + FileRoutesByPath['/(gen)/relative63']['fullPath'] + > +} +declare module './routes/(gen)/relative64' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative64', + FileRoutesByPath['/(gen)/relative64']['parentRoute'], + FileRoutesByPath['/(gen)/relative64']['id'], + FileRoutesByPath['/(gen)/relative64']['path'], + FileRoutesByPath['/(gen)/relative64']['fullPath'] + > +} +declare module './routes/(gen)/relative65' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative65', + FileRoutesByPath['/(gen)/relative65']['parentRoute'], + FileRoutesByPath['/(gen)/relative65']['id'], + FileRoutesByPath['/(gen)/relative65']['path'], + FileRoutesByPath['/(gen)/relative65']['fullPath'] + > +} +declare module './routes/(gen)/relative66' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative66', + FileRoutesByPath['/(gen)/relative66']['parentRoute'], + FileRoutesByPath['/(gen)/relative66']['id'], + FileRoutesByPath['/(gen)/relative66']['path'], + FileRoutesByPath['/(gen)/relative66']['fullPath'] + > +} +declare module './routes/(gen)/relative67' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative67', + FileRoutesByPath['/(gen)/relative67']['parentRoute'], + FileRoutesByPath['/(gen)/relative67']['id'], + FileRoutesByPath['/(gen)/relative67']['path'], + FileRoutesByPath['/(gen)/relative67']['fullPath'] + > +} +declare module './routes/(gen)/relative68' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative68', + FileRoutesByPath['/(gen)/relative68']['parentRoute'], + FileRoutesByPath['/(gen)/relative68']['id'], + FileRoutesByPath['/(gen)/relative68']['path'], + FileRoutesByPath['/(gen)/relative68']['fullPath'] + > +} +declare module './routes/(gen)/relative69' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative69', + FileRoutesByPath['/(gen)/relative69']['parentRoute'], + FileRoutesByPath['/(gen)/relative69']['id'], + FileRoutesByPath['/(gen)/relative69']['path'], + FileRoutesByPath['/(gen)/relative69']['fullPath'] + > +} +declare module './routes/(gen)/relative7' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative7', + FileRoutesByPath['/(gen)/relative7']['parentRoute'], + FileRoutesByPath['/(gen)/relative7']['id'], + FileRoutesByPath['/(gen)/relative7']['path'], + FileRoutesByPath['/(gen)/relative7']['fullPath'] + > +} +declare module './routes/(gen)/relative70' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative70', + FileRoutesByPath['/(gen)/relative70']['parentRoute'], + FileRoutesByPath['/(gen)/relative70']['id'], + FileRoutesByPath['/(gen)/relative70']['path'], + FileRoutesByPath['/(gen)/relative70']['fullPath'] + > +} +declare module './routes/(gen)/relative71' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative71', + FileRoutesByPath['/(gen)/relative71']['parentRoute'], + FileRoutesByPath['/(gen)/relative71']['id'], + FileRoutesByPath['/(gen)/relative71']['path'], + FileRoutesByPath['/(gen)/relative71']['fullPath'] + > +} +declare module './routes/(gen)/relative72' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative72', + FileRoutesByPath['/(gen)/relative72']['parentRoute'], + FileRoutesByPath['/(gen)/relative72']['id'], + FileRoutesByPath['/(gen)/relative72']['path'], + FileRoutesByPath['/(gen)/relative72']['fullPath'] + > +} +declare module './routes/(gen)/relative73' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative73', + FileRoutesByPath['/(gen)/relative73']['parentRoute'], + FileRoutesByPath['/(gen)/relative73']['id'], + FileRoutesByPath['/(gen)/relative73']['path'], + FileRoutesByPath['/(gen)/relative73']['fullPath'] + > +} +declare module './routes/(gen)/relative74' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative74', + FileRoutesByPath['/(gen)/relative74']['parentRoute'], + FileRoutesByPath['/(gen)/relative74']['id'], + FileRoutesByPath['/(gen)/relative74']['path'], + FileRoutesByPath['/(gen)/relative74']['fullPath'] + > +} +declare module './routes/(gen)/relative75' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative75', + FileRoutesByPath['/(gen)/relative75']['parentRoute'], + FileRoutesByPath['/(gen)/relative75']['id'], + FileRoutesByPath['/(gen)/relative75']['path'], + FileRoutesByPath['/(gen)/relative75']['fullPath'] + > +} +declare module './routes/(gen)/relative76' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative76', + FileRoutesByPath['/(gen)/relative76']['parentRoute'], + FileRoutesByPath['/(gen)/relative76']['id'], + FileRoutesByPath['/(gen)/relative76']['path'], + FileRoutesByPath['/(gen)/relative76']['fullPath'] + > +} +declare module './routes/(gen)/relative77' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative77', + FileRoutesByPath['/(gen)/relative77']['parentRoute'], + FileRoutesByPath['/(gen)/relative77']['id'], + FileRoutesByPath['/(gen)/relative77']['path'], + FileRoutesByPath['/(gen)/relative77']['fullPath'] + > +} +declare module './routes/(gen)/relative78' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative78', + FileRoutesByPath['/(gen)/relative78']['parentRoute'], + FileRoutesByPath['/(gen)/relative78']['id'], + FileRoutesByPath['/(gen)/relative78']['path'], + FileRoutesByPath['/(gen)/relative78']['fullPath'] + > +} +declare module './routes/(gen)/relative79' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative79', + FileRoutesByPath['/(gen)/relative79']['parentRoute'], + FileRoutesByPath['/(gen)/relative79']['id'], + FileRoutesByPath['/(gen)/relative79']['path'], + FileRoutesByPath['/(gen)/relative79']['fullPath'] + > +} +declare module './routes/(gen)/relative8' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative8', + FileRoutesByPath['/(gen)/relative8']['parentRoute'], + FileRoutesByPath['/(gen)/relative8']['id'], + FileRoutesByPath['/(gen)/relative8']['path'], + FileRoutesByPath['/(gen)/relative8']['fullPath'] + > +} +declare module './routes/(gen)/relative80' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative80', + FileRoutesByPath['/(gen)/relative80']['parentRoute'], + FileRoutesByPath['/(gen)/relative80']['id'], + FileRoutesByPath['/(gen)/relative80']['path'], + FileRoutesByPath['/(gen)/relative80']['fullPath'] + > +} +declare module './routes/(gen)/relative81' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative81', + FileRoutesByPath['/(gen)/relative81']['parentRoute'], + FileRoutesByPath['/(gen)/relative81']['id'], + FileRoutesByPath['/(gen)/relative81']['path'], + FileRoutesByPath['/(gen)/relative81']['fullPath'] + > +} +declare module './routes/(gen)/relative82' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative82', + FileRoutesByPath['/(gen)/relative82']['parentRoute'], + FileRoutesByPath['/(gen)/relative82']['id'], + FileRoutesByPath['/(gen)/relative82']['path'], + FileRoutesByPath['/(gen)/relative82']['fullPath'] + > +} +declare module './routes/(gen)/relative83' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative83', + FileRoutesByPath['/(gen)/relative83']['parentRoute'], + FileRoutesByPath['/(gen)/relative83']['id'], + FileRoutesByPath['/(gen)/relative83']['path'], + FileRoutesByPath['/(gen)/relative83']['fullPath'] + > +} +declare module './routes/(gen)/relative84' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative84', + FileRoutesByPath['/(gen)/relative84']['parentRoute'], + FileRoutesByPath['/(gen)/relative84']['id'], + FileRoutesByPath['/(gen)/relative84']['path'], + FileRoutesByPath['/(gen)/relative84']['fullPath'] + > +} +declare module './routes/(gen)/relative85' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative85', + FileRoutesByPath['/(gen)/relative85']['parentRoute'], + FileRoutesByPath['/(gen)/relative85']['id'], + FileRoutesByPath['/(gen)/relative85']['path'], + FileRoutesByPath['/(gen)/relative85']['fullPath'] + > +} +declare module './routes/(gen)/relative86' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative86', + FileRoutesByPath['/(gen)/relative86']['parentRoute'], + FileRoutesByPath['/(gen)/relative86']['id'], + FileRoutesByPath['/(gen)/relative86']['path'], + FileRoutesByPath['/(gen)/relative86']['fullPath'] + > +} +declare module './routes/(gen)/relative87' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative87', + FileRoutesByPath['/(gen)/relative87']['parentRoute'], + FileRoutesByPath['/(gen)/relative87']['id'], + FileRoutesByPath['/(gen)/relative87']['path'], + FileRoutesByPath['/(gen)/relative87']['fullPath'] + > +} +declare module './routes/(gen)/relative88' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative88', + FileRoutesByPath['/(gen)/relative88']['parentRoute'], + FileRoutesByPath['/(gen)/relative88']['id'], + FileRoutesByPath['/(gen)/relative88']['path'], + FileRoutesByPath['/(gen)/relative88']['fullPath'] + > +} +declare module './routes/(gen)/relative89' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative89', + FileRoutesByPath['/(gen)/relative89']['parentRoute'], + FileRoutesByPath['/(gen)/relative89']['id'], + FileRoutesByPath['/(gen)/relative89']['path'], + FileRoutesByPath['/(gen)/relative89']['fullPath'] + > +} +declare module './routes/(gen)/relative9' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative9', + FileRoutesByPath['/(gen)/relative9']['parentRoute'], + FileRoutesByPath['/(gen)/relative9']['id'], + FileRoutesByPath['/(gen)/relative9']['path'], + FileRoutesByPath['/(gen)/relative9']['fullPath'] + > +} +declare module './routes/(gen)/relative90' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative90', + FileRoutesByPath['/(gen)/relative90']['parentRoute'], + FileRoutesByPath['/(gen)/relative90']['id'], + FileRoutesByPath['/(gen)/relative90']['path'], + FileRoutesByPath['/(gen)/relative90']['fullPath'] + > +} +declare module './routes/(gen)/relative91' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative91', + FileRoutesByPath['/(gen)/relative91']['parentRoute'], + FileRoutesByPath['/(gen)/relative91']['id'], + FileRoutesByPath['/(gen)/relative91']['path'], + FileRoutesByPath['/(gen)/relative91']['fullPath'] + > +} +declare module './routes/(gen)/relative92' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative92', + FileRoutesByPath['/(gen)/relative92']['parentRoute'], + FileRoutesByPath['/(gen)/relative92']['id'], + FileRoutesByPath['/(gen)/relative92']['path'], + FileRoutesByPath['/(gen)/relative92']['fullPath'] + > +} +declare module './routes/(gen)/relative93' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative93', + FileRoutesByPath['/(gen)/relative93']['parentRoute'], + FileRoutesByPath['/(gen)/relative93']['id'], + FileRoutesByPath['/(gen)/relative93']['path'], + FileRoutesByPath['/(gen)/relative93']['fullPath'] + > +} +declare module './routes/(gen)/relative94' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative94', + FileRoutesByPath['/(gen)/relative94']['parentRoute'], + FileRoutesByPath['/(gen)/relative94']['id'], + FileRoutesByPath['/(gen)/relative94']['path'], + FileRoutesByPath['/(gen)/relative94']['fullPath'] + > +} +declare module './routes/(gen)/relative95' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative95', + FileRoutesByPath['/(gen)/relative95']['parentRoute'], + FileRoutesByPath['/(gen)/relative95']['id'], + FileRoutesByPath['/(gen)/relative95']['path'], + FileRoutesByPath['/(gen)/relative95']['fullPath'] + > +} +declare module './routes/(gen)/relative96' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative96', + FileRoutesByPath['/(gen)/relative96']['parentRoute'], + FileRoutesByPath['/(gen)/relative96']['id'], + FileRoutesByPath['/(gen)/relative96']['path'], + FileRoutesByPath['/(gen)/relative96']['fullPath'] + > +} +declare module './routes/(gen)/relative97' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative97', + FileRoutesByPath['/(gen)/relative97']['parentRoute'], + FileRoutesByPath['/(gen)/relative97']['id'], + FileRoutesByPath['/(gen)/relative97']['path'], + FileRoutesByPath['/(gen)/relative97']['fullPath'] + > +} +declare module './routes/(gen)/relative98' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative98', + FileRoutesByPath['/(gen)/relative98']['parentRoute'], + FileRoutesByPath['/(gen)/relative98']['id'], + FileRoutesByPath['/(gen)/relative98']['path'], + FileRoutesByPath['/(gen)/relative98']['fullPath'] + > +} +declare module './routes/(gen)/relative99' { + const createFileRoute: CreateFileRoute< + '/(gen)/relative99', + FileRoutesByPath['/(gen)/relative99']['parentRoute'], + FileRoutesByPath['/(gen)/relative99']['id'], + FileRoutesByPath['/(gen)/relative99']['path'], + FileRoutesByPath['/(gen)/relative99']['fullPath'] + > +} +declare module './routes/params/$paramsPlaceholder' { + const createFileRoute: CreateFileRoute< + '/params/$paramsPlaceholder', + FileRoutesByPath['/params/$paramsPlaceholder']['parentRoute'], + FileRoutesByPath['/params/$paramsPlaceholder']['id'], + FileRoutesByPath['/params/$paramsPlaceholder']['path'], + FileRoutesByPath['/params/$paramsPlaceholder']['fullPath'] + > +} +declare module './routes/search/searchPlaceholder' { + const createFileRoute: CreateFileRoute< + '/search/searchPlaceholder', + FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], + FileRoutesByPath['/search/searchPlaceholder']['id'], + FileRoutesByPath['/search/searchPlaceholder']['path'], + FileRoutesByPath['/search/searchPlaceholder']['fullPath'] + > +} +declare module './routes/(gen)/params/$param0' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param0', + FileRoutesByPath['/(gen)/params/$param0']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param0']['id'], + FileRoutesByPath['/(gen)/params/$param0']['path'], + FileRoutesByPath['/(gen)/params/$param0']['fullPath'] + > +} +declare module './routes/(gen)/params/$param1' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param1', + FileRoutesByPath['/(gen)/params/$param1']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param1']['id'], + FileRoutesByPath['/(gen)/params/$param1']['path'], + FileRoutesByPath['/(gen)/params/$param1']['fullPath'] + > +} +declare module './routes/(gen)/params/$param10' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param10', + FileRoutesByPath['/(gen)/params/$param10']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param10']['id'], + FileRoutesByPath['/(gen)/params/$param10']['path'], + FileRoutesByPath['/(gen)/params/$param10']['fullPath'] + > +} +declare module './routes/(gen)/params/$param11' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param11', + FileRoutesByPath['/(gen)/params/$param11']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param11']['id'], + FileRoutesByPath['/(gen)/params/$param11']['path'], + FileRoutesByPath['/(gen)/params/$param11']['fullPath'] + > +} +declare module './routes/(gen)/params/$param12' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param12', + FileRoutesByPath['/(gen)/params/$param12']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param12']['id'], + FileRoutesByPath['/(gen)/params/$param12']['path'], + FileRoutesByPath['/(gen)/params/$param12']['fullPath'] + > +} +declare module './routes/(gen)/params/$param13' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param13', + FileRoutesByPath['/(gen)/params/$param13']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param13']['id'], + FileRoutesByPath['/(gen)/params/$param13']['path'], + FileRoutesByPath['/(gen)/params/$param13']['fullPath'] + > +} +declare module './routes/(gen)/params/$param14' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param14', + FileRoutesByPath['/(gen)/params/$param14']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param14']['id'], + FileRoutesByPath['/(gen)/params/$param14']['path'], + FileRoutesByPath['/(gen)/params/$param14']['fullPath'] + > +} +declare module './routes/(gen)/params/$param15' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param15', + FileRoutesByPath['/(gen)/params/$param15']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param15']['id'], + FileRoutesByPath['/(gen)/params/$param15']['path'], + FileRoutesByPath['/(gen)/params/$param15']['fullPath'] + > +} +declare module './routes/(gen)/params/$param16' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param16', + FileRoutesByPath['/(gen)/params/$param16']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param16']['id'], + FileRoutesByPath['/(gen)/params/$param16']['path'], + FileRoutesByPath['/(gen)/params/$param16']['fullPath'] + > +} +declare module './routes/(gen)/params/$param17' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param17', + FileRoutesByPath['/(gen)/params/$param17']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param17']['id'], + FileRoutesByPath['/(gen)/params/$param17']['path'], + FileRoutesByPath['/(gen)/params/$param17']['fullPath'] + > +} +declare module './routes/(gen)/params/$param18' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param18', + FileRoutesByPath['/(gen)/params/$param18']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param18']['id'], + FileRoutesByPath['/(gen)/params/$param18']['path'], + FileRoutesByPath['/(gen)/params/$param18']['fullPath'] + > +} +declare module './routes/(gen)/params/$param19' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param19', + FileRoutesByPath['/(gen)/params/$param19']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param19']['id'], + FileRoutesByPath['/(gen)/params/$param19']['path'], + FileRoutesByPath['/(gen)/params/$param19']['fullPath'] + > +} +declare module './routes/(gen)/params/$param2' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param2', + FileRoutesByPath['/(gen)/params/$param2']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param2']['id'], + FileRoutesByPath['/(gen)/params/$param2']['path'], + FileRoutesByPath['/(gen)/params/$param2']['fullPath'] + > +} +declare module './routes/(gen)/params/$param20' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param20', + FileRoutesByPath['/(gen)/params/$param20']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param20']['id'], + FileRoutesByPath['/(gen)/params/$param20']['path'], + FileRoutesByPath['/(gen)/params/$param20']['fullPath'] + > +} +declare module './routes/(gen)/params/$param21' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param21', + FileRoutesByPath['/(gen)/params/$param21']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param21']['id'], + FileRoutesByPath['/(gen)/params/$param21']['path'], + FileRoutesByPath['/(gen)/params/$param21']['fullPath'] + > +} +declare module './routes/(gen)/params/$param22' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param22', + FileRoutesByPath['/(gen)/params/$param22']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param22']['id'], + FileRoutesByPath['/(gen)/params/$param22']['path'], + FileRoutesByPath['/(gen)/params/$param22']['fullPath'] + > +} +declare module './routes/(gen)/params/$param23' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param23', + FileRoutesByPath['/(gen)/params/$param23']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param23']['id'], + FileRoutesByPath['/(gen)/params/$param23']['path'], + FileRoutesByPath['/(gen)/params/$param23']['fullPath'] + > +} +declare module './routes/(gen)/params/$param24' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param24', + FileRoutesByPath['/(gen)/params/$param24']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param24']['id'], + FileRoutesByPath['/(gen)/params/$param24']['path'], + FileRoutesByPath['/(gen)/params/$param24']['fullPath'] + > +} +declare module './routes/(gen)/params/$param25' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param25', + FileRoutesByPath['/(gen)/params/$param25']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param25']['id'], + FileRoutesByPath['/(gen)/params/$param25']['path'], + FileRoutesByPath['/(gen)/params/$param25']['fullPath'] + > +} +declare module './routes/(gen)/params/$param26' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param26', + FileRoutesByPath['/(gen)/params/$param26']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param26']['id'], + FileRoutesByPath['/(gen)/params/$param26']['path'], + FileRoutesByPath['/(gen)/params/$param26']['fullPath'] + > +} +declare module './routes/(gen)/params/$param27' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param27', + FileRoutesByPath['/(gen)/params/$param27']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param27']['id'], + FileRoutesByPath['/(gen)/params/$param27']['path'], + FileRoutesByPath['/(gen)/params/$param27']['fullPath'] + > +} +declare module './routes/(gen)/params/$param28' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param28', + FileRoutesByPath['/(gen)/params/$param28']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param28']['id'], + FileRoutesByPath['/(gen)/params/$param28']['path'], + FileRoutesByPath['/(gen)/params/$param28']['fullPath'] + > +} +declare module './routes/(gen)/params/$param29' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param29', + FileRoutesByPath['/(gen)/params/$param29']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param29']['id'], + FileRoutesByPath['/(gen)/params/$param29']['path'], + FileRoutesByPath['/(gen)/params/$param29']['fullPath'] + > +} +declare module './routes/(gen)/params/$param3' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param3', + FileRoutesByPath['/(gen)/params/$param3']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param3']['id'], + FileRoutesByPath['/(gen)/params/$param3']['path'], + FileRoutesByPath['/(gen)/params/$param3']['fullPath'] + > +} +declare module './routes/(gen)/params/$param30' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param30', + FileRoutesByPath['/(gen)/params/$param30']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param30']['id'], + FileRoutesByPath['/(gen)/params/$param30']['path'], + FileRoutesByPath['/(gen)/params/$param30']['fullPath'] + > +} +declare module './routes/(gen)/params/$param31' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param31', + FileRoutesByPath['/(gen)/params/$param31']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param31']['id'], + FileRoutesByPath['/(gen)/params/$param31']['path'], + FileRoutesByPath['/(gen)/params/$param31']['fullPath'] + > +} +declare module './routes/(gen)/params/$param32' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param32', + FileRoutesByPath['/(gen)/params/$param32']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param32']['id'], + FileRoutesByPath['/(gen)/params/$param32']['path'], + FileRoutesByPath['/(gen)/params/$param32']['fullPath'] + > +} +declare module './routes/(gen)/params/$param33' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param33', + FileRoutesByPath['/(gen)/params/$param33']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param33']['id'], + FileRoutesByPath['/(gen)/params/$param33']['path'], + FileRoutesByPath['/(gen)/params/$param33']['fullPath'] + > +} +declare module './routes/(gen)/params/$param34' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param34', + FileRoutesByPath['/(gen)/params/$param34']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param34']['id'], + FileRoutesByPath['/(gen)/params/$param34']['path'], + FileRoutesByPath['/(gen)/params/$param34']['fullPath'] + > +} +declare module './routes/(gen)/params/$param35' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param35', + FileRoutesByPath['/(gen)/params/$param35']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param35']['id'], + FileRoutesByPath['/(gen)/params/$param35']['path'], + FileRoutesByPath['/(gen)/params/$param35']['fullPath'] + > +} +declare module './routes/(gen)/params/$param36' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param36', + FileRoutesByPath['/(gen)/params/$param36']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param36']['id'], + FileRoutesByPath['/(gen)/params/$param36']['path'], + FileRoutesByPath['/(gen)/params/$param36']['fullPath'] + > +} +declare module './routes/(gen)/params/$param37' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param37', + FileRoutesByPath['/(gen)/params/$param37']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param37']['id'], + FileRoutesByPath['/(gen)/params/$param37']['path'], + FileRoutesByPath['/(gen)/params/$param37']['fullPath'] + > +} +declare module './routes/(gen)/params/$param38' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param38', + FileRoutesByPath['/(gen)/params/$param38']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param38']['id'], + FileRoutesByPath['/(gen)/params/$param38']['path'], + FileRoutesByPath['/(gen)/params/$param38']['fullPath'] + > +} +declare module './routes/(gen)/params/$param39' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param39', + FileRoutesByPath['/(gen)/params/$param39']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param39']['id'], + FileRoutesByPath['/(gen)/params/$param39']['path'], + FileRoutesByPath['/(gen)/params/$param39']['fullPath'] + > +} +declare module './routes/(gen)/params/$param4' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param4', + FileRoutesByPath['/(gen)/params/$param4']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param4']['id'], + FileRoutesByPath['/(gen)/params/$param4']['path'], + FileRoutesByPath['/(gen)/params/$param4']['fullPath'] + > +} +declare module './routes/(gen)/params/$param40' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param40', + FileRoutesByPath['/(gen)/params/$param40']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param40']['id'], + FileRoutesByPath['/(gen)/params/$param40']['path'], + FileRoutesByPath['/(gen)/params/$param40']['fullPath'] + > +} +declare module './routes/(gen)/params/$param41' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param41', + FileRoutesByPath['/(gen)/params/$param41']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param41']['id'], + FileRoutesByPath['/(gen)/params/$param41']['path'], + FileRoutesByPath['/(gen)/params/$param41']['fullPath'] + > +} +declare module './routes/(gen)/params/$param42' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param42', + FileRoutesByPath['/(gen)/params/$param42']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param42']['id'], + FileRoutesByPath['/(gen)/params/$param42']['path'], + FileRoutesByPath['/(gen)/params/$param42']['fullPath'] + > +} +declare module './routes/(gen)/params/$param43' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param43', + FileRoutesByPath['/(gen)/params/$param43']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param43']['id'], + FileRoutesByPath['/(gen)/params/$param43']['path'], + FileRoutesByPath['/(gen)/params/$param43']['fullPath'] + > +} +declare module './routes/(gen)/params/$param44' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param44', + FileRoutesByPath['/(gen)/params/$param44']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param44']['id'], + FileRoutesByPath['/(gen)/params/$param44']['path'], + FileRoutesByPath['/(gen)/params/$param44']['fullPath'] + > +} +declare module './routes/(gen)/params/$param45' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param45', + FileRoutesByPath['/(gen)/params/$param45']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param45']['id'], + FileRoutesByPath['/(gen)/params/$param45']['path'], + FileRoutesByPath['/(gen)/params/$param45']['fullPath'] + > +} +declare module './routes/(gen)/params/$param46' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param46', + FileRoutesByPath['/(gen)/params/$param46']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param46']['id'], + FileRoutesByPath['/(gen)/params/$param46']['path'], + FileRoutesByPath['/(gen)/params/$param46']['fullPath'] + > +} +declare module './routes/(gen)/params/$param47' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param47', + FileRoutesByPath['/(gen)/params/$param47']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param47']['id'], + FileRoutesByPath['/(gen)/params/$param47']['path'], + FileRoutesByPath['/(gen)/params/$param47']['fullPath'] + > +} +declare module './routes/(gen)/params/$param48' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param48', + FileRoutesByPath['/(gen)/params/$param48']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param48']['id'], + FileRoutesByPath['/(gen)/params/$param48']['path'], + FileRoutesByPath['/(gen)/params/$param48']['fullPath'] + > +} +declare module './routes/(gen)/params/$param49' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param49', + FileRoutesByPath['/(gen)/params/$param49']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param49']['id'], + FileRoutesByPath['/(gen)/params/$param49']['path'], + FileRoutesByPath['/(gen)/params/$param49']['fullPath'] + > +} +declare module './routes/(gen)/params/$param5' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param5', + FileRoutesByPath['/(gen)/params/$param5']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param5']['id'], + FileRoutesByPath['/(gen)/params/$param5']['path'], + FileRoutesByPath['/(gen)/params/$param5']['fullPath'] + > +} +declare module './routes/(gen)/params/$param50' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param50', + FileRoutesByPath['/(gen)/params/$param50']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param50']['id'], + FileRoutesByPath['/(gen)/params/$param50']['path'], + FileRoutesByPath['/(gen)/params/$param50']['fullPath'] + > +} +declare module './routes/(gen)/params/$param51' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param51', + FileRoutesByPath['/(gen)/params/$param51']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param51']['id'], + FileRoutesByPath['/(gen)/params/$param51']['path'], + FileRoutesByPath['/(gen)/params/$param51']['fullPath'] + > +} +declare module './routes/(gen)/params/$param52' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param52', + FileRoutesByPath['/(gen)/params/$param52']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param52']['id'], + FileRoutesByPath['/(gen)/params/$param52']['path'], + FileRoutesByPath['/(gen)/params/$param52']['fullPath'] + > +} +declare module './routes/(gen)/params/$param53' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param53', + FileRoutesByPath['/(gen)/params/$param53']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param53']['id'], + FileRoutesByPath['/(gen)/params/$param53']['path'], + FileRoutesByPath['/(gen)/params/$param53']['fullPath'] + > +} +declare module './routes/(gen)/params/$param54' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param54', + FileRoutesByPath['/(gen)/params/$param54']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param54']['id'], + FileRoutesByPath['/(gen)/params/$param54']['path'], + FileRoutesByPath['/(gen)/params/$param54']['fullPath'] + > +} +declare module './routes/(gen)/params/$param55' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param55', + FileRoutesByPath['/(gen)/params/$param55']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param55']['id'], + FileRoutesByPath['/(gen)/params/$param55']['path'], + FileRoutesByPath['/(gen)/params/$param55']['fullPath'] + > +} +declare module './routes/(gen)/params/$param56' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param56', + FileRoutesByPath['/(gen)/params/$param56']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param56']['id'], + FileRoutesByPath['/(gen)/params/$param56']['path'], + FileRoutesByPath['/(gen)/params/$param56']['fullPath'] + > +} +declare module './routes/(gen)/params/$param57' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param57', + FileRoutesByPath['/(gen)/params/$param57']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param57']['id'], + FileRoutesByPath['/(gen)/params/$param57']['path'], + FileRoutesByPath['/(gen)/params/$param57']['fullPath'] + > +} +declare module './routes/(gen)/params/$param58' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param58', + FileRoutesByPath['/(gen)/params/$param58']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param58']['id'], + FileRoutesByPath['/(gen)/params/$param58']['path'], + FileRoutesByPath['/(gen)/params/$param58']['fullPath'] + > +} +declare module './routes/(gen)/params/$param59' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param59', + FileRoutesByPath['/(gen)/params/$param59']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param59']['id'], + FileRoutesByPath['/(gen)/params/$param59']['path'], + FileRoutesByPath['/(gen)/params/$param59']['fullPath'] + > +} +declare module './routes/(gen)/params/$param6' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param6', + FileRoutesByPath['/(gen)/params/$param6']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param6']['id'], + FileRoutesByPath['/(gen)/params/$param6']['path'], + FileRoutesByPath['/(gen)/params/$param6']['fullPath'] + > +} +declare module './routes/(gen)/params/$param60' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param60', + FileRoutesByPath['/(gen)/params/$param60']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param60']['id'], + FileRoutesByPath['/(gen)/params/$param60']['path'], + FileRoutesByPath['/(gen)/params/$param60']['fullPath'] + > +} +declare module './routes/(gen)/params/$param61' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param61', + FileRoutesByPath['/(gen)/params/$param61']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param61']['id'], + FileRoutesByPath['/(gen)/params/$param61']['path'], + FileRoutesByPath['/(gen)/params/$param61']['fullPath'] + > +} +declare module './routes/(gen)/params/$param62' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param62', + FileRoutesByPath['/(gen)/params/$param62']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param62']['id'], + FileRoutesByPath['/(gen)/params/$param62']['path'], + FileRoutesByPath['/(gen)/params/$param62']['fullPath'] + > +} +declare module './routes/(gen)/params/$param63' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param63', + FileRoutesByPath['/(gen)/params/$param63']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param63']['id'], + FileRoutesByPath['/(gen)/params/$param63']['path'], + FileRoutesByPath['/(gen)/params/$param63']['fullPath'] + > +} +declare module './routes/(gen)/params/$param64' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param64', + FileRoutesByPath['/(gen)/params/$param64']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param64']['id'], + FileRoutesByPath['/(gen)/params/$param64']['path'], + FileRoutesByPath['/(gen)/params/$param64']['fullPath'] + > +} +declare module './routes/(gen)/params/$param65' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param65', + FileRoutesByPath['/(gen)/params/$param65']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param65']['id'], + FileRoutesByPath['/(gen)/params/$param65']['path'], + FileRoutesByPath['/(gen)/params/$param65']['fullPath'] + > +} +declare module './routes/(gen)/params/$param66' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param66', + FileRoutesByPath['/(gen)/params/$param66']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param66']['id'], + FileRoutesByPath['/(gen)/params/$param66']['path'], + FileRoutesByPath['/(gen)/params/$param66']['fullPath'] + > +} +declare module './routes/(gen)/params/$param67' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param67', + FileRoutesByPath['/(gen)/params/$param67']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param67']['id'], + FileRoutesByPath['/(gen)/params/$param67']['path'], + FileRoutesByPath['/(gen)/params/$param67']['fullPath'] + > +} +declare module './routes/(gen)/params/$param68' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param68', + FileRoutesByPath['/(gen)/params/$param68']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param68']['id'], + FileRoutesByPath['/(gen)/params/$param68']['path'], + FileRoutesByPath['/(gen)/params/$param68']['fullPath'] + > +} +declare module './routes/(gen)/params/$param69' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param69', + FileRoutesByPath['/(gen)/params/$param69']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param69']['id'], + FileRoutesByPath['/(gen)/params/$param69']['path'], + FileRoutesByPath['/(gen)/params/$param69']['fullPath'] + > +} +declare module './routes/(gen)/params/$param7' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param7', + FileRoutesByPath['/(gen)/params/$param7']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param7']['id'], + FileRoutesByPath['/(gen)/params/$param7']['path'], + FileRoutesByPath['/(gen)/params/$param7']['fullPath'] + > +} +declare module './routes/(gen)/params/$param70' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param70', + FileRoutesByPath['/(gen)/params/$param70']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param70']['id'], + FileRoutesByPath['/(gen)/params/$param70']['path'], + FileRoutesByPath['/(gen)/params/$param70']['fullPath'] + > +} +declare module './routes/(gen)/params/$param71' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param71', + FileRoutesByPath['/(gen)/params/$param71']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param71']['id'], + FileRoutesByPath['/(gen)/params/$param71']['path'], + FileRoutesByPath['/(gen)/params/$param71']['fullPath'] + > +} +declare module './routes/(gen)/params/$param72' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param72', + FileRoutesByPath['/(gen)/params/$param72']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param72']['id'], + FileRoutesByPath['/(gen)/params/$param72']['path'], + FileRoutesByPath['/(gen)/params/$param72']['fullPath'] + > +} +declare module './routes/(gen)/params/$param73' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param73', + FileRoutesByPath['/(gen)/params/$param73']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param73']['id'], + FileRoutesByPath['/(gen)/params/$param73']['path'], + FileRoutesByPath['/(gen)/params/$param73']['fullPath'] + > +} +declare module './routes/(gen)/params/$param74' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param74', + FileRoutesByPath['/(gen)/params/$param74']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param74']['id'], + FileRoutesByPath['/(gen)/params/$param74']['path'], + FileRoutesByPath['/(gen)/params/$param74']['fullPath'] + > +} +declare module './routes/(gen)/params/$param75' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param75', + FileRoutesByPath['/(gen)/params/$param75']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param75']['id'], + FileRoutesByPath['/(gen)/params/$param75']['path'], + FileRoutesByPath['/(gen)/params/$param75']['fullPath'] + > +} +declare module './routes/(gen)/params/$param76' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param76', + FileRoutesByPath['/(gen)/params/$param76']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param76']['id'], + FileRoutesByPath['/(gen)/params/$param76']['path'], + FileRoutesByPath['/(gen)/params/$param76']['fullPath'] + > +} +declare module './routes/(gen)/params/$param77' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param77', + FileRoutesByPath['/(gen)/params/$param77']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param77']['id'], + FileRoutesByPath['/(gen)/params/$param77']['path'], + FileRoutesByPath['/(gen)/params/$param77']['fullPath'] + > +} +declare module './routes/(gen)/params/$param78' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param78', + FileRoutesByPath['/(gen)/params/$param78']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param78']['id'], + FileRoutesByPath['/(gen)/params/$param78']['path'], + FileRoutesByPath['/(gen)/params/$param78']['fullPath'] + > +} +declare module './routes/(gen)/params/$param79' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param79', + FileRoutesByPath['/(gen)/params/$param79']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param79']['id'], + FileRoutesByPath['/(gen)/params/$param79']['path'], + FileRoutesByPath['/(gen)/params/$param79']['fullPath'] + > +} +declare module './routes/(gen)/params/$param8' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param8', + FileRoutesByPath['/(gen)/params/$param8']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param8']['id'], + FileRoutesByPath['/(gen)/params/$param8']['path'], + FileRoutesByPath['/(gen)/params/$param8']['fullPath'] + > +} +declare module './routes/(gen)/params/$param80' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param80', + FileRoutesByPath['/(gen)/params/$param80']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param80']['id'], + FileRoutesByPath['/(gen)/params/$param80']['path'], + FileRoutesByPath['/(gen)/params/$param80']['fullPath'] + > +} +declare module './routes/(gen)/params/$param81' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param81', + FileRoutesByPath['/(gen)/params/$param81']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param81']['id'], + FileRoutesByPath['/(gen)/params/$param81']['path'], + FileRoutesByPath['/(gen)/params/$param81']['fullPath'] + > +} +declare module './routes/(gen)/params/$param82' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param82', + FileRoutesByPath['/(gen)/params/$param82']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param82']['id'], + FileRoutesByPath['/(gen)/params/$param82']['path'], + FileRoutesByPath['/(gen)/params/$param82']['fullPath'] + > +} +declare module './routes/(gen)/params/$param83' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param83', + FileRoutesByPath['/(gen)/params/$param83']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param83']['id'], + FileRoutesByPath['/(gen)/params/$param83']['path'], + FileRoutesByPath['/(gen)/params/$param83']['fullPath'] + > +} +declare module './routes/(gen)/params/$param84' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param84', + FileRoutesByPath['/(gen)/params/$param84']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param84']['id'], + FileRoutesByPath['/(gen)/params/$param84']['path'], + FileRoutesByPath['/(gen)/params/$param84']['fullPath'] + > +} +declare module './routes/(gen)/params/$param85' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param85', + FileRoutesByPath['/(gen)/params/$param85']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param85']['id'], + FileRoutesByPath['/(gen)/params/$param85']['path'], + FileRoutesByPath['/(gen)/params/$param85']['fullPath'] + > +} +declare module './routes/(gen)/params/$param86' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param86', + FileRoutesByPath['/(gen)/params/$param86']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param86']['id'], + FileRoutesByPath['/(gen)/params/$param86']['path'], + FileRoutesByPath['/(gen)/params/$param86']['fullPath'] + > +} +declare module './routes/(gen)/params/$param87' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param87', + FileRoutesByPath['/(gen)/params/$param87']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param87']['id'], + FileRoutesByPath['/(gen)/params/$param87']['path'], + FileRoutesByPath['/(gen)/params/$param87']['fullPath'] + > +} +declare module './routes/(gen)/params/$param88' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param88', + FileRoutesByPath['/(gen)/params/$param88']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param88']['id'], + FileRoutesByPath['/(gen)/params/$param88']['path'], + FileRoutesByPath['/(gen)/params/$param88']['fullPath'] + > +} +declare module './routes/(gen)/params/$param89' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param89', + FileRoutesByPath['/(gen)/params/$param89']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param89']['id'], + FileRoutesByPath['/(gen)/params/$param89']['path'], + FileRoutesByPath['/(gen)/params/$param89']['fullPath'] + > +} +declare module './routes/(gen)/params/$param9' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param9', + FileRoutesByPath['/(gen)/params/$param9']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param9']['id'], + FileRoutesByPath['/(gen)/params/$param9']['path'], + FileRoutesByPath['/(gen)/params/$param9']['fullPath'] + > +} +declare module './routes/(gen)/params/$param90' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param90', + FileRoutesByPath['/(gen)/params/$param90']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param90']['id'], + FileRoutesByPath['/(gen)/params/$param90']['path'], + FileRoutesByPath['/(gen)/params/$param90']['fullPath'] + > +} +declare module './routes/(gen)/params/$param91' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param91', + FileRoutesByPath['/(gen)/params/$param91']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param91']['id'], + FileRoutesByPath['/(gen)/params/$param91']['path'], + FileRoutesByPath['/(gen)/params/$param91']['fullPath'] + > +} +declare module './routes/(gen)/params/$param92' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param92', + FileRoutesByPath['/(gen)/params/$param92']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param92']['id'], + FileRoutesByPath['/(gen)/params/$param92']['path'], + FileRoutesByPath['/(gen)/params/$param92']['fullPath'] + > +} +declare module './routes/(gen)/params/$param93' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param93', + FileRoutesByPath['/(gen)/params/$param93']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param93']['id'], + FileRoutesByPath['/(gen)/params/$param93']['path'], + FileRoutesByPath['/(gen)/params/$param93']['fullPath'] + > +} +declare module './routes/(gen)/params/$param94' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param94', + FileRoutesByPath['/(gen)/params/$param94']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param94']['id'], + FileRoutesByPath['/(gen)/params/$param94']['path'], + FileRoutesByPath['/(gen)/params/$param94']['fullPath'] + > +} +declare module './routes/(gen)/params/$param95' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param95', + FileRoutesByPath['/(gen)/params/$param95']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param95']['id'], + FileRoutesByPath['/(gen)/params/$param95']['path'], + FileRoutesByPath['/(gen)/params/$param95']['fullPath'] + > +} +declare module './routes/(gen)/params/$param96' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param96', + FileRoutesByPath['/(gen)/params/$param96']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param96']['id'], + FileRoutesByPath['/(gen)/params/$param96']['path'], + FileRoutesByPath['/(gen)/params/$param96']['fullPath'] + > +} +declare module './routes/(gen)/params/$param97' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param97', + FileRoutesByPath['/(gen)/params/$param97']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param97']['id'], + FileRoutesByPath['/(gen)/params/$param97']['path'], + FileRoutesByPath['/(gen)/params/$param97']['fullPath'] + > +} +declare module './routes/(gen)/params/$param98' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param98', + FileRoutesByPath['/(gen)/params/$param98']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param98']['id'], + FileRoutesByPath['/(gen)/params/$param98']['path'], + FileRoutesByPath['/(gen)/params/$param98']['fullPath'] + > +} +declare module './routes/(gen)/params/$param99' { + const createFileRoute: CreateFileRoute< + '/(gen)/params/$param99', + FileRoutesByPath['/(gen)/params/$param99']['parentRoute'], + FileRoutesByPath['/(gen)/params/$param99']['id'], + FileRoutesByPath['/(gen)/params/$param99']['path'], + FileRoutesByPath['/(gen)/params/$param99']['fullPath'] + > +} +declare module './routes/(gen)/search/search0' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search0', + FileRoutesByPath['/(gen)/search/search0']['parentRoute'], + FileRoutesByPath['/(gen)/search/search0']['id'], + FileRoutesByPath['/(gen)/search/search0']['path'], + FileRoutesByPath['/(gen)/search/search0']['fullPath'] + > +} +declare module './routes/(gen)/search/search1' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search1', + FileRoutesByPath['/(gen)/search/search1']['parentRoute'], + FileRoutesByPath['/(gen)/search/search1']['id'], + FileRoutesByPath['/(gen)/search/search1']['path'], + FileRoutesByPath['/(gen)/search/search1']['fullPath'] + > +} +declare module './routes/(gen)/search/search10' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search10', + FileRoutesByPath['/(gen)/search/search10']['parentRoute'], + FileRoutesByPath['/(gen)/search/search10']['id'], + FileRoutesByPath['/(gen)/search/search10']['path'], + FileRoutesByPath['/(gen)/search/search10']['fullPath'] + > +} +declare module './routes/(gen)/search/search11' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search11', + FileRoutesByPath['/(gen)/search/search11']['parentRoute'], + FileRoutesByPath['/(gen)/search/search11']['id'], + FileRoutesByPath['/(gen)/search/search11']['path'], + FileRoutesByPath['/(gen)/search/search11']['fullPath'] + > +} +declare module './routes/(gen)/search/search12' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search12', + FileRoutesByPath['/(gen)/search/search12']['parentRoute'], + FileRoutesByPath['/(gen)/search/search12']['id'], + FileRoutesByPath['/(gen)/search/search12']['path'], + FileRoutesByPath['/(gen)/search/search12']['fullPath'] + > +} +declare module './routes/(gen)/search/search13' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search13', + FileRoutesByPath['/(gen)/search/search13']['parentRoute'], + FileRoutesByPath['/(gen)/search/search13']['id'], + FileRoutesByPath['/(gen)/search/search13']['path'], + FileRoutesByPath['/(gen)/search/search13']['fullPath'] + > +} +declare module './routes/(gen)/search/search14' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search14', + FileRoutesByPath['/(gen)/search/search14']['parentRoute'], + FileRoutesByPath['/(gen)/search/search14']['id'], + FileRoutesByPath['/(gen)/search/search14']['path'], + FileRoutesByPath['/(gen)/search/search14']['fullPath'] + > +} +declare module './routes/(gen)/search/search15' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search15', + FileRoutesByPath['/(gen)/search/search15']['parentRoute'], + FileRoutesByPath['/(gen)/search/search15']['id'], + FileRoutesByPath['/(gen)/search/search15']['path'], + FileRoutesByPath['/(gen)/search/search15']['fullPath'] + > +} +declare module './routes/(gen)/search/search16' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search16', + FileRoutesByPath['/(gen)/search/search16']['parentRoute'], + FileRoutesByPath['/(gen)/search/search16']['id'], + FileRoutesByPath['/(gen)/search/search16']['path'], + FileRoutesByPath['/(gen)/search/search16']['fullPath'] + > +} +declare module './routes/(gen)/search/search17' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search17', + FileRoutesByPath['/(gen)/search/search17']['parentRoute'], + FileRoutesByPath['/(gen)/search/search17']['id'], + FileRoutesByPath['/(gen)/search/search17']['path'], + FileRoutesByPath['/(gen)/search/search17']['fullPath'] + > +} +declare module './routes/(gen)/search/search18' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search18', + FileRoutesByPath['/(gen)/search/search18']['parentRoute'], + FileRoutesByPath['/(gen)/search/search18']['id'], + FileRoutesByPath['/(gen)/search/search18']['path'], + FileRoutesByPath['/(gen)/search/search18']['fullPath'] + > +} +declare module './routes/(gen)/search/search19' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search19', + FileRoutesByPath['/(gen)/search/search19']['parentRoute'], + FileRoutesByPath['/(gen)/search/search19']['id'], + FileRoutesByPath['/(gen)/search/search19']['path'], + FileRoutesByPath['/(gen)/search/search19']['fullPath'] + > +} +declare module './routes/(gen)/search/search2' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search2', + FileRoutesByPath['/(gen)/search/search2']['parentRoute'], + FileRoutesByPath['/(gen)/search/search2']['id'], + FileRoutesByPath['/(gen)/search/search2']['path'], + FileRoutesByPath['/(gen)/search/search2']['fullPath'] + > +} +declare module './routes/(gen)/search/search20' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search20', + FileRoutesByPath['/(gen)/search/search20']['parentRoute'], + FileRoutesByPath['/(gen)/search/search20']['id'], + FileRoutesByPath['/(gen)/search/search20']['path'], + FileRoutesByPath['/(gen)/search/search20']['fullPath'] + > +} +declare module './routes/(gen)/search/search21' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search21', + FileRoutesByPath['/(gen)/search/search21']['parentRoute'], + FileRoutesByPath['/(gen)/search/search21']['id'], + FileRoutesByPath['/(gen)/search/search21']['path'], + FileRoutesByPath['/(gen)/search/search21']['fullPath'] + > +} +declare module './routes/(gen)/search/search22' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search22', + FileRoutesByPath['/(gen)/search/search22']['parentRoute'], + FileRoutesByPath['/(gen)/search/search22']['id'], + FileRoutesByPath['/(gen)/search/search22']['path'], + FileRoutesByPath['/(gen)/search/search22']['fullPath'] + > +} +declare module './routes/(gen)/search/search23' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search23', + FileRoutesByPath['/(gen)/search/search23']['parentRoute'], + FileRoutesByPath['/(gen)/search/search23']['id'], + FileRoutesByPath['/(gen)/search/search23']['path'], + FileRoutesByPath['/(gen)/search/search23']['fullPath'] + > +} +declare module './routes/(gen)/search/search24' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search24', + FileRoutesByPath['/(gen)/search/search24']['parentRoute'], + FileRoutesByPath['/(gen)/search/search24']['id'], + FileRoutesByPath['/(gen)/search/search24']['path'], + FileRoutesByPath['/(gen)/search/search24']['fullPath'] + > +} +declare module './routes/(gen)/search/search25' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search25', + FileRoutesByPath['/(gen)/search/search25']['parentRoute'], + FileRoutesByPath['/(gen)/search/search25']['id'], + FileRoutesByPath['/(gen)/search/search25']['path'], + FileRoutesByPath['/(gen)/search/search25']['fullPath'] + > +} +declare module './routes/(gen)/search/search26' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search26', + FileRoutesByPath['/(gen)/search/search26']['parentRoute'], + FileRoutesByPath['/(gen)/search/search26']['id'], + FileRoutesByPath['/(gen)/search/search26']['path'], + FileRoutesByPath['/(gen)/search/search26']['fullPath'] + > +} +declare module './routes/(gen)/search/search27' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search27', + FileRoutesByPath['/(gen)/search/search27']['parentRoute'], + FileRoutesByPath['/(gen)/search/search27']['id'], + FileRoutesByPath['/(gen)/search/search27']['path'], + FileRoutesByPath['/(gen)/search/search27']['fullPath'] + > +} +declare module './routes/(gen)/search/search28' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search28', + FileRoutesByPath['/(gen)/search/search28']['parentRoute'], + FileRoutesByPath['/(gen)/search/search28']['id'], + FileRoutesByPath['/(gen)/search/search28']['path'], + FileRoutesByPath['/(gen)/search/search28']['fullPath'] + > +} +declare module './routes/(gen)/search/search29' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search29', + FileRoutesByPath['/(gen)/search/search29']['parentRoute'], + FileRoutesByPath['/(gen)/search/search29']['id'], + FileRoutesByPath['/(gen)/search/search29']['path'], + FileRoutesByPath['/(gen)/search/search29']['fullPath'] + > +} +declare module './routes/(gen)/search/search3' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search3', + FileRoutesByPath['/(gen)/search/search3']['parentRoute'], + FileRoutesByPath['/(gen)/search/search3']['id'], + FileRoutesByPath['/(gen)/search/search3']['path'], + FileRoutesByPath['/(gen)/search/search3']['fullPath'] + > +} +declare module './routes/(gen)/search/search30' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search30', + FileRoutesByPath['/(gen)/search/search30']['parentRoute'], + FileRoutesByPath['/(gen)/search/search30']['id'], + FileRoutesByPath['/(gen)/search/search30']['path'], + FileRoutesByPath['/(gen)/search/search30']['fullPath'] + > +} +declare module './routes/(gen)/search/search31' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search31', + FileRoutesByPath['/(gen)/search/search31']['parentRoute'], + FileRoutesByPath['/(gen)/search/search31']['id'], + FileRoutesByPath['/(gen)/search/search31']['path'], + FileRoutesByPath['/(gen)/search/search31']['fullPath'] + > +} +declare module './routes/(gen)/search/search32' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search32', + FileRoutesByPath['/(gen)/search/search32']['parentRoute'], + FileRoutesByPath['/(gen)/search/search32']['id'], + FileRoutesByPath['/(gen)/search/search32']['path'], + FileRoutesByPath['/(gen)/search/search32']['fullPath'] + > +} +declare module './routes/(gen)/search/search33' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search33', + FileRoutesByPath['/(gen)/search/search33']['parentRoute'], + FileRoutesByPath['/(gen)/search/search33']['id'], + FileRoutesByPath['/(gen)/search/search33']['path'], + FileRoutesByPath['/(gen)/search/search33']['fullPath'] + > +} +declare module './routes/(gen)/search/search34' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search34', + FileRoutesByPath['/(gen)/search/search34']['parentRoute'], + FileRoutesByPath['/(gen)/search/search34']['id'], + FileRoutesByPath['/(gen)/search/search34']['path'], + FileRoutesByPath['/(gen)/search/search34']['fullPath'] + > +} +declare module './routes/(gen)/search/search35' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search35', + FileRoutesByPath['/(gen)/search/search35']['parentRoute'], + FileRoutesByPath['/(gen)/search/search35']['id'], + FileRoutesByPath['/(gen)/search/search35']['path'], + FileRoutesByPath['/(gen)/search/search35']['fullPath'] + > +} +declare module './routes/(gen)/search/search36' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search36', + FileRoutesByPath['/(gen)/search/search36']['parentRoute'], + FileRoutesByPath['/(gen)/search/search36']['id'], + FileRoutesByPath['/(gen)/search/search36']['path'], + FileRoutesByPath['/(gen)/search/search36']['fullPath'] + > +} +declare module './routes/(gen)/search/search37' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search37', + FileRoutesByPath['/(gen)/search/search37']['parentRoute'], + FileRoutesByPath['/(gen)/search/search37']['id'], + FileRoutesByPath['/(gen)/search/search37']['path'], + FileRoutesByPath['/(gen)/search/search37']['fullPath'] + > +} +declare module './routes/(gen)/search/search38' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search38', + FileRoutesByPath['/(gen)/search/search38']['parentRoute'], + FileRoutesByPath['/(gen)/search/search38']['id'], + FileRoutesByPath['/(gen)/search/search38']['path'], + FileRoutesByPath['/(gen)/search/search38']['fullPath'] + > +} +declare module './routes/(gen)/search/search39' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search39', + FileRoutesByPath['/(gen)/search/search39']['parentRoute'], + FileRoutesByPath['/(gen)/search/search39']['id'], + FileRoutesByPath['/(gen)/search/search39']['path'], + FileRoutesByPath['/(gen)/search/search39']['fullPath'] + > +} +declare module './routes/(gen)/search/search4' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search4', + FileRoutesByPath['/(gen)/search/search4']['parentRoute'], + FileRoutesByPath['/(gen)/search/search4']['id'], + FileRoutesByPath['/(gen)/search/search4']['path'], + FileRoutesByPath['/(gen)/search/search4']['fullPath'] + > +} +declare module './routes/(gen)/search/search40' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search40', + FileRoutesByPath['/(gen)/search/search40']['parentRoute'], + FileRoutesByPath['/(gen)/search/search40']['id'], + FileRoutesByPath['/(gen)/search/search40']['path'], + FileRoutesByPath['/(gen)/search/search40']['fullPath'] + > +} +declare module './routes/(gen)/search/search41' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search41', + FileRoutesByPath['/(gen)/search/search41']['parentRoute'], + FileRoutesByPath['/(gen)/search/search41']['id'], + FileRoutesByPath['/(gen)/search/search41']['path'], + FileRoutesByPath['/(gen)/search/search41']['fullPath'] + > +} +declare module './routes/(gen)/search/search42' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search42', + FileRoutesByPath['/(gen)/search/search42']['parentRoute'], + FileRoutesByPath['/(gen)/search/search42']['id'], + FileRoutesByPath['/(gen)/search/search42']['path'], + FileRoutesByPath['/(gen)/search/search42']['fullPath'] + > +} +declare module './routes/(gen)/search/search43' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search43', + FileRoutesByPath['/(gen)/search/search43']['parentRoute'], + FileRoutesByPath['/(gen)/search/search43']['id'], + FileRoutesByPath['/(gen)/search/search43']['path'], + FileRoutesByPath['/(gen)/search/search43']['fullPath'] + > +} +declare module './routes/(gen)/search/search44' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search44', + FileRoutesByPath['/(gen)/search/search44']['parentRoute'], + FileRoutesByPath['/(gen)/search/search44']['id'], + FileRoutesByPath['/(gen)/search/search44']['path'], + FileRoutesByPath['/(gen)/search/search44']['fullPath'] + > +} +declare module './routes/(gen)/search/search45' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search45', + FileRoutesByPath['/(gen)/search/search45']['parentRoute'], + FileRoutesByPath['/(gen)/search/search45']['id'], + FileRoutesByPath['/(gen)/search/search45']['path'], + FileRoutesByPath['/(gen)/search/search45']['fullPath'] + > +} +declare module './routes/(gen)/search/search46' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search46', + FileRoutesByPath['/(gen)/search/search46']['parentRoute'], + FileRoutesByPath['/(gen)/search/search46']['id'], + FileRoutesByPath['/(gen)/search/search46']['path'], + FileRoutesByPath['/(gen)/search/search46']['fullPath'] + > +} +declare module './routes/(gen)/search/search47' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search47', + FileRoutesByPath['/(gen)/search/search47']['parentRoute'], + FileRoutesByPath['/(gen)/search/search47']['id'], + FileRoutesByPath['/(gen)/search/search47']['path'], + FileRoutesByPath['/(gen)/search/search47']['fullPath'] + > +} +declare module './routes/(gen)/search/search48' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search48', + FileRoutesByPath['/(gen)/search/search48']['parentRoute'], + FileRoutesByPath['/(gen)/search/search48']['id'], + FileRoutesByPath['/(gen)/search/search48']['path'], + FileRoutesByPath['/(gen)/search/search48']['fullPath'] + > +} +declare module './routes/(gen)/search/search49' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search49', + FileRoutesByPath['/(gen)/search/search49']['parentRoute'], + FileRoutesByPath['/(gen)/search/search49']['id'], + FileRoutesByPath['/(gen)/search/search49']['path'], + FileRoutesByPath['/(gen)/search/search49']['fullPath'] + > +} +declare module './routes/(gen)/search/search5' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search5', + FileRoutesByPath['/(gen)/search/search5']['parentRoute'], + FileRoutesByPath['/(gen)/search/search5']['id'], + FileRoutesByPath['/(gen)/search/search5']['path'], + FileRoutesByPath['/(gen)/search/search5']['fullPath'] + > +} +declare module './routes/(gen)/search/search50' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search50', + FileRoutesByPath['/(gen)/search/search50']['parentRoute'], + FileRoutesByPath['/(gen)/search/search50']['id'], + FileRoutesByPath['/(gen)/search/search50']['path'], + FileRoutesByPath['/(gen)/search/search50']['fullPath'] + > +} +declare module './routes/(gen)/search/search51' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search51', + FileRoutesByPath['/(gen)/search/search51']['parentRoute'], + FileRoutesByPath['/(gen)/search/search51']['id'], + FileRoutesByPath['/(gen)/search/search51']['path'], + FileRoutesByPath['/(gen)/search/search51']['fullPath'] + > +} +declare module './routes/(gen)/search/search52' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search52', + FileRoutesByPath['/(gen)/search/search52']['parentRoute'], + FileRoutesByPath['/(gen)/search/search52']['id'], + FileRoutesByPath['/(gen)/search/search52']['path'], + FileRoutesByPath['/(gen)/search/search52']['fullPath'] + > +} +declare module './routes/(gen)/search/search53' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search53', + FileRoutesByPath['/(gen)/search/search53']['parentRoute'], + FileRoutesByPath['/(gen)/search/search53']['id'], + FileRoutesByPath['/(gen)/search/search53']['path'], + FileRoutesByPath['/(gen)/search/search53']['fullPath'] + > +} +declare module './routes/(gen)/search/search54' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search54', + FileRoutesByPath['/(gen)/search/search54']['parentRoute'], + FileRoutesByPath['/(gen)/search/search54']['id'], + FileRoutesByPath['/(gen)/search/search54']['path'], + FileRoutesByPath['/(gen)/search/search54']['fullPath'] + > +} +declare module './routes/(gen)/search/search55' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search55', + FileRoutesByPath['/(gen)/search/search55']['parentRoute'], + FileRoutesByPath['/(gen)/search/search55']['id'], + FileRoutesByPath['/(gen)/search/search55']['path'], + FileRoutesByPath['/(gen)/search/search55']['fullPath'] + > +} +declare module './routes/(gen)/search/search56' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search56', + FileRoutesByPath['/(gen)/search/search56']['parentRoute'], + FileRoutesByPath['/(gen)/search/search56']['id'], + FileRoutesByPath['/(gen)/search/search56']['path'], + FileRoutesByPath['/(gen)/search/search56']['fullPath'] + > +} +declare module './routes/(gen)/search/search57' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search57', + FileRoutesByPath['/(gen)/search/search57']['parentRoute'], + FileRoutesByPath['/(gen)/search/search57']['id'], + FileRoutesByPath['/(gen)/search/search57']['path'], + FileRoutesByPath['/(gen)/search/search57']['fullPath'] + > +} +declare module './routes/(gen)/search/search58' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search58', + FileRoutesByPath['/(gen)/search/search58']['parentRoute'], + FileRoutesByPath['/(gen)/search/search58']['id'], + FileRoutesByPath['/(gen)/search/search58']['path'], + FileRoutesByPath['/(gen)/search/search58']['fullPath'] + > +} +declare module './routes/(gen)/search/search59' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search59', + FileRoutesByPath['/(gen)/search/search59']['parentRoute'], + FileRoutesByPath['/(gen)/search/search59']['id'], + FileRoutesByPath['/(gen)/search/search59']['path'], + FileRoutesByPath['/(gen)/search/search59']['fullPath'] + > +} +declare module './routes/(gen)/search/search6' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search6', + FileRoutesByPath['/(gen)/search/search6']['parentRoute'], + FileRoutesByPath['/(gen)/search/search6']['id'], + FileRoutesByPath['/(gen)/search/search6']['path'], + FileRoutesByPath['/(gen)/search/search6']['fullPath'] + > +} +declare module './routes/(gen)/search/search60' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search60', + FileRoutesByPath['/(gen)/search/search60']['parentRoute'], + FileRoutesByPath['/(gen)/search/search60']['id'], + FileRoutesByPath['/(gen)/search/search60']['path'], + FileRoutesByPath['/(gen)/search/search60']['fullPath'] + > +} +declare module './routes/(gen)/search/search61' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search61', + FileRoutesByPath['/(gen)/search/search61']['parentRoute'], + FileRoutesByPath['/(gen)/search/search61']['id'], + FileRoutesByPath['/(gen)/search/search61']['path'], + FileRoutesByPath['/(gen)/search/search61']['fullPath'] + > +} +declare module './routes/(gen)/search/search62' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search62', + FileRoutesByPath['/(gen)/search/search62']['parentRoute'], + FileRoutesByPath['/(gen)/search/search62']['id'], + FileRoutesByPath['/(gen)/search/search62']['path'], + FileRoutesByPath['/(gen)/search/search62']['fullPath'] + > +} +declare module './routes/(gen)/search/search63' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search63', + FileRoutesByPath['/(gen)/search/search63']['parentRoute'], + FileRoutesByPath['/(gen)/search/search63']['id'], + FileRoutesByPath['/(gen)/search/search63']['path'], + FileRoutesByPath['/(gen)/search/search63']['fullPath'] + > +} +declare module './routes/(gen)/search/search64' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search64', + FileRoutesByPath['/(gen)/search/search64']['parentRoute'], + FileRoutesByPath['/(gen)/search/search64']['id'], + FileRoutesByPath['/(gen)/search/search64']['path'], + FileRoutesByPath['/(gen)/search/search64']['fullPath'] + > +} +declare module './routes/(gen)/search/search65' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search65', + FileRoutesByPath['/(gen)/search/search65']['parentRoute'], + FileRoutesByPath['/(gen)/search/search65']['id'], + FileRoutesByPath['/(gen)/search/search65']['path'], + FileRoutesByPath['/(gen)/search/search65']['fullPath'] + > +} +declare module './routes/(gen)/search/search66' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search66', + FileRoutesByPath['/(gen)/search/search66']['parentRoute'], + FileRoutesByPath['/(gen)/search/search66']['id'], + FileRoutesByPath['/(gen)/search/search66']['path'], + FileRoutesByPath['/(gen)/search/search66']['fullPath'] + > +} +declare module './routes/(gen)/search/search67' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search67', + FileRoutesByPath['/(gen)/search/search67']['parentRoute'], + FileRoutesByPath['/(gen)/search/search67']['id'], + FileRoutesByPath['/(gen)/search/search67']['path'], + FileRoutesByPath['/(gen)/search/search67']['fullPath'] + > +} +declare module './routes/(gen)/search/search68' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search68', + FileRoutesByPath['/(gen)/search/search68']['parentRoute'], + FileRoutesByPath['/(gen)/search/search68']['id'], + FileRoutesByPath['/(gen)/search/search68']['path'], + FileRoutesByPath['/(gen)/search/search68']['fullPath'] + > +} +declare module './routes/(gen)/search/search69' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search69', + FileRoutesByPath['/(gen)/search/search69']['parentRoute'], + FileRoutesByPath['/(gen)/search/search69']['id'], + FileRoutesByPath['/(gen)/search/search69']['path'], + FileRoutesByPath['/(gen)/search/search69']['fullPath'] + > +} +declare module './routes/(gen)/search/search7' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search7', + FileRoutesByPath['/(gen)/search/search7']['parentRoute'], + FileRoutesByPath['/(gen)/search/search7']['id'], + FileRoutesByPath['/(gen)/search/search7']['path'], + FileRoutesByPath['/(gen)/search/search7']['fullPath'] + > +} +declare module './routes/(gen)/search/search70' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search70', + FileRoutesByPath['/(gen)/search/search70']['parentRoute'], + FileRoutesByPath['/(gen)/search/search70']['id'], + FileRoutesByPath['/(gen)/search/search70']['path'], + FileRoutesByPath['/(gen)/search/search70']['fullPath'] + > +} +declare module './routes/(gen)/search/search71' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search71', + FileRoutesByPath['/(gen)/search/search71']['parentRoute'], + FileRoutesByPath['/(gen)/search/search71']['id'], + FileRoutesByPath['/(gen)/search/search71']['path'], + FileRoutesByPath['/(gen)/search/search71']['fullPath'] + > +} +declare module './routes/(gen)/search/search72' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search72', + FileRoutesByPath['/(gen)/search/search72']['parentRoute'], + FileRoutesByPath['/(gen)/search/search72']['id'], + FileRoutesByPath['/(gen)/search/search72']['path'], + FileRoutesByPath['/(gen)/search/search72']['fullPath'] + > +} +declare module './routes/(gen)/search/search73' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search73', + FileRoutesByPath['/(gen)/search/search73']['parentRoute'], + FileRoutesByPath['/(gen)/search/search73']['id'], + FileRoutesByPath['/(gen)/search/search73']['path'], + FileRoutesByPath['/(gen)/search/search73']['fullPath'] + > +} +declare module './routes/(gen)/search/search74' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search74', + FileRoutesByPath['/(gen)/search/search74']['parentRoute'], + FileRoutesByPath['/(gen)/search/search74']['id'], + FileRoutesByPath['/(gen)/search/search74']['path'], + FileRoutesByPath['/(gen)/search/search74']['fullPath'] + > +} +declare module './routes/(gen)/search/search75' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search75', + FileRoutesByPath['/(gen)/search/search75']['parentRoute'], + FileRoutesByPath['/(gen)/search/search75']['id'], + FileRoutesByPath['/(gen)/search/search75']['path'], + FileRoutesByPath['/(gen)/search/search75']['fullPath'] + > +} +declare module './routes/(gen)/search/search76' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search76', + FileRoutesByPath['/(gen)/search/search76']['parentRoute'], + FileRoutesByPath['/(gen)/search/search76']['id'], + FileRoutesByPath['/(gen)/search/search76']['path'], + FileRoutesByPath['/(gen)/search/search76']['fullPath'] + > +} +declare module './routes/(gen)/search/search77' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search77', + FileRoutesByPath['/(gen)/search/search77']['parentRoute'], + FileRoutesByPath['/(gen)/search/search77']['id'], + FileRoutesByPath['/(gen)/search/search77']['path'], + FileRoutesByPath['/(gen)/search/search77']['fullPath'] + > +} +declare module './routes/(gen)/search/search78' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search78', + FileRoutesByPath['/(gen)/search/search78']['parentRoute'], + FileRoutesByPath['/(gen)/search/search78']['id'], + FileRoutesByPath['/(gen)/search/search78']['path'], + FileRoutesByPath['/(gen)/search/search78']['fullPath'] + > +} +declare module './routes/(gen)/search/search79' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search79', + FileRoutesByPath['/(gen)/search/search79']['parentRoute'], + FileRoutesByPath['/(gen)/search/search79']['id'], + FileRoutesByPath['/(gen)/search/search79']['path'], + FileRoutesByPath['/(gen)/search/search79']['fullPath'] + > +} +declare module './routes/(gen)/search/search8' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search8', + FileRoutesByPath['/(gen)/search/search8']['parentRoute'], + FileRoutesByPath['/(gen)/search/search8']['id'], + FileRoutesByPath['/(gen)/search/search8']['path'], + FileRoutesByPath['/(gen)/search/search8']['fullPath'] + > +} +declare module './routes/(gen)/search/search80' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search80', + FileRoutesByPath['/(gen)/search/search80']['parentRoute'], + FileRoutesByPath['/(gen)/search/search80']['id'], + FileRoutesByPath['/(gen)/search/search80']['path'], + FileRoutesByPath['/(gen)/search/search80']['fullPath'] + > +} +declare module './routes/(gen)/search/search81' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search81', + FileRoutesByPath['/(gen)/search/search81']['parentRoute'], + FileRoutesByPath['/(gen)/search/search81']['id'], + FileRoutesByPath['/(gen)/search/search81']['path'], + FileRoutesByPath['/(gen)/search/search81']['fullPath'] + > +} +declare module './routes/(gen)/search/search82' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search82', + FileRoutesByPath['/(gen)/search/search82']['parentRoute'], + FileRoutesByPath['/(gen)/search/search82']['id'], + FileRoutesByPath['/(gen)/search/search82']['path'], + FileRoutesByPath['/(gen)/search/search82']['fullPath'] + > +} +declare module './routes/(gen)/search/search83' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search83', + FileRoutesByPath['/(gen)/search/search83']['parentRoute'], + FileRoutesByPath['/(gen)/search/search83']['id'], + FileRoutesByPath['/(gen)/search/search83']['path'], + FileRoutesByPath['/(gen)/search/search83']['fullPath'] + > +} +declare module './routes/(gen)/search/search84' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search84', + FileRoutesByPath['/(gen)/search/search84']['parentRoute'], + FileRoutesByPath['/(gen)/search/search84']['id'], + FileRoutesByPath['/(gen)/search/search84']['path'], + FileRoutesByPath['/(gen)/search/search84']['fullPath'] + > +} +declare module './routes/(gen)/search/search85' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search85', + FileRoutesByPath['/(gen)/search/search85']['parentRoute'], + FileRoutesByPath['/(gen)/search/search85']['id'], + FileRoutesByPath['/(gen)/search/search85']['path'], + FileRoutesByPath['/(gen)/search/search85']['fullPath'] + > +} +declare module './routes/(gen)/search/search86' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search86', + FileRoutesByPath['/(gen)/search/search86']['parentRoute'], + FileRoutesByPath['/(gen)/search/search86']['id'], + FileRoutesByPath['/(gen)/search/search86']['path'], + FileRoutesByPath['/(gen)/search/search86']['fullPath'] + > +} +declare module './routes/(gen)/search/search87' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search87', + FileRoutesByPath['/(gen)/search/search87']['parentRoute'], + FileRoutesByPath['/(gen)/search/search87']['id'], + FileRoutesByPath['/(gen)/search/search87']['path'], + FileRoutesByPath['/(gen)/search/search87']['fullPath'] + > +} +declare module './routes/(gen)/search/search88' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search88', + FileRoutesByPath['/(gen)/search/search88']['parentRoute'], + FileRoutesByPath['/(gen)/search/search88']['id'], + FileRoutesByPath['/(gen)/search/search88']['path'], + FileRoutesByPath['/(gen)/search/search88']['fullPath'] + > +} +declare module './routes/(gen)/search/search89' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search89', + FileRoutesByPath['/(gen)/search/search89']['parentRoute'], + FileRoutesByPath['/(gen)/search/search89']['id'], + FileRoutesByPath['/(gen)/search/search89']['path'], + FileRoutesByPath['/(gen)/search/search89']['fullPath'] + > +} +declare module './routes/(gen)/search/search9' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search9', + FileRoutesByPath['/(gen)/search/search9']['parentRoute'], + FileRoutesByPath['/(gen)/search/search9']['id'], + FileRoutesByPath['/(gen)/search/search9']['path'], + FileRoutesByPath['/(gen)/search/search9']['fullPath'] + > +} +declare module './routes/(gen)/search/search90' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search90', + FileRoutesByPath['/(gen)/search/search90']['parentRoute'], + FileRoutesByPath['/(gen)/search/search90']['id'], + FileRoutesByPath['/(gen)/search/search90']['path'], + FileRoutesByPath['/(gen)/search/search90']['fullPath'] + > +} +declare module './routes/(gen)/search/search91' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search91', + FileRoutesByPath['/(gen)/search/search91']['parentRoute'], + FileRoutesByPath['/(gen)/search/search91']['id'], + FileRoutesByPath['/(gen)/search/search91']['path'], + FileRoutesByPath['/(gen)/search/search91']['fullPath'] + > +} +declare module './routes/(gen)/search/search92' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search92', + FileRoutesByPath['/(gen)/search/search92']['parentRoute'], + FileRoutesByPath['/(gen)/search/search92']['id'], + FileRoutesByPath['/(gen)/search/search92']['path'], + FileRoutesByPath['/(gen)/search/search92']['fullPath'] + > +} +declare module './routes/(gen)/search/search93' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search93', + FileRoutesByPath['/(gen)/search/search93']['parentRoute'], + FileRoutesByPath['/(gen)/search/search93']['id'], + FileRoutesByPath['/(gen)/search/search93']['path'], + FileRoutesByPath['/(gen)/search/search93']['fullPath'] + > +} +declare module './routes/(gen)/search/search94' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search94', + FileRoutesByPath['/(gen)/search/search94']['parentRoute'], + FileRoutesByPath['/(gen)/search/search94']['id'], + FileRoutesByPath['/(gen)/search/search94']['path'], + FileRoutesByPath['/(gen)/search/search94']['fullPath'] + > +} +declare module './routes/(gen)/search/search95' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search95', + FileRoutesByPath['/(gen)/search/search95']['parentRoute'], + FileRoutesByPath['/(gen)/search/search95']['id'], + FileRoutesByPath['/(gen)/search/search95']['path'], + FileRoutesByPath['/(gen)/search/search95']['fullPath'] + > +} +declare module './routes/(gen)/search/search96' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search96', + FileRoutesByPath['/(gen)/search/search96']['parentRoute'], + FileRoutesByPath['/(gen)/search/search96']['id'], + FileRoutesByPath['/(gen)/search/search96']['path'], + FileRoutesByPath['/(gen)/search/search96']['fullPath'] + > +} +declare module './routes/(gen)/search/search97' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search97', + FileRoutesByPath['/(gen)/search/search97']['parentRoute'], + FileRoutesByPath['/(gen)/search/search97']['id'], + FileRoutesByPath['/(gen)/search/search97']['path'], + FileRoutesByPath['/(gen)/search/search97']['fullPath'] + > +} +declare module './routes/(gen)/search/search98' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search98', + FileRoutesByPath['/(gen)/search/search98']['parentRoute'], + FileRoutesByPath['/(gen)/search/search98']['id'], + FileRoutesByPath['/(gen)/search/search98']['path'], + FileRoutesByPath['/(gen)/search/search98']['fullPath'] + > +} +declare module './routes/(gen)/search/search99' { + const createFileRoute: CreateFileRoute< + '/(gen)/search/search99', + FileRoutesByPath['/(gen)/search/search99']['parentRoute'], + FileRoutesByPath['/(gen)/search/search99']['id'], + FileRoutesByPath['/(gen)/search/search99']['path'], + FileRoutesByPath['/(gen)/search/search99']['fullPath'] + > +} + +// Create and export the route tree + +interface ParamsRouteRouteChildren { + ParamsParamsPlaceholderRoute: typeof ParamsParamsPlaceholderRoute +} + +const ParamsRouteRouteChildren: ParamsRouteRouteChildren = { + ParamsParamsPlaceholderRoute: ParamsParamsPlaceholderRoute, +} + +const ParamsRouteRouteWithChildren = ParamsRouteRoute._addFileChildren( + ParamsRouteRouteChildren, +) + +interface SearchRouteRouteChildren { + SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute +} + +const SearchRouteRouteChildren: SearchRouteRouteChildren = { + SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, +} + +const SearchRouteRouteWithChildren = SearchRouteRoute._addFileChildren( + SearchRouteRouteChildren, +) + +interface genParamsRouteRouteChildren { + genParamsParam0Route: typeof genParamsParam0Route + genParamsParam1Route: typeof genParamsParam1Route + genParamsParam10Route: typeof genParamsParam10Route + genParamsParam11Route: typeof genParamsParam11Route + genParamsParam12Route: typeof genParamsParam12Route + genParamsParam13Route: typeof genParamsParam13Route + genParamsParam14Route: typeof genParamsParam14Route + genParamsParam15Route: typeof genParamsParam15Route + genParamsParam16Route: typeof genParamsParam16Route + genParamsParam17Route: typeof genParamsParam17Route + genParamsParam18Route: typeof genParamsParam18Route + genParamsParam19Route: typeof genParamsParam19Route + genParamsParam2Route: typeof genParamsParam2Route + genParamsParam20Route: typeof genParamsParam20Route + genParamsParam21Route: typeof genParamsParam21Route + genParamsParam22Route: typeof genParamsParam22Route + genParamsParam23Route: typeof genParamsParam23Route + genParamsParam24Route: typeof genParamsParam24Route + genParamsParam25Route: typeof genParamsParam25Route + genParamsParam26Route: typeof genParamsParam26Route + genParamsParam27Route: typeof genParamsParam27Route + genParamsParam28Route: typeof genParamsParam28Route + genParamsParam29Route: typeof genParamsParam29Route + genParamsParam3Route: typeof genParamsParam3Route + genParamsParam30Route: typeof genParamsParam30Route + genParamsParam31Route: typeof genParamsParam31Route + genParamsParam32Route: typeof genParamsParam32Route + genParamsParam33Route: typeof genParamsParam33Route + genParamsParam34Route: typeof genParamsParam34Route + genParamsParam35Route: typeof genParamsParam35Route + genParamsParam36Route: typeof genParamsParam36Route + genParamsParam37Route: typeof genParamsParam37Route + genParamsParam38Route: typeof genParamsParam38Route + genParamsParam39Route: typeof genParamsParam39Route + genParamsParam4Route: typeof genParamsParam4Route + genParamsParam40Route: typeof genParamsParam40Route + genParamsParam41Route: typeof genParamsParam41Route + genParamsParam42Route: typeof genParamsParam42Route + genParamsParam43Route: typeof genParamsParam43Route + genParamsParam44Route: typeof genParamsParam44Route + genParamsParam45Route: typeof genParamsParam45Route + genParamsParam46Route: typeof genParamsParam46Route + genParamsParam47Route: typeof genParamsParam47Route + genParamsParam48Route: typeof genParamsParam48Route + genParamsParam49Route: typeof genParamsParam49Route + genParamsParam5Route: typeof genParamsParam5Route + genParamsParam50Route: typeof genParamsParam50Route + genParamsParam51Route: typeof genParamsParam51Route + genParamsParam52Route: typeof genParamsParam52Route + genParamsParam53Route: typeof genParamsParam53Route + genParamsParam54Route: typeof genParamsParam54Route + genParamsParam55Route: typeof genParamsParam55Route + genParamsParam56Route: typeof genParamsParam56Route + genParamsParam57Route: typeof genParamsParam57Route + genParamsParam58Route: typeof genParamsParam58Route + genParamsParam59Route: typeof genParamsParam59Route + genParamsParam6Route: typeof genParamsParam6Route + genParamsParam60Route: typeof genParamsParam60Route + genParamsParam61Route: typeof genParamsParam61Route + genParamsParam62Route: typeof genParamsParam62Route + genParamsParam63Route: typeof genParamsParam63Route + genParamsParam64Route: typeof genParamsParam64Route + genParamsParam65Route: typeof genParamsParam65Route + genParamsParam66Route: typeof genParamsParam66Route + genParamsParam67Route: typeof genParamsParam67Route + genParamsParam68Route: typeof genParamsParam68Route + genParamsParam69Route: typeof genParamsParam69Route + genParamsParam7Route: typeof genParamsParam7Route + genParamsParam70Route: typeof genParamsParam70Route + genParamsParam71Route: typeof genParamsParam71Route + genParamsParam72Route: typeof genParamsParam72Route + genParamsParam73Route: typeof genParamsParam73Route + genParamsParam74Route: typeof genParamsParam74Route + genParamsParam75Route: typeof genParamsParam75Route + genParamsParam76Route: typeof genParamsParam76Route + genParamsParam77Route: typeof genParamsParam77Route + genParamsParam78Route: typeof genParamsParam78Route + genParamsParam79Route: typeof genParamsParam79Route + genParamsParam8Route: typeof genParamsParam8Route + genParamsParam80Route: typeof genParamsParam80Route + genParamsParam81Route: typeof genParamsParam81Route + genParamsParam82Route: typeof genParamsParam82Route + genParamsParam83Route: typeof genParamsParam83Route + genParamsParam84Route: typeof genParamsParam84Route + genParamsParam85Route: typeof genParamsParam85Route + genParamsParam86Route: typeof genParamsParam86Route + genParamsParam87Route: typeof genParamsParam87Route + genParamsParam88Route: typeof genParamsParam88Route + genParamsParam89Route: typeof genParamsParam89Route + genParamsParam9Route: typeof genParamsParam9Route + genParamsParam90Route: typeof genParamsParam90Route + genParamsParam91Route: typeof genParamsParam91Route + genParamsParam92Route: typeof genParamsParam92Route + genParamsParam93Route: typeof genParamsParam93Route + genParamsParam94Route: typeof genParamsParam94Route + genParamsParam95Route: typeof genParamsParam95Route + genParamsParam96Route: typeof genParamsParam96Route + genParamsParam97Route: typeof genParamsParam97Route + genParamsParam98Route: typeof genParamsParam98Route + genParamsParam99Route: typeof genParamsParam99Route +} + +const genParamsRouteRouteChildren: genParamsRouteRouteChildren = { + genParamsParam0Route: genParamsParam0Route, + genParamsParam1Route: genParamsParam1Route, + genParamsParam10Route: genParamsParam10Route, + genParamsParam11Route: genParamsParam11Route, + genParamsParam12Route: genParamsParam12Route, + genParamsParam13Route: genParamsParam13Route, + genParamsParam14Route: genParamsParam14Route, + genParamsParam15Route: genParamsParam15Route, + genParamsParam16Route: genParamsParam16Route, + genParamsParam17Route: genParamsParam17Route, + genParamsParam18Route: genParamsParam18Route, + genParamsParam19Route: genParamsParam19Route, + genParamsParam2Route: genParamsParam2Route, + genParamsParam20Route: genParamsParam20Route, + genParamsParam21Route: genParamsParam21Route, + genParamsParam22Route: genParamsParam22Route, + genParamsParam23Route: genParamsParam23Route, + genParamsParam24Route: genParamsParam24Route, + genParamsParam25Route: genParamsParam25Route, + genParamsParam26Route: genParamsParam26Route, + genParamsParam27Route: genParamsParam27Route, + genParamsParam28Route: genParamsParam28Route, + genParamsParam29Route: genParamsParam29Route, + genParamsParam3Route: genParamsParam3Route, + genParamsParam30Route: genParamsParam30Route, + genParamsParam31Route: genParamsParam31Route, + genParamsParam32Route: genParamsParam32Route, + genParamsParam33Route: genParamsParam33Route, + genParamsParam34Route: genParamsParam34Route, + genParamsParam35Route: genParamsParam35Route, + genParamsParam36Route: genParamsParam36Route, + genParamsParam37Route: genParamsParam37Route, + genParamsParam38Route: genParamsParam38Route, + genParamsParam39Route: genParamsParam39Route, + genParamsParam4Route: genParamsParam4Route, + genParamsParam40Route: genParamsParam40Route, + genParamsParam41Route: genParamsParam41Route, + genParamsParam42Route: genParamsParam42Route, + genParamsParam43Route: genParamsParam43Route, + genParamsParam44Route: genParamsParam44Route, + genParamsParam45Route: genParamsParam45Route, + genParamsParam46Route: genParamsParam46Route, + genParamsParam47Route: genParamsParam47Route, + genParamsParam48Route: genParamsParam48Route, + genParamsParam49Route: genParamsParam49Route, + genParamsParam5Route: genParamsParam5Route, + genParamsParam50Route: genParamsParam50Route, + genParamsParam51Route: genParamsParam51Route, + genParamsParam52Route: genParamsParam52Route, + genParamsParam53Route: genParamsParam53Route, + genParamsParam54Route: genParamsParam54Route, + genParamsParam55Route: genParamsParam55Route, + genParamsParam56Route: genParamsParam56Route, + genParamsParam57Route: genParamsParam57Route, + genParamsParam58Route: genParamsParam58Route, + genParamsParam59Route: genParamsParam59Route, + genParamsParam6Route: genParamsParam6Route, + genParamsParam60Route: genParamsParam60Route, + genParamsParam61Route: genParamsParam61Route, + genParamsParam62Route: genParamsParam62Route, + genParamsParam63Route: genParamsParam63Route, + genParamsParam64Route: genParamsParam64Route, + genParamsParam65Route: genParamsParam65Route, + genParamsParam66Route: genParamsParam66Route, + genParamsParam67Route: genParamsParam67Route, + genParamsParam68Route: genParamsParam68Route, + genParamsParam69Route: genParamsParam69Route, + genParamsParam7Route: genParamsParam7Route, + genParamsParam70Route: genParamsParam70Route, + genParamsParam71Route: genParamsParam71Route, + genParamsParam72Route: genParamsParam72Route, + genParamsParam73Route: genParamsParam73Route, + genParamsParam74Route: genParamsParam74Route, + genParamsParam75Route: genParamsParam75Route, + genParamsParam76Route: genParamsParam76Route, + genParamsParam77Route: genParamsParam77Route, + genParamsParam78Route: genParamsParam78Route, + genParamsParam79Route: genParamsParam79Route, + genParamsParam8Route: genParamsParam8Route, + genParamsParam80Route: genParamsParam80Route, + genParamsParam81Route: genParamsParam81Route, + genParamsParam82Route: genParamsParam82Route, + genParamsParam83Route: genParamsParam83Route, + genParamsParam84Route: genParamsParam84Route, + genParamsParam85Route: genParamsParam85Route, + genParamsParam86Route: genParamsParam86Route, + genParamsParam87Route: genParamsParam87Route, + genParamsParam88Route: genParamsParam88Route, + genParamsParam89Route: genParamsParam89Route, + genParamsParam9Route: genParamsParam9Route, + genParamsParam90Route: genParamsParam90Route, + genParamsParam91Route: genParamsParam91Route, + genParamsParam92Route: genParamsParam92Route, + genParamsParam93Route: genParamsParam93Route, + genParamsParam94Route: genParamsParam94Route, + genParamsParam95Route: genParamsParam95Route, + genParamsParam96Route: genParamsParam96Route, + genParamsParam97Route: genParamsParam97Route, + genParamsParam98Route: genParamsParam98Route, + genParamsParam99Route: genParamsParam99Route, +} + +const genParamsRouteRouteWithChildren = genParamsRouteRoute._addFileChildren( + genParamsRouteRouteChildren, +) + +interface genSearchRouteRouteChildren { + genSearchSearch0Route: typeof genSearchSearch0Route + genSearchSearch1Route: typeof genSearchSearch1Route + genSearchSearch10Route: typeof genSearchSearch10Route + genSearchSearch11Route: typeof genSearchSearch11Route + genSearchSearch12Route: typeof genSearchSearch12Route + genSearchSearch13Route: typeof genSearchSearch13Route + genSearchSearch14Route: typeof genSearchSearch14Route + genSearchSearch15Route: typeof genSearchSearch15Route + genSearchSearch16Route: typeof genSearchSearch16Route + genSearchSearch17Route: typeof genSearchSearch17Route + genSearchSearch18Route: typeof genSearchSearch18Route + genSearchSearch19Route: typeof genSearchSearch19Route + genSearchSearch2Route: typeof genSearchSearch2Route + genSearchSearch20Route: typeof genSearchSearch20Route + genSearchSearch21Route: typeof genSearchSearch21Route + genSearchSearch22Route: typeof genSearchSearch22Route + genSearchSearch23Route: typeof genSearchSearch23Route + genSearchSearch24Route: typeof genSearchSearch24Route + genSearchSearch25Route: typeof genSearchSearch25Route + genSearchSearch26Route: typeof genSearchSearch26Route + genSearchSearch27Route: typeof genSearchSearch27Route + genSearchSearch28Route: typeof genSearchSearch28Route + genSearchSearch29Route: typeof genSearchSearch29Route + genSearchSearch3Route: typeof genSearchSearch3Route + genSearchSearch30Route: typeof genSearchSearch30Route + genSearchSearch31Route: typeof genSearchSearch31Route + genSearchSearch32Route: typeof genSearchSearch32Route + genSearchSearch33Route: typeof genSearchSearch33Route + genSearchSearch34Route: typeof genSearchSearch34Route + genSearchSearch35Route: typeof genSearchSearch35Route + genSearchSearch36Route: typeof genSearchSearch36Route + genSearchSearch37Route: typeof genSearchSearch37Route + genSearchSearch38Route: typeof genSearchSearch38Route + genSearchSearch39Route: typeof genSearchSearch39Route + genSearchSearch4Route: typeof genSearchSearch4Route + genSearchSearch40Route: typeof genSearchSearch40Route + genSearchSearch41Route: typeof genSearchSearch41Route + genSearchSearch42Route: typeof genSearchSearch42Route + genSearchSearch43Route: typeof genSearchSearch43Route + genSearchSearch44Route: typeof genSearchSearch44Route + genSearchSearch45Route: typeof genSearchSearch45Route + genSearchSearch46Route: typeof genSearchSearch46Route + genSearchSearch47Route: typeof genSearchSearch47Route + genSearchSearch48Route: typeof genSearchSearch48Route + genSearchSearch49Route: typeof genSearchSearch49Route + genSearchSearch5Route: typeof genSearchSearch5Route + genSearchSearch50Route: typeof genSearchSearch50Route + genSearchSearch51Route: typeof genSearchSearch51Route + genSearchSearch52Route: typeof genSearchSearch52Route + genSearchSearch53Route: typeof genSearchSearch53Route + genSearchSearch54Route: typeof genSearchSearch54Route + genSearchSearch55Route: typeof genSearchSearch55Route + genSearchSearch56Route: typeof genSearchSearch56Route + genSearchSearch57Route: typeof genSearchSearch57Route + genSearchSearch58Route: typeof genSearchSearch58Route + genSearchSearch59Route: typeof genSearchSearch59Route + genSearchSearch6Route: typeof genSearchSearch6Route + genSearchSearch60Route: typeof genSearchSearch60Route + genSearchSearch61Route: typeof genSearchSearch61Route + genSearchSearch62Route: typeof genSearchSearch62Route + genSearchSearch63Route: typeof genSearchSearch63Route + genSearchSearch64Route: typeof genSearchSearch64Route + genSearchSearch65Route: typeof genSearchSearch65Route + genSearchSearch66Route: typeof genSearchSearch66Route + genSearchSearch67Route: typeof genSearchSearch67Route + genSearchSearch68Route: typeof genSearchSearch68Route + genSearchSearch69Route: typeof genSearchSearch69Route + genSearchSearch7Route: typeof genSearchSearch7Route + genSearchSearch70Route: typeof genSearchSearch70Route + genSearchSearch71Route: typeof genSearchSearch71Route + genSearchSearch72Route: typeof genSearchSearch72Route + genSearchSearch73Route: typeof genSearchSearch73Route + genSearchSearch74Route: typeof genSearchSearch74Route + genSearchSearch75Route: typeof genSearchSearch75Route + genSearchSearch76Route: typeof genSearchSearch76Route + genSearchSearch77Route: typeof genSearchSearch77Route + genSearchSearch78Route: typeof genSearchSearch78Route + genSearchSearch79Route: typeof genSearchSearch79Route + genSearchSearch8Route: typeof genSearchSearch8Route + genSearchSearch80Route: typeof genSearchSearch80Route + genSearchSearch81Route: typeof genSearchSearch81Route + genSearchSearch82Route: typeof genSearchSearch82Route + genSearchSearch83Route: typeof genSearchSearch83Route + genSearchSearch84Route: typeof genSearchSearch84Route + genSearchSearch85Route: typeof genSearchSearch85Route + genSearchSearch86Route: typeof genSearchSearch86Route + genSearchSearch87Route: typeof genSearchSearch87Route + genSearchSearch88Route: typeof genSearchSearch88Route + genSearchSearch89Route: typeof genSearchSearch89Route + genSearchSearch9Route: typeof genSearchSearch9Route + genSearchSearch90Route: typeof genSearchSearch90Route + genSearchSearch91Route: typeof genSearchSearch91Route + genSearchSearch92Route: typeof genSearchSearch92Route + genSearchSearch93Route: typeof genSearchSearch93Route + genSearchSearch94Route: typeof genSearchSearch94Route + genSearchSearch95Route: typeof genSearchSearch95Route + genSearchSearch96Route: typeof genSearchSearch96Route + genSearchSearch97Route: typeof genSearchSearch97Route + genSearchSearch98Route: typeof genSearchSearch98Route + genSearchSearch99Route: typeof genSearchSearch99Route +} + +const genSearchRouteRouteChildren: genSearchRouteRouteChildren = { + genSearchSearch0Route: genSearchSearch0Route, + genSearchSearch1Route: genSearchSearch1Route, + genSearchSearch10Route: genSearchSearch10Route, + genSearchSearch11Route: genSearchSearch11Route, + genSearchSearch12Route: genSearchSearch12Route, + genSearchSearch13Route: genSearchSearch13Route, + genSearchSearch14Route: genSearchSearch14Route, + genSearchSearch15Route: genSearchSearch15Route, + genSearchSearch16Route: genSearchSearch16Route, + genSearchSearch17Route: genSearchSearch17Route, + genSearchSearch18Route: genSearchSearch18Route, + genSearchSearch19Route: genSearchSearch19Route, + genSearchSearch2Route: genSearchSearch2Route, + genSearchSearch20Route: genSearchSearch20Route, + genSearchSearch21Route: genSearchSearch21Route, + genSearchSearch22Route: genSearchSearch22Route, + genSearchSearch23Route: genSearchSearch23Route, + genSearchSearch24Route: genSearchSearch24Route, + genSearchSearch25Route: genSearchSearch25Route, + genSearchSearch26Route: genSearchSearch26Route, + genSearchSearch27Route: genSearchSearch27Route, + genSearchSearch28Route: genSearchSearch28Route, + genSearchSearch29Route: genSearchSearch29Route, + genSearchSearch3Route: genSearchSearch3Route, + genSearchSearch30Route: genSearchSearch30Route, + genSearchSearch31Route: genSearchSearch31Route, + genSearchSearch32Route: genSearchSearch32Route, + genSearchSearch33Route: genSearchSearch33Route, + genSearchSearch34Route: genSearchSearch34Route, + genSearchSearch35Route: genSearchSearch35Route, + genSearchSearch36Route: genSearchSearch36Route, + genSearchSearch37Route: genSearchSearch37Route, + genSearchSearch38Route: genSearchSearch38Route, + genSearchSearch39Route: genSearchSearch39Route, + genSearchSearch4Route: genSearchSearch4Route, + genSearchSearch40Route: genSearchSearch40Route, + genSearchSearch41Route: genSearchSearch41Route, + genSearchSearch42Route: genSearchSearch42Route, + genSearchSearch43Route: genSearchSearch43Route, + genSearchSearch44Route: genSearchSearch44Route, + genSearchSearch45Route: genSearchSearch45Route, + genSearchSearch46Route: genSearchSearch46Route, + genSearchSearch47Route: genSearchSearch47Route, + genSearchSearch48Route: genSearchSearch48Route, + genSearchSearch49Route: genSearchSearch49Route, + genSearchSearch5Route: genSearchSearch5Route, + genSearchSearch50Route: genSearchSearch50Route, + genSearchSearch51Route: genSearchSearch51Route, + genSearchSearch52Route: genSearchSearch52Route, + genSearchSearch53Route: genSearchSearch53Route, + genSearchSearch54Route: genSearchSearch54Route, + genSearchSearch55Route: genSearchSearch55Route, + genSearchSearch56Route: genSearchSearch56Route, + genSearchSearch57Route: genSearchSearch57Route, + genSearchSearch58Route: genSearchSearch58Route, + genSearchSearch59Route: genSearchSearch59Route, + genSearchSearch6Route: genSearchSearch6Route, + genSearchSearch60Route: genSearchSearch60Route, + genSearchSearch61Route: genSearchSearch61Route, + genSearchSearch62Route: genSearchSearch62Route, + genSearchSearch63Route: genSearchSearch63Route, + genSearchSearch64Route: genSearchSearch64Route, + genSearchSearch65Route: genSearchSearch65Route, + genSearchSearch66Route: genSearchSearch66Route, + genSearchSearch67Route: genSearchSearch67Route, + genSearchSearch68Route: genSearchSearch68Route, + genSearchSearch69Route: genSearchSearch69Route, + genSearchSearch7Route: genSearchSearch7Route, + genSearchSearch70Route: genSearchSearch70Route, + genSearchSearch71Route: genSearchSearch71Route, + genSearchSearch72Route: genSearchSearch72Route, + genSearchSearch73Route: genSearchSearch73Route, + genSearchSearch74Route: genSearchSearch74Route, + genSearchSearch75Route: genSearchSearch75Route, + genSearchSearch76Route: genSearchSearch76Route, + genSearchSearch77Route: genSearchSearch77Route, + genSearchSearch78Route: genSearchSearch78Route, + genSearchSearch79Route: genSearchSearch79Route, + genSearchSearch8Route: genSearchSearch8Route, + genSearchSearch80Route: genSearchSearch80Route, + genSearchSearch81Route: genSearchSearch81Route, + genSearchSearch82Route: genSearchSearch82Route, + genSearchSearch83Route: genSearchSearch83Route, + genSearchSearch84Route: genSearchSearch84Route, + genSearchSearch85Route: genSearchSearch85Route, + genSearchSearch86Route: genSearchSearch86Route, + genSearchSearch87Route: genSearchSearch87Route, + genSearchSearch88Route: genSearchSearch88Route, + genSearchSearch89Route: genSearchSearch89Route, + genSearchSearch9Route: genSearchSearch9Route, + genSearchSearch90Route: genSearchSearch90Route, + genSearchSearch91Route: genSearchSearch91Route, + genSearchSearch92Route: genSearchSearch92Route, + genSearchSearch93Route: genSearchSearch93Route, + genSearchSearch94Route: genSearchSearch94Route, + genSearchSearch95Route: genSearchSearch95Route, + genSearchSearch96Route: genSearchSearch96Route, + genSearchSearch97Route: genSearchSearch97Route, + genSearchSearch98Route: genSearchSearch98Route, + genSearchSearch99Route: genSearchSearch99Route, +} + +const genSearchRouteRouteWithChildren = genSearchRouteRoute._addFileChildren( + genSearchRouteRouteChildren, +) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/params': typeof genParamsRouteRouteWithChildren + '/search': typeof genSearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/absolute0': typeof genAbsolute0Route + '/absolute1': typeof genAbsolute1Route + '/absolute10': typeof genAbsolute10Route + '/absolute11': typeof genAbsolute11Route + '/absolute12': typeof genAbsolute12Route + '/absolute13': typeof genAbsolute13Route + '/absolute14': typeof genAbsolute14Route + '/absolute15': typeof genAbsolute15Route + '/absolute16': typeof genAbsolute16Route + '/absolute17': typeof genAbsolute17Route + '/absolute18': typeof genAbsolute18Route + '/absolute19': typeof genAbsolute19Route + '/absolute2': typeof genAbsolute2Route + '/absolute20': typeof genAbsolute20Route + '/absolute21': typeof genAbsolute21Route + '/absolute22': typeof genAbsolute22Route + '/absolute23': typeof genAbsolute23Route + '/absolute24': typeof genAbsolute24Route + '/absolute25': typeof genAbsolute25Route + '/absolute26': typeof genAbsolute26Route + '/absolute27': typeof genAbsolute27Route + '/absolute28': typeof genAbsolute28Route + '/absolute29': typeof genAbsolute29Route + '/absolute3': typeof genAbsolute3Route + '/absolute30': typeof genAbsolute30Route + '/absolute31': typeof genAbsolute31Route + '/absolute32': typeof genAbsolute32Route + '/absolute33': typeof genAbsolute33Route + '/absolute34': typeof genAbsolute34Route + '/absolute35': typeof genAbsolute35Route + '/absolute36': typeof genAbsolute36Route + '/absolute37': typeof genAbsolute37Route + '/absolute38': typeof genAbsolute38Route + '/absolute39': typeof genAbsolute39Route + '/absolute4': typeof genAbsolute4Route + '/absolute40': typeof genAbsolute40Route + '/absolute41': typeof genAbsolute41Route + '/absolute42': typeof genAbsolute42Route + '/absolute43': typeof genAbsolute43Route + '/absolute44': typeof genAbsolute44Route + '/absolute45': typeof genAbsolute45Route + '/absolute46': typeof genAbsolute46Route + '/absolute47': typeof genAbsolute47Route + '/absolute48': typeof genAbsolute48Route + '/absolute49': typeof genAbsolute49Route + '/absolute5': typeof genAbsolute5Route + '/absolute50': typeof genAbsolute50Route + '/absolute51': typeof genAbsolute51Route + '/absolute52': typeof genAbsolute52Route + '/absolute53': typeof genAbsolute53Route + '/absolute54': typeof genAbsolute54Route + '/absolute55': typeof genAbsolute55Route + '/absolute56': typeof genAbsolute56Route + '/absolute57': typeof genAbsolute57Route + '/absolute58': typeof genAbsolute58Route + '/absolute59': typeof genAbsolute59Route + '/absolute6': typeof genAbsolute6Route + '/absolute60': typeof genAbsolute60Route + '/absolute61': typeof genAbsolute61Route + '/absolute62': typeof genAbsolute62Route + '/absolute63': typeof genAbsolute63Route + '/absolute64': typeof genAbsolute64Route + '/absolute65': typeof genAbsolute65Route + '/absolute66': typeof genAbsolute66Route + '/absolute67': typeof genAbsolute67Route + '/absolute68': typeof genAbsolute68Route + '/absolute69': typeof genAbsolute69Route + '/absolute7': typeof genAbsolute7Route + '/absolute70': typeof genAbsolute70Route + '/absolute71': typeof genAbsolute71Route + '/absolute72': typeof genAbsolute72Route + '/absolute73': typeof genAbsolute73Route + '/absolute74': typeof genAbsolute74Route + '/absolute75': typeof genAbsolute75Route + '/absolute76': typeof genAbsolute76Route + '/absolute77': typeof genAbsolute77Route + '/absolute78': typeof genAbsolute78Route + '/absolute79': typeof genAbsolute79Route + '/absolute8': typeof genAbsolute8Route + '/absolute80': typeof genAbsolute80Route + '/absolute81': typeof genAbsolute81Route + '/absolute82': typeof genAbsolute82Route + '/absolute83': typeof genAbsolute83Route + '/absolute84': typeof genAbsolute84Route + '/absolute85': typeof genAbsolute85Route + '/absolute86': typeof genAbsolute86Route + '/absolute87': typeof genAbsolute87Route + '/absolute88': typeof genAbsolute88Route + '/absolute89': typeof genAbsolute89Route + '/absolute9': typeof genAbsolute9Route + '/absolute90': typeof genAbsolute90Route + '/absolute91': typeof genAbsolute91Route + '/absolute92': typeof genAbsolute92Route + '/absolute93': typeof genAbsolute93Route + '/absolute94': typeof genAbsolute94Route + '/absolute95': typeof genAbsolute95Route + '/absolute96': typeof genAbsolute96Route + '/absolute97': typeof genAbsolute97Route + '/absolute98': typeof genAbsolute98Route + '/absolute99': typeof genAbsolute99Route + '/relative0': typeof genRelative0Route + '/relative1': typeof genRelative1Route + '/relative10': typeof genRelative10Route + '/relative11': typeof genRelative11Route + '/relative12': typeof genRelative12Route + '/relative13': typeof genRelative13Route + '/relative14': typeof genRelative14Route + '/relative15': typeof genRelative15Route + '/relative16': typeof genRelative16Route + '/relative17': typeof genRelative17Route + '/relative18': typeof genRelative18Route + '/relative19': typeof genRelative19Route + '/relative2': typeof genRelative2Route + '/relative20': typeof genRelative20Route + '/relative21': typeof genRelative21Route + '/relative22': typeof genRelative22Route + '/relative23': typeof genRelative23Route + '/relative24': typeof genRelative24Route + '/relative25': typeof genRelative25Route + '/relative26': typeof genRelative26Route + '/relative27': typeof genRelative27Route + '/relative28': typeof genRelative28Route + '/relative29': typeof genRelative29Route + '/relative3': typeof genRelative3Route + '/relative30': typeof genRelative30Route + '/relative31': typeof genRelative31Route + '/relative32': typeof genRelative32Route + '/relative33': typeof genRelative33Route + '/relative34': typeof genRelative34Route + '/relative35': typeof genRelative35Route + '/relative36': typeof genRelative36Route + '/relative37': typeof genRelative37Route + '/relative38': typeof genRelative38Route + '/relative39': typeof genRelative39Route + '/relative4': typeof genRelative4Route + '/relative40': typeof genRelative40Route + '/relative41': typeof genRelative41Route + '/relative42': typeof genRelative42Route + '/relative43': typeof genRelative43Route + '/relative44': typeof genRelative44Route + '/relative45': typeof genRelative45Route + '/relative46': typeof genRelative46Route + '/relative47': typeof genRelative47Route + '/relative48': typeof genRelative48Route + '/relative49': typeof genRelative49Route + '/relative5': typeof genRelative5Route + '/relative50': typeof genRelative50Route + '/relative51': typeof genRelative51Route + '/relative52': typeof genRelative52Route + '/relative53': typeof genRelative53Route + '/relative54': typeof genRelative54Route + '/relative55': typeof genRelative55Route + '/relative56': typeof genRelative56Route + '/relative57': typeof genRelative57Route + '/relative58': typeof genRelative58Route + '/relative59': typeof genRelative59Route + '/relative6': typeof genRelative6Route + '/relative60': typeof genRelative60Route + '/relative61': typeof genRelative61Route + '/relative62': typeof genRelative62Route + '/relative63': typeof genRelative63Route + '/relative64': typeof genRelative64Route + '/relative65': typeof genRelative65Route + '/relative66': typeof genRelative66Route + '/relative67': typeof genRelative67Route + '/relative68': typeof genRelative68Route + '/relative69': typeof genRelative69Route + '/relative7': typeof genRelative7Route + '/relative70': typeof genRelative70Route + '/relative71': typeof genRelative71Route + '/relative72': typeof genRelative72Route + '/relative73': typeof genRelative73Route + '/relative74': typeof genRelative74Route + '/relative75': typeof genRelative75Route + '/relative76': typeof genRelative76Route + '/relative77': typeof genRelative77Route + '/relative78': typeof genRelative78Route + '/relative79': typeof genRelative79Route + '/relative8': typeof genRelative8Route + '/relative80': typeof genRelative80Route + '/relative81': typeof genRelative81Route + '/relative82': typeof genRelative82Route + '/relative83': typeof genRelative83Route + '/relative84': typeof genRelative84Route + '/relative85': typeof genRelative85Route + '/relative86': typeof genRelative86Route + '/relative87': typeof genRelative87Route + '/relative88': typeof genRelative88Route + '/relative89': typeof genRelative89Route + '/relative9': typeof genRelative9Route + '/relative90': typeof genRelative90Route + '/relative91': typeof genRelative91Route + '/relative92': typeof genRelative92Route + '/relative93': typeof genRelative93Route + '/relative94': typeof genRelative94Route + '/relative95': typeof genRelative95Route + '/relative96': typeof genRelative96Route + '/relative97': typeof genRelative97Route + '/relative98': typeof genRelative98Route + '/relative99': typeof genRelative99Route + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/params/$param0': typeof genParamsParam0Route + '/params/$param1': typeof genParamsParam1Route + '/params/$param10': typeof genParamsParam10Route + '/params/$param11': typeof genParamsParam11Route + '/params/$param12': typeof genParamsParam12Route + '/params/$param13': typeof genParamsParam13Route + '/params/$param14': typeof genParamsParam14Route + '/params/$param15': typeof genParamsParam15Route + '/params/$param16': typeof genParamsParam16Route + '/params/$param17': typeof genParamsParam17Route + '/params/$param18': typeof genParamsParam18Route + '/params/$param19': typeof genParamsParam19Route + '/params/$param2': typeof genParamsParam2Route + '/params/$param20': typeof genParamsParam20Route + '/params/$param21': typeof genParamsParam21Route + '/params/$param22': typeof genParamsParam22Route + '/params/$param23': typeof genParamsParam23Route + '/params/$param24': typeof genParamsParam24Route + '/params/$param25': typeof genParamsParam25Route + '/params/$param26': typeof genParamsParam26Route + '/params/$param27': typeof genParamsParam27Route + '/params/$param28': typeof genParamsParam28Route + '/params/$param29': typeof genParamsParam29Route + '/params/$param3': typeof genParamsParam3Route + '/params/$param30': typeof genParamsParam30Route + '/params/$param31': typeof genParamsParam31Route + '/params/$param32': typeof genParamsParam32Route + '/params/$param33': typeof genParamsParam33Route + '/params/$param34': typeof genParamsParam34Route + '/params/$param35': typeof genParamsParam35Route + '/params/$param36': typeof genParamsParam36Route + '/params/$param37': typeof genParamsParam37Route + '/params/$param38': typeof genParamsParam38Route + '/params/$param39': typeof genParamsParam39Route + '/params/$param4': typeof genParamsParam4Route + '/params/$param40': typeof genParamsParam40Route + '/params/$param41': typeof genParamsParam41Route + '/params/$param42': typeof genParamsParam42Route + '/params/$param43': typeof genParamsParam43Route + '/params/$param44': typeof genParamsParam44Route + '/params/$param45': typeof genParamsParam45Route + '/params/$param46': typeof genParamsParam46Route + '/params/$param47': typeof genParamsParam47Route + '/params/$param48': typeof genParamsParam48Route + '/params/$param49': typeof genParamsParam49Route + '/params/$param5': typeof genParamsParam5Route + '/params/$param50': typeof genParamsParam50Route + '/params/$param51': typeof genParamsParam51Route + '/params/$param52': typeof genParamsParam52Route + '/params/$param53': typeof genParamsParam53Route + '/params/$param54': typeof genParamsParam54Route + '/params/$param55': typeof genParamsParam55Route + '/params/$param56': typeof genParamsParam56Route + '/params/$param57': typeof genParamsParam57Route + '/params/$param58': typeof genParamsParam58Route + '/params/$param59': typeof genParamsParam59Route + '/params/$param6': typeof genParamsParam6Route + '/params/$param60': typeof genParamsParam60Route + '/params/$param61': typeof genParamsParam61Route + '/params/$param62': typeof genParamsParam62Route + '/params/$param63': typeof genParamsParam63Route + '/params/$param64': typeof genParamsParam64Route + '/params/$param65': typeof genParamsParam65Route + '/params/$param66': typeof genParamsParam66Route + '/params/$param67': typeof genParamsParam67Route + '/params/$param68': typeof genParamsParam68Route + '/params/$param69': typeof genParamsParam69Route + '/params/$param7': typeof genParamsParam7Route + '/params/$param70': typeof genParamsParam70Route + '/params/$param71': typeof genParamsParam71Route + '/params/$param72': typeof genParamsParam72Route + '/params/$param73': typeof genParamsParam73Route + '/params/$param74': typeof genParamsParam74Route + '/params/$param75': typeof genParamsParam75Route + '/params/$param76': typeof genParamsParam76Route + '/params/$param77': typeof genParamsParam77Route + '/params/$param78': typeof genParamsParam78Route + '/params/$param79': typeof genParamsParam79Route + '/params/$param8': typeof genParamsParam8Route + '/params/$param80': typeof genParamsParam80Route + '/params/$param81': typeof genParamsParam81Route + '/params/$param82': typeof genParamsParam82Route + '/params/$param83': typeof genParamsParam83Route + '/params/$param84': typeof genParamsParam84Route + '/params/$param85': typeof genParamsParam85Route + '/params/$param86': typeof genParamsParam86Route + '/params/$param87': typeof genParamsParam87Route + '/params/$param88': typeof genParamsParam88Route + '/params/$param89': typeof genParamsParam89Route + '/params/$param9': typeof genParamsParam9Route + '/params/$param90': typeof genParamsParam90Route + '/params/$param91': typeof genParamsParam91Route + '/params/$param92': typeof genParamsParam92Route + '/params/$param93': typeof genParamsParam93Route + '/params/$param94': typeof genParamsParam94Route + '/params/$param95': typeof genParamsParam95Route + '/params/$param96': typeof genParamsParam96Route + '/params/$param97': typeof genParamsParam97Route + '/params/$param98': typeof genParamsParam98Route + '/params/$param99': typeof genParamsParam99Route + '/search/search0': typeof genSearchSearch0Route + '/search/search1': typeof genSearchSearch1Route + '/search/search10': typeof genSearchSearch10Route + '/search/search11': typeof genSearchSearch11Route + '/search/search12': typeof genSearchSearch12Route + '/search/search13': typeof genSearchSearch13Route + '/search/search14': typeof genSearchSearch14Route + '/search/search15': typeof genSearchSearch15Route + '/search/search16': typeof genSearchSearch16Route + '/search/search17': typeof genSearchSearch17Route + '/search/search18': typeof genSearchSearch18Route + '/search/search19': typeof genSearchSearch19Route + '/search/search2': typeof genSearchSearch2Route + '/search/search20': typeof genSearchSearch20Route + '/search/search21': typeof genSearchSearch21Route + '/search/search22': typeof genSearchSearch22Route + '/search/search23': typeof genSearchSearch23Route + '/search/search24': typeof genSearchSearch24Route + '/search/search25': typeof genSearchSearch25Route + '/search/search26': typeof genSearchSearch26Route + '/search/search27': typeof genSearchSearch27Route + '/search/search28': typeof genSearchSearch28Route + '/search/search29': typeof genSearchSearch29Route + '/search/search3': typeof genSearchSearch3Route + '/search/search30': typeof genSearchSearch30Route + '/search/search31': typeof genSearchSearch31Route + '/search/search32': typeof genSearchSearch32Route + '/search/search33': typeof genSearchSearch33Route + '/search/search34': typeof genSearchSearch34Route + '/search/search35': typeof genSearchSearch35Route + '/search/search36': typeof genSearchSearch36Route + '/search/search37': typeof genSearchSearch37Route + '/search/search38': typeof genSearchSearch38Route + '/search/search39': typeof genSearchSearch39Route + '/search/search4': typeof genSearchSearch4Route + '/search/search40': typeof genSearchSearch40Route + '/search/search41': typeof genSearchSearch41Route + '/search/search42': typeof genSearchSearch42Route + '/search/search43': typeof genSearchSearch43Route + '/search/search44': typeof genSearchSearch44Route + '/search/search45': typeof genSearchSearch45Route + '/search/search46': typeof genSearchSearch46Route + '/search/search47': typeof genSearchSearch47Route + '/search/search48': typeof genSearchSearch48Route + '/search/search49': typeof genSearchSearch49Route + '/search/search5': typeof genSearchSearch5Route + '/search/search50': typeof genSearchSearch50Route + '/search/search51': typeof genSearchSearch51Route + '/search/search52': typeof genSearchSearch52Route + '/search/search53': typeof genSearchSearch53Route + '/search/search54': typeof genSearchSearch54Route + '/search/search55': typeof genSearchSearch55Route + '/search/search56': typeof genSearchSearch56Route + '/search/search57': typeof genSearchSearch57Route + '/search/search58': typeof genSearchSearch58Route + '/search/search59': typeof genSearchSearch59Route + '/search/search6': typeof genSearchSearch6Route + '/search/search60': typeof genSearchSearch60Route + '/search/search61': typeof genSearchSearch61Route + '/search/search62': typeof genSearchSearch62Route + '/search/search63': typeof genSearchSearch63Route + '/search/search64': typeof genSearchSearch64Route + '/search/search65': typeof genSearchSearch65Route + '/search/search66': typeof genSearchSearch66Route + '/search/search67': typeof genSearchSearch67Route + '/search/search68': typeof genSearchSearch68Route + '/search/search69': typeof genSearchSearch69Route + '/search/search7': typeof genSearchSearch7Route + '/search/search70': typeof genSearchSearch70Route + '/search/search71': typeof genSearchSearch71Route + '/search/search72': typeof genSearchSearch72Route + '/search/search73': typeof genSearchSearch73Route + '/search/search74': typeof genSearchSearch74Route + '/search/search75': typeof genSearchSearch75Route + '/search/search76': typeof genSearchSearch76Route + '/search/search77': typeof genSearchSearch77Route + '/search/search78': typeof genSearchSearch78Route + '/search/search79': typeof genSearchSearch79Route + '/search/search8': typeof genSearchSearch8Route + '/search/search80': typeof genSearchSearch80Route + '/search/search81': typeof genSearchSearch81Route + '/search/search82': typeof genSearchSearch82Route + '/search/search83': typeof genSearchSearch83Route + '/search/search84': typeof genSearchSearch84Route + '/search/search85': typeof genSearchSearch85Route + '/search/search86': typeof genSearchSearch86Route + '/search/search87': typeof genSearchSearch87Route + '/search/search88': typeof genSearchSearch88Route + '/search/search89': typeof genSearchSearch89Route + '/search/search9': typeof genSearchSearch9Route + '/search/search90': typeof genSearchSearch90Route + '/search/search91': typeof genSearchSearch91Route + '/search/search92': typeof genSearchSearch92Route + '/search/search93': typeof genSearchSearch93Route + '/search/search94': typeof genSearchSearch94Route + '/search/search95': typeof genSearchSearch95Route + '/search/search96': typeof genSearchSearch96Route + '/search/search97': typeof genSearchSearch97Route + '/search/search98': typeof genSearchSearch98Route + '/search/search99': typeof genSearchSearch99Route +} + +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/params': typeof genParamsRouteRouteWithChildren + '/search': typeof genSearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/absolute0': typeof genAbsolute0Route + '/absolute1': typeof genAbsolute1Route + '/absolute10': typeof genAbsolute10Route + '/absolute11': typeof genAbsolute11Route + '/absolute12': typeof genAbsolute12Route + '/absolute13': typeof genAbsolute13Route + '/absolute14': typeof genAbsolute14Route + '/absolute15': typeof genAbsolute15Route + '/absolute16': typeof genAbsolute16Route + '/absolute17': typeof genAbsolute17Route + '/absolute18': typeof genAbsolute18Route + '/absolute19': typeof genAbsolute19Route + '/absolute2': typeof genAbsolute2Route + '/absolute20': typeof genAbsolute20Route + '/absolute21': typeof genAbsolute21Route + '/absolute22': typeof genAbsolute22Route + '/absolute23': typeof genAbsolute23Route + '/absolute24': typeof genAbsolute24Route + '/absolute25': typeof genAbsolute25Route + '/absolute26': typeof genAbsolute26Route + '/absolute27': typeof genAbsolute27Route + '/absolute28': typeof genAbsolute28Route + '/absolute29': typeof genAbsolute29Route + '/absolute3': typeof genAbsolute3Route + '/absolute30': typeof genAbsolute30Route + '/absolute31': typeof genAbsolute31Route + '/absolute32': typeof genAbsolute32Route + '/absolute33': typeof genAbsolute33Route + '/absolute34': typeof genAbsolute34Route + '/absolute35': typeof genAbsolute35Route + '/absolute36': typeof genAbsolute36Route + '/absolute37': typeof genAbsolute37Route + '/absolute38': typeof genAbsolute38Route + '/absolute39': typeof genAbsolute39Route + '/absolute4': typeof genAbsolute4Route + '/absolute40': typeof genAbsolute40Route + '/absolute41': typeof genAbsolute41Route + '/absolute42': typeof genAbsolute42Route + '/absolute43': typeof genAbsolute43Route + '/absolute44': typeof genAbsolute44Route + '/absolute45': typeof genAbsolute45Route + '/absolute46': typeof genAbsolute46Route + '/absolute47': typeof genAbsolute47Route + '/absolute48': typeof genAbsolute48Route + '/absolute49': typeof genAbsolute49Route + '/absolute5': typeof genAbsolute5Route + '/absolute50': typeof genAbsolute50Route + '/absolute51': typeof genAbsolute51Route + '/absolute52': typeof genAbsolute52Route + '/absolute53': typeof genAbsolute53Route + '/absolute54': typeof genAbsolute54Route + '/absolute55': typeof genAbsolute55Route + '/absolute56': typeof genAbsolute56Route + '/absolute57': typeof genAbsolute57Route + '/absolute58': typeof genAbsolute58Route + '/absolute59': typeof genAbsolute59Route + '/absolute6': typeof genAbsolute6Route + '/absolute60': typeof genAbsolute60Route + '/absolute61': typeof genAbsolute61Route + '/absolute62': typeof genAbsolute62Route + '/absolute63': typeof genAbsolute63Route + '/absolute64': typeof genAbsolute64Route + '/absolute65': typeof genAbsolute65Route + '/absolute66': typeof genAbsolute66Route + '/absolute67': typeof genAbsolute67Route + '/absolute68': typeof genAbsolute68Route + '/absolute69': typeof genAbsolute69Route + '/absolute7': typeof genAbsolute7Route + '/absolute70': typeof genAbsolute70Route + '/absolute71': typeof genAbsolute71Route + '/absolute72': typeof genAbsolute72Route + '/absolute73': typeof genAbsolute73Route + '/absolute74': typeof genAbsolute74Route + '/absolute75': typeof genAbsolute75Route + '/absolute76': typeof genAbsolute76Route + '/absolute77': typeof genAbsolute77Route + '/absolute78': typeof genAbsolute78Route + '/absolute79': typeof genAbsolute79Route + '/absolute8': typeof genAbsolute8Route + '/absolute80': typeof genAbsolute80Route + '/absolute81': typeof genAbsolute81Route + '/absolute82': typeof genAbsolute82Route + '/absolute83': typeof genAbsolute83Route + '/absolute84': typeof genAbsolute84Route + '/absolute85': typeof genAbsolute85Route + '/absolute86': typeof genAbsolute86Route + '/absolute87': typeof genAbsolute87Route + '/absolute88': typeof genAbsolute88Route + '/absolute89': typeof genAbsolute89Route + '/absolute9': typeof genAbsolute9Route + '/absolute90': typeof genAbsolute90Route + '/absolute91': typeof genAbsolute91Route + '/absolute92': typeof genAbsolute92Route + '/absolute93': typeof genAbsolute93Route + '/absolute94': typeof genAbsolute94Route + '/absolute95': typeof genAbsolute95Route + '/absolute96': typeof genAbsolute96Route + '/absolute97': typeof genAbsolute97Route + '/absolute98': typeof genAbsolute98Route + '/absolute99': typeof genAbsolute99Route + '/relative0': typeof genRelative0Route + '/relative1': typeof genRelative1Route + '/relative10': typeof genRelative10Route + '/relative11': typeof genRelative11Route + '/relative12': typeof genRelative12Route + '/relative13': typeof genRelative13Route + '/relative14': typeof genRelative14Route + '/relative15': typeof genRelative15Route + '/relative16': typeof genRelative16Route + '/relative17': typeof genRelative17Route + '/relative18': typeof genRelative18Route + '/relative19': typeof genRelative19Route + '/relative2': typeof genRelative2Route + '/relative20': typeof genRelative20Route + '/relative21': typeof genRelative21Route + '/relative22': typeof genRelative22Route + '/relative23': typeof genRelative23Route + '/relative24': typeof genRelative24Route + '/relative25': typeof genRelative25Route + '/relative26': typeof genRelative26Route + '/relative27': typeof genRelative27Route + '/relative28': typeof genRelative28Route + '/relative29': typeof genRelative29Route + '/relative3': typeof genRelative3Route + '/relative30': typeof genRelative30Route + '/relative31': typeof genRelative31Route + '/relative32': typeof genRelative32Route + '/relative33': typeof genRelative33Route + '/relative34': typeof genRelative34Route + '/relative35': typeof genRelative35Route + '/relative36': typeof genRelative36Route + '/relative37': typeof genRelative37Route + '/relative38': typeof genRelative38Route + '/relative39': typeof genRelative39Route + '/relative4': typeof genRelative4Route + '/relative40': typeof genRelative40Route + '/relative41': typeof genRelative41Route + '/relative42': typeof genRelative42Route + '/relative43': typeof genRelative43Route + '/relative44': typeof genRelative44Route + '/relative45': typeof genRelative45Route + '/relative46': typeof genRelative46Route + '/relative47': typeof genRelative47Route + '/relative48': typeof genRelative48Route + '/relative49': typeof genRelative49Route + '/relative5': typeof genRelative5Route + '/relative50': typeof genRelative50Route + '/relative51': typeof genRelative51Route + '/relative52': typeof genRelative52Route + '/relative53': typeof genRelative53Route + '/relative54': typeof genRelative54Route + '/relative55': typeof genRelative55Route + '/relative56': typeof genRelative56Route + '/relative57': typeof genRelative57Route + '/relative58': typeof genRelative58Route + '/relative59': typeof genRelative59Route + '/relative6': typeof genRelative6Route + '/relative60': typeof genRelative60Route + '/relative61': typeof genRelative61Route + '/relative62': typeof genRelative62Route + '/relative63': typeof genRelative63Route + '/relative64': typeof genRelative64Route + '/relative65': typeof genRelative65Route + '/relative66': typeof genRelative66Route + '/relative67': typeof genRelative67Route + '/relative68': typeof genRelative68Route + '/relative69': typeof genRelative69Route + '/relative7': typeof genRelative7Route + '/relative70': typeof genRelative70Route + '/relative71': typeof genRelative71Route + '/relative72': typeof genRelative72Route + '/relative73': typeof genRelative73Route + '/relative74': typeof genRelative74Route + '/relative75': typeof genRelative75Route + '/relative76': typeof genRelative76Route + '/relative77': typeof genRelative77Route + '/relative78': typeof genRelative78Route + '/relative79': typeof genRelative79Route + '/relative8': typeof genRelative8Route + '/relative80': typeof genRelative80Route + '/relative81': typeof genRelative81Route + '/relative82': typeof genRelative82Route + '/relative83': typeof genRelative83Route + '/relative84': typeof genRelative84Route + '/relative85': typeof genRelative85Route + '/relative86': typeof genRelative86Route + '/relative87': typeof genRelative87Route + '/relative88': typeof genRelative88Route + '/relative89': typeof genRelative89Route + '/relative9': typeof genRelative9Route + '/relative90': typeof genRelative90Route + '/relative91': typeof genRelative91Route + '/relative92': typeof genRelative92Route + '/relative93': typeof genRelative93Route + '/relative94': typeof genRelative94Route + '/relative95': typeof genRelative95Route + '/relative96': typeof genRelative96Route + '/relative97': typeof genRelative97Route + '/relative98': typeof genRelative98Route + '/relative99': typeof genRelative99Route + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/params/$param0': typeof genParamsParam0Route + '/params/$param1': typeof genParamsParam1Route + '/params/$param10': typeof genParamsParam10Route + '/params/$param11': typeof genParamsParam11Route + '/params/$param12': typeof genParamsParam12Route + '/params/$param13': typeof genParamsParam13Route + '/params/$param14': typeof genParamsParam14Route + '/params/$param15': typeof genParamsParam15Route + '/params/$param16': typeof genParamsParam16Route + '/params/$param17': typeof genParamsParam17Route + '/params/$param18': typeof genParamsParam18Route + '/params/$param19': typeof genParamsParam19Route + '/params/$param2': typeof genParamsParam2Route + '/params/$param20': typeof genParamsParam20Route + '/params/$param21': typeof genParamsParam21Route + '/params/$param22': typeof genParamsParam22Route + '/params/$param23': typeof genParamsParam23Route + '/params/$param24': typeof genParamsParam24Route + '/params/$param25': typeof genParamsParam25Route + '/params/$param26': typeof genParamsParam26Route + '/params/$param27': typeof genParamsParam27Route + '/params/$param28': typeof genParamsParam28Route + '/params/$param29': typeof genParamsParam29Route + '/params/$param3': typeof genParamsParam3Route + '/params/$param30': typeof genParamsParam30Route + '/params/$param31': typeof genParamsParam31Route + '/params/$param32': typeof genParamsParam32Route + '/params/$param33': typeof genParamsParam33Route + '/params/$param34': typeof genParamsParam34Route + '/params/$param35': typeof genParamsParam35Route + '/params/$param36': typeof genParamsParam36Route + '/params/$param37': typeof genParamsParam37Route + '/params/$param38': typeof genParamsParam38Route + '/params/$param39': typeof genParamsParam39Route + '/params/$param4': typeof genParamsParam4Route + '/params/$param40': typeof genParamsParam40Route + '/params/$param41': typeof genParamsParam41Route + '/params/$param42': typeof genParamsParam42Route + '/params/$param43': typeof genParamsParam43Route + '/params/$param44': typeof genParamsParam44Route + '/params/$param45': typeof genParamsParam45Route + '/params/$param46': typeof genParamsParam46Route + '/params/$param47': typeof genParamsParam47Route + '/params/$param48': typeof genParamsParam48Route + '/params/$param49': typeof genParamsParam49Route + '/params/$param5': typeof genParamsParam5Route + '/params/$param50': typeof genParamsParam50Route + '/params/$param51': typeof genParamsParam51Route + '/params/$param52': typeof genParamsParam52Route + '/params/$param53': typeof genParamsParam53Route + '/params/$param54': typeof genParamsParam54Route + '/params/$param55': typeof genParamsParam55Route + '/params/$param56': typeof genParamsParam56Route + '/params/$param57': typeof genParamsParam57Route + '/params/$param58': typeof genParamsParam58Route + '/params/$param59': typeof genParamsParam59Route + '/params/$param6': typeof genParamsParam6Route + '/params/$param60': typeof genParamsParam60Route + '/params/$param61': typeof genParamsParam61Route + '/params/$param62': typeof genParamsParam62Route + '/params/$param63': typeof genParamsParam63Route + '/params/$param64': typeof genParamsParam64Route + '/params/$param65': typeof genParamsParam65Route + '/params/$param66': typeof genParamsParam66Route + '/params/$param67': typeof genParamsParam67Route + '/params/$param68': typeof genParamsParam68Route + '/params/$param69': typeof genParamsParam69Route + '/params/$param7': typeof genParamsParam7Route + '/params/$param70': typeof genParamsParam70Route + '/params/$param71': typeof genParamsParam71Route + '/params/$param72': typeof genParamsParam72Route + '/params/$param73': typeof genParamsParam73Route + '/params/$param74': typeof genParamsParam74Route + '/params/$param75': typeof genParamsParam75Route + '/params/$param76': typeof genParamsParam76Route + '/params/$param77': typeof genParamsParam77Route + '/params/$param78': typeof genParamsParam78Route + '/params/$param79': typeof genParamsParam79Route + '/params/$param8': typeof genParamsParam8Route + '/params/$param80': typeof genParamsParam80Route + '/params/$param81': typeof genParamsParam81Route + '/params/$param82': typeof genParamsParam82Route + '/params/$param83': typeof genParamsParam83Route + '/params/$param84': typeof genParamsParam84Route + '/params/$param85': typeof genParamsParam85Route + '/params/$param86': typeof genParamsParam86Route + '/params/$param87': typeof genParamsParam87Route + '/params/$param88': typeof genParamsParam88Route + '/params/$param89': typeof genParamsParam89Route + '/params/$param9': typeof genParamsParam9Route + '/params/$param90': typeof genParamsParam90Route + '/params/$param91': typeof genParamsParam91Route + '/params/$param92': typeof genParamsParam92Route + '/params/$param93': typeof genParamsParam93Route + '/params/$param94': typeof genParamsParam94Route + '/params/$param95': typeof genParamsParam95Route + '/params/$param96': typeof genParamsParam96Route + '/params/$param97': typeof genParamsParam97Route + '/params/$param98': typeof genParamsParam98Route + '/params/$param99': typeof genParamsParam99Route + '/search/search0': typeof genSearchSearch0Route + '/search/search1': typeof genSearchSearch1Route + '/search/search10': typeof genSearchSearch10Route + '/search/search11': typeof genSearchSearch11Route + '/search/search12': typeof genSearchSearch12Route + '/search/search13': typeof genSearchSearch13Route + '/search/search14': typeof genSearchSearch14Route + '/search/search15': typeof genSearchSearch15Route + '/search/search16': typeof genSearchSearch16Route + '/search/search17': typeof genSearchSearch17Route + '/search/search18': typeof genSearchSearch18Route + '/search/search19': typeof genSearchSearch19Route + '/search/search2': typeof genSearchSearch2Route + '/search/search20': typeof genSearchSearch20Route + '/search/search21': typeof genSearchSearch21Route + '/search/search22': typeof genSearchSearch22Route + '/search/search23': typeof genSearchSearch23Route + '/search/search24': typeof genSearchSearch24Route + '/search/search25': typeof genSearchSearch25Route + '/search/search26': typeof genSearchSearch26Route + '/search/search27': typeof genSearchSearch27Route + '/search/search28': typeof genSearchSearch28Route + '/search/search29': typeof genSearchSearch29Route + '/search/search3': typeof genSearchSearch3Route + '/search/search30': typeof genSearchSearch30Route + '/search/search31': typeof genSearchSearch31Route + '/search/search32': typeof genSearchSearch32Route + '/search/search33': typeof genSearchSearch33Route + '/search/search34': typeof genSearchSearch34Route + '/search/search35': typeof genSearchSearch35Route + '/search/search36': typeof genSearchSearch36Route + '/search/search37': typeof genSearchSearch37Route + '/search/search38': typeof genSearchSearch38Route + '/search/search39': typeof genSearchSearch39Route + '/search/search4': typeof genSearchSearch4Route + '/search/search40': typeof genSearchSearch40Route + '/search/search41': typeof genSearchSearch41Route + '/search/search42': typeof genSearchSearch42Route + '/search/search43': typeof genSearchSearch43Route + '/search/search44': typeof genSearchSearch44Route + '/search/search45': typeof genSearchSearch45Route + '/search/search46': typeof genSearchSearch46Route + '/search/search47': typeof genSearchSearch47Route + '/search/search48': typeof genSearchSearch48Route + '/search/search49': typeof genSearchSearch49Route + '/search/search5': typeof genSearchSearch5Route + '/search/search50': typeof genSearchSearch50Route + '/search/search51': typeof genSearchSearch51Route + '/search/search52': typeof genSearchSearch52Route + '/search/search53': typeof genSearchSearch53Route + '/search/search54': typeof genSearchSearch54Route + '/search/search55': typeof genSearchSearch55Route + '/search/search56': typeof genSearchSearch56Route + '/search/search57': typeof genSearchSearch57Route + '/search/search58': typeof genSearchSearch58Route + '/search/search59': typeof genSearchSearch59Route + '/search/search6': typeof genSearchSearch6Route + '/search/search60': typeof genSearchSearch60Route + '/search/search61': typeof genSearchSearch61Route + '/search/search62': typeof genSearchSearch62Route + '/search/search63': typeof genSearchSearch63Route + '/search/search64': typeof genSearchSearch64Route + '/search/search65': typeof genSearchSearch65Route + '/search/search66': typeof genSearchSearch66Route + '/search/search67': typeof genSearchSearch67Route + '/search/search68': typeof genSearchSearch68Route + '/search/search69': typeof genSearchSearch69Route + '/search/search7': typeof genSearchSearch7Route + '/search/search70': typeof genSearchSearch70Route + '/search/search71': typeof genSearchSearch71Route + '/search/search72': typeof genSearchSearch72Route + '/search/search73': typeof genSearchSearch73Route + '/search/search74': typeof genSearchSearch74Route + '/search/search75': typeof genSearchSearch75Route + '/search/search76': typeof genSearchSearch76Route + '/search/search77': typeof genSearchSearch77Route + '/search/search78': typeof genSearchSearch78Route + '/search/search79': typeof genSearchSearch79Route + '/search/search8': typeof genSearchSearch8Route + '/search/search80': typeof genSearchSearch80Route + '/search/search81': typeof genSearchSearch81Route + '/search/search82': typeof genSearchSearch82Route + '/search/search83': typeof genSearchSearch83Route + '/search/search84': typeof genSearchSearch84Route + '/search/search85': typeof genSearchSearch85Route + '/search/search86': typeof genSearchSearch86Route + '/search/search87': typeof genSearchSearch87Route + '/search/search88': typeof genSearchSearch88Route + '/search/search89': typeof genSearchSearch89Route + '/search/search9': typeof genSearchSearch9Route + '/search/search90': typeof genSearchSearch90Route + '/search/search91': typeof genSearchSearch91Route + '/search/search92': typeof genSearchSearch92Route + '/search/search93': typeof genSearchSearch93Route + '/search/search94': typeof genSearchSearch94Route + '/search/search95': typeof genSearchSearch95Route + '/search/search96': typeof genSearchSearch96Route + '/search/search97': typeof genSearchSearch97Route + '/search/search98': typeof genSearchSearch98Route + '/search/search99': typeof genSearchSearch99Route +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute + '/params': typeof ParamsRouteRouteWithChildren + '/search': typeof SearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/(gen)/params': typeof genParamsRouteRouteWithChildren + '/(gen)/search': typeof genSearchRouteRouteWithChildren + '/(gen)/absolute0': typeof genAbsolute0Route + '/(gen)/absolute1': typeof genAbsolute1Route + '/(gen)/absolute10': typeof genAbsolute10Route + '/(gen)/absolute11': typeof genAbsolute11Route + '/(gen)/absolute12': typeof genAbsolute12Route + '/(gen)/absolute13': typeof genAbsolute13Route + '/(gen)/absolute14': typeof genAbsolute14Route + '/(gen)/absolute15': typeof genAbsolute15Route + '/(gen)/absolute16': typeof genAbsolute16Route + '/(gen)/absolute17': typeof genAbsolute17Route + '/(gen)/absolute18': typeof genAbsolute18Route + '/(gen)/absolute19': typeof genAbsolute19Route + '/(gen)/absolute2': typeof genAbsolute2Route + '/(gen)/absolute20': typeof genAbsolute20Route + '/(gen)/absolute21': typeof genAbsolute21Route + '/(gen)/absolute22': typeof genAbsolute22Route + '/(gen)/absolute23': typeof genAbsolute23Route + '/(gen)/absolute24': typeof genAbsolute24Route + '/(gen)/absolute25': typeof genAbsolute25Route + '/(gen)/absolute26': typeof genAbsolute26Route + '/(gen)/absolute27': typeof genAbsolute27Route + '/(gen)/absolute28': typeof genAbsolute28Route + '/(gen)/absolute29': typeof genAbsolute29Route + '/(gen)/absolute3': typeof genAbsolute3Route + '/(gen)/absolute30': typeof genAbsolute30Route + '/(gen)/absolute31': typeof genAbsolute31Route + '/(gen)/absolute32': typeof genAbsolute32Route + '/(gen)/absolute33': typeof genAbsolute33Route + '/(gen)/absolute34': typeof genAbsolute34Route + '/(gen)/absolute35': typeof genAbsolute35Route + '/(gen)/absolute36': typeof genAbsolute36Route + '/(gen)/absolute37': typeof genAbsolute37Route + '/(gen)/absolute38': typeof genAbsolute38Route + '/(gen)/absolute39': typeof genAbsolute39Route + '/(gen)/absolute4': typeof genAbsolute4Route + '/(gen)/absolute40': typeof genAbsolute40Route + '/(gen)/absolute41': typeof genAbsolute41Route + '/(gen)/absolute42': typeof genAbsolute42Route + '/(gen)/absolute43': typeof genAbsolute43Route + '/(gen)/absolute44': typeof genAbsolute44Route + '/(gen)/absolute45': typeof genAbsolute45Route + '/(gen)/absolute46': typeof genAbsolute46Route + '/(gen)/absolute47': typeof genAbsolute47Route + '/(gen)/absolute48': typeof genAbsolute48Route + '/(gen)/absolute49': typeof genAbsolute49Route + '/(gen)/absolute5': typeof genAbsolute5Route + '/(gen)/absolute50': typeof genAbsolute50Route + '/(gen)/absolute51': typeof genAbsolute51Route + '/(gen)/absolute52': typeof genAbsolute52Route + '/(gen)/absolute53': typeof genAbsolute53Route + '/(gen)/absolute54': typeof genAbsolute54Route + '/(gen)/absolute55': typeof genAbsolute55Route + '/(gen)/absolute56': typeof genAbsolute56Route + '/(gen)/absolute57': typeof genAbsolute57Route + '/(gen)/absolute58': typeof genAbsolute58Route + '/(gen)/absolute59': typeof genAbsolute59Route + '/(gen)/absolute6': typeof genAbsolute6Route + '/(gen)/absolute60': typeof genAbsolute60Route + '/(gen)/absolute61': typeof genAbsolute61Route + '/(gen)/absolute62': typeof genAbsolute62Route + '/(gen)/absolute63': typeof genAbsolute63Route + '/(gen)/absolute64': typeof genAbsolute64Route + '/(gen)/absolute65': typeof genAbsolute65Route + '/(gen)/absolute66': typeof genAbsolute66Route + '/(gen)/absolute67': typeof genAbsolute67Route + '/(gen)/absolute68': typeof genAbsolute68Route + '/(gen)/absolute69': typeof genAbsolute69Route + '/(gen)/absolute7': typeof genAbsolute7Route + '/(gen)/absolute70': typeof genAbsolute70Route + '/(gen)/absolute71': typeof genAbsolute71Route + '/(gen)/absolute72': typeof genAbsolute72Route + '/(gen)/absolute73': typeof genAbsolute73Route + '/(gen)/absolute74': typeof genAbsolute74Route + '/(gen)/absolute75': typeof genAbsolute75Route + '/(gen)/absolute76': typeof genAbsolute76Route + '/(gen)/absolute77': typeof genAbsolute77Route + '/(gen)/absolute78': typeof genAbsolute78Route + '/(gen)/absolute79': typeof genAbsolute79Route + '/(gen)/absolute8': typeof genAbsolute8Route + '/(gen)/absolute80': typeof genAbsolute80Route + '/(gen)/absolute81': typeof genAbsolute81Route + '/(gen)/absolute82': typeof genAbsolute82Route + '/(gen)/absolute83': typeof genAbsolute83Route + '/(gen)/absolute84': typeof genAbsolute84Route + '/(gen)/absolute85': typeof genAbsolute85Route + '/(gen)/absolute86': typeof genAbsolute86Route + '/(gen)/absolute87': typeof genAbsolute87Route + '/(gen)/absolute88': typeof genAbsolute88Route + '/(gen)/absolute89': typeof genAbsolute89Route + '/(gen)/absolute9': typeof genAbsolute9Route + '/(gen)/absolute90': typeof genAbsolute90Route + '/(gen)/absolute91': typeof genAbsolute91Route + '/(gen)/absolute92': typeof genAbsolute92Route + '/(gen)/absolute93': typeof genAbsolute93Route + '/(gen)/absolute94': typeof genAbsolute94Route + '/(gen)/absolute95': typeof genAbsolute95Route + '/(gen)/absolute96': typeof genAbsolute96Route + '/(gen)/absolute97': typeof genAbsolute97Route + '/(gen)/absolute98': typeof genAbsolute98Route + '/(gen)/absolute99': typeof genAbsolute99Route + '/(gen)/relative0': typeof genRelative0Route + '/(gen)/relative1': typeof genRelative1Route + '/(gen)/relative10': typeof genRelative10Route + '/(gen)/relative11': typeof genRelative11Route + '/(gen)/relative12': typeof genRelative12Route + '/(gen)/relative13': typeof genRelative13Route + '/(gen)/relative14': typeof genRelative14Route + '/(gen)/relative15': typeof genRelative15Route + '/(gen)/relative16': typeof genRelative16Route + '/(gen)/relative17': typeof genRelative17Route + '/(gen)/relative18': typeof genRelative18Route + '/(gen)/relative19': typeof genRelative19Route + '/(gen)/relative2': typeof genRelative2Route + '/(gen)/relative20': typeof genRelative20Route + '/(gen)/relative21': typeof genRelative21Route + '/(gen)/relative22': typeof genRelative22Route + '/(gen)/relative23': typeof genRelative23Route + '/(gen)/relative24': typeof genRelative24Route + '/(gen)/relative25': typeof genRelative25Route + '/(gen)/relative26': typeof genRelative26Route + '/(gen)/relative27': typeof genRelative27Route + '/(gen)/relative28': typeof genRelative28Route + '/(gen)/relative29': typeof genRelative29Route + '/(gen)/relative3': typeof genRelative3Route + '/(gen)/relative30': typeof genRelative30Route + '/(gen)/relative31': typeof genRelative31Route + '/(gen)/relative32': typeof genRelative32Route + '/(gen)/relative33': typeof genRelative33Route + '/(gen)/relative34': typeof genRelative34Route + '/(gen)/relative35': typeof genRelative35Route + '/(gen)/relative36': typeof genRelative36Route + '/(gen)/relative37': typeof genRelative37Route + '/(gen)/relative38': typeof genRelative38Route + '/(gen)/relative39': typeof genRelative39Route + '/(gen)/relative4': typeof genRelative4Route + '/(gen)/relative40': typeof genRelative40Route + '/(gen)/relative41': typeof genRelative41Route + '/(gen)/relative42': typeof genRelative42Route + '/(gen)/relative43': typeof genRelative43Route + '/(gen)/relative44': typeof genRelative44Route + '/(gen)/relative45': typeof genRelative45Route + '/(gen)/relative46': typeof genRelative46Route + '/(gen)/relative47': typeof genRelative47Route + '/(gen)/relative48': typeof genRelative48Route + '/(gen)/relative49': typeof genRelative49Route + '/(gen)/relative5': typeof genRelative5Route + '/(gen)/relative50': typeof genRelative50Route + '/(gen)/relative51': typeof genRelative51Route + '/(gen)/relative52': typeof genRelative52Route + '/(gen)/relative53': typeof genRelative53Route + '/(gen)/relative54': typeof genRelative54Route + '/(gen)/relative55': typeof genRelative55Route + '/(gen)/relative56': typeof genRelative56Route + '/(gen)/relative57': typeof genRelative57Route + '/(gen)/relative58': typeof genRelative58Route + '/(gen)/relative59': typeof genRelative59Route + '/(gen)/relative6': typeof genRelative6Route + '/(gen)/relative60': typeof genRelative60Route + '/(gen)/relative61': typeof genRelative61Route + '/(gen)/relative62': typeof genRelative62Route + '/(gen)/relative63': typeof genRelative63Route + '/(gen)/relative64': typeof genRelative64Route + '/(gen)/relative65': typeof genRelative65Route + '/(gen)/relative66': typeof genRelative66Route + '/(gen)/relative67': typeof genRelative67Route + '/(gen)/relative68': typeof genRelative68Route + '/(gen)/relative69': typeof genRelative69Route + '/(gen)/relative7': typeof genRelative7Route + '/(gen)/relative70': typeof genRelative70Route + '/(gen)/relative71': typeof genRelative71Route + '/(gen)/relative72': typeof genRelative72Route + '/(gen)/relative73': typeof genRelative73Route + '/(gen)/relative74': typeof genRelative74Route + '/(gen)/relative75': typeof genRelative75Route + '/(gen)/relative76': typeof genRelative76Route + '/(gen)/relative77': typeof genRelative77Route + '/(gen)/relative78': typeof genRelative78Route + '/(gen)/relative79': typeof genRelative79Route + '/(gen)/relative8': typeof genRelative8Route + '/(gen)/relative80': typeof genRelative80Route + '/(gen)/relative81': typeof genRelative81Route + '/(gen)/relative82': typeof genRelative82Route + '/(gen)/relative83': typeof genRelative83Route + '/(gen)/relative84': typeof genRelative84Route + '/(gen)/relative85': typeof genRelative85Route + '/(gen)/relative86': typeof genRelative86Route + '/(gen)/relative87': typeof genRelative87Route + '/(gen)/relative88': typeof genRelative88Route + '/(gen)/relative89': typeof genRelative89Route + '/(gen)/relative9': typeof genRelative9Route + '/(gen)/relative90': typeof genRelative90Route + '/(gen)/relative91': typeof genRelative91Route + '/(gen)/relative92': typeof genRelative92Route + '/(gen)/relative93': typeof genRelative93Route + '/(gen)/relative94': typeof genRelative94Route + '/(gen)/relative95': typeof genRelative95Route + '/(gen)/relative96': typeof genRelative96Route + '/(gen)/relative97': typeof genRelative97Route + '/(gen)/relative98': typeof genRelative98Route + '/(gen)/relative99': typeof genRelative99Route + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute + '/(gen)/params/$param0': typeof genParamsParam0Route + '/(gen)/params/$param1': typeof genParamsParam1Route + '/(gen)/params/$param10': typeof genParamsParam10Route + '/(gen)/params/$param11': typeof genParamsParam11Route + '/(gen)/params/$param12': typeof genParamsParam12Route + '/(gen)/params/$param13': typeof genParamsParam13Route + '/(gen)/params/$param14': typeof genParamsParam14Route + '/(gen)/params/$param15': typeof genParamsParam15Route + '/(gen)/params/$param16': typeof genParamsParam16Route + '/(gen)/params/$param17': typeof genParamsParam17Route + '/(gen)/params/$param18': typeof genParamsParam18Route + '/(gen)/params/$param19': typeof genParamsParam19Route + '/(gen)/params/$param2': typeof genParamsParam2Route + '/(gen)/params/$param20': typeof genParamsParam20Route + '/(gen)/params/$param21': typeof genParamsParam21Route + '/(gen)/params/$param22': typeof genParamsParam22Route + '/(gen)/params/$param23': typeof genParamsParam23Route + '/(gen)/params/$param24': typeof genParamsParam24Route + '/(gen)/params/$param25': typeof genParamsParam25Route + '/(gen)/params/$param26': typeof genParamsParam26Route + '/(gen)/params/$param27': typeof genParamsParam27Route + '/(gen)/params/$param28': typeof genParamsParam28Route + '/(gen)/params/$param29': typeof genParamsParam29Route + '/(gen)/params/$param3': typeof genParamsParam3Route + '/(gen)/params/$param30': typeof genParamsParam30Route + '/(gen)/params/$param31': typeof genParamsParam31Route + '/(gen)/params/$param32': typeof genParamsParam32Route + '/(gen)/params/$param33': typeof genParamsParam33Route + '/(gen)/params/$param34': typeof genParamsParam34Route + '/(gen)/params/$param35': typeof genParamsParam35Route + '/(gen)/params/$param36': typeof genParamsParam36Route + '/(gen)/params/$param37': typeof genParamsParam37Route + '/(gen)/params/$param38': typeof genParamsParam38Route + '/(gen)/params/$param39': typeof genParamsParam39Route + '/(gen)/params/$param4': typeof genParamsParam4Route + '/(gen)/params/$param40': typeof genParamsParam40Route + '/(gen)/params/$param41': typeof genParamsParam41Route + '/(gen)/params/$param42': typeof genParamsParam42Route + '/(gen)/params/$param43': typeof genParamsParam43Route + '/(gen)/params/$param44': typeof genParamsParam44Route + '/(gen)/params/$param45': typeof genParamsParam45Route + '/(gen)/params/$param46': typeof genParamsParam46Route + '/(gen)/params/$param47': typeof genParamsParam47Route + '/(gen)/params/$param48': typeof genParamsParam48Route + '/(gen)/params/$param49': typeof genParamsParam49Route + '/(gen)/params/$param5': typeof genParamsParam5Route + '/(gen)/params/$param50': typeof genParamsParam50Route + '/(gen)/params/$param51': typeof genParamsParam51Route + '/(gen)/params/$param52': typeof genParamsParam52Route + '/(gen)/params/$param53': typeof genParamsParam53Route + '/(gen)/params/$param54': typeof genParamsParam54Route + '/(gen)/params/$param55': typeof genParamsParam55Route + '/(gen)/params/$param56': typeof genParamsParam56Route + '/(gen)/params/$param57': typeof genParamsParam57Route + '/(gen)/params/$param58': typeof genParamsParam58Route + '/(gen)/params/$param59': typeof genParamsParam59Route + '/(gen)/params/$param6': typeof genParamsParam6Route + '/(gen)/params/$param60': typeof genParamsParam60Route + '/(gen)/params/$param61': typeof genParamsParam61Route + '/(gen)/params/$param62': typeof genParamsParam62Route + '/(gen)/params/$param63': typeof genParamsParam63Route + '/(gen)/params/$param64': typeof genParamsParam64Route + '/(gen)/params/$param65': typeof genParamsParam65Route + '/(gen)/params/$param66': typeof genParamsParam66Route + '/(gen)/params/$param67': typeof genParamsParam67Route + '/(gen)/params/$param68': typeof genParamsParam68Route + '/(gen)/params/$param69': typeof genParamsParam69Route + '/(gen)/params/$param7': typeof genParamsParam7Route + '/(gen)/params/$param70': typeof genParamsParam70Route + '/(gen)/params/$param71': typeof genParamsParam71Route + '/(gen)/params/$param72': typeof genParamsParam72Route + '/(gen)/params/$param73': typeof genParamsParam73Route + '/(gen)/params/$param74': typeof genParamsParam74Route + '/(gen)/params/$param75': typeof genParamsParam75Route + '/(gen)/params/$param76': typeof genParamsParam76Route + '/(gen)/params/$param77': typeof genParamsParam77Route + '/(gen)/params/$param78': typeof genParamsParam78Route + '/(gen)/params/$param79': typeof genParamsParam79Route + '/(gen)/params/$param8': typeof genParamsParam8Route + '/(gen)/params/$param80': typeof genParamsParam80Route + '/(gen)/params/$param81': typeof genParamsParam81Route + '/(gen)/params/$param82': typeof genParamsParam82Route + '/(gen)/params/$param83': typeof genParamsParam83Route + '/(gen)/params/$param84': typeof genParamsParam84Route + '/(gen)/params/$param85': typeof genParamsParam85Route + '/(gen)/params/$param86': typeof genParamsParam86Route + '/(gen)/params/$param87': typeof genParamsParam87Route + '/(gen)/params/$param88': typeof genParamsParam88Route + '/(gen)/params/$param89': typeof genParamsParam89Route + '/(gen)/params/$param9': typeof genParamsParam9Route + '/(gen)/params/$param90': typeof genParamsParam90Route + '/(gen)/params/$param91': typeof genParamsParam91Route + '/(gen)/params/$param92': typeof genParamsParam92Route + '/(gen)/params/$param93': typeof genParamsParam93Route + '/(gen)/params/$param94': typeof genParamsParam94Route + '/(gen)/params/$param95': typeof genParamsParam95Route + '/(gen)/params/$param96': typeof genParamsParam96Route + '/(gen)/params/$param97': typeof genParamsParam97Route + '/(gen)/params/$param98': typeof genParamsParam98Route + '/(gen)/params/$param99': typeof genParamsParam99Route + '/(gen)/search/search0': typeof genSearchSearch0Route + '/(gen)/search/search1': typeof genSearchSearch1Route + '/(gen)/search/search10': typeof genSearchSearch10Route + '/(gen)/search/search11': typeof genSearchSearch11Route + '/(gen)/search/search12': typeof genSearchSearch12Route + '/(gen)/search/search13': typeof genSearchSearch13Route + '/(gen)/search/search14': typeof genSearchSearch14Route + '/(gen)/search/search15': typeof genSearchSearch15Route + '/(gen)/search/search16': typeof genSearchSearch16Route + '/(gen)/search/search17': typeof genSearchSearch17Route + '/(gen)/search/search18': typeof genSearchSearch18Route + '/(gen)/search/search19': typeof genSearchSearch19Route + '/(gen)/search/search2': typeof genSearchSearch2Route + '/(gen)/search/search20': typeof genSearchSearch20Route + '/(gen)/search/search21': typeof genSearchSearch21Route + '/(gen)/search/search22': typeof genSearchSearch22Route + '/(gen)/search/search23': typeof genSearchSearch23Route + '/(gen)/search/search24': typeof genSearchSearch24Route + '/(gen)/search/search25': typeof genSearchSearch25Route + '/(gen)/search/search26': typeof genSearchSearch26Route + '/(gen)/search/search27': typeof genSearchSearch27Route + '/(gen)/search/search28': typeof genSearchSearch28Route + '/(gen)/search/search29': typeof genSearchSearch29Route + '/(gen)/search/search3': typeof genSearchSearch3Route + '/(gen)/search/search30': typeof genSearchSearch30Route + '/(gen)/search/search31': typeof genSearchSearch31Route + '/(gen)/search/search32': typeof genSearchSearch32Route + '/(gen)/search/search33': typeof genSearchSearch33Route + '/(gen)/search/search34': typeof genSearchSearch34Route + '/(gen)/search/search35': typeof genSearchSearch35Route + '/(gen)/search/search36': typeof genSearchSearch36Route + '/(gen)/search/search37': typeof genSearchSearch37Route + '/(gen)/search/search38': typeof genSearchSearch38Route + '/(gen)/search/search39': typeof genSearchSearch39Route + '/(gen)/search/search4': typeof genSearchSearch4Route + '/(gen)/search/search40': typeof genSearchSearch40Route + '/(gen)/search/search41': typeof genSearchSearch41Route + '/(gen)/search/search42': typeof genSearchSearch42Route + '/(gen)/search/search43': typeof genSearchSearch43Route + '/(gen)/search/search44': typeof genSearchSearch44Route + '/(gen)/search/search45': typeof genSearchSearch45Route + '/(gen)/search/search46': typeof genSearchSearch46Route + '/(gen)/search/search47': typeof genSearchSearch47Route + '/(gen)/search/search48': typeof genSearchSearch48Route + '/(gen)/search/search49': typeof genSearchSearch49Route + '/(gen)/search/search5': typeof genSearchSearch5Route + '/(gen)/search/search50': typeof genSearchSearch50Route + '/(gen)/search/search51': typeof genSearchSearch51Route + '/(gen)/search/search52': typeof genSearchSearch52Route + '/(gen)/search/search53': typeof genSearchSearch53Route + '/(gen)/search/search54': typeof genSearchSearch54Route + '/(gen)/search/search55': typeof genSearchSearch55Route + '/(gen)/search/search56': typeof genSearchSearch56Route + '/(gen)/search/search57': typeof genSearchSearch57Route + '/(gen)/search/search58': typeof genSearchSearch58Route + '/(gen)/search/search59': typeof genSearchSearch59Route + '/(gen)/search/search6': typeof genSearchSearch6Route + '/(gen)/search/search60': typeof genSearchSearch60Route + '/(gen)/search/search61': typeof genSearchSearch61Route + '/(gen)/search/search62': typeof genSearchSearch62Route + '/(gen)/search/search63': typeof genSearchSearch63Route + '/(gen)/search/search64': typeof genSearchSearch64Route + '/(gen)/search/search65': typeof genSearchSearch65Route + '/(gen)/search/search66': typeof genSearchSearch66Route + '/(gen)/search/search67': typeof genSearchSearch67Route + '/(gen)/search/search68': typeof genSearchSearch68Route + '/(gen)/search/search69': typeof genSearchSearch69Route + '/(gen)/search/search7': typeof genSearchSearch7Route + '/(gen)/search/search70': typeof genSearchSearch70Route + '/(gen)/search/search71': typeof genSearchSearch71Route + '/(gen)/search/search72': typeof genSearchSearch72Route + '/(gen)/search/search73': typeof genSearchSearch73Route + '/(gen)/search/search74': typeof genSearchSearch74Route + '/(gen)/search/search75': typeof genSearchSearch75Route + '/(gen)/search/search76': typeof genSearchSearch76Route + '/(gen)/search/search77': typeof genSearchSearch77Route + '/(gen)/search/search78': typeof genSearchSearch78Route + '/(gen)/search/search79': typeof genSearchSearch79Route + '/(gen)/search/search8': typeof genSearchSearch8Route + '/(gen)/search/search80': typeof genSearchSearch80Route + '/(gen)/search/search81': typeof genSearchSearch81Route + '/(gen)/search/search82': typeof genSearchSearch82Route + '/(gen)/search/search83': typeof genSearchSearch83Route + '/(gen)/search/search84': typeof genSearchSearch84Route + '/(gen)/search/search85': typeof genSearchSearch85Route + '/(gen)/search/search86': typeof genSearchSearch86Route + '/(gen)/search/search87': typeof genSearchSearch87Route + '/(gen)/search/search88': typeof genSearchSearch88Route + '/(gen)/search/search89': typeof genSearchSearch89Route + '/(gen)/search/search9': typeof genSearchSearch9Route + '/(gen)/search/search90': typeof genSearchSearch90Route + '/(gen)/search/search91': typeof genSearchSearch91Route + '/(gen)/search/search92': typeof genSearchSearch92Route + '/(gen)/search/search93': typeof genSearchSearch93Route + '/(gen)/search/search94': typeof genSearchSearch94Route + '/(gen)/search/search95': typeof genSearchSearch95Route + '/(gen)/search/search96': typeof genSearchSearch96Route + '/(gen)/search/search97': typeof genSearchSearch97Route + '/(gen)/search/search98': typeof genSearchSearch98Route + '/(gen)/search/search99': typeof genSearchSearch99Route +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/absolute0' + | '/absolute1' + | '/absolute10' + | '/absolute11' + | '/absolute12' + | '/absolute13' + | '/absolute14' + | '/absolute15' + | '/absolute16' + | '/absolute17' + | '/absolute18' + | '/absolute19' + | '/absolute2' + | '/absolute20' + | '/absolute21' + | '/absolute22' + | '/absolute23' + | '/absolute24' + | '/absolute25' + | '/absolute26' + | '/absolute27' + | '/absolute28' + | '/absolute29' + | '/absolute3' + | '/absolute30' + | '/absolute31' + | '/absolute32' + | '/absolute33' + | '/absolute34' + | '/absolute35' + | '/absolute36' + | '/absolute37' + | '/absolute38' + | '/absolute39' + | '/absolute4' + | '/absolute40' + | '/absolute41' + | '/absolute42' + | '/absolute43' + | '/absolute44' + | '/absolute45' + | '/absolute46' + | '/absolute47' + | '/absolute48' + | '/absolute49' + | '/absolute5' + | '/absolute50' + | '/absolute51' + | '/absolute52' + | '/absolute53' + | '/absolute54' + | '/absolute55' + | '/absolute56' + | '/absolute57' + | '/absolute58' + | '/absolute59' + | '/absolute6' + | '/absolute60' + | '/absolute61' + | '/absolute62' + | '/absolute63' + | '/absolute64' + | '/absolute65' + | '/absolute66' + | '/absolute67' + | '/absolute68' + | '/absolute69' + | '/absolute7' + | '/absolute70' + | '/absolute71' + | '/absolute72' + | '/absolute73' + | '/absolute74' + | '/absolute75' + | '/absolute76' + | '/absolute77' + | '/absolute78' + | '/absolute79' + | '/absolute8' + | '/absolute80' + | '/absolute81' + | '/absolute82' + | '/absolute83' + | '/absolute84' + | '/absolute85' + | '/absolute86' + | '/absolute87' + | '/absolute88' + | '/absolute89' + | '/absolute9' + | '/absolute90' + | '/absolute91' + | '/absolute92' + | '/absolute93' + | '/absolute94' + | '/absolute95' + | '/absolute96' + | '/absolute97' + | '/absolute98' + | '/absolute99' + | '/relative0' + | '/relative1' + | '/relative10' + | '/relative11' + | '/relative12' + | '/relative13' + | '/relative14' + | '/relative15' + | '/relative16' + | '/relative17' + | '/relative18' + | '/relative19' + | '/relative2' + | '/relative20' + | '/relative21' + | '/relative22' + | '/relative23' + | '/relative24' + | '/relative25' + | '/relative26' + | '/relative27' + | '/relative28' + | '/relative29' + | '/relative3' + | '/relative30' + | '/relative31' + | '/relative32' + | '/relative33' + | '/relative34' + | '/relative35' + | '/relative36' + | '/relative37' + | '/relative38' + | '/relative39' + | '/relative4' + | '/relative40' + | '/relative41' + | '/relative42' + | '/relative43' + | '/relative44' + | '/relative45' + | '/relative46' + | '/relative47' + | '/relative48' + | '/relative49' + | '/relative5' + | '/relative50' + | '/relative51' + | '/relative52' + | '/relative53' + | '/relative54' + | '/relative55' + | '/relative56' + | '/relative57' + | '/relative58' + | '/relative59' + | '/relative6' + | '/relative60' + | '/relative61' + | '/relative62' + | '/relative63' + | '/relative64' + | '/relative65' + | '/relative66' + | '/relative67' + | '/relative68' + | '/relative69' + | '/relative7' + | '/relative70' + | '/relative71' + | '/relative72' + | '/relative73' + | '/relative74' + | '/relative75' + | '/relative76' + | '/relative77' + | '/relative78' + | '/relative79' + | '/relative8' + | '/relative80' + | '/relative81' + | '/relative82' + | '/relative83' + | '/relative84' + | '/relative85' + | '/relative86' + | '/relative87' + | '/relative88' + | '/relative89' + | '/relative9' + | '/relative90' + | '/relative91' + | '/relative92' + | '/relative93' + | '/relative94' + | '/relative95' + | '/relative96' + | '/relative97' + | '/relative98' + | '/relative99' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + | '/params/$param0' + | '/params/$param1' + | '/params/$param10' + | '/params/$param11' + | '/params/$param12' + | '/params/$param13' + | '/params/$param14' + | '/params/$param15' + | '/params/$param16' + | '/params/$param17' + | '/params/$param18' + | '/params/$param19' + | '/params/$param2' + | '/params/$param20' + | '/params/$param21' + | '/params/$param22' + | '/params/$param23' + | '/params/$param24' + | '/params/$param25' + | '/params/$param26' + | '/params/$param27' + | '/params/$param28' + | '/params/$param29' + | '/params/$param3' + | '/params/$param30' + | '/params/$param31' + | '/params/$param32' + | '/params/$param33' + | '/params/$param34' + | '/params/$param35' + | '/params/$param36' + | '/params/$param37' + | '/params/$param38' + | '/params/$param39' + | '/params/$param4' + | '/params/$param40' + | '/params/$param41' + | '/params/$param42' + | '/params/$param43' + | '/params/$param44' + | '/params/$param45' + | '/params/$param46' + | '/params/$param47' + | '/params/$param48' + | '/params/$param49' + | '/params/$param5' + | '/params/$param50' + | '/params/$param51' + | '/params/$param52' + | '/params/$param53' + | '/params/$param54' + | '/params/$param55' + | '/params/$param56' + | '/params/$param57' + | '/params/$param58' + | '/params/$param59' + | '/params/$param6' + | '/params/$param60' + | '/params/$param61' + | '/params/$param62' + | '/params/$param63' + | '/params/$param64' + | '/params/$param65' + | '/params/$param66' + | '/params/$param67' + | '/params/$param68' + | '/params/$param69' + | '/params/$param7' + | '/params/$param70' + | '/params/$param71' + | '/params/$param72' + | '/params/$param73' + | '/params/$param74' + | '/params/$param75' + | '/params/$param76' + | '/params/$param77' + | '/params/$param78' + | '/params/$param79' + | '/params/$param8' + | '/params/$param80' + | '/params/$param81' + | '/params/$param82' + | '/params/$param83' + | '/params/$param84' + | '/params/$param85' + | '/params/$param86' + | '/params/$param87' + | '/params/$param88' + | '/params/$param89' + | '/params/$param9' + | '/params/$param90' + | '/params/$param91' + | '/params/$param92' + | '/params/$param93' + | '/params/$param94' + | '/params/$param95' + | '/params/$param96' + | '/params/$param97' + | '/params/$param98' + | '/params/$param99' + | '/search/search0' + | '/search/search1' + | '/search/search10' + | '/search/search11' + | '/search/search12' + | '/search/search13' + | '/search/search14' + | '/search/search15' + | '/search/search16' + | '/search/search17' + | '/search/search18' + | '/search/search19' + | '/search/search2' + | '/search/search20' + | '/search/search21' + | '/search/search22' + | '/search/search23' + | '/search/search24' + | '/search/search25' + | '/search/search26' + | '/search/search27' + | '/search/search28' + | '/search/search29' + | '/search/search3' + | '/search/search30' + | '/search/search31' + | '/search/search32' + | '/search/search33' + | '/search/search34' + | '/search/search35' + | '/search/search36' + | '/search/search37' + | '/search/search38' + | '/search/search39' + | '/search/search4' + | '/search/search40' + | '/search/search41' + | '/search/search42' + | '/search/search43' + | '/search/search44' + | '/search/search45' + | '/search/search46' + | '/search/search47' + | '/search/search48' + | '/search/search49' + | '/search/search5' + | '/search/search50' + | '/search/search51' + | '/search/search52' + | '/search/search53' + | '/search/search54' + | '/search/search55' + | '/search/search56' + | '/search/search57' + | '/search/search58' + | '/search/search59' + | '/search/search6' + | '/search/search60' + | '/search/search61' + | '/search/search62' + | '/search/search63' + | '/search/search64' + | '/search/search65' + | '/search/search66' + | '/search/search67' + | '/search/search68' + | '/search/search69' + | '/search/search7' + | '/search/search70' + | '/search/search71' + | '/search/search72' + | '/search/search73' + | '/search/search74' + | '/search/search75' + | '/search/search76' + | '/search/search77' + | '/search/search78' + | '/search/search79' + | '/search/search8' + | '/search/search80' + | '/search/search81' + | '/search/search82' + | '/search/search83' + | '/search/search84' + | '/search/search85' + | '/search/search86' + | '/search/search87' + | '/search/search88' + | '/search/search89' + | '/search/search9' + | '/search/search90' + | '/search/search91' + | '/search/search92' + | '/search/search93' + | '/search/search94' + | '/search/search95' + | '/search/search96' + | '/search/search97' + | '/search/search98' + | '/search/search99' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/absolute0' + | '/absolute1' + | '/absolute10' + | '/absolute11' + | '/absolute12' + | '/absolute13' + | '/absolute14' + | '/absolute15' + | '/absolute16' + | '/absolute17' + | '/absolute18' + | '/absolute19' + | '/absolute2' + | '/absolute20' + | '/absolute21' + | '/absolute22' + | '/absolute23' + | '/absolute24' + | '/absolute25' + | '/absolute26' + | '/absolute27' + | '/absolute28' + | '/absolute29' + | '/absolute3' + | '/absolute30' + | '/absolute31' + | '/absolute32' + | '/absolute33' + | '/absolute34' + | '/absolute35' + | '/absolute36' + | '/absolute37' + | '/absolute38' + | '/absolute39' + | '/absolute4' + | '/absolute40' + | '/absolute41' + | '/absolute42' + | '/absolute43' + | '/absolute44' + | '/absolute45' + | '/absolute46' + | '/absolute47' + | '/absolute48' + | '/absolute49' + | '/absolute5' + | '/absolute50' + | '/absolute51' + | '/absolute52' + | '/absolute53' + | '/absolute54' + | '/absolute55' + | '/absolute56' + | '/absolute57' + | '/absolute58' + | '/absolute59' + | '/absolute6' + | '/absolute60' + | '/absolute61' + | '/absolute62' + | '/absolute63' + | '/absolute64' + | '/absolute65' + | '/absolute66' + | '/absolute67' + | '/absolute68' + | '/absolute69' + | '/absolute7' + | '/absolute70' + | '/absolute71' + | '/absolute72' + | '/absolute73' + | '/absolute74' + | '/absolute75' + | '/absolute76' + | '/absolute77' + | '/absolute78' + | '/absolute79' + | '/absolute8' + | '/absolute80' + | '/absolute81' + | '/absolute82' + | '/absolute83' + | '/absolute84' + | '/absolute85' + | '/absolute86' + | '/absolute87' + | '/absolute88' + | '/absolute89' + | '/absolute9' + | '/absolute90' + | '/absolute91' + | '/absolute92' + | '/absolute93' + | '/absolute94' + | '/absolute95' + | '/absolute96' + | '/absolute97' + | '/absolute98' + | '/absolute99' + | '/relative0' + | '/relative1' + | '/relative10' + | '/relative11' + | '/relative12' + | '/relative13' + | '/relative14' + | '/relative15' + | '/relative16' + | '/relative17' + | '/relative18' + | '/relative19' + | '/relative2' + | '/relative20' + | '/relative21' + | '/relative22' + | '/relative23' + | '/relative24' + | '/relative25' + | '/relative26' + | '/relative27' + | '/relative28' + | '/relative29' + | '/relative3' + | '/relative30' + | '/relative31' + | '/relative32' + | '/relative33' + | '/relative34' + | '/relative35' + | '/relative36' + | '/relative37' + | '/relative38' + | '/relative39' + | '/relative4' + | '/relative40' + | '/relative41' + | '/relative42' + | '/relative43' + | '/relative44' + | '/relative45' + | '/relative46' + | '/relative47' + | '/relative48' + | '/relative49' + | '/relative5' + | '/relative50' + | '/relative51' + | '/relative52' + | '/relative53' + | '/relative54' + | '/relative55' + | '/relative56' + | '/relative57' + | '/relative58' + | '/relative59' + | '/relative6' + | '/relative60' + | '/relative61' + | '/relative62' + | '/relative63' + | '/relative64' + | '/relative65' + | '/relative66' + | '/relative67' + | '/relative68' + | '/relative69' + | '/relative7' + | '/relative70' + | '/relative71' + | '/relative72' + | '/relative73' + | '/relative74' + | '/relative75' + | '/relative76' + | '/relative77' + | '/relative78' + | '/relative79' + | '/relative8' + | '/relative80' + | '/relative81' + | '/relative82' + | '/relative83' + | '/relative84' + | '/relative85' + | '/relative86' + | '/relative87' + | '/relative88' + | '/relative89' + | '/relative9' + | '/relative90' + | '/relative91' + | '/relative92' + | '/relative93' + | '/relative94' + | '/relative95' + | '/relative96' + | '/relative97' + | '/relative98' + | '/relative99' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + | '/params/$param0' + | '/params/$param1' + | '/params/$param10' + | '/params/$param11' + | '/params/$param12' + | '/params/$param13' + | '/params/$param14' + | '/params/$param15' + | '/params/$param16' + | '/params/$param17' + | '/params/$param18' + | '/params/$param19' + | '/params/$param2' + | '/params/$param20' + | '/params/$param21' + | '/params/$param22' + | '/params/$param23' + | '/params/$param24' + | '/params/$param25' + | '/params/$param26' + | '/params/$param27' + | '/params/$param28' + | '/params/$param29' + | '/params/$param3' + | '/params/$param30' + | '/params/$param31' + | '/params/$param32' + | '/params/$param33' + | '/params/$param34' + | '/params/$param35' + | '/params/$param36' + | '/params/$param37' + | '/params/$param38' + | '/params/$param39' + | '/params/$param4' + | '/params/$param40' + | '/params/$param41' + | '/params/$param42' + | '/params/$param43' + | '/params/$param44' + | '/params/$param45' + | '/params/$param46' + | '/params/$param47' + | '/params/$param48' + | '/params/$param49' + | '/params/$param5' + | '/params/$param50' + | '/params/$param51' + | '/params/$param52' + | '/params/$param53' + | '/params/$param54' + | '/params/$param55' + | '/params/$param56' + | '/params/$param57' + | '/params/$param58' + | '/params/$param59' + | '/params/$param6' + | '/params/$param60' + | '/params/$param61' + | '/params/$param62' + | '/params/$param63' + | '/params/$param64' + | '/params/$param65' + | '/params/$param66' + | '/params/$param67' + | '/params/$param68' + | '/params/$param69' + | '/params/$param7' + | '/params/$param70' + | '/params/$param71' + | '/params/$param72' + | '/params/$param73' + | '/params/$param74' + | '/params/$param75' + | '/params/$param76' + | '/params/$param77' + | '/params/$param78' + | '/params/$param79' + | '/params/$param8' + | '/params/$param80' + | '/params/$param81' + | '/params/$param82' + | '/params/$param83' + | '/params/$param84' + | '/params/$param85' + | '/params/$param86' + | '/params/$param87' + | '/params/$param88' + | '/params/$param89' + | '/params/$param9' + | '/params/$param90' + | '/params/$param91' + | '/params/$param92' + | '/params/$param93' + | '/params/$param94' + | '/params/$param95' + | '/params/$param96' + | '/params/$param97' + | '/params/$param98' + | '/params/$param99' + | '/search/search0' + | '/search/search1' + | '/search/search10' + | '/search/search11' + | '/search/search12' + | '/search/search13' + | '/search/search14' + | '/search/search15' + | '/search/search16' + | '/search/search17' + | '/search/search18' + | '/search/search19' + | '/search/search2' + | '/search/search20' + | '/search/search21' + | '/search/search22' + | '/search/search23' + | '/search/search24' + | '/search/search25' + | '/search/search26' + | '/search/search27' + | '/search/search28' + | '/search/search29' + | '/search/search3' + | '/search/search30' + | '/search/search31' + | '/search/search32' + | '/search/search33' + | '/search/search34' + | '/search/search35' + | '/search/search36' + | '/search/search37' + | '/search/search38' + | '/search/search39' + | '/search/search4' + | '/search/search40' + | '/search/search41' + | '/search/search42' + | '/search/search43' + | '/search/search44' + | '/search/search45' + | '/search/search46' + | '/search/search47' + | '/search/search48' + | '/search/search49' + | '/search/search5' + | '/search/search50' + | '/search/search51' + | '/search/search52' + | '/search/search53' + | '/search/search54' + | '/search/search55' + | '/search/search56' + | '/search/search57' + | '/search/search58' + | '/search/search59' + | '/search/search6' + | '/search/search60' + | '/search/search61' + | '/search/search62' + | '/search/search63' + | '/search/search64' + | '/search/search65' + | '/search/search66' + | '/search/search67' + | '/search/search68' + | '/search/search69' + | '/search/search7' + | '/search/search70' + | '/search/search71' + | '/search/search72' + | '/search/search73' + | '/search/search74' + | '/search/search75' + | '/search/search76' + | '/search/search77' + | '/search/search78' + | '/search/search79' + | '/search/search8' + | '/search/search80' + | '/search/search81' + | '/search/search82' + | '/search/search83' + | '/search/search84' + | '/search/search85' + | '/search/search86' + | '/search/search87' + | '/search/search88' + | '/search/search89' + | '/search/search9' + | '/search/search90' + | '/search/search91' + | '/search/search92' + | '/search/search93' + | '/search/search94' + | '/search/search95' + | '/search/search96' + | '/search/search97' + | '/search/search98' + | '/search/search99' + id: + | '__root__' + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/(gen)/params' + | '/(gen)/search' + | '/(gen)/absolute0' + | '/(gen)/absolute1' + | '/(gen)/absolute10' + | '/(gen)/absolute11' + | '/(gen)/absolute12' + | '/(gen)/absolute13' + | '/(gen)/absolute14' + | '/(gen)/absolute15' + | '/(gen)/absolute16' + | '/(gen)/absolute17' + | '/(gen)/absolute18' + | '/(gen)/absolute19' + | '/(gen)/absolute2' + | '/(gen)/absolute20' + | '/(gen)/absolute21' + | '/(gen)/absolute22' + | '/(gen)/absolute23' + | '/(gen)/absolute24' + | '/(gen)/absolute25' + | '/(gen)/absolute26' + | '/(gen)/absolute27' + | '/(gen)/absolute28' + | '/(gen)/absolute29' + | '/(gen)/absolute3' + | '/(gen)/absolute30' + | '/(gen)/absolute31' + | '/(gen)/absolute32' + | '/(gen)/absolute33' + | '/(gen)/absolute34' + | '/(gen)/absolute35' + | '/(gen)/absolute36' + | '/(gen)/absolute37' + | '/(gen)/absolute38' + | '/(gen)/absolute39' + | '/(gen)/absolute4' + | '/(gen)/absolute40' + | '/(gen)/absolute41' + | '/(gen)/absolute42' + | '/(gen)/absolute43' + | '/(gen)/absolute44' + | '/(gen)/absolute45' + | '/(gen)/absolute46' + | '/(gen)/absolute47' + | '/(gen)/absolute48' + | '/(gen)/absolute49' + | '/(gen)/absolute5' + | '/(gen)/absolute50' + | '/(gen)/absolute51' + | '/(gen)/absolute52' + | '/(gen)/absolute53' + | '/(gen)/absolute54' + | '/(gen)/absolute55' + | '/(gen)/absolute56' + | '/(gen)/absolute57' + | '/(gen)/absolute58' + | '/(gen)/absolute59' + | '/(gen)/absolute6' + | '/(gen)/absolute60' + | '/(gen)/absolute61' + | '/(gen)/absolute62' + | '/(gen)/absolute63' + | '/(gen)/absolute64' + | '/(gen)/absolute65' + | '/(gen)/absolute66' + | '/(gen)/absolute67' + | '/(gen)/absolute68' + | '/(gen)/absolute69' + | '/(gen)/absolute7' + | '/(gen)/absolute70' + | '/(gen)/absolute71' + | '/(gen)/absolute72' + | '/(gen)/absolute73' + | '/(gen)/absolute74' + | '/(gen)/absolute75' + | '/(gen)/absolute76' + | '/(gen)/absolute77' + | '/(gen)/absolute78' + | '/(gen)/absolute79' + | '/(gen)/absolute8' + | '/(gen)/absolute80' + | '/(gen)/absolute81' + | '/(gen)/absolute82' + | '/(gen)/absolute83' + | '/(gen)/absolute84' + | '/(gen)/absolute85' + | '/(gen)/absolute86' + | '/(gen)/absolute87' + | '/(gen)/absolute88' + | '/(gen)/absolute89' + | '/(gen)/absolute9' + | '/(gen)/absolute90' + | '/(gen)/absolute91' + | '/(gen)/absolute92' + | '/(gen)/absolute93' + | '/(gen)/absolute94' + | '/(gen)/absolute95' + | '/(gen)/absolute96' + | '/(gen)/absolute97' + | '/(gen)/absolute98' + | '/(gen)/absolute99' + | '/(gen)/relative0' + | '/(gen)/relative1' + | '/(gen)/relative10' + | '/(gen)/relative11' + | '/(gen)/relative12' + | '/(gen)/relative13' + | '/(gen)/relative14' + | '/(gen)/relative15' + | '/(gen)/relative16' + | '/(gen)/relative17' + | '/(gen)/relative18' + | '/(gen)/relative19' + | '/(gen)/relative2' + | '/(gen)/relative20' + | '/(gen)/relative21' + | '/(gen)/relative22' + | '/(gen)/relative23' + | '/(gen)/relative24' + | '/(gen)/relative25' + | '/(gen)/relative26' + | '/(gen)/relative27' + | '/(gen)/relative28' + | '/(gen)/relative29' + | '/(gen)/relative3' + | '/(gen)/relative30' + | '/(gen)/relative31' + | '/(gen)/relative32' + | '/(gen)/relative33' + | '/(gen)/relative34' + | '/(gen)/relative35' + | '/(gen)/relative36' + | '/(gen)/relative37' + | '/(gen)/relative38' + | '/(gen)/relative39' + | '/(gen)/relative4' + | '/(gen)/relative40' + | '/(gen)/relative41' + | '/(gen)/relative42' + | '/(gen)/relative43' + | '/(gen)/relative44' + | '/(gen)/relative45' + | '/(gen)/relative46' + | '/(gen)/relative47' + | '/(gen)/relative48' + | '/(gen)/relative49' + | '/(gen)/relative5' + | '/(gen)/relative50' + | '/(gen)/relative51' + | '/(gen)/relative52' + | '/(gen)/relative53' + | '/(gen)/relative54' + | '/(gen)/relative55' + | '/(gen)/relative56' + | '/(gen)/relative57' + | '/(gen)/relative58' + | '/(gen)/relative59' + | '/(gen)/relative6' + | '/(gen)/relative60' + | '/(gen)/relative61' + | '/(gen)/relative62' + | '/(gen)/relative63' + | '/(gen)/relative64' + | '/(gen)/relative65' + | '/(gen)/relative66' + | '/(gen)/relative67' + | '/(gen)/relative68' + | '/(gen)/relative69' + | '/(gen)/relative7' + | '/(gen)/relative70' + | '/(gen)/relative71' + | '/(gen)/relative72' + | '/(gen)/relative73' + | '/(gen)/relative74' + | '/(gen)/relative75' + | '/(gen)/relative76' + | '/(gen)/relative77' + | '/(gen)/relative78' + | '/(gen)/relative79' + | '/(gen)/relative8' + | '/(gen)/relative80' + | '/(gen)/relative81' + | '/(gen)/relative82' + | '/(gen)/relative83' + | '/(gen)/relative84' + | '/(gen)/relative85' + | '/(gen)/relative86' + | '/(gen)/relative87' + | '/(gen)/relative88' + | '/(gen)/relative89' + | '/(gen)/relative9' + | '/(gen)/relative90' + | '/(gen)/relative91' + | '/(gen)/relative92' + | '/(gen)/relative93' + | '/(gen)/relative94' + | '/(gen)/relative95' + | '/(gen)/relative96' + | '/(gen)/relative97' + | '/(gen)/relative98' + | '/(gen)/relative99' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + | '/(gen)/params/$param0' + | '/(gen)/params/$param1' + | '/(gen)/params/$param10' + | '/(gen)/params/$param11' + | '/(gen)/params/$param12' + | '/(gen)/params/$param13' + | '/(gen)/params/$param14' + | '/(gen)/params/$param15' + | '/(gen)/params/$param16' + | '/(gen)/params/$param17' + | '/(gen)/params/$param18' + | '/(gen)/params/$param19' + | '/(gen)/params/$param2' + | '/(gen)/params/$param20' + | '/(gen)/params/$param21' + | '/(gen)/params/$param22' + | '/(gen)/params/$param23' + | '/(gen)/params/$param24' + | '/(gen)/params/$param25' + | '/(gen)/params/$param26' + | '/(gen)/params/$param27' + | '/(gen)/params/$param28' + | '/(gen)/params/$param29' + | '/(gen)/params/$param3' + | '/(gen)/params/$param30' + | '/(gen)/params/$param31' + | '/(gen)/params/$param32' + | '/(gen)/params/$param33' + | '/(gen)/params/$param34' + | '/(gen)/params/$param35' + | '/(gen)/params/$param36' + | '/(gen)/params/$param37' + | '/(gen)/params/$param38' + | '/(gen)/params/$param39' + | '/(gen)/params/$param4' + | '/(gen)/params/$param40' + | '/(gen)/params/$param41' + | '/(gen)/params/$param42' + | '/(gen)/params/$param43' + | '/(gen)/params/$param44' + | '/(gen)/params/$param45' + | '/(gen)/params/$param46' + | '/(gen)/params/$param47' + | '/(gen)/params/$param48' + | '/(gen)/params/$param49' + | '/(gen)/params/$param5' + | '/(gen)/params/$param50' + | '/(gen)/params/$param51' + | '/(gen)/params/$param52' + | '/(gen)/params/$param53' + | '/(gen)/params/$param54' + | '/(gen)/params/$param55' + | '/(gen)/params/$param56' + | '/(gen)/params/$param57' + | '/(gen)/params/$param58' + | '/(gen)/params/$param59' + | '/(gen)/params/$param6' + | '/(gen)/params/$param60' + | '/(gen)/params/$param61' + | '/(gen)/params/$param62' + | '/(gen)/params/$param63' + | '/(gen)/params/$param64' + | '/(gen)/params/$param65' + | '/(gen)/params/$param66' + | '/(gen)/params/$param67' + | '/(gen)/params/$param68' + | '/(gen)/params/$param69' + | '/(gen)/params/$param7' + | '/(gen)/params/$param70' + | '/(gen)/params/$param71' + | '/(gen)/params/$param72' + | '/(gen)/params/$param73' + | '/(gen)/params/$param74' + | '/(gen)/params/$param75' + | '/(gen)/params/$param76' + | '/(gen)/params/$param77' + | '/(gen)/params/$param78' + | '/(gen)/params/$param79' + | '/(gen)/params/$param8' + | '/(gen)/params/$param80' + | '/(gen)/params/$param81' + | '/(gen)/params/$param82' + | '/(gen)/params/$param83' + | '/(gen)/params/$param84' + | '/(gen)/params/$param85' + | '/(gen)/params/$param86' + | '/(gen)/params/$param87' + | '/(gen)/params/$param88' + | '/(gen)/params/$param89' + | '/(gen)/params/$param9' + | '/(gen)/params/$param90' + | '/(gen)/params/$param91' + | '/(gen)/params/$param92' + | '/(gen)/params/$param93' + | '/(gen)/params/$param94' + | '/(gen)/params/$param95' + | '/(gen)/params/$param96' + | '/(gen)/params/$param97' + | '/(gen)/params/$param98' + | '/(gen)/params/$param99' + | '/(gen)/search/search0' + | '/(gen)/search/search1' + | '/(gen)/search/search10' + | '/(gen)/search/search11' + | '/(gen)/search/search12' + | '/(gen)/search/search13' + | '/(gen)/search/search14' + | '/(gen)/search/search15' + | '/(gen)/search/search16' + | '/(gen)/search/search17' + | '/(gen)/search/search18' + | '/(gen)/search/search19' + | '/(gen)/search/search2' + | '/(gen)/search/search20' + | '/(gen)/search/search21' + | '/(gen)/search/search22' + | '/(gen)/search/search23' + | '/(gen)/search/search24' + | '/(gen)/search/search25' + | '/(gen)/search/search26' + | '/(gen)/search/search27' + | '/(gen)/search/search28' + | '/(gen)/search/search29' + | '/(gen)/search/search3' + | '/(gen)/search/search30' + | '/(gen)/search/search31' + | '/(gen)/search/search32' + | '/(gen)/search/search33' + | '/(gen)/search/search34' + | '/(gen)/search/search35' + | '/(gen)/search/search36' + | '/(gen)/search/search37' + | '/(gen)/search/search38' + | '/(gen)/search/search39' + | '/(gen)/search/search4' + | '/(gen)/search/search40' + | '/(gen)/search/search41' + | '/(gen)/search/search42' + | '/(gen)/search/search43' + | '/(gen)/search/search44' + | '/(gen)/search/search45' + | '/(gen)/search/search46' + | '/(gen)/search/search47' + | '/(gen)/search/search48' + | '/(gen)/search/search49' + | '/(gen)/search/search5' + | '/(gen)/search/search50' + | '/(gen)/search/search51' + | '/(gen)/search/search52' + | '/(gen)/search/search53' + | '/(gen)/search/search54' + | '/(gen)/search/search55' + | '/(gen)/search/search56' + | '/(gen)/search/search57' + | '/(gen)/search/search58' + | '/(gen)/search/search59' + | '/(gen)/search/search6' + | '/(gen)/search/search60' + | '/(gen)/search/search61' + | '/(gen)/search/search62' + | '/(gen)/search/search63' + | '/(gen)/search/search64' + | '/(gen)/search/search65' + | '/(gen)/search/search66' + | '/(gen)/search/search67' + | '/(gen)/search/search68' + | '/(gen)/search/search69' + | '/(gen)/search/search7' + | '/(gen)/search/search70' + | '/(gen)/search/search71' + | '/(gen)/search/search72' + | '/(gen)/search/search73' + | '/(gen)/search/search74' + | '/(gen)/search/search75' + | '/(gen)/search/search76' + | '/(gen)/search/search77' + | '/(gen)/search/search78' + | '/(gen)/search/search79' + | '/(gen)/search/search8' + | '/(gen)/search/search80' + | '/(gen)/search/search81' + | '/(gen)/search/search82' + | '/(gen)/search/search83' + | '/(gen)/search/search84' + | '/(gen)/search/search85' + | '/(gen)/search/search86' + | '/(gen)/search/search87' + | '/(gen)/search/search88' + | '/(gen)/search/search89' + | '/(gen)/search/search9' + | '/(gen)/search/search90' + | '/(gen)/search/search91' + | '/(gen)/search/search92' + | '/(gen)/search/search93' + | '/(gen)/search/search94' + | '/(gen)/search/search95' + | '/(gen)/search/search96' + | '/(gen)/search/search97' + | '/(gen)/search/search98' + | '/(gen)/search/search99' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ParamsRouteRoute: typeof ParamsRouteRouteWithChildren + SearchRouteRoute: typeof SearchRouteRouteWithChildren + AbsoluteRoute: typeof AbsoluteRoute + LinkPropsRoute: typeof LinkPropsRoute + RelativeRoute: typeof RelativeRoute + genParamsRouteRoute: typeof genParamsRouteRouteWithChildren + genSearchRouteRoute: typeof genSearchRouteRouteWithChildren + genAbsolute0Route: typeof genAbsolute0Route + genAbsolute1Route: typeof genAbsolute1Route + genAbsolute10Route: typeof genAbsolute10Route + genAbsolute11Route: typeof genAbsolute11Route + genAbsolute12Route: typeof genAbsolute12Route + genAbsolute13Route: typeof genAbsolute13Route + genAbsolute14Route: typeof genAbsolute14Route + genAbsolute15Route: typeof genAbsolute15Route + genAbsolute16Route: typeof genAbsolute16Route + genAbsolute17Route: typeof genAbsolute17Route + genAbsolute18Route: typeof genAbsolute18Route + genAbsolute19Route: typeof genAbsolute19Route + genAbsolute2Route: typeof genAbsolute2Route + genAbsolute20Route: typeof genAbsolute20Route + genAbsolute21Route: typeof genAbsolute21Route + genAbsolute22Route: typeof genAbsolute22Route + genAbsolute23Route: typeof genAbsolute23Route + genAbsolute24Route: typeof genAbsolute24Route + genAbsolute25Route: typeof genAbsolute25Route + genAbsolute26Route: typeof genAbsolute26Route + genAbsolute27Route: typeof genAbsolute27Route + genAbsolute28Route: typeof genAbsolute28Route + genAbsolute29Route: typeof genAbsolute29Route + genAbsolute3Route: typeof genAbsolute3Route + genAbsolute30Route: typeof genAbsolute30Route + genAbsolute31Route: typeof genAbsolute31Route + genAbsolute32Route: typeof genAbsolute32Route + genAbsolute33Route: typeof genAbsolute33Route + genAbsolute34Route: typeof genAbsolute34Route + genAbsolute35Route: typeof genAbsolute35Route + genAbsolute36Route: typeof genAbsolute36Route + genAbsolute37Route: typeof genAbsolute37Route + genAbsolute38Route: typeof genAbsolute38Route + genAbsolute39Route: typeof genAbsolute39Route + genAbsolute4Route: typeof genAbsolute4Route + genAbsolute40Route: typeof genAbsolute40Route + genAbsolute41Route: typeof genAbsolute41Route + genAbsolute42Route: typeof genAbsolute42Route + genAbsolute43Route: typeof genAbsolute43Route + genAbsolute44Route: typeof genAbsolute44Route + genAbsolute45Route: typeof genAbsolute45Route + genAbsolute46Route: typeof genAbsolute46Route + genAbsolute47Route: typeof genAbsolute47Route + genAbsolute48Route: typeof genAbsolute48Route + genAbsolute49Route: typeof genAbsolute49Route + genAbsolute5Route: typeof genAbsolute5Route + genAbsolute50Route: typeof genAbsolute50Route + genAbsolute51Route: typeof genAbsolute51Route + genAbsolute52Route: typeof genAbsolute52Route + genAbsolute53Route: typeof genAbsolute53Route + genAbsolute54Route: typeof genAbsolute54Route + genAbsolute55Route: typeof genAbsolute55Route + genAbsolute56Route: typeof genAbsolute56Route + genAbsolute57Route: typeof genAbsolute57Route + genAbsolute58Route: typeof genAbsolute58Route + genAbsolute59Route: typeof genAbsolute59Route + genAbsolute6Route: typeof genAbsolute6Route + genAbsolute60Route: typeof genAbsolute60Route + genAbsolute61Route: typeof genAbsolute61Route + genAbsolute62Route: typeof genAbsolute62Route + genAbsolute63Route: typeof genAbsolute63Route + genAbsolute64Route: typeof genAbsolute64Route + genAbsolute65Route: typeof genAbsolute65Route + genAbsolute66Route: typeof genAbsolute66Route + genAbsolute67Route: typeof genAbsolute67Route + genAbsolute68Route: typeof genAbsolute68Route + genAbsolute69Route: typeof genAbsolute69Route + genAbsolute7Route: typeof genAbsolute7Route + genAbsolute70Route: typeof genAbsolute70Route + genAbsolute71Route: typeof genAbsolute71Route + genAbsolute72Route: typeof genAbsolute72Route + genAbsolute73Route: typeof genAbsolute73Route + genAbsolute74Route: typeof genAbsolute74Route + genAbsolute75Route: typeof genAbsolute75Route + genAbsolute76Route: typeof genAbsolute76Route + genAbsolute77Route: typeof genAbsolute77Route + genAbsolute78Route: typeof genAbsolute78Route + genAbsolute79Route: typeof genAbsolute79Route + genAbsolute8Route: typeof genAbsolute8Route + genAbsolute80Route: typeof genAbsolute80Route + genAbsolute81Route: typeof genAbsolute81Route + genAbsolute82Route: typeof genAbsolute82Route + genAbsolute83Route: typeof genAbsolute83Route + genAbsolute84Route: typeof genAbsolute84Route + genAbsolute85Route: typeof genAbsolute85Route + genAbsolute86Route: typeof genAbsolute86Route + genAbsolute87Route: typeof genAbsolute87Route + genAbsolute88Route: typeof genAbsolute88Route + genAbsolute89Route: typeof genAbsolute89Route + genAbsolute9Route: typeof genAbsolute9Route + genAbsolute90Route: typeof genAbsolute90Route + genAbsolute91Route: typeof genAbsolute91Route + genAbsolute92Route: typeof genAbsolute92Route + genAbsolute93Route: typeof genAbsolute93Route + genAbsolute94Route: typeof genAbsolute94Route + genAbsolute95Route: typeof genAbsolute95Route + genAbsolute96Route: typeof genAbsolute96Route + genAbsolute97Route: typeof genAbsolute97Route + genAbsolute98Route: typeof genAbsolute98Route + genAbsolute99Route: typeof genAbsolute99Route + genRelative0Route: typeof genRelative0Route + genRelative1Route: typeof genRelative1Route + genRelative10Route: typeof genRelative10Route + genRelative11Route: typeof genRelative11Route + genRelative12Route: typeof genRelative12Route + genRelative13Route: typeof genRelative13Route + genRelative14Route: typeof genRelative14Route + genRelative15Route: typeof genRelative15Route + genRelative16Route: typeof genRelative16Route + genRelative17Route: typeof genRelative17Route + genRelative18Route: typeof genRelative18Route + genRelative19Route: typeof genRelative19Route + genRelative2Route: typeof genRelative2Route + genRelative20Route: typeof genRelative20Route + genRelative21Route: typeof genRelative21Route + genRelative22Route: typeof genRelative22Route + genRelative23Route: typeof genRelative23Route + genRelative24Route: typeof genRelative24Route + genRelative25Route: typeof genRelative25Route + genRelative26Route: typeof genRelative26Route + genRelative27Route: typeof genRelative27Route + genRelative28Route: typeof genRelative28Route + genRelative29Route: typeof genRelative29Route + genRelative3Route: typeof genRelative3Route + genRelative30Route: typeof genRelative30Route + genRelative31Route: typeof genRelative31Route + genRelative32Route: typeof genRelative32Route + genRelative33Route: typeof genRelative33Route + genRelative34Route: typeof genRelative34Route + genRelative35Route: typeof genRelative35Route + genRelative36Route: typeof genRelative36Route + genRelative37Route: typeof genRelative37Route + genRelative38Route: typeof genRelative38Route + genRelative39Route: typeof genRelative39Route + genRelative4Route: typeof genRelative4Route + genRelative40Route: typeof genRelative40Route + genRelative41Route: typeof genRelative41Route + genRelative42Route: typeof genRelative42Route + genRelative43Route: typeof genRelative43Route + genRelative44Route: typeof genRelative44Route + genRelative45Route: typeof genRelative45Route + genRelative46Route: typeof genRelative46Route + genRelative47Route: typeof genRelative47Route + genRelative48Route: typeof genRelative48Route + genRelative49Route: typeof genRelative49Route + genRelative5Route: typeof genRelative5Route + genRelative50Route: typeof genRelative50Route + genRelative51Route: typeof genRelative51Route + genRelative52Route: typeof genRelative52Route + genRelative53Route: typeof genRelative53Route + genRelative54Route: typeof genRelative54Route + genRelative55Route: typeof genRelative55Route + genRelative56Route: typeof genRelative56Route + genRelative57Route: typeof genRelative57Route + genRelative58Route: typeof genRelative58Route + genRelative59Route: typeof genRelative59Route + genRelative6Route: typeof genRelative6Route + genRelative60Route: typeof genRelative60Route + genRelative61Route: typeof genRelative61Route + genRelative62Route: typeof genRelative62Route + genRelative63Route: typeof genRelative63Route + genRelative64Route: typeof genRelative64Route + genRelative65Route: typeof genRelative65Route + genRelative66Route: typeof genRelative66Route + genRelative67Route: typeof genRelative67Route + genRelative68Route: typeof genRelative68Route + genRelative69Route: typeof genRelative69Route + genRelative7Route: typeof genRelative7Route + genRelative70Route: typeof genRelative70Route + genRelative71Route: typeof genRelative71Route + genRelative72Route: typeof genRelative72Route + genRelative73Route: typeof genRelative73Route + genRelative74Route: typeof genRelative74Route + genRelative75Route: typeof genRelative75Route + genRelative76Route: typeof genRelative76Route + genRelative77Route: typeof genRelative77Route + genRelative78Route: typeof genRelative78Route + genRelative79Route: typeof genRelative79Route + genRelative8Route: typeof genRelative8Route + genRelative80Route: typeof genRelative80Route + genRelative81Route: typeof genRelative81Route + genRelative82Route: typeof genRelative82Route + genRelative83Route: typeof genRelative83Route + genRelative84Route: typeof genRelative84Route + genRelative85Route: typeof genRelative85Route + genRelative86Route: typeof genRelative86Route + genRelative87Route: typeof genRelative87Route + genRelative88Route: typeof genRelative88Route + genRelative89Route: typeof genRelative89Route + genRelative9Route: typeof genRelative9Route + genRelative90Route: typeof genRelative90Route + genRelative91Route: typeof genRelative91Route + genRelative92Route: typeof genRelative92Route + genRelative93Route: typeof genRelative93Route + genRelative94Route: typeof genRelative94Route + genRelative95Route: typeof genRelative95Route + genRelative96Route: typeof genRelative96Route + genRelative97Route: typeof genRelative97Route + genRelative98Route: typeof genRelative98Route + genRelative99Route: typeof genRelative99Route +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ParamsRouteRoute: ParamsRouteRouteWithChildren, + SearchRouteRoute: SearchRouteRouteWithChildren, + AbsoluteRoute: AbsoluteRoute, + LinkPropsRoute: LinkPropsRoute, + RelativeRoute: RelativeRoute, + genParamsRouteRoute: genParamsRouteRouteWithChildren, + genSearchRouteRoute: genSearchRouteRouteWithChildren, + genAbsolute0Route: genAbsolute0Route, + genAbsolute1Route: genAbsolute1Route, + genAbsolute10Route: genAbsolute10Route, + genAbsolute11Route: genAbsolute11Route, + genAbsolute12Route: genAbsolute12Route, + genAbsolute13Route: genAbsolute13Route, + genAbsolute14Route: genAbsolute14Route, + genAbsolute15Route: genAbsolute15Route, + genAbsolute16Route: genAbsolute16Route, + genAbsolute17Route: genAbsolute17Route, + genAbsolute18Route: genAbsolute18Route, + genAbsolute19Route: genAbsolute19Route, + genAbsolute2Route: genAbsolute2Route, + genAbsolute20Route: genAbsolute20Route, + genAbsolute21Route: genAbsolute21Route, + genAbsolute22Route: genAbsolute22Route, + genAbsolute23Route: genAbsolute23Route, + genAbsolute24Route: genAbsolute24Route, + genAbsolute25Route: genAbsolute25Route, + genAbsolute26Route: genAbsolute26Route, + genAbsolute27Route: genAbsolute27Route, + genAbsolute28Route: genAbsolute28Route, + genAbsolute29Route: genAbsolute29Route, + genAbsolute3Route: genAbsolute3Route, + genAbsolute30Route: genAbsolute30Route, + genAbsolute31Route: genAbsolute31Route, + genAbsolute32Route: genAbsolute32Route, + genAbsolute33Route: genAbsolute33Route, + genAbsolute34Route: genAbsolute34Route, + genAbsolute35Route: genAbsolute35Route, + genAbsolute36Route: genAbsolute36Route, + genAbsolute37Route: genAbsolute37Route, + genAbsolute38Route: genAbsolute38Route, + genAbsolute39Route: genAbsolute39Route, + genAbsolute4Route: genAbsolute4Route, + genAbsolute40Route: genAbsolute40Route, + genAbsolute41Route: genAbsolute41Route, + genAbsolute42Route: genAbsolute42Route, + genAbsolute43Route: genAbsolute43Route, + genAbsolute44Route: genAbsolute44Route, + genAbsolute45Route: genAbsolute45Route, + genAbsolute46Route: genAbsolute46Route, + genAbsolute47Route: genAbsolute47Route, + genAbsolute48Route: genAbsolute48Route, + genAbsolute49Route: genAbsolute49Route, + genAbsolute5Route: genAbsolute5Route, + genAbsolute50Route: genAbsolute50Route, + genAbsolute51Route: genAbsolute51Route, + genAbsolute52Route: genAbsolute52Route, + genAbsolute53Route: genAbsolute53Route, + genAbsolute54Route: genAbsolute54Route, + genAbsolute55Route: genAbsolute55Route, + genAbsolute56Route: genAbsolute56Route, + genAbsolute57Route: genAbsolute57Route, + genAbsolute58Route: genAbsolute58Route, + genAbsolute59Route: genAbsolute59Route, + genAbsolute6Route: genAbsolute6Route, + genAbsolute60Route: genAbsolute60Route, + genAbsolute61Route: genAbsolute61Route, + genAbsolute62Route: genAbsolute62Route, + genAbsolute63Route: genAbsolute63Route, + genAbsolute64Route: genAbsolute64Route, + genAbsolute65Route: genAbsolute65Route, + genAbsolute66Route: genAbsolute66Route, + genAbsolute67Route: genAbsolute67Route, + genAbsolute68Route: genAbsolute68Route, + genAbsolute69Route: genAbsolute69Route, + genAbsolute7Route: genAbsolute7Route, + genAbsolute70Route: genAbsolute70Route, + genAbsolute71Route: genAbsolute71Route, + genAbsolute72Route: genAbsolute72Route, + genAbsolute73Route: genAbsolute73Route, + genAbsolute74Route: genAbsolute74Route, + genAbsolute75Route: genAbsolute75Route, + genAbsolute76Route: genAbsolute76Route, + genAbsolute77Route: genAbsolute77Route, + genAbsolute78Route: genAbsolute78Route, + genAbsolute79Route: genAbsolute79Route, + genAbsolute8Route: genAbsolute8Route, + genAbsolute80Route: genAbsolute80Route, + genAbsolute81Route: genAbsolute81Route, + genAbsolute82Route: genAbsolute82Route, + genAbsolute83Route: genAbsolute83Route, + genAbsolute84Route: genAbsolute84Route, + genAbsolute85Route: genAbsolute85Route, + genAbsolute86Route: genAbsolute86Route, + genAbsolute87Route: genAbsolute87Route, + genAbsolute88Route: genAbsolute88Route, + genAbsolute89Route: genAbsolute89Route, + genAbsolute9Route: genAbsolute9Route, + genAbsolute90Route: genAbsolute90Route, + genAbsolute91Route: genAbsolute91Route, + genAbsolute92Route: genAbsolute92Route, + genAbsolute93Route: genAbsolute93Route, + genAbsolute94Route: genAbsolute94Route, + genAbsolute95Route: genAbsolute95Route, + genAbsolute96Route: genAbsolute96Route, + genAbsolute97Route: genAbsolute97Route, + genAbsolute98Route: genAbsolute98Route, + genAbsolute99Route: genAbsolute99Route, + genRelative0Route: genRelative0Route, + genRelative1Route: genRelative1Route, + genRelative10Route: genRelative10Route, + genRelative11Route: genRelative11Route, + genRelative12Route: genRelative12Route, + genRelative13Route: genRelative13Route, + genRelative14Route: genRelative14Route, + genRelative15Route: genRelative15Route, + genRelative16Route: genRelative16Route, + genRelative17Route: genRelative17Route, + genRelative18Route: genRelative18Route, + genRelative19Route: genRelative19Route, + genRelative2Route: genRelative2Route, + genRelative20Route: genRelative20Route, + genRelative21Route: genRelative21Route, + genRelative22Route: genRelative22Route, + genRelative23Route: genRelative23Route, + genRelative24Route: genRelative24Route, + genRelative25Route: genRelative25Route, + genRelative26Route: genRelative26Route, + genRelative27Route: genRelative27Route, + genRelative28Route: genRelative28Route, + genRelative29Route: genRelative29Route, + genRelative3Route: genRelative3Route, + genRelative30Route: genRelative30Route, + genRelative31Route: genRelative31Route, + genRelative32Route: genRelative32Route, + genRelative33Route: genRelative33Route, + genRelative34Route: genRelative34Route, + genRelative35Route: genRelative35Route, + genRelative36Route: genRelative36Route, + genRelative37Route: genRelative37Route, + genRelative38Route: genRelative38Route, + genRelative39Route: genRelative39Route, + genRelative4Route: genRelative4Route, + genRelative40Route: genRelative40Route, + genRelative41Route: genRelative41Route, + genRelative42Route: genRelative42Route, + genRelative43Route: genRelative43Route, + genRelative44Route: genRelative44Route, + genRelative45Route: genRelative45Route, + genRelative46Route: genRelative46Route, + genRelative47Route: genRelative47Route, + genRelative48Route: genRelative48Route, + genRelative49Route: genRelative49Route, + genRelative5Route: genRelative5Route, + genRelative50Route: genRelative50Route, + genRelative51Route: genRelative51Route, + genRelative52Route: genRelative52Route, + genRelative53Route: genRelative53Route, + genRelative54Route: genRelative54Route, + genRelative55Route: genRelative55Route, + genRelative56Route: genRelative56Route, + genRelative57Route: genRelative57Route, + genRelative58Route: genRelative58Route, + genRelative59Route: genRelative59Route, + genRelative6Route: genRelative6Route, + genRelative60Route: genRelative60Route, + genRelative61Route: genRelative61Route, + genRelative62Route: genRelative62Route, + genRelative63Route: genRelative63Route, + genRelative64Route: genRelative64Route, + genRelative65Route: genRelative65Route, + genRelative66Route: genRelative66Route, + genRelative67Route: genRelative67Route, + genRelative68Route: genRelative68Route, + genRelative69Route: genRelative69Route, + genRelative7Route: genRelative7Route, + genRelative70Route: genRelative70Route, + genRelative71Route: genRelative71Route, + genRelative72Route: genRelative72Route, + genRelative73Route: genRelative73Route, + genRelative74Route: genRelative74Route, + genRelative75Route: genRelative75Route, + genRelative76Route: genRelative76Route, + genRelative77Route: genRelative77Route, + genRelative78Route: genRelative78Route, + genRelative79Route: genRelative79Route, + genRelative8Route: genRelative8Route, + genRelative80Route: genRelative80Route, + genRelative81Route: genRelative81Route, + genRelative82Route: genRelative82Route, + genRelative83Route: genRelative83Route, + genRelative84Route: genRelative84Route, + genRelative85Route: genRelative85Route, + genRelative86Route: genRelative86Route, + genRelative87Route: genRelative87Route, + genRelative88Route: genRelative88Route, + genRelative89Route: genRelative89Route, + genRelative9Route: genRelative9Route, + genRelative90Route: genRelative90Route, + genRelative91Route: genRelative91Route, + genRelative92Route: genRelative92Route, + genRelative93Route: genRelative93Route, + genRelative94Route: genRelative94Route, + genRelative95Route: genRelative95Route, + genRelative96Route: genRelative96Route, + genRelative97Route: genRelative97Route, + genRelative98Route: genRelative98Route, + genRelative99Route: genRelative99Route, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/params", + "/search", + "/absolute", + "/linkProps", + "/relative", + "/(gen)/params", + "/(gen)/search", + "/(gen)/absolute0", + "/(gen)/absolute1", + "/(gen)/absolute10", + "/(gen)/absolute11", + "/(gen)/absolute12", + "/(gen)/absolute13", + "/(gen)/absolute14", + "/(gen)/absolute15", + "/(gen)/absolute16", + "/(gen)/absolute17", + "/(gen)/absolute18", + "/(gen)/absolute19", + "/(gen)/absolute2", + "/(gen)/absolute20", + "/(gen)/absolute21", + "/(gen)/absolute22", + "/(gen)/absolute23", + "/(gen)/absolute24", + "/(gen)/absolute25", + "/(gen)/absolute26", + "/(gen)/absolute27", + "/(gen)/absolute28", + "/(gen)/absolute29", + "/(gen)/absolute3", + "/(gen)/absolute30", + "/(gen)/absolute31", + "/(gen)/absolute32", + "/(gen)/absolute33", + "/(gen)/absolute34", + "/(gen)/absolute35", + "/(gen)/absolute36", + "/(gen)/absolute37", + "/(gen)/absolute38", + "/(gen)/absolute39", + "/(gen)/absolute4", + "/(gen)/absolute40", + "/(gen)/absolute41", + "/(gen)/absolute42", + "/(gen)/absolute43", + "/(gen)/absolute44", + "/(gen)/absolute45", + "/(gen)/absolute46", + "/(gen)/absolute47", + "/(gen)/absolute48", + "/(gen)/absolute49", + "/(gen)/absolute5", + "/(gen)/absolute50", + "/(gen)/absolute51", + "/(gen)/absolute52", + "/(gen)/absolute53", + "/(gen)/absolute54", + "/(gen)/absolute55", + "/(gen)/absolute56", + "/(gen)/absolute57", + "/(gen)/absolute58", + "/(gen)/absolute59", + "/(gen)/absolute6", + "/(gen)/absolute60", + "/(gen)/absolute61", + "/(gen)/absolute62", + "/(gen)/absolute63", + "/(gen)/absolute64", + "/(gen)/absolute65", + "/(gen)/absolute66", + "/(gen)/absolute67", + "/(gen)/absolute68", + "/(gen)/absolute69", + "/(gen)/absolute7", + "/(gen)/absolute70", + "/(gen)/absolute71", + "/(gen)/absolute72", + "/(gen)/absolute73", + "/(gen)/absolute74", + "/(gen)/absolute75", + "/(gen)/absolute76", + "/(gen)/absolute77", + "/(gen)/absolute78", + "/(gen)/absolute79", + "/(gen)/absolute8", + "/(gen)/absolute80", + "/(gen)/absolute81", + "/(gen)/absolute82", + "/(gen)/absolute83", + "/(gen)/absolute84", + "/(gen)/absolute85", + "/(gen)/absolute86", + "/(gen)/absolute87", + "/(gen)/absolute88", + "/(gen)/absolute89", + "/(gen)/absolute9", + "/(gen)/absolute90", + "/(gen)/absolute91", + "/(gen)/absolute92", + "/(gen)/absolute93", + "/(gen)/absolute94", + "/(gen)/absolute95", + "/(gen)/absolute96", + "/(gen)/absolute97", + "/(gen)/absolute98", + "/(gen)/absolute99", + "/(gen)/relative0", + "/(gen)/relative1", + "/(gen)/relative10", + "/(gen)/relative11", + "/(gen)/relative12", + "/(gen)/relative13", + "/(gen)/relative14", + "/(gen)/relative15", + "/(gen)/relative16", + "/(gen)/relative17", + "/(gen)/relative18", + "/(gen)/relative19", + "/(gen)/relative2", + "/(gen)/relative20", + "/(gen)/relative21", + "/(gen)/relative22", + "/(gen)/relative23", + "/(gen)/relative24", + "/(gen)/relative25", + "/(gen)/relative26", + "/(gen)/relative27", + "/(gen)/relative28", + "/(gen)/relative29", + "/(gen)/relative3", + "/(gen)/relative30", + "/(gen)/relative31", + "/(gen)/relative32", + "/(gen)/relative33", + "/(gen)/relative34", + "/(gen)/relative35", + "/(gen)/relative36", + "/(gen)/relative37", + "/(gen)/relative38", + "/(gen)/relative39", + "/(gen)/relative4", + "/(gen)/relative40", + "/(gen)/relative41", + "/(gen)/relative42", + "/(gen)/relative43", + "/(gen)/relative44", + "/(gen)/relative45", + "/(gen)/relative46", + "/(gen)/relative47", + "/(gen)/relative48", + "/(gen)/relative49", + "/(gen)/relative5", + "/(gen)/relative50", + "/(gen)/relative51", + "/(gen)/relative52", + "/(gen)/relative53", + "/(gen)/relative54", + "/(gen)/relative55", + "/(gen)/relative56", + "/(gen)/relative57", + "/(gen)/relative58", + "/(gen)/relative59", + "/(gen)/relative6", + "/(gen)/relative60", + "/(gen)/relative61", + "/(gen)/relative62", + "/(gen)/relative63", + "/(gen)/relative64", + "/(gen)/relative65", + "/(gen)/relative66", + "/(gen)/relative67", + "/(gen)/relative68", + "/(gen)/relative69", + "/(gen)/relative7", + "/(gen)/relative70", + "/(gen)/relative71", + "/(gen)/relative72", + "/(gen)/relative73", + "/(gen)/relative74", + "/(gen)/relative75", + "/(gen)/relative76", + "/(gen)/relative77", + "/(gen)/relative78", + "/(gen)/relative79", + "/(gen)/relative8", + "/(gen)/relative80", + "/(gen)/relative81", + "/(gen)/relative82", + "/(gen)/relative83", + "/(gen)/relative84", + "/(gen)/relative85", + "/(gen)/relative86", + "/(gen)/relative87", + "/(gen)/relative88", + "/(gen)/relative89", + "/(gen)/relative9", + "/(gen)/relative90", + "/(gen)/relative91", + "/(gen)/relative92", + "/(gen)/relative93", + "/(gen)/relative94", + "/(gen)/relative95", + "/(gen)/relative96", + "/(gen)/relative97", + "/(gen)/relative98", + "/(gen)/relative99" + ] + }, + "/": { + "filePath": "index.tsx" + }, + "/params": { + "filePath": "params/route.tsx", + "children": [ + "/params/$paramsPlaceholder" + ] + }, + "/search": { + "filePath": "search/route.tsx", + "children": [ + "/search/searchPlaceholder" + ] + }, + "/absolute": { + "filePath": "absolute.tsx" + }, + "/linkProps": { + "filePath": "linkProps.tsx" + }, + "/relative": { + "filePath": "relative.tsx" + }, + "/(gen)/params": { + "filePath": "(gen)/params/route.tsx", + "children": [ + "/(gen)/params/$param0", + "/(gen)/params/$param1", + "/(gen)/params/$param10", + "/(gen)/params/$param11", + "/(gen)/params/$param12", + "/(gen)/params/$param13", + "/(gen)/params/$param14", + "/(gen)/params/$param15", + "/(gen)/params/$param16", + "/(gen)/params/$param17", + "/(gen)/params/$param18", + "/(gen)/params/$param19", + "/(gen)/params/$param2", + "/(gen)/params/$param20", + "/(gen)/params/$param21", + "/(gen)/params/$param22", + "/(gen)/params/$param23", + "/(gen)/params/$param24", + "/(gen)/params/$param25", + "/(gen)/params/$param26", + "/(gen)/params/$param27", + "/(gen)/params/$param28", + "/(gen)/params/$param29", + "/(gen)/params/$param3", + "/(gen)/params/$param30", + "/(gen)/params/$param31", + "/(gen)/params/$param32", + "/(gen)/params/$param33", + "/(gen)/params/$param34", + "/(gen)/params/$param35", + "/(gen)/params/$param36", + "/(gen)/params/$param37", + "/(gen)/params/$param38", + "/(gen)/params/$param39", + "/(gen)/params/$param4", + "/(gen)/params/$param40", + "/(gen)/params/$param41", + "/(gen)/params/$param42", + "/(gen)/params/$param43", + "/(gen)/params/$param44", + "/(gen)/params/$param45", + "/(gen)/params/$param46", + "/(gen)/params/$param47", + "/(gen)/params/$param48", + "/(gen)/params/$param49", + "/(gen)/params/$param5", + "/(gen)/params/$param50", + "/(gen)/params/$param51", + "/(gen)/params/$param52", + "/(gen)/params/$param53", + "/(gen)/params/$param54", + "/(gen)/params/$param55", + "/(gen)/params/$param56", + "/(gen)/params/$param57", + "/(gen)/params/$param58", + "/(gen)/params/$param59", + "/(gen)/params/$param6", + "/(gen)/params/$param60", + "/(gen)/params/$param61", + "/(gen)/params/$param62", + "/(gen)/params/$param63", + "/(gen)/params/$param64", + "/(gen)/params/$param65", + "/(gen)/params/$param66", + "/(gen)/params/$param67", + "/(gen)/params/$param68", + "/(gen)/params/$param69", + "/(gen)/params/$param7", + "/(gen)/params/$param70", + "/(gen)/params/$param71", + "/(gen)/params/$param72", + "/(gen)/params/$param73", + "/(gen)/params/$param74", + "/(gen)/params/$param75", + "/(gen)/params/$param76", + "/(gen)/params/$param77", + "/(gen)/params/$param78", + "/(gen)/params/$param79", + "/(gen)/params/$param8", + "/(gen)/params/$param80", + "/(gen)/params/$param81", + "/(gen)/params/$param82", + "/(gen)/params/$param83", + "/(gen)/params/$param84", + "/(gen)/params/$param85", + "/(gen)/params/$param86", + "/(gen)/params/$param87", + "/(gen)/params/$param88", + "/(gen)/params/$param89", + "/(gen)/params/$param9", + "/(gen)/params/$param90", + "/(gen)/params/$param91", + "/(gen)/params/$param92", + "/(gen)/params/$param93", + "/(gen)/params/$param94", + "/(gen)/params/$param95", + "/(gen)/params/$param96", + "/(gen)/params/$param97", + "/(gen)/params/$param98", + "/(gen)/params/$param99" + ] + }, + "/(gen)/search": { + "filePath": "(gen)/search/route.tsx", + "children": [ + "/(gen)/search/search0", + "/(gen)/search/search1", + "/(gen)/search/search10", + "/(gen)/search/search11", + "/(gen)/search/search12", + "/(gen)/search/search13", + "/(gen)/search/search14", + "/(gen)/search/search15", + "/(gen)/search/search16", + "/(gen)/search/search17", + "/(gen)/search/search18", + "/(gen)/search/search19", + "/(gen)/search/search2", + "/(gen)/search/search20", + "/(gen)/search/search21", + "/(gen)/search/search22", + "/(gen)/search/search23", + "/(gen)/search/search24", + "/(gen)/search/search25", + "/(gen)/search/search26", + "/(gen)/search/search27", + "/(gen)/search/search28", + "/(gen)/search/search29", + "/(gen)/search/search3", + "/(gen)/search/search30", + "/(gen)/search/search31", + "/(gen)/search/search32", + "/(gen)/search/search33", + "/(gen)/search/search34", + "/(gen)/search/search35", + "/(gen)/search/search36", + "/(gen)/search/search37", + "/(gen)/search/search38", + "/(gen)/search/search39", + "/(gen)/search/search4", + "/(gen)/search/search40", + "/(gen)/search/search41", + "/(gen)/search/search42", + "/(gen)/search/search43", + "/(gen)/search/search44", + "/(gen)/search/search45", + "/(gen)/search/search46", + "/(gen)/search/search47", + "/(gen)/search/search48", + "/(gen)/search/search49", + "/(gen)/search/search5", + "/(gen)/search/search50", + "/(gen)/search/search51", + "/(gen)/search/search52", + "/(gen)/search/search53", + "/(gen)/search/search54", + "/(gen)/search/search55", + "/(gen)/search/search56", + "/(gen)/search/search57", + "/(gen)/search/search58", + "/(gen)/search/search59", + "/(gen)/search/search6", + "/(gen)/search/search60", + "/(gen)/search/search61", + "/(gen)/search/search62", + "/(gen)/search/search63", + "/(gen)/search/search64", + "/(gen)/search/search65", + "/(gen)/search/search66", + "/(gen)/search/search67", + "/(gen)/search/search68", + "/(gen)/search/search69", + "/(gen)/search/search7", + "/(gen)/search/search70", + "/(gen)/search/search71", + "/(gen)/search/search72", + "/(gen)/search/search73", + "/(gen)/search/search74", + "/(gen)/search/search75", + "/(gen)/search/search76", + "/(gen)/search/search77", + "/(gen)/search/search78", + "/(gen)/search/search79", + "/(gen)/search/search8", + "/(gen)/search/search80", + "/(gen)/search/search81", + "/(gen)/search/search82", + "/(gen)/search/search83", + "/(gen)/search/search84", + "/(gen)/search/search85", + "/(gen)/search/search86", + "/(gen)/search/search87", + "/(gen)/search/search88", + "/(gen)/search/search89", + "/(gen)/search/search9", + "/(gen)/search/search90", + "/(gen)/search/search91", + "/(gen)/search/search92", + "/(gen)/search/search93", + "/(gen)/search/search94", + "/(gen)/search/search95", + "/(gen)/search/search96", + "/(gen)/search/search97", + "/(gen)/search/search98", + "/(gen)/search/search99" + ] + }, + "/(gen)/absolute0": { + "filePath": "(gen)/absolute0.tsx" + }, + "/(gen)/absolute1": { + "filePath": "(gen)/absolute1.tsx" + }, + "/(gen)/absolute10": { + "filePath": "(gen)/absolute10.tsx" + }, + "/(gen)/absolute11": { + "filePath": "(gen)/absolute11.tsx" + }, + "/(gen)/absolute12": { + "filePath": "(gen)/absolute12.tsx" + }, + "/(gen)/absolute13": { + "filePath": "(gen)/absolute13.tsx" + }, + "/(gen)/absolute14": { + "filePath": "(gen)/absolute14.tsx" + }, + "/(gen)/absolute15": { + "filePath": "(gen)/absolute15.tsx" + }, + "/(gen)/absolute16": { + "filePath": "(gen)/absolute16.tsx" + }, + "/(gen)/absolute17": { + "filePath": "(gen)/absolute17.tsx" + }, + "/(gen)/absolute18": { + "filePath": "(gen)/absolute18.tsx" + }, + "/(gen)/absolute19": { + "filePath": "(gen)/absolute19.tsx" + }, + "/(gen)/absolute2": { + "filePath": "(gen)/absolute2.tsx" + }, + "/(gen)/absolute20": { + "filePath": "(gen)/absolute20.tsx" + }, + "/(gen)/absolute21": { + "filePath": "(gen)/absolute21.tsx" + }, + "/(gen)/absolute22": { + "filePath": "(gen)/absolute22.tsx" + }, + "/(gen)/absolute23": { + "filePath": "(gen)/absolute23.tsx" + }, + "/(gen)/absolute24": { + "filePath": "(gen)/absolute24.tsx" + }, + "/(gen)/absolute25": { + "filePath": "(gen)/absolute25.tsx" + }, + "/(gen)/absolute26": { + "filePath": "(gen)/absolute26.tsx" + }, + "/(gen)/absolute27": { + "filePath": "(gen)/absolute27.tsx" + }, + "/(gen)/absolute28": { + "filePath": "(gen)/absolute28.tsx" + }, + "/(gen)/absolute29": { + "filePath": "(gen)/absolute29.tsx" + }, + "/(gen)/absolute3": { + "filePath": "(gen)/absolute3.tsx" + }, + "/(gen)/absolute30": { + "filePath": "(gen)/absolute30.tsx" + }, + "/(gen)/absolute31": { + "filePath": "(gen)/absolute31.tsx" + }, + "/(gen)/absolute32": { + "filePath": "(gen)/absolute32.tsx" + }, + "/(gen)/absolute33": { + "filePath": "(gen)/absolute33.tsx" + }, + "/(gen)/absolute34": { + "filePath": "(gen)/absolute34.tsx" + }, + "/(gen)/absolute35": { + "filePath": "(gen)/absolute35.tsx" + }, + "/(gen)/absolute36": { + "filePath": "(gen)/absolute36.tsx" + }, + "/(gen)/absolute37": { + "filePath": "(gen)/absolute37.tsx" + }, + "/(gen)/absolute38": { + "filePath": "(gen)/absolute38.tsx" + }, + "/(gen)/absolute39": { + "filePath": "(gen)/absolute39.tsx" + }, + "/(gen)/absolute4": { + "filePath": "(gen)/absolute4.tsx" + }, + "/(gen)/absolute40": { + "filePath": "(gen)/absolute40.tsx" + }, + "/(gen)/absolute41": { + "filePath": "(gen)/absolute41.tsx" + }, + "/(gen)/absolute42": { + "filePath": "(gen)/absolute42.tsx" + }, + "/(gen)/absolute43": { + "filePath": "(gen)/absolute43.tsx" + }, + "/(gen)/absolute44": { + "filePath": "(gen)/absolute44.tsx" + }, + "/(gen)/absolute45": { + "filePath": "(gen)/absolute45.tsx" + }, + "/(gen)/absolute46": { + "filePath": "(gen)/absolute46.tsx" + }, + "/(gen)/absolute47": { + "filePath": "(gen)/absolute47.tsx" + }, + "/(gen)/absolute48": { + "filePath": "(gen)/absolute48.tsx" + }, + "/(gen)/absolute49": { + "filePath": "(gen)/absolute49.tsx" + }, + "/(gen)/absolute5": { + "filePath": "(gen)/absolute5.tsx" + }, + "/(gen)/absolute50": { + "filePath": "(gen)/absolute50.tsx" + }, + "/(gen)/absolute51": { + "filePath": "(gen)/absolute51.tsx" + }, + "/(gen)/absolute52": { + "filePath": "(gen)/absolute52.tsx" + }, + "/(gen)/absolute53": { + "filePath": "(gen)/absolute53.tsx" + }, + "/(gen)/absolute54": { + "filePath": "(gen)/absolute54.tsx" + }, + "/(gen)/absolute55": { + "filePath": "(gen)/absolute55.tsx" + }, + "/(gen)/absolute56": { + "filePath": "(gen)/absolute56.tsx" + }, + "/(gen)/absolute57": { + "filePath": "(gen)/absolute57.tsx" + }, + "/(gen)/absolute58": { + "filePath": "(gen)/absolute58.tsx" + }, + "/(gen)/absolute59": { + "filePath": "(gen)/absolute59.tsx" + }, + "/(gen)/absolute6": { + "filePath": "(gen)/absolute6.tsx" + }, + "/(gen)/absolute60": { + "filePath": "(gen)/absolute60.tsx" + }, + "/(gen)/absolute61": { + "filePath": "(gen)/absolute61.tsx" + }, + "/(gen)/absolute62": { + "filePath": "(gen)/absolute62.tsx" + }, + "/(gen)/absolute63": { + "filePath": "(gen)/absolute63.tsx" + }, + "/(gen)/absolute64": { + "filePath": "(gen)/absolute64.tsx" + }, + "/(gen)/absolute65": { + "filePath": "(gen)/absolute65.tsx" + }, + "/(gen)/absolute66": { + "filePath": "(gen)/absolute66.tsx" + }, + "/(gen)/absolute67": { + "filePath": "(gen)/absolute67.tsx" + }, + "/(gen)/absolute68": { + "filePath": "(gen)/absolute68.tsx" + }, + "/(gen)/absolute69": { + "filePath": "(gen)/absolute69.tsx" + }, + "/(gen)/absolute7": { + "filePath": "(gen)/absolute7.tsx" + }, + "/(gen)/absolute70": { + "filePath": "(gen)/absolute70.tsx" + }, + "/(gen)/absolute71": { + "filePath": "(gen)/absolute71.tsx" + }, + "/(gen)/absolute72": { + "filePath": "(gen)/absolute72.tsx" + }, + "/(gen)/absolute73": { + "filePath": "(gen)/absolute73.tsx" + }, + "/(gen)/absolute74": { + "filePath": "(gen)/absolute74.tsx" + }, + "/(gen)/absolute75": { + "filePath": "(gen)/absolute75.tsx" + }, + "/(gen)/absolute76": { + "filePath": "(gen)/absolute76.tsx" + }, + "/(gen)/absolute77": { + "filePath": "(gen)/absolute77.tsx" + }, + "/(gen)/absolute78": { + "filePath": "(gen)/absolute78.tsx" + }, + "/(gen)/absolute79": { + "filePath": "(gen)/absolute79.tsx" + }, + "/(gen)/absolute8": { + "filePath": "(gen)/absolute8.tsx" + }, + "/(gen)/absolute80": { + "filePath": "(gen)/absolute80.tsx" + }, + "/(gen)/absolute81": { + "filePath": "(gen)/absolute81.tsx" + }, + "/(gen)/absolute82": { + "filePath": "(gen)/absolute82.tsx" + }, + "/(gen)/absolute83": { + "filePath": "(gen)/absolute83.tsx" + }, + "/(gen)/absolute84": { + "filePath": "(gen)/absolute84.tsx" + }, + "/(gen)/absolute85": { + "filePath": "(gen)/absolute85.tsx" + }, + "/(gen)/absolute86": { + "filePath": "(gen)/absolute86.tsx" + }, + "/(gen)/absolute87": { + "filePath": "(gen)/absolute87.tsx" + }, + "/(gen)/absolute88": { + "filePath": "(gen)/absolute88.tsx" + }, + "/(gen)/absolute89": { + "filePath": "(gen)/absolute89.tsx" + }, + "/(gen)/absolute9": { + "filePath": "(gen)/absolute9.tsx" + }, + "/(gen)/absolute90": { + "filePath": "(gen)/absolute90.tsx" + }, + "/(gen)/absolute91": { + "filePath": "(gen)/absolute91.tsx" + }, + "/(gen)/absolute92": { + "filePath": "(gen)/absolute92.tsx" + }, + "/(gen)/absolute93": { + "filePath": "(gen)/absolute93.tsx" + }, + "/(gen)/absolute94": { + "filePath": "(gen)/absolute94.tsx" + }, + "/(gen)/absolute95": { + "filePath": "(gen)/absolute95.tsx" + }, + "/(gen)/absolute96": { + "filePath": "(gen)/absolute96.tsx" + }, + "/(gen)/absolute97": { + "filePath": "(gen)/absolute97.tsx" + }, + "/(gen)/absolute98": { + "filePath": "(gen)/absolute98.tsx" + }, + "/(gen)/absolute99": { + "filePath": "(gen)/absolute99.tsx" + }, + "/(gen)/relative0": { + "filePath": "(gen)/relative0.tsx" + }, + "/(gen)/relative1": { + "filePath": "(gen)/relative1.tsx" + }, + "/(gen)/relative10": { + "filePath": "(gen)/relative10.tsx" + }, + "/(gen)/relative11": { + "filePath": "(gen)/relative11.tsx" + }, + "/(gen)/relative12": { + "filePath": "(gen)/relative12.tsx" + }, + "/(gen)/relative13": { + "filePath": "(gen)/relative13.tsx" + }, + "/(gen)/relative14": { + "filePath": "(gen)/relative14.tsx" + }, + "/(gen)/relative15": { + "filePath": "(gen)/relative15.tsx" + }, + "/(gen)/relative16": { + "filePath": "(gen)/relative16.tsx" + }, + "/(gen)/relative17": { + "filePath": "(gen)/relative17.tsx" + }, + "/(gen)/relative18": { + "filePath": "(gen)/relative18.tsx" + }, + "/(gen)/relative19": { + "filePath": "(gen)/relative19.tsx" + }, + "/(gen)/relative2": { + "filePath": "(gen)/relative2.tsx" + }, + "/(gen)/relative20": { + "filePath": "(gen)/relative20.tsx" + }, + "/(gen)/relative21": { + "filePath": "(gen)/relative21.tsx" + }, + "/(gen)/relative22": { + "filePath": "(gen)/relative22.tsx" + }, + "/(gen)/relative23": { + "filePath": "(gen)/relative23.tsx" + }, + "/(gen)/relative24": { + "filePath": "(gen)/relative24.tsx" + }, + "/(gen)/relative25": { + "filePath": "(gen)/relative25.tsx" + }, + "/(gen)/relative26": { + "filePath": "(gen)/relative26.tsx" + }, + "/(gen)/relative27": { + "filePath": "(gen)/relative27.tsx" + }, + "/(gen)/relative28": { + "filePath": "(gen)/relative28.tsx" + }, + "/(gen)/relative29": { + "filePath": "(gen)/relative29.tsx" + }, + "/(gen)/relative3": { + "filePath": "(gen)/relative3.tsx" + }, + "/(gen)/relative30": { + "filePath": "(gen)/relative30.tsx" + }, + "/(gen)/relative31": { + "filePath": "(gen)/relative31.tsx" + }, + "/(gen)/relative32": { + "filePath": "(gen)/relative32.tsx" + }, + "/(gen)/relative33": { + "filePath": "(gen)/relative33.tsx" + }, + "/(gen)/relative34": { + "filePath": "(gen)/relative34.tsx" + }, + "/(gen)/relative35": { + "filePath": "(gen)/relative35.tsx" + }, + "/(gen)/relative36": { + "filePath": "(gen)/relative36.tsx" + }, + "/(gen)/relative37": { + "filePath": "(gen)/relative37.tsx" + }, + "/(gen)/relative38": { + "filePath": "(gen)/relative38.tsx" + }, + "/(gen)/relative39": { + "filePath": "(gen)/relative39.tsx" + }, + "/(gen)/relative4": { + "filePath": "(gen)/relative4.tsx" + }, + "/(gen)/relative40": { + "filePath": "(gen)/relative40.tsx" + }, + "/(gen)/relative41": { + "filePath": "(gen)/relative41.tsx" + }, + "/(gen)/relative42": { + "filePath": "(gen)/relative42.tsx" + }, + "/(gen)/relative43": { + "filePath": "(gen)/relative43.tsx" + }, + "/(gen)/relative44": { + "filePath": "(gen)/relative44.tsx" + }, + "/(gen)/relative45": { + "filePath": "(gen)/relative45.tsx" + }, + "/(gen)/relative46": { + "filePath": "(gen)/relative46.tsx" + }, + "/(gen)/relative47": { + "filePath": "(gen)/relative47.tsx" + }, + "/(gen)/relative48": { + "filePath": "(gen)/relative48.tsx" + }, + "/(gen)/relative49": { + "filePath": "(gen)/relative49.tsx" + }, + "/(gen)/relative5": { + "filePath": "(gen)/relative5.tsx" + }, + "/(gen)/relative50": { + "filePath": "(gen)/relative50.tsx" + }, + "/(gen)/relative51": { + "filePath": "(gen)/relative51.tsx" + }, + "/(gen)/relative52": { + "filePath": "(gen)/relative52.tsx" + }, + "/(gen)/relative53": { + "filePath": "(gen)/relative53.tsx" + }, + "/(gen)/relative54": { + "filePath": "(gen)/relative54.tsx" + }, + "/(gen)/relative55": { + "filePath": "(gen)/relative55.tsx" + }, + "/(gen)/relative56": { + "filePath": "(gen)/relative56.tsx" + }, + "/(gen)/relative57": { + "filePath": "(gen)/relative57.tsx" + }, + "/(gen)/relative58": { + "filePath": "(gen)/relative58.tsx" + }, + "/(gen)/relative59": { + "filePath": "(gen)/relative59.tsx" + }, + "/(gen)/relative6": { + "filePath": "(gen)/relative6.tsx" + }, + "/(gen)/relative60": { + "filePath": "(gen)/relative60.tsx" + }, + "/(gen)/relative61": { + "filePath": "(gen)/relative61.tsx" + }, + "/(gen)/relative62": { + "filePath": "(gen)/relative62.tsx" + }, + "/(gen)/relative63": { + "filePath": "(gen)/relative63.tsx" + }, + "/(gen)/relative64": { + "filePath": "(gen)/relative64.tsx" + }, + "/(gen)/relative65": { + "filePath": "(gen)/relative65.tsx" + }, + "/(gen)/relative66": { + "filePath": "(gen)/relative66.tsx" + }, + "/(gen)/relative67": { + "filePath": "(gen)/relative67.tsx" + }, + "/(gen)/relative68": { + "filePath": "(gen)/relative68.tsx" + }, + "/(gen)/relative69": { + "filePath": "(gen)/relative69.tsx" + }, + "/(gen)/relative7": { + "filePath": "(gen)/relative7.tsx" + }, + "/(gen)/relative70": { + "filePath": "(gen)/relative70.tsx" + }, + "/(gen)/relative71": { + "filePath": "(gen)/relative71.tsx" + }, + "/(gen)/relative72": { + "filePath": "(gen)/relative72.tsx" + }, + "/(gen)/relative73": { + "filePath": "(gen)/relative73.tsx" + }, + "/(gen)/relative74": { + "filePath": "(gen)/relative74.tsx" + }, + "/(gen)/relative75": { + "filePath": "(gen)/relative75.tsx" + }, + "/(gen)/relative76": { + "filePath": "(gen)/relative76.tsx" + }, + "/(gen)/relative77": { + "filePath": "(gen)/relative77.tsx" + }, + "/(gen)/relative78": { + "filePath": "(gen)/relative78.tsx" + }, + "/(gen)/relative79": { + "filePath": "(gen)/relative79.tsx" + }, + "/(gen)/relative8": { + "filePath": "(gen)/relative8.tsx" + }, + "/(gen)/relative80": { + "filePath": "(gen)/relative80.tsx" + }, + "/(gen)/relative81": { + "filePath": "(gen)/relative81.tsx" + }, + "/(gen)/relative82": { + "filePath": "(gen)/relative82.tsx" + }, + "/(gen)/relative83": { + "filePath": "(gen)/relative83.tsx" + }, + "/(gen)/relative84": { + "filePath": "(gen)/relative84.tsx" + }, + "/(gen)/relative85": { + "filePath": "(gen)/relative85.tsx" + }, + "/(gen)/relative86": { + "filePath": "(gen)/relative86.tsx" + }, + "/(gen)/relative87": { + "filePath": "(gen)/relative87.tsx" + }, + "/(gen)/relative88": { + "filePath": "(gen)/relative88.tsx" + }, + "/(gen)/relative89": { + "filePath": "(gen)/relative89.tsx" + }, + "/(gen)/relative9": { + "filePath": "(gen)/relative9.tsx" + }, + "/(gen)/relative90": { + "filePath": "(gen)/relative90.tsx" + }, + "/(gen)/relative91": { + "filePath": "(gen)/relative91.tsx" + }, + "/(gen)/relative92": { + "filePath": "(gen)/relative92.tsx" + }, + "/(gen)/relative93": { + "filePath": "(gen)/relative93.tsx" + }, + "/(gen)/relative94": { + "filePath": "(gen)/relative94.tsx" + }, + "/(gen)/relative95": { + "filePath": "(gen)/relative95.tsx" + }, + "/(gen)/relative96": { + "filePath": "(gen)/relative96.tsx" + }, + "/(gen)/relative97": { + "filePath": "(gen)/relative97.tsx" + }, + "/(gen)/relative98": { + "filePath": "(gen)/relative98.tsx" + }, + "/(gen)/relative99": { + "filePath": "(gen)/relative99.tsx" + }, + "/params/$paramsPlaceholder": { + "filePath": "params/$paramsPlaceholder.tsx", + "parent": "/params" + }, + "/search/searchPlaceholder": { + "filePath": "search/searchPlaceholder.tsx", + "parent": "/search" + }, + "/(gen)/params/$param0": { + "filePath": "(gen)/params/$param0.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param1": { + "filePath": "(gen)/params/$param1.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param10": { + "filePath": "(gen)/params/$param10.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param11": { + "filePath": "(gen)/params/$param11.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param12": { + "filePath": "(gen)/params/$param12.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param13": { + "filePath": "(gen)/params/$param13.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param14": { + "filePath": "(gen)/params/$param14.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param15": { + "filePath": "(gen)/params/$param15.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param16": { + "filePath": "(gen)/params/$param16.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param17": { + "filePath": "(gen)/params/$param17.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param18": { + "filePath": "(gen)/params/$param18.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param19": { + "filePath": "(gen)/params/$param19.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param2": { + "filePath": "(gen)/params/$param2.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param20": { + "filePath": "(gen)/params/$param20.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param21": { + "filePath": "(gen)/params/$param21.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param22": { + "filePath": "(gen)/params/$param22.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param23": { + "filePath": "(gen)/params/$param23.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param24": { + "filePath": "(gen)/params/$param24.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param25": { + "filePath": "(gen)/params/$param25.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param26": { + "filePath": "(gen)/params/$param26.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param27": { + "filePath": "(gen)/params/$param27.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param28": { + "filePath": "(gen)/params/$param28.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param29": { + "filePath": "(gen)/params/$param29.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param3": { + "filePath": "(gen)/params/$param3.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param30": { + "filePath": "(gen)/params/$param30.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param31": { + "filePath": "(gen)/params/$param31.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param32": { + "filePath": "(gen)/params/$param32.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param33": { + "filePath": "(gen)/params/$param33.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param34": { + "filePath": "(gen)/params/$param34.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param35": { + "filePath": "(gen)/params/$param35.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param36": { + "filePath": "(gen)/params/$param36.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param37": { + "filePath": "(gen)/params/$param37.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param38": { + "filePath": "(gen)/params/$param38.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param39": { + "filePath": "(gen)/params/$param39.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param4": { + "filePath": "(gen)/params/$param4.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param40": { + "filePath": "(gen)/params/$param40.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param41": { + "filePath": "(gen)/params/$param41.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param42": { + "filePath": "(gen)/params/$param42.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param43": { + "filePath": "(gen)/params/$param43.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param44": { + "filePath": "(gen)/params/$param44.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param45": { + "filePath": "(gen)/params/$param45.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param46": { + "filePath": "(gen)/params/$param46.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param47": { + "filePath": "(gen)/params/$param47.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param48": { + "filePath": "(gen)/params/$param48.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param49": { + "filePath": "(gen)/params/$param49.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param5": { + "filePath": "(gen)/params/$param5.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param50": { + "filePath": "(gen)/params/$param50.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param51": { + "filePath": "(gen)/params/$param51.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param52": { + "filePath": "(gen)/params/$param52.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param53": { + "filePath": "(gen)/params/$param53.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param54": { + "filePath": "(gen)/params/$param54.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param55": { + "filePath": "(gen)/params/$param55.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param56": { + "filePath": "(gen)/params/$param56.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param57": { + "filePath": "(gen)/params/$param57.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param58": { + "filePath": "(gen)/params/$param58.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param59": { + "filePath": "(gen)/params/$param59.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param6": { + "filePath": "(gen)/params/$param6.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param60": { + "filePath": "(gen)/params/$param60.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param61": { + "filePath": "(gen)/params/$param61.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param62": { + "filePath": "(gen)/params/$param62.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param63": { + "filePath": "(gen)/params/$param63.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param64": { + "filePath": "(gen)/params/$param64.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param65": { + "filePath": "(gen)/params/$param65.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param66": { + "filePath": "(gen)/params/$param66.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param67": { + "filePath": "(gen)/params/$param67.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param68": { + "filePath": "(gen)/params/$param68.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param69": { + "filePath": "(gen)/params/$param69.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param7": { + "filePath": "(gen)/params/$param7.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param70": { + "filePath": "(gen)/params/$param70.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param71": { + "filePath": "(gen)/params/$param71.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param72": { + "filePath": "(gen)/params/$param72.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param73": { + "filePath": "(gen)/params/$param73.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param74": { + "filePath": "(gen)/params/$param74.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param75": { + "filePath": "(gen)/params/$param75.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param76": { + "filePath": "(gen)/params/$param76.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param77": { + "filePath": "(gen)/params/$param77.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param78": { + "filePath": "(gen)/params/$param78.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param79": { + "filePath": "(gen)/params/$param79.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param8": { + "filePath": "(gen)/params/$param8.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param80": { + "filePath": "(gen)/params/$param80.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param81": { + "filePath": "(gen)/params/$param81.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param82": { + "filePath": "(gen)/params/$param82.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param83": { + "filePath": "(gen)/params/$param83.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param84": { + "filePath": "(gen)/params/$param84.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param85": { + "filePath": "(gen)/params/$param85.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param86": { + "filePath": "(gen)/params/$param86.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param87": { + "filePath": "(gen)/params/$param87.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param88": { + "filePath": "(gen)/params/$param88.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param89": { + "filePath": "(gen)/params/$param89.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param9": { + "filePath": "(gen)/params/$param9.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param90": { + "filePath": "(gen)/params/$param90.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param91": { + "filePath": "(gen)/params/$param91.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param92": { + "filePath": "(gen)/params/$param92.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param93": { + "filePath": "(gen)/params/$param93.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param94": { + "filePath": "(gen)/params/$param94.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param95": { + "filePath": "(gen)/params/$param95.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param96": { + "filePath": "(gen)/params/$param96.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param97": { + "filePath": "(gen)/params/$param97.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param98": { + "filePath": "(gen)/params/$param98.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/params/$param99": { + "filePath": "(gen)/params/$param99.tsx", + "parent": "/(gen)/params" + }, + "/(gen)/search/search0": { + "filePath": "(gen)/search/search0.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search1": { + "filePath": "(gen)/search/search1.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search10": { + "filePath": "(gen)/search/search10.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search11": { + "filePath": "(gen)/search/search11.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search12": { + "filePath": "(gen)/search/search12.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search13": { + "filePath": "(gen)/search/search13.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search14": { + "filePath": "(gen)/search/search14.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search15": { + "filePath": "(gen)/search/search15.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search16": { + "filePath": "(gen)/search/search16.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search17": { + "filePath": "(gen)/search/search17.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search18": { + "filePath": "(gen)/search/search18.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search19": { + "filePath": "(gen)/search/search19.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search2": { + "filePath": "(gen)/search/search2.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search20": { + "filePath": "(gen)/search/search20.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search21": { + "filePath": "(gen)/search/search21.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search22": { + "filePath": "(gen)/search/search22.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search23": { + "filePath": "(gen)/search/search23.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search24": { + "filePath": "(gen)/search/search24.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search25": { + "filePath": "(gen)/search/search25.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search26": { + "filePath": "(gen)/search/search26.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search27": { + "filePath": "(gen)/search/search27.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search28": { + "filePath": "(gen)/search/search28.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search29": { + "filePath": "(gen)/search/search29.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search3": { + "filePath": "(gen)/search/search3.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search30": { + "filePath": "(gen)/search/search30.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search31": { + "filePath": "(gen)/search/search31.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search32": { + "filePath": "(gen)/search/search32.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search33": { + "filePath": "(gen)/search/search33.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search34": { + "filePath": "(gen)/search/search34.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search35": { + "filePath": "(gen)/search/search35.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search36": { + "filePath": "(gen)/search/search36.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search37": { + "filePath": "(gen)/search/search37.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search38": { + "filePath": "(gen)/search/search38.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search39": { + "filePath": "(gen)/search/search39.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search4": { + "filePath": "(gen)/search/search4.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search40": { + "filePath": "(gen)/search/search40.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search41": { + "filePath": "(gen)/search/search41.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search42": { + "filePath": "(gen)/search/search42.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search43": { + "filePath": "(gen)/search/search43.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search44": { + "filePath": "(gen)/search/search44.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search45": { + "filePath": "(gen)/search/search45.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search46": { + "filePath": "(gen)/search/search46.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search47": { + "filePath": "(gen)/search/search47.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search48": { + "filePath": "(gen)/search/search48.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search49": { + "filePath": "(gen)/search/search49.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search5": { + "filePath": "(gen)/search/search5.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search50": { + "filePath": "(gen)/search/search50.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search51": { + "filePath": "(gen)/search/search51.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search52": { + "filePath": "(gen)/search/search52.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search53": { + "filePath": "(gen)/search/search53.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search54": { + "filePath": "(gen)/search/search54.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search55": { + "filePath": "(gen)/search/search55.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search56": { + "filePath": "(gen)/search/search56.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search57": { + "filePath": "(gen)/search/search57.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search58": { + "filePath": "(gen)/search/search58.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search59": { + "filePath": "(gen)/search/search59.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search6": { + "filePath": "(gen)/search/search6.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search60": { + "filePath": "(gen)/search/search60.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search61": { + "filePath": "(gen)/search/search61.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search62": { + "filePath": "(gen)/search/search62.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search63": { + "filePath": "(gen)/search/search63.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search64": { + "filePath": "(gen)/search/search64.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search65": { + "filePath": "(gen)/search/search65.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search66": { + "filePath": "(gen)/search/search66.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search67": { + "filePath": "(gen)/search/search67.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search68": { + "filePath": "(gen)/search/search68.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search69": { + "filePath": "(gen)/search/search69.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search7": { + "filePath": "(gen)/search/search7.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search70": { + "filePath": "(gen)/search/search70.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search71": { + "filePath": "(gen)/search/search71.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search72": { + "filePath": "(gen)/search/search72.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search73": { + "filePath": "(gen)/search/search73.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search74": { + "filePath": "(gen)/search/search74.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search75": { + "filePath": "(gen)/search/search75.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search76": { + "filePath": "(gen)/search/search76.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search77": { + "filePath": "(gen)/search/search77.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search78": { + "filePath": "(gen)/search/search78.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search79": { + "filePath": "(gen)/search/search79.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search8": { + "filePath": "(gen)/search/search8.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search80": { + "filePath": "(gen)/search/search80.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search81": { + "filePath": "(gen)/search/search81.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search82": { + "filePath": "(gen)/search/search82.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search83": { + "filePath": "(gen)/search/search83.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search84": { + "filePath": "(gen)/search/search84.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search85": { + "filePath": "(gen)/search/search85.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search86": { + "filePath": "(gen)/search/search86.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search87": { + "filePath": "(gen)/search/search87.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search88": { + "filePath": "(gen)/search/search88.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search89": { + "filePath": "(gen)/search/search89.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search9": { + "filePath": "(gen)/search/search9.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search90": { + "filePath": "(gen)/search/search90.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search91": { + "filePath": "(gen)/search/search91.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search92": { + "filePath": "(gen)/search/search92.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search93": { + "filePath": "(gen)/search/search93.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search94": { + "filePath": "(gen)/search/search94.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search95": { + "filePath": "(gen)/search/search95.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search96": { + "filePath": "(gen)/search/search96.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search97": { + "filePath": "(gen)/search/search97.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search98": { + "filePath": "(gen)/search/search98.tsx", + "parent": "/(gen)/search" + }, + "/(gen)/search/search99": { + "filePath": "(gen)/search/search99.tsx", + "parent": "/(gen)/search" } } } diff --git a/examples/react/start-large/src/routes/__root.tsx b/examples/react/start-large/src/routes/__root.tsx index 789c85c351..b52ca36ae8 100644 --- a/examples/react/start-large/src/routes/__root.tsx +++ b/examples/react/start-large/src/routes/__root.tsx @@ -7,7 +7,6 @@ import { } from '@tanstack/react-router' import type { QueryClient } from '@tanstack/react-query' import type { ReactNode } from 'react' -import appCss from '~/styles.css?url' import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' export interface Context { queryClient: QueryClient @@ -15,7 +14,7 @@ export interface Context { export const Route = createRootRouteWithContext()({ head: () => ({ - links: [{ rel: 'stylesheet', href: appCss }], + links: [{ rel: 'stylesheet' }], meta: [ { charSet: 'utf-8', diff --git a/examples/react/start-large/src/routes/absolute.tsx b/examples/react/start-large/src/routes/absolute.tsx index ba1f875050..857515fa10 100644 --- a/examples/react/start-large/src/routes/absolute.tsx +++ b/examples/react/start-large/src/routes/absolute.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/absolute')({ +export const Route = createFileRoute({ component: AbsoluteComponent, }) diff --git a/examples/react/start-large/src/routes/index.tsx b/examples/react/start-large/src/routes/index.tsx index eac82a9174..b23956ae17 100644 --- a/examples/react/start-large/src/routes/index.tsx +++ b/examples/react/start-large/src/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-large/src/routes/linkProps.tsx b/examples/react/start-large/src/routes/linkProps.tsx index 4804161ccf..89ef1c2a36 100644 --- a/examples/react/start-large/src/routes/linkProps.tsx +++ b/examples/react/start-large/src/routes/linkProps.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, createFileRoute, linkOptions } from '@tanstack/react-router' +import { Link, linkOptions } from '@tanstack/react-router' import { customRedirect, ListItems, @@ -7,7 +7,7 @@ import { useCustomNavigate, } from '~/typePrimitives' -export const Route = createFileRoute('/linkProps')({ +export const Route = createFileRoute({ component: LinkPropsPage, loader: () => { throw customRedirect({ diff --git a/examples/react/start-large/src/routes/params/$paramsPlaceholder.tsx b/examples/react/start-large/src/routes/params/$paramsPlaceholder.tsx index 45c00d1837..99486e6380 100644 --- a/examples/react/start-large/src/routes/params/$paramsPlaceholder.tsx +++ b/examples/react/start-large/src/routes/params/$paramsPlaceholder.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import * as v from 'valibot' import { queryOptions } from '@tanstack/react-query' import { createMiddleware, createServerFn } from '@tanstack/react-start' @@ -14,7 +14,7 @@ const loaderResult = v.object({ params, }) -const middleware = createMiddleware() +const middleware = createMiddleware({ type: 'function' }) .validator(params) .client(({ next }) => { const context = { client: { paramsPlaceholder: 'paramsPlaceholder' } } @@ -44,7 +44,7 @@ const paramsQueryOptions = queryOptions({ }, }) -export const Route = createFileRoute('/params/$paramsPlaceholder')({ +export const Route = createFileRoute({ component: ParamsComponent, context: () => ({ paramsQueryOptions: queryOptions({ diff --git a/examples/react/start-large/src/routes/params/route.tsx b/examples/react/start-large/src/routes/params/route.tsx index 32f2b82024..a37f312161 100644 --- a/examples/react/start-large/src/routes/params/route.tsx +++ b/examples/react/start-large/src/routes/params/route.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/params')({ +export const Route = createFileRoute({ component: () =>
Hello /params!
, }) diff --git a/examples/react/start-large/src/routes/relative.tsx b/examples/react/start-large/src/routes/relative.tsx index 6f6e581efd..cf25ec6f9f 100644 --- a/examples/react/start-large/src/routes/relative.tsx +++ b/examples/react/start-large/src/routes/relative.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/relative')({ +export const Route = createFileRoute({ component: RelativeComponent, }) diff --git a/examples/react/start-large/src/routes/search/route.tsx b/examples/react/start-large/src/routes/search/route.tsx index 3bcbe420e1..9829854586 100644 --- a/examples/react/start-large/src/routes/search/route.tsx +++ b/examples/react/start-large/src/routes/search/route.tsx @@ -1,11 +1,10 @@ -import { createFileRoute } from '@tanstack/react-router' import * as v from 'valibot' const search = v.object({ rootSearch: v.number(), }) -export const Route = createFileRoute('/search')({ +export const Route = createFileRoute({ component: () =>
Hello /search!
, validateSearch: search, }) diff --git a/examples/react/start-large/src/routes/search/searchPlaceholder.tsx b/examples/react/start-large/src/routes/search/searchPlaceholder.tsx index 56dc0a2931..1071a38cb7 100644 --- a/examples/react/start-large/src/routes/search/searchPlaceholder.tsx +++ b/examples/react/start-large/src/routes/search/searchPlaceholder.tsx @@ -1,4 +1,4 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import * as v from 'valibot' import { queryOptions } from '@tanstack/react-query' @@ -15,7 +15,7 @@ const loaderResult = v.object({ searchPlaceholder: v.number(), }) -const middleware = createMiddleware() +const middleware = createMiddleware({ type: 'function' }) .validator(search) .client(({ next }) => { const context = { client: { searchPlaceholder: 'searchPlaceholder' } } @@ -42,7 +42,13 @@ const fn = createServerFn() return result }) -export const Route = createFileRoute('/search/searchPlaceholder')({ +export const ServerRoute = createServerFileRoute().methods((api) => ({ + GET: api.handler(() => { + return 'searchPlaceholder' + }), +})) + +export const Route = createFileRoute({ component: SearchComponent, validateSearch: search, loaderDeps: ({ search }) => ({ search }), @@ -52,8 +58,16 @@ export const Route = createFileRoute('/search/searchPlaceholder')({ queryFn: () => fn({ data: ctx.deps.search }), }), }), - loader: (opts) => - opts.context.queryClient.ensureQueryData(opts.context.searchQueryOptions), + loader: async (opts) => { + const search = await opts.context.queryClient.ensureQueryData( + opts.context.searchQueryOptions, + ) + + return { + search, + external, + } + }, }) function SearchComponent() { diff --git a/examples/react/start-large/src/ssr.tsx b/examples/react/start-large/src/ssr.tsx deleted file mode 100644 index a24fb32843..0000000000 --- a/examples/react/start-large/src/ssr.tsx +++ /dev/null @@ -1,14 +0,0 @@ -// src/ssr.tsx -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-large/src/tanstack-start.d.ts b/examples/react/start-large/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-large/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-large/vite.config.ts b/examples/react/start-large/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-large/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-material-ui/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-material-ui/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-material-ui/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-material-ui/app.config.ts b/examples/react/start-material-ui/app.config.ts deleted file mode 100644 index 659f799bb9..0000000000 --- a/examples/react/start-material-ui/app.config.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - ssr: { - noExternal: ['@mui/*'], - }, - - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index e327c367b7..ac52782139 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@emotion/cache": "11.14.0", @@ -19,7 +19,6 @@ "@tanstack/react-router-devtools": "^1.120.3", "react": "^19.0.0", "react-dom": "^19.0.0", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/start-material-ui/src/client.tsx b/examples/react/start-material-ui/src/client.tsx index 1593d1b3c7..c5fbaa3c67 100644 --- a/examples/react/start-material-ui/src/client.tsx +++ b/examples/react/start-material-ui/src/client.tsx @@ -1,4 +1,3 @@ -/// import { hydrateRoot } from 'react-dom/client' import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' diff --git a/examples/react/start-material-ui/src/routeTree.gen.ts b/examples/react/start-material-ui/src/routeTree.gen.ts index 48c183c8da..3f5c19883b 100644 --- a/examples/react/start-material-ui/src/routeTree.gen.ts +++ b/examples/react/start-material-ui/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/start-material-ui/src/routes/about.tsx b/examples/react/start-material-ui/src/routes/about.tsx index 39492e85d7..1a9b347084 100644 --- a/examples/react/start-material-ui/src/routes/about.tsx +++ b/examples/react/start-material-ui/src/routes/about.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { Typography } from '@mui/material' -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/react/start-material-ui/src/routes/index.tsx b/examples/react/start-material-ui/src/routes/index.tsx index 75f5d14de4..f52a53f5ad 100644 --- a/examples/react/start-material-ui/src/routes/index.tsx +++ b/examples/react/start-material-ui/src/routes/index.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/react-router' import { Stack, Typography } from '@mui/material' import z from 'zod' import { Counter } from '~/components/Counter' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ validateSearch: z.object({ count: z.number().optional(), }), diff --git a/examples/react/start-material-ui/src/tanstack-start.d.ts b/examples/react/start-material-ui/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-material-ui/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-material-ui/vite.config.ts b/examples/react/start-material-ui/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-material-ui/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-supabase-basic/.gitignore b/examples/react/start-supabase-basic/.gitignore index 5578fb7487..8293849e8d 100644 --- a/examples/react/start-supabase-basic/.gitignore +++ b/examples/react/start-supabase-basic/.gitignore @@ -9,14 +9,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/start-supabase-basic/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-supabase-basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-supabase-basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-supabase-basic/app.config.ts b/examples/react/start-supabase-basic/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-supabase-basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 45d347e083..89e81f46c0 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -5,9 +5,9 @@ "main": "index.js", "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "keywords": [], "author": "", @@ -19,8 +19,7 @@ "@tanstack/react-router-devtools": "^1.120.3", "@tanstack/react-start": "^1.120.3", "react": "^19.0.0", - "react-dom": "^19.0.0", - "vinxi": "0.5.3" + "react-dom": "^19.0.0" }, "devDependencies": { "@types/react": "^19.0.8", diff --git a/examples/react/start-supabase-basic/src/client.tsx b/examples/react/start-supabase-basic/src/client.tsx deleted file mode 100644 index 4d4c49a500..0000000000 --- a/examples/react/start-supabase-basic/src/client.tsx +++ /dev/null @@ -1,9 +0,0 @@ -// src/client.tsx -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-supabase-basic/src/routeTree.gen.ts b/examples/react/start-supabase-basic/src/routeTree.gen.ts index a37809fd07..664daacd0d 100644 --- a/examples/react/start-supabase-basic/src/routeTree.gen.ts +++ b/examples/react/start-supabase-basic/src/routeTree.gen.ts @@ -8,62 +8,64 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as SignupImport } from './routes/signup' -import { Route as LogoutImport } from './routes/logout' -import { Route as LoginImport } from './routes/login' -import { Route as AuthedImport } from './routes/_authed' -import { Route as IndexImport } from './routes/index' -import { Route as AuthedPostsImport } from './routes/_authed/posts' -import { Route as AuthedPostsIndexImport } from './routes/_authed/posts.index' -import { Route as AuthedPostsPostIdImport } from './routes/_authed/posts.$postId' +import { Route as SignupRouteImport } from './routes/signup' +import { Route as LogoutRouteImport } from './routes/logout' +import { Route as LoginRouteImport } from './routes/login' +import { Route as AuthedRouteImport } from './routes/_authed' +import { Route as IndexRouteImport } from './routes/index' +import { Route as AuthedPostsRouteImport } from './routes/_authed/posts' +import { Route as AuthedPostsIndexRouteImport } from './routes/_authed/posts.index' +import { Route as AuthedPostsPostIdRouteImport } from './routes/_authed/posts.$postId' // Create/Update Routes -const SignupRoute = SignupImport.update({ +const SignupRoute = SignupRouteImport.update({ id: '/signup', path: '/signup', getParentRoute: () => rootRoute, } as any) -const LogoutRoute = LogoutImport.update({ +const LogoutRoute = LogoutRouteImport.update({ id: '/logout', path: '/logout', getParentRoute: () => rootRoute, } as any) -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const AuthedRoute = AuthedImport.update({ +const AuthedRoute = AuthedRouteImport.update({ id: '/_authed', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const AuthedPostsRoute = AuthedPostsImport.update({ +const AuthedPostsRoute = AuthedPostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => AuthedRoute, } as any) -const AuthedPostsIndexRoute = AuthedPostsIndexImport.update({ +const AuthedPostsIndexRoute = AuthedPostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => AuthedPostsRoute, } as any) -const AuthedPostsPostIdRoute = AuthedPostsPostIdImport.update({ +const AuthedPostsPostIdRoute = AuthedPostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => AuthedPostsRoute, @@ -77,61 +79,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_authed': { id: '/_authed' path: '' fullPath: '' - preLoaderRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/logout': { id: '/logout' path: '/logout' fullPath: '/logout' - preLoaderRoute: typeof LogoutImport + preLoaderRoute: typeof LogoutRouteImport parentRoute: typeof rootRoute } '/signup': { id: '/signup' path: '/signup' fullPath: '/signup' - preLoaderRoute: typeof SignupImport + preLoaderRoute: typeof SignupRouteImport parentRoute: typeof rootRoute } '/_authed/posts': { id: '/_authed/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof AuthedPostsImport - parentRoute: typeof AuthedImport + preLoaderRoute: typeof AuthedPostsRouteImport + parentRoute: typeof AuthedRouteImport } '/_authed/posts/$postId': { id: '/_authed/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof AuthedPostsPostIdImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsPostIdRouteImport + parentRoute: typeof AuthedPostsRouteImport } '/_authed/posts/': { id: '/_authed/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof AuthedPostsIndexImport - parentRoute: typeof AuthedPostsImport + preLoaderRoute: typeof AuthedPostsIndexRouteImport + parentRoute: typeof AuthedPostsRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_authed' { + const createFileRoute: CreateFileRoute< + '/_authed', + FileRoutesByPath['/_authed']['parentRoute'], + FileRoutesByPath['/_authed']['id'], + FileRoutesByPath['/_authed']['path'], + FileRoutesByPath['/_authed']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/logout' { + const createFileRoute: CreateFileRoute< + '/logout', + FileRoutesByPath['/logout']['parentRoute'], + FileRoutesByPath['/logout']['id'], + FileRoutesByPath['/logout']['path'], + FileRoutesByPath['/logout']['fullPath'] + > +} +declare module './routes/signup' { + const createFileRoute: CreateFileRoute< + '/signup', + FileRoutesByPath['/signup']['parentRoute'], + FileRoutesByPath['/signup']['id'], + FileRoutesByPath['/signup']['path'], + FileRoutesByPath['/signup']['fullPath'] + > +} +declare module './routes/_authed/posts' { + const createFileRoute: CreateFileRoute< + '/_authed/posts', + FileRoutesByPath['/_authed/posts']['parentRoute'], + FileRoutesByPath['/_authed/posts']['id'], + FileRoutesByPath['/_authed/posts']['path'], + FileRoutesByPath['/_authed/posts']['fullPath'] + > +} +declare module './routes/_authed/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/$postId', + FileRoutesByPath['/_authed/posts/$postId']['parentRoute'], + FileRoutesByPath['/_authed/posts/$postId']['id'], + FileRoutesByPath['/_authed/posts/$postId']['path'], + FileRoutesByPath['/_authed/posts/$postId']['fullPath'] + > +} +declare module './routes/_authed/posts.index' { + const createFileRoute: CreateFileRoute< + '/_authed/posts/', + FileRoutesByPath['/_authed/posts/']['parentRoute'], + FileRoutesByPath['/_authed/posts/']['id'], + FileRoutesByPath['/_authed/posts/']['path'], + FileRoutesByPath['/_authed/posts/']['fullPath'] + > +} + // Create and export the route tree interface AuthedPostsRouteChildren { diff --git a/examples/react/start-supabase-basic/src/routes/_authed.tsx b/examples/react/start-supabase-basic/src/routes/_authed.tsx index 91b9ca133f..4ecd57cb86 100644 --- a/examples/react/start-supabase-basic/src/routes/_authed.tsx +++ b/examples/react/start-supabase-basic/src/routes/_authed.tsx @@ -1,4 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Login } from '../components/Login' import { getSupabaseServerClient } from '../utils/supabase' @@ -20,7 +19,7 @@ export const loginFn = createServerFn({ method: 'POST' }) } }) -export const Route = createFileRoute('/_authed')({ +export const Route = createFileRoute({ beforeLoad: ({ context }) => { if (!context.user) { throw new Error('Not authenticated') diff --git a/examples/react/start-supabase-basic/src/routes/_authed/posts.$postId.tsx b/examples/react/start-supabase-basic/src/routes/_authed/posts.$postId.tsx index 4dd11756a8..0c58d7839f 100644 --- a/examples/react/start-supabase-basic/src/routes/_authed/posts.$postId.tsx +++ b/examples/react/start-supabase-basic/src/routes/_authed/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import type { ErrorComponentProps } from '@tanstack/react-router' import { NotFound } from '~/components/NotFound' import { fetchPost } from '~/utils/posts' -export const Route = createFileRoute('/_authed/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/examples/react/start-supabase-basic/src/routes/_authed/posts.index.tsx b/examples/react/start-supabase-basic/src/routes/_authed/posts.index.tsx index ea9e667e54..13529228bb 100644 --- a/examples/react/start-supabase-basic/src/routes/_authed/posts.index.tsx +++ b/examples/react/start-supabase-basic/src/routes/_authed/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_authed/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/start-supabase-basic/src/routes/_authed/posts.tsx b/examples/react/start-supabase-basic/src/routes/_authed/posts.tsx index f7d863b8b9..fbcf599a08 100644 --- a/examples/react/start-supabase-basic/src/routes/_authed/posts.tsx +++ b/examples/react/start-supabase-basic/src/routes/_authed/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../utils/posts' -export const Route = createFileRoute('/_authed/posts')({ +export const Route = createFileRoute({ loader: () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/react/start-supabase-basic/src/routes/index.tsx b/examples/react/start-supabase-basic/src/routes/index.tsx index 09a907cb18..f6c5b98b02 100644 --- a/examples/react/start-supabase-basic/src/routes/index.tsx +++ b/examples/react/start-supabase-basic/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/start-supabase-basic/src/routes/login.tsx b/examples/react/start-supabase-basic/src/routes/login.tsx index 64b539d819..9d7bd16865 100644 --- a/examples/react/start-supabase-basic/src/routes/login.tsx +++ b/examples/react/start-supabase-basic/src/routes/login.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router' import { Login } from '../components/Login' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ component: LoginComp, }) diff --git a/examples/react/start-supabase-basic/src/routes/logout.tsx b/examples/react/start-supabase-basic/src/routes/logout.tsx index a2f495c7fb..4b170c9bdd 100644 --- a/examples/react/start-supabase-basic/src/routes/logout.tsx +++ b/examples/react/start-supabase-basic/src/routes/logout.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { getSupabaseServerClient } from '../utils/supabase' @@ -18,7 +18,7 @@ const logoutFn = createServerFn().handler(async () => { }) }) -export const Route = createFileRoute('/logout')({ +export const Route = createFileRoute({ preload: false, loader: () => logoutFn(), }) diff --git a/examples/react/start-supabase-basic/src/routes/signup.tsx b/examples/react/start-supabase-basic/src/routes/signup.tsx index f37a2fa6a8..5896510b23 100644 --- a/examples/react/start-supabase-basic/src/routes/signup.tsx +++ b/examples/react/start-supabase-basic/src/routes/signup.tsx @@ -1,4 +1,4 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { redirect } from '@tanstack/react-router' import { createServerFn, useServerFn } from '@tanstack/react-start' import { useMutation } from '../hooks/useMutation' import { Auth } from '../components/Auth' @@ -27,7 +27,7 @@ export const signupFn = createServerFn({ method: 'POST' }) }) }) -export const Route = createFileRoute('/signup')({ +export const Route = createFileRoute({ component: SignupComp, }) diff --git a/examples/react/start-supabase-basic/src/ssr.tsx b/examples/react/start-supabase-basic/src/ssr.tsx deleted file mode 100644 index a24fb32843..0000000000 --- a/examples/react/start-supabase-basic/src/ssr.tsx +++ /dev/null @@ -1,14 +0,0 @@ -// src/ssr.tsx -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-supabase-basic/src/tanstack-start.d.ts b/examples/react/start-supabase-basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-supabase-basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-supabase-basic/vite.config.ts b/examples/react/start-supabase-basic/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-supabase-basic/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-trellaux/.gitignore b/examples/react/start-trellaux/.gitignore index d3387e00cd..3c8e6870b3 100644 --- a/examples/react/start-trellaux/.gitignore +++ b/examples/react/start-trellaux/.gitignore @@ -7,12 +7,8 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin diff --git a/examples/react/start-trellaux/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-trellaux/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-trellaux/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-trellaux/app.config.ts b/examples/react/start-trellaux/app.config.ts deleted file mode 100644 index 90c7c8cba8..0000000000 --- a/examples/react/start-trellaux/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 8e30f6062d..d3db08d319 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-query": "^5.66.0", @@ -23,7 +23,6 @@ "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", "tiny-invariant": "^1.3.3", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/start-trellaux/src/client.tsx b/examples/react/start-trellaux/src/client.tsx deleted file mode 100644 index 1593d1b3c7..0000000000 --- a/examples/react/start-trellaux/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-trellaux/src/routeTree.gen.ts b/examples/react/start-trellaux/src/routeTree.gen.ts index 7ee57387dc..e8cc65e620 100644 --- a/examples/react/start-trellaux/src/routeTree.gen.ts +++ b/examples/react/start-trellaux/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as BoardsBoardIdImport } from './routes/boards.$boardId' +import { Route as IndexRouteImport } from './routes/index' +import { Route as BoardsBoardIdRouteImport } from './routes/boards.$boardId' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const BoardsBoardIdRoute = BoardsBoardIdImport.update({ +const BoardsBoardIdRoute = BoardsBoardIdRouteImport.update({ id: '/boards/$boardId', path: '/boards/$boardId', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/boards/$boardId': { id: '/boards/$boardId' path: '/boards/$boardId' fullPath: '/boards/$boardId' - preLoaderRoute: typeof BoardsBoardIdImport + preLoaderRoute: typeof BoardsBoardIdRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/boards.$boardId' { + const createFileRoute: CreateFileRoute< + '/boards/$boardId', + FileRoutesByPath['/boards/$boardId']['parentRoute'], + FileRoutesByPath['/boards/$boardId']['id'], + FileRoutesByPath['/boards/$boardId']['path'], + FileRoutesByPath['/boards/$boardId']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/start-trellaux/src/routes/boards.$boardId.tsx b/examples/react/start-trellaux/src/routes/boards.$boardId.tsx index 36896cbb02..19400b89f6 100644 --- a/examples/react/start-trellaux/src/routes/boards.$boardId.tsx +++ b/examples/react/start-trellaux/src/routes/boards.$boardId.tsx @@ -1,9 +1,8 @@ -import { createFileRoute } from '@tanstack/react-router' import { Board } from '~/components/Board' import { Loader } from '~/components/Loader' import { boardQueries } from '~/queries' -export const Route = createFileRoute('/boards/$boardId')({ +export const Route = createFileRoute({ component: Home, pendingComponent: () => , loader: async ({ params, context: { queryClient } }) => { diff --git a/examples/react/start-trellaux/src/routes/index.tsx b/examples/react/start-trellaux/src/routes/index.tsx index 3b9e1a5fac..85baed6c0b 100644 --- a/examples/react/start-trellaux/src/routes/index.tsx +++ b/examples/react/start-trellaux/src/routes/index.tsx @@ -1,9 +1,9 @@ import { useSuspenseQuery } from '@tanstack/react-query' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' import { Loader } from '~/components/Loader' import { boardQueries } from '~/queries' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, pendingComponent: () => , }) diff --git a/e2e/react-start/basic-tsr-config/src/app/ssr.tsx b/examples/react/start-trellaux/src/server.ts similarity index 87% rename from e2e/react-start/basic-tsr-config/src/app/ssr.tsx rename to examples/react/start-trellaux/src/server.ts index 8981a9a338..65a580f25e 100644 --- a/e2e/react-start/basic-tsr-config/src/app/ssr.tsx +++ b/examples/react/start-trellaux/src/server.ts @@ -1,4 +1,3 @@ -/// import { createStartHandler, defaultStreamHandler, diff --git a/examples/react/start-trellaux/src/ssr.tsx b/examples/react/start-trellaux/src/ssr.tsx deleted file mode 100644 index 8981a9a338..0000000000 --- a/examples/react/start-trellaux/src/ssr.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/// -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-trellaux/src/tanstack-start.d.ts b/examples/react/start-trellaux/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/react/start-trellaux/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-trellaux/vite.config.ts b/examples/react/start-trellaux/vite.config.ts new file mode 100644 index 0000000000..1f5fd1961a --- /dev/null +++ b/examples/react/start-trellaux/vite.config.ts @@ -0,0 +1,15 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/examples/react/start-workos/.gitignore b/examples/react/start-workos/.gitignore index c274dbb056..51e00c0d4a 100644 --- a/examples/react/start-workos/.gitignore +++ b/examples/react/start-workos/.gitignore @@ -7,10 +7,8 @@ yarn.lock .env .vercel .output -.vinxi /build/ /api/ /server/build /public/build -.vinxi diff --git a/examples/react/start-workos/.prettierignore b/examples/react/start-workos/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/examples/react/start-workos/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/examples/react/start-workos/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-workos/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..e4a8044a28 --- /dev/null +++ b/examples/react/start-workos/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,62 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { FileRoutesByPath, CreateServerFileRoute } from '@tanstack/react-start/server'; +import { createServerRoute, createServerFileRoute } from '@tanstack/react-start/server'; + +// Create/Update Routes + +const rootRoute = createServerRoute(); + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute; +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath; + fullPaths: never; + fileRoutesByTo: FileRoutesByTo; + to: never; + id: '__root__'; + fileRoutesById: FileRoutesById; +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {}; + +export const routeTree = rootRoute._addFileChildren(rootRouteChildren)._addFileTypes(); + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-workos/app.config.ts b/examples/react/start-workos/app.config.ts deleted file mode 100644 index 3096b30089..0000000000 --- a/examples/react/start-workos/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/react-start/config'; -import tsConfigPaths from 'vite-tsconfig-paths'; - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}); diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 9b4f6be98b..97f0798993 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -5,13 +5,13 @@ "main": "index.js", "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "keywords": [], "author": "", - "license": "ISC", + "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.3", @@ -22,7 +22,7 @@ "jose": "^6.0.10", "react": "^19.0.0", "react-dom": "^19.0.0", - "vinxi": "0.5.3" + "vite": "6.1.0" }, "devDependencies": { "@types/react": "^19.0.8", diff --git a/examples/react/start-workos/src/routeTree.gen.ts b/examples/react/start-workos/src/routeTree.gen.ts index f7cb0a82d5..1ff74abe50 100644 --- a/examples/react/start-workos/src/routeTree.gen.ts +++ b/examples/react/start-workos/src/routeTree.gen.ts @@ -8,34 +8,36 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router'; + // Import Routes import { Route as rootRoute } from './routes/__root'; -import { Route as LogoutImport } from './routes/logout'; -import { Route as AuthenticatedImport } from './routes/_authenticated'; -import { Route as IndexImport } from './routes/index'; -import { Route as AuthenticatedAccountImport } from './routes/_authenticated/account'; +import { Route as LogoutRouteImport } from './routes/logout'; +import { Route as AuthenticatedRouteImport } from './routes/_authenticated'; +import { Route as IndexRouteImport } from './routes/index'; +import { Route as AuthenticatedAccountRouteImport } from './routes/_authenticated/account'; // Create/Update Routes -const LogoutRoute = LogoutImport.update({ +const LogoutRoute = LogoutRouteImport.update({ id: '/logout', path: '/logout', getParentRoute: () => rootRoute, } as any); -const AuthenticatedRoute = AuthenticatedImport.update({ +const AuthenticatedRoute = AuthenticatedRouteImport.update({ id: '/_authenticated', getParentRoute: () => rootRoute, } as any); -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any); -const AuthenticatedAccountRoute = AuthenticatedAccountImport.update({ +const AuthenticatedAccountRoute = AuthenticatedAccountRouteImport.update({ id: '/account', path: '/account', getParentRoute: () => AuthenticatedRoute, @@ -49,33 +51,72 @@ declare module '@tanstack/react-router' { id: '/'; path: '/'; fullPath: '/'; - preLoaderRoute: typeof IndexImport; + preLoaderRoute: typeof IndexRouteImport; parentRoute: typeof rootRoute; }; '/_authenticated': { id: '/_authenticated'; path: ''; fullPath: ''; - preLoaderRoute: typeof AuthenticatedImport; + preLoaderRoute: typeof AuthenticatedRouteImport; parentRoute: typeof rootRoute; }; '/logout': { id: '/logout'; path: '/logout'; fullPath: '/logout'; - preLoaderRoute: typeof LogoutImport; + preLoaderRoute: typeof LogoutRouteImport; parentRoute: typeof rootRoute; }; '/_authenticated/account': { id: '/_authenticated/account'; path: '/account'; fullPath: '/account'; - preLoaderRoute: typeof AuthenticatedAccountImport; - parentRoute: typeof AuthenticatedImport; + preLoaderRoute: typeof AuthenticatedAccountRouteImport; + parentRoute: typeof AuthenticatedRouteImport; }; } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + >; +} +declare module './routes/_authenticated' { + const createFileRoute: CreateFileRoute< + '/_authenticated', + FileRoutesByPath['/_authenticated']['parentRoute'], + FileRoutesByPath['/_authenticated']['id'], + FileRoutesByPath['/_authenticated']['path'], + FileRoutesByPath['/_authenticated']['fullPath'] + >; +} +declare module './routes/logout' { + const createFileRoute: CreateFileRoute< + '/logout', + FileRoutesByPath['/logout']['parentRoute'], + FileRoutesByPath['/logout']['id'], + FileRoutesByPath['/logout']['path'], + FileRoutesByPath['/logout']['fullPath'] + >; +} +declare module './routes/_authenticated/account' { + const createFileRoute: CreateFileRoute< + '/_authenticated/account', + FileRoutesByPath['/_authenticated/account']['parentRoute'], + FileRoutesByPath['/_authenticated/account']['id'], + FileRoutesByPath['/_authenticated/account']['path'], + FileRoutesByPath['/_authenticated/account']['fullPath'] + >; +} + // Create and export the route tree interface AuthenticatedRouteChildren { diff --git a/examples/react/start-workos/src/routes/_authenticated.tsx b/examples/react/start-workos/src/routes/_authenticated.tsx index 2533014a27..a44930eaa1 100644 --- a/examples/react/start-workos/src/routes/_authenticated.tsx +++ b/examples/react/start-workos/src/routes/_authenticated.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/react-router'; +import { redirect } from '@tanstack/react-router'; import { getSignInUrl } from '../authkit/serverFunctions'; -export const Route = createFileRoute('/_authenticated')({ +export const Route = createFileRoute({ beforeLoad: async ({ context, location }) => { if (!context.user) { const path = location.pathname; diff --git a/examples/react/start-workos/src/routes/_authenticated/account.tsx b/examples/react/start-workos/src/routes/_authenticated/account.tsx index b5a8a660a1..7776e66e53 100644 --- a/examples/react/start-workos/src/routes/_authenticated/account.tsx +++ b/examples/react/start-workos/src/routes/_authenticated/account.tsx @@ -1,8 +1,8 @@ import { Box, Flex, Heading, Text, TextField } from '@radix-ui/themes'; -import { createFileRoute } from '@tanstack/react-router'; +import {} from '@tanstack/react-router'; import { getAuth } from '../../authkit/serverFunctions'; -export const Route = createFileRoute('/_authenticated/account')({ +export const Route = createFileRoute({ component: RouteComponent, loader: async ({ context }) => { const { user } = context; diff --git a/examples/react/start-workos/src/routes/index.tsx b/examples/react/start-workos/src/routes/index.tsx index 6f2c64415b..f6ecd09981 100644 --- a/examples/react/start-workos/src/routes/index.tsx +++ b/examples/react/start-workos/src/routes/index.tsx @@ -1,9 +1,9 @@ import { Button, Flex, Heading, Text } from '@radix-ui/themes'; -import { Link, createFileRoute } from '@tanstack/react-router'; +import { Link } from '@tanstack/react-router'; import { getSignInUrl } from '../authkit/serverFunctions'; import SignInButton from '../components/sign-in-button'; -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, loader: async ({ context }) => { const { user } = context; diff --git a/examples/react/start-workos/src/routes/logout.tsx b/examples/react/start-workos/src/routes/logout.tsx index 41e8bc0b88..dc61380a45 100644 --- a/examples/react/start-workos/src/routes/logout.tsx +++ b/examples/react/start-workos/src/routes/logout.tsx @@ -1,7 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; import { signOut } from '../authkit/serverFunctions'; -export const Route = createFileRoute('/logout')({ +export const Route = createFileRoute({ preload: false, loader: () => signOut(), }); diff --git a/examples/react/start-workos/src/tanstack-start.d.ts b/examples/react/start-workos/src/tanstack-start.d.ts new file mode 100644 index 0000000000..4ec0e297aa --- /dev/null +++ b/examples/react/start-workos/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen'; diff --git a/examples/react/start-workos/vite.config.ts b/examples/react/start-workos/vite.config.ts new file mode 100644 index 0000000000..cd888de96e --- /dev/null +++ b/examples/react/start-workos/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite'; +import tsConfigPaths from 'vite-tsconfig-paths'; +import { tanstackStart } from '@tanstack/react-start/plugin/vite'; + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}); diff --git a/examples/react/view-transitions/src/routeTree.gen.ts b/examples/react/view-transitions/src/routeTree.gen.ts index 7dc7f740d9..2eb2bc10db 100644 --- a/examples/react/view-transitions/src/routeTree.gen.ts +++ b/examples/react/view-transitions/src/routeTree.gen.ts @@ -8,49 +8,51 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as HowItWorksImport } from './routes/how-it-works' -import { Route as ExploreImport } from './routes/explore' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' +import { Route as HowItWorksRouteImport } from './routes/how-it-works' +import { Route as ExploreRouteImport } from './routes/explore' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' // Create/Update Routes -const HowItWorksRoute = HowItWorksImport.update({ +const HowItWorksRoute = HowItWorksRouteImport.update({ id: '/how-it-works', path: '/how-it-works', getParentRoute: () => rootRoute, } as any) -const ExploreRoute = ExploreImport.update({ +const ExploreRoute = ExploreRouteImport.update({ id: '/explore', path: '/explore', getParentRoute: () => rootRoute, } as any) -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRouteRoute, @@ -64,47 +66,104 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/explore': { id: '/explore' path: '/explore' fullPath: '/explore' - preLoaderRoute: typeof ExploreImport + preLoaderRoute: typeof ExploreRouteImport parentRoute: typeof rootRoute } '/how-it-works': { id: '/how-it-works' path: '/how-it-works' fullPath: '/how-it-works' - preLoaderRoute: typeof HowItWorksImport + preLoaderRoute: typeof HowItWorksRouteImport parentRoute: typeof rootRoute } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts.route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/explore' { + const createFileRoute: CreateFileRoute< + '/explore', + FileRoutesByPath['/explore']['parentRoute'], + FileRoutesByPath['/explore']['id'], + FileRoutesByPath['/explore']['path'], + FileRoutesByPath['/explore']['fullPath'] + > +} +declare module './routes/how-it-works' { + const createFileRoute: CreateFileRoute< + '/how-it-works', + FileRoutesByPath['/how-it-works']['parentRoute'], + FileRoutesByPath['/how-it-works']['id'], + FileRoutesByPath['/how-it-works']['path'], + FileRoutesByPath['/how-it-works']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} + // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/view-transitions/src/routes/explore.tsx b/examples/react/view-transitions/src/routes/explore.tsx index b70a6f3bd5..6728fd4ad8 100644 --- a/examples/react/view-transitions/src/routes/explore.tsx +++ b/examples/react/view-transitions/src/routes/explore.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/explore')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/react/view-transitions/src/routes/how-it-works.tsx b/examples/react/view-transitions/src/routes/how-it-works.tsx index ab4dd4c714..bf2c1b4287 100644 --- a/examples/react/view-transitions/src/routes/how-it-works.tsx +++ b/examples/react/view-transitions/src/routes/how-it-works.tsx @@ -1,6 +1,6 @@ -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/how-it-works')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/react/view-transitions/src/routes/index.tsx b/examples/react/view-transitions/src/routes/index.tsx index 132ba18dbb..d62a1aff95 100644 --- a/examples/react/view-transitions/src/routes/index.tsx +++ b/examples/react/view-transitions/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { Link, createFileRoute } from '@tanstack/react-router' +import { Link } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/react/view-transitions/src/routes/posts.$postId.tsx b/examples/react/view-transitions/src/routes/posts.$postId.tsx index cded91ef96..0578182ecb 100644 --- a/examples/react/view-transitions/src/routes/posts.$postId.tsx +++ b/examples/react/view-transitions/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { ErrorComponent, createFileRoute } from '@tanstack/react-router' +import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/react/view-transitions/src/routes/posts.index.tsx b/examples/react/view-transitions/src/routes/posts.index.tsx index 056433ca0a..fdbe5865e5 100644 --- a/examples/react/view-transitions/src/routes/posts.index.tsx +++ b/examples/react/view-transitions/src/routes/posts.index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/react/view-transitions/src/routes/posts.route.tsx b/examples/react/view-transitions/src/routes/posts.route.tsx index c63dc78ff2..41c034c7ee 100644 --- a/examples/react/view-transitions/src/routes/posts.route.tsx +++ b/examples/react/view-transitions/src/routes/posts.route.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { Link, Outlet, createFileRoute } from '@tanstack/react-router' +import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/examples/react/with-trpc-react-query/.gitignore b/examples/react/with-trpc-react-query/.gitignore index be342025da..ca63f49885 100644 --- a/examples/react/with-trpc-react-query/.gitignore +++ b/examples/react/with-trpc-react-query/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/with-trpc-react-query/app.config.js b/examples/react/with-trpc-react-query/app.config.js index ef4eb87c7b..0f15246c33 100644 --- a/examples/react/with-trpc-react-query/app.config.js +++ b/examples/react/with-trpc-react-query/app.config.js @@ -1,8 +1,10 @@ -import { createApp } from 'vinxi' +import { defineConfig } from 'vite' import reactRefresh from '@vitejs/plugin-react' import { TanStackRouterVite } from '@tanstack/router-plugin/vite' -export default createApp({ +// TODO: Need to migrate this to vite and the new TanStack Start plugin + +export default defineConfig({ server: { preset: 'node-server', // change to 'netlify' or 'bun' or anyof the supported presets for nitro (nitro.unjs.io) experimental: { diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index bc9b26032a..4900f5621d 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -3,9 +3,9 @@ "private": true, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-query": "^5.66.0", @@ -23,7 +23,6 @@ "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/with-trpc-react-query/src/main.tsx b/examples/react/with-trpc-react-query/src/main.tsx index 4cc69baaac..bda5f47256 100644 --- a/examples/react/with-trpc-react-query/src/main.tsx +++ b/examples/react/with-trpc-react-query/src/main.tsx @@ -1,5 +1,3 @@ -/// - import React from 'react' import ReactDOM from 'react-dom/client' import { RouterProvider } from '@tanstack/react-router' diff --git a/examples/react/with-trpc-react-query/src/router.tsx b/examples/react/with-trpc-react-query/src/router.tsx index 1dfd9c4131..0d9dd5c4e4 100644 --- a/examples/react/with-trpc-react-query/src/router.tsx +++ b/examples/react/with-trpc-react-query/src/router.tsx @@ -15,7 +15,7 @@ export const trpc = createTRPCOptionsProxy({ client: createTRPCClient({ links: [ httpBatchLink({ - // since we are using Vinxi, the server is running on the same port, + // since we are using Vite, the server is running on the same port, // this means in dev the url is `http://localhost:3000/trpc` // and since its from the same origin, we don't need to explicitly set the full URL url: '/trpc', diff --git a/examples/react/with-trpc/.gitignore b/examples/react/with-trpc/.gitignore index be342025da..ca63f49885 100644 --- a/examples/react/with-trpc/.gitignore +++ b/examples/react/with-trpc/.gitignore @@ -7,14 +7,10 @@ yarn.lock .env .vercel .output -.vinxi - /build/ /api/ /server/build -/public/build -.vinxi -# Sentry Config File +/public/build# Sentry Config File .env.sentry-build-plugin /test-results/ /playwright-report/ diff --git a/examples/react/with-trpc/app.config.js b/examples/react/with-trpc/app.config.js index ef4eb87c7b..0f15246c33 100644 --- a/examples/react/with-trpc/app.config.js +++ b/examples/react/with-trpc/app.config.js @@ -1,8 +1,10 @@ -import { createApp } from 'vinxi' +import { defineConfig } from 'vite' import reactRefresh from '@vitejs/plugin-react' import { TanStackRouterVite } from '@tanstack/router-plugin/vite' -export default createApp({ +// TODO: Need to migrate this to vite and the new TanStack Start plugin + +export default defineConfig({ server: { preset: 'node-server', // change to 'netlify' or 'bun' or anyof the supported presets for nitro (nitro.unjs.io) experimental: { diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 2414353240..708a214c3b 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -3,9 +3,9 @@ "private": true, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/react-router": "^1.120.3", @@ -20,7 +20,6 @@ "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", - "vinxi": "0.5.3", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/with-trpc/src/main.tsx b/examples/react/with-trpc/src/main.tsx index 3cff783e4b..ff5d7de693 100644 --- a/examples/react/with-trpc/src/main.tsx +++ b/examples/react/with-trpc/src/main.tsx @@ -1,5 +1,3 @@ -/// - import React from 'react' import ReactDOM from 'react-dom/client' import { RouterProvider, createRouter } from '@tanstack/react-router' diff --git a/examples/react/with-trpc/src/trpc.ts b/examples/react/with-trpc/src/trpc.ts index 243e4a6f5e..2320dcdfb6 100644 --- a/examples/react/with-trpc/src/trpc.ts +++ b/examples/react/with-trpc/src/trpc.ts @@ -4,7 +4,7 @@ import type { AppRouter } from '../trpc-server.handler' export const trpc = createTRPCClient({ links: [ httpBatchLink({ - // since we are using Vinxi, the server is running on the same port, + // since we are using Vite, the server is running on the same port, // this means in dev the url is `http://localhost:3000/trpc` // and since its from the same origin, we don't need to explicitly set the full URL url: '/trpc', diff --git a/examples/solid/basic-file-based/src/routeTree.gen.ts b/examples/solid/basic-file-based/src/routeTree.gen.ts index 1f53fb23d7..bf1a9aa496 100644 --- a/examples/solid/basic-file-based/src/routeTree.gen.ts +++ b/examples/solid/basic-file-based/src/routeTree.gen.ts @@ -8,65 +8,66 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -80,61 +81,136 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} + // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx index af197bc038..c549175638 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index f54a42abb4..dd2e04ea2b 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a22902a271..a0bd5240b7 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 36231d2153..2864ec1f28 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/solid/basic-file-based/src/routes/index.tsx b/examples/solid/basic-file-based/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/examples/solid/basic-file-based/src/routes/index.tsx +++ b/examples/solid/basic-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/solid/basic-file-based/src/routes/posts.$postId.tsx b/examples/solid/basic-file-based/src/routes/posts.$postId.tsx index c673d45fa6..e06a7e1f38 100644 --- a/examples/solid/basic-file-based/src/routes/posts.$postId.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.$postId.tsx @@ -1,8 +1,7 @@ -import { createFileRoute } from '@tanstack/solid-router' import { fetchPost } from '../posts' import { PostErrorComponent } from './-components/PostErrorComponent' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/solid/basic-file-based/src/routes/posts.index.tsx b/examples/solid/basic-file-based/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/examples/solid/basic-file-based/src/routes/posts.index.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/posts.tsx b/examples/solid/basic-file-based/src/routes/posts.tsx index 11a999f50a..2e28f9beb3 100644 --- a/examples/solid/basic-file-based/src/routes/posts.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: fetchPosts, component: PostsComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts b/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts index 1f53fb23d7..bf1a9aa496 100644 --- a/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts +++ b/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts @@ -8,65 +8,66 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as PostsPostIdImport } from './routes/posts.$postId' -import { Route as PathlessLayoutNestedLayoutImport } from './routes/_pathlessLayout/_nested-layout' -import { Route as PathlessLayoutNestedLayoutRouteBImport } from './routes/_pathlessLayout/_nested-layout/route-b' -import { Route as PathlessLayoutNestedLayoutRouteAImport } from './routes/_pathlessLayout/_nested-layout/route-a' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -80,61 +81,136 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} + // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx index b52af5379b..53068bc1bb 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index f9a1b90b23..584515d8ec 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a22902a271..a0bd5240b7 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 36231d2153..2864ec1f28 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/solid/basic-solid-query-file-based/src/routes/index.tsx b/examples/solid/basic-solid-query-file-based/src/routes/index.tsx index bdfb4c7676..510db79b73 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/index.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx index 619428c4b5..38ae2af8bd 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx @@ -1,8 +1,4 @@ -import { - ErrorComponent, - createFileRoute, - useRouter, -} from '@tanstack/solid-router' +import { ErrorComponent, useRouter } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createEffect, createMemo } from 'solid-js' import { PostNotFoundError } from '../posts' @@ -35,7 +31,7 @@ export function PostErrorComponent({ error, reset }: ErrorComponentProps) { ) } -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx index b0af26be32..a41ebe0dd7 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx @@ -1,9 +1,9 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { postsQueryOptions } from '../postsQueryOptions' import { createMemo } from 'solid-js' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts b/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts index 0deb820043..f8a770b3f8 100644 --- a/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts +++ b/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts @@ -8,131 +8,132 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LoginImport } from './routes/login' -import { Route as PathlessLayoutImport } from './routes/_pathlessLayout' -import { Route as AuthImport } from './routes/_auth' -import { Route as DashboardRouteImport } from './routes/dashboard.route' -import { Route as IndexImport } from './routes/index' -import { Route as ExpensiveIndexImport } from './routes/expensive/index' -import { Route as DashboardIndexImport } from './routes/dashboard.index' -import { Route as PathlessLayoutRouteBImport } from './routes/_pathlessLayout.route-b' -import { Route as PathlessLayoutRouteAImport } from './routes/_pathlessLayout.route-a' -import { Route as AuthProfileImport } from './routes/_auth.profile' -import { Route as thisFolderIsNotInTheUrlRouteGroupImport } from './routes/(this-folder-is-not-in-the-url)/route-group' -import { Route as DashboardUsersRouteImport } from './routes/dashboard.users.route' -import { Route as DashboardInvoicesRouteImport } from './routes/dashboard.invoices.route' -import { Route as DashboardUsersIndexImport } from './routes/dashboard.users.index' -import { Route as DashboardInvoicesIndexImport } from './routes/dashboard.invoices.index' -import { Route as DashboardUsersUserImport } from './routes/dashboard.users.user' -import { Route as DashboardInvoicesInvoiceIdImport } from './routes/dashboard.invoices.$invoiceId' +import { Route as LoginRouteImport } from './routes/login' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as AuthRouteImport } from './routes/_auth' +import { Route as DashboardRouteRouteImport } from './routes/dashboard.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ExpensiveIndexRouteImport } from './routes/expensive/index' +import { Route as DashboardIndexRouteImport } from './routes/dashboard.index' +import { Route as PathlessLayoutRouteBRouteImport } from './routes/_pathlessLayout.route-b' +import { Route as PathlessLayoutRouteARouteImport } from './routes/_pathlessLayout.route-a' +import { Route as AuthProfileRouteImport } from './routes/_auth.profile' +import { Route as thisFolderIsNotInTheUrlRouteGroupRouteImport } from './routes/(this-folder-is-not-in-the-url)/route-group' +import { Route as DashboardUsersRouteRouteImport } from './routes/dashboard.users.route' +import { Route as DashboardInvoicesRouteRouteImport } from './routes/dashboard.invoices.route' +import { Route as DashboardUsersIndexRouteImport } from './routes/dashboard.users.index' +import { Route as DashboardInvoicesIndexRouteImport } from './routes/dashboard.invoices.index' +import { Route as DashboardUsersUserRouteImport } from './routes/dashboard.users.user' +import { Route as DashboardInvoicesInvoiceIdRouteImport } from './routes/dashboard.invoices.$invoiceId' // Create/Update Routes -const LoginRoute = LoginImport.update({ +const LoginRoute = LoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const AuthRoute = AuthImport.update({ +const AuthRoute = AuthRouteImport.update({ id: '/_auth', getParentRoute: () => rootRoute, } as any) -const DashboardRouteRoute = DashboardRouteImport.update({ +const DashboardRouteRoute = DashboardRouteRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const ExpensiveIndexRoute = ExpensiveIndexImport.update({ +const ExpensiveIndexRoute = ExpensiveIndexRouteImport.update({ id: '/expensive/', path: '/expensive/', getParentRoute: () => rootRoute, } as any) -const DashboardIndexRoute = DashboardIndexImport.update({ +const DashboardIndexRoute = DashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardRouteRoute, } as any) -const PathlessLayoutRouteBRoute = PathlessLayoutRouteBImport.update({ +const PathlessLayoutRouteBRoute = PathlessLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutRoute, } as any) -const PathlessLayoutRouteARoute = PathlessLayoutRouteAImport.update({ +const PathlessLayoutRouteARoute = PathlessLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutRoute, } as any) -const AuthProfileRoute = AuthProfileImport.update({ +const AuthProfileRoute = AuthProfileRouteImport.update({ id: '/profile', path: '/profile', getParentRoute: () => AuthRoute, } as any) const thisFolderIsNotInTheUrlRouteGroupRoute = - thisFolderIsNotInTheUrlRouteGroupImport.update({ + thisFolderIsNotInTheUrlRouteGroupRouteImport.update({ id: '/(this-folder-is-not-in-the-url)/route-group', path: '/route-group', getParentRoute: () => rootRoute, } as any) -const DashboardUsersRouteRoute = DashboardUsersRouteImport.update({ +const DashboardUsersRouteRoute = DashboardUsersRouteRouteImport.update({ id: '/users', path: '/users', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardInvoicesRouteRoute = DashboardInvoicesRouteImport.update({ +const DashboardInvoicesRouteRoute = DashboardInvoicesRouteRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => DashboardRouteRoute, } as any) -const DashboardUsersIndexRoute = DashboardUsersIndexImport.update({ +const DashboardUsersIndexRoute = DashboardUsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesIndexRoute = DashboardInvoicesIndexImport.update({ +const DashboardInvoicesIndexRoute = DashboardInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => DashboardInvoicesRouteRoute, } as any) -const DashboardUsersUserRoute = DashboardUsersUserImport.update({ +const DashboardUsersUserRoute = DashboardUsersUserRouteImport.update({ id: '/user', path: '/user', getParentRoute: () => DashboardUsersRouteRoute, } as any) -const DashboardInvoicesInvoiceIdRoute = DashboardInvoicesInvoiceIdImport.update( - { +const DashboardInvoicesInvoiceIdRoute = + DashboardInvoicesInvoiceIdRouteImport.update({ id: '/$invoiceId', path: '/$invoiceId', getParentRoute: () => DashboardInvoicesRouteRoute, - } as any, -) + } as any) // Populate the FileRoutesByPath interface @@ -142,124 +143,280 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/dashboard': { id: '/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardRouteRouteImport parentRoute: typeof rootRoute } '/_auth': { id: '/_auth' path: '' fullPath: '' - preLoaderRoute: typeof AuthImport + preLoaderRoute: typeof AuthRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/login': { id: '/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof LoginImport + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices': { id: '/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof DashboardInvoicesRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardInvoicesRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/dashboard/users': { id: '/dashboard/users' path: '/users' fullPath: '/dashboard/users' - preLoaderRoute: typeof DashboardUsersRouteImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardUsersRouteRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/(this-folder-is-not-in-the-url)/route-group': { id: '/(this-folder-is-not-in-the-url)/route-group' path: '/route-group' fullPath: '/route-group' - preLoaderRoute: typeof thisFolderIsNotInTheUrlRouteGroupImport + preLoaderRoute: typeof thisFolderIsNotInTheUrlRouteGroupRouteImport parentRoute: typeof rootRoute } '/_auth/profile': { id: '/_auth/profile' path: '/profile' fullPath: '/profile' - preLoaderRoute: typeof AuthProfileImport - parentRoute: typeof AuthImport + preLoaderRoute: typeof AuthProfileRouteImport + parentRoute: typeof AuthRouteImport } '/_pathlessLayout/route-a': { id: '/_pathlessLayout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutRouteAImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/_pathlessLayout/route-b': { id: '/_pathlessLayout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutRouteBImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/dashboard/': { id: '/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof DashboardIndexImport - parentRoute: typeof DashboardRouteImport + preLoaderRoute: typeof DashboardIndexRouteImport + parentRoute: typeof DashboardRouteRouteImport } '/expensive/': { id: '/expensive/' path: '/expensive' fullPath: '/expensive' - preLoaderRoute: typeof ExpensiveIndexImport + preLoaderRoute: typeof ExpensiveIndexRouteImport parentRoute: typeof rootRoute } '/dashboard/invoices/$invoiceId': { id: '/dashboard/invoices/$invoiceId' path: '/$invoiceId' fullPath: '/dashboard/invoices/$invoiceId' - preLoaderRoute: typeof DashboardInvoicesInvoiceIdImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesInvoiceIdRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/user': { id: '/dashboard/users/user' path: '/user' fullPath: '/dashboard/users/user' - preLoaderRoute: typeof DashboardUsersUserImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersUserRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } '/dashboard/invoices/': { id: '/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof DashboardInvoicesIndexImport - parentRoute: typeof DashboardInvoicesRouteImport + preLoaderRoute: typeof DashboardInvoicesIndexRouteImport + parentRoute: typeof DashboardInvoicesRouteRouteImport } '/dashboard/users/': { id: '/dashboard/users/' path: '/' fullPath: '/dashboard/users/' - preLoaderRoute: typeof DashboardUsersIndexImport - parentRoute: typeof DashboardUsersRouteImport + preLoaderRoute: typeof DashboardUsersIndexRouteImport + parentRoute: typeof DashboardUsersRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/dashboard.route' { + const createFileRoute: CreateFileRoute< + '/dashboard', + FileRoutesByPath['/dashboard']['parentRoute'], + FileRoutesByPath['/dashboard']['id'], + FileRoutesByPath['/dashboard']['path'], + FileRoutesByPath['/dashboard']['fullPath'] + > +} +declare module './routes/_auth' { + const createFileRoute: CreateFileRoute< + '/_auth', + FileRoutesByPath['/_auth']['parentRoute'], + FileRoutesByPath['/_auth']['id'], + FileRoutesByPath['/_auth']['path'], + FileRoutesByPath['/_auth']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/login' { + const createFileRoute: CreateFileRoute< + '/login', + FileRoutesByPath['/login']['parentRoute'], + FileRoutesByPath['/login']['id'], + FileRoutesByPath['/login']['path'], + FileRoutesByPath['/login']['fullPath'] + > +} +declare module './routes/dashboard.invoices.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices', + FileRoutesByPath['/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/dashboard/invoices']['id'], + FileRoutesByPath['/dashboard/invoices']['path'], + FileRoutesByPath['/dashboard/invoices']['fullPath'] + > +} +declare module './routes/dashboard.users.route' { + const createFileRoute: CreateFileRoute< + '/dashboard/users', + FileRoutesByPath['/dashboard/users']['parentRoute'], + FileRoutesByPath['/dashboard/users']['id'], + FileRoutesByPath['/dashboard/users']['path'], + FileRoutesByPath['/dashboard/users']['fullPath'] + > +} +declare module './routes/(this-folder-is-not-in-the-url)/route-group' { + const createFileRoute: CreateFileRoute< + '/(this-folder-is-not-in-the-url)/route-group', + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['parentRoute'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['id'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['path'], + FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['fullPath'] + > +} +declare module './routes/_auth.profile' { + const createFileRoute: CreateFileRoute< + '/_auth/profile', + FileRoutesByPath['/_auth/profile']['parentRoute'], + FileRoutesByPath['/_auth/profile']['id'], + FileRoutesByPath['/_auth/profile']['path'], + FileRoutesByPath['/_auth/profile']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-a', + FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout.route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/route-b', + FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] + > +} +declare module './routes/dashboard.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/', + FileRoutesByPath['/dashboard/']['parentRoute'], + FileRoutesByPath['/dashboard/']['id'], + FileRoutesByPath['/dashboard/']['path'], + FileRoutesByPath['/dashboard/']['fullPath'] + > +} +declare module './routes/expensive/index' { + const createFileRoute: CreateFileRoute< + '/expensive/', + FileRoutesByPath['/expensive/']['parentRoute'], + FileRoutesByPath['/expensive/']['id'], + FileRoutesByPath['/expensive/']['path'], + FileRoutesByPath['/expensive/']['fullPath'] + > +} +declare module './routes/dashboard.invoices.$invoiceId' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/$invoiceId', + FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], + FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] + > +} +declare module './routes/dashboard.users.user' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/user', + FileRoutesByPath['/dashboard/users/user']['parentRoute'], + FileRoutesByPath['/dashboard/users/user']['id'], + FileRoutesByPath['/dashboard/users/user']['path'], + FileRoutesByPath['/dashboard/users/user']['fullPath'] + > +} +declare module './routes/dashboard.invoices.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/invoices/', + FileRoutesByPath['/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/dashboard/invoices/']['id'], + FileRoutesByPath['/dashboard/invoices/']['path'], + FileRoutesByPath['/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/dashboard.users.index' { + const createFileRoute: CreateFileRoute< + '/dashboard/users/', + FileRoutesByPath['/dashboard/users/']['parentRoute'], + FileRoutesByPath['/dashboard/users/']['id'], + FileRoutesByPath['/dashboard/users/']['path'], + FileRoutesByPath['/dashboard/users/']['fullPath'] + > +} + // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx b/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx index c06e439a1b..3b34f15613 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx @@ -1,9 +1,6 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' -export const Route = createFileRoute( - '/(this-folder-is-not-in-the-url)/route-group', -)({ +export const Route = createFileRoute({ component: RouteGroupExample, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx index f67d367ee1..389d0f3477 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx @@ -1,7 +1,6 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' -export const Route = createFileRoute('/_auth/profile')({ +export const Route = createFileRoute({ component: ProfileComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx index a5b98f8631..6936f9e0ff 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx @@ -1,7 +1,7 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' import { auth } from '../utils/auth' -export const Route = createFileRoute('/_auth')({ +export const Route = createFileRoute({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx index c1c392cbad..a0bd5240b7 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/route-a')({ +export const Route = createFileRoute({ component: LayoutAComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx index 30dd035c93..2864ec1f28 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/route-b')({ +export const Route = createFileRoute({ component: LayoutBComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx index 9e090b1166..ebfb59943c 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: PathlessLayoutComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx index f967ed4f4b..d046fd363b 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx @@ -1,8 +1,8 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' + import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/')({ +export const Route = createFileRoute({ loader: () => fetchInvoices(), component: DashboardIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index c5c35e15b9..5f520989a7 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,16 +1,11 @@ import * as Solid from 'solid-js' -import { - Link, - createFileRoute, - useNavigate, - useRouter, -} from '@tanstack/solid-router' +import { Link, useNavigate, useRouter } from '@tanstack/solid-router' import { z } from 'zod' import { InvoiceFields } from '../components/InvoiceFields' import { useMutation } from '../hooks/useMutation' import { fetchInvoiceById, patchInvoice } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ +export const Route = createFileRoute({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx index 936a2b01b3..591a53b7cb 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,12 +1,12 @@ import * as Solid from 'solid-js' -import { createFileRoute, useRouter } from '@tanstack/solid-router' +import { useRouter } from '@tanstack/solid-router' import { InvoiceFields } from '../components/InvoiceFields' import { Spinner } from '../components/Spinner' import { useMutation } from '../hooks/useMutation' import { postInvoice } from '../utils/mockTodos' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices/')({ +export const Route = createFileRoute({ component: InvoicesIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx index 11668cac8e..817a493f75 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,14 +1,9 @@ import * as Solid from 'solid-js' -import { - Link, - MatchRoute, - Outlet, - createFileRoute, -} from '@tanstack/solid-router' +import { Link, MatchRoute, Outlet } from '@tanstack/solid-router' import { Spinner } from '../components/Spinner' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/invoices')({ +export const Route = createFileRoute({ loader: () => fetchInvoices(), component: InvoicesComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx index c10209e841..fe88331414 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx @@ -1,12 +1,7 @@ import * as Solid from 'solid-js' -import { - Link, - Outlet, - createFileRoute, - linkOptions, -} from '@tanstack/solid-router' +import { Link, Outlet, linkOptions } from '@tanstack/solid-router' -export const Route = createFileRoute('/dashboard')({ +export const Route = createFileRoute({ component: DashboardComponent, loader: () => ({ crumb: 'Dashboard', diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx index 268107589d..b6f431fbdf 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx @@ -1,7 +1,6 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' -export const Route = createFileRoute('/dashboard/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx index dee3a070ec..32213eacb2 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx @@ -3,7 +3,6 @@ import { Link, MatchRoute, Outlet, - createFileRoute, retainSearchParams, useNavigate, useRouterState, @@ -15,7 +14,7 @@ import { fetchUsers } from '../utils/mockTodos' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute('/dashboard/users')({ +export const Route = createFileRoute({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx index 84cecbe1c0..962d1e27cb 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx @@ -1,9 +1,9 @@ import * as Solid from 'solid-js' -import { createFileRoute } from '@tanstack/solid-router' + import { z } from 'zod' import { fetchUserById } from '../utils/mockTodos' -export const Route = createFileRoute('/dashboard/users/user')({ +export const Route = createFileRoute({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx index f1ae88b32b..5066d67ac5 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/solid-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute('/expensive/')({ +export const Route = createFileRoute({ component: Expensive, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/index.tsx index 3301318ef3..d0f309f8b5 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/index.tsx @@ -1,7 +1,7 @@ import * as Solid from 'solid-js' -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: IndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/login.tsx b/examples/solid/kitchen-sink-file-based/src/routes/login.tsx index 1a4bed3e9c..823555d813 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/login.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/login.tsx @@ -1,8 +1,8 @@ import * as Solid from 'solid-js' -import { createFileRoute, useRouter } from '@tanstack/solid-router' +import { useRouter } from '@tanstack/solid-router' import { z } from 'zod' -export const Route = createFileRoute('/login')({ +export const Route = createFileRoute({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/solid/quickstart-file-based/src/routeTree.gen.ts b/examples/solid/quickstart-file-based/src/routeTree.gen.ts index cb367c516c..ba17474a57 100644 --- a/examples/solid/quickstart-file-based/src/routeTree.gen.ts +++ b/examples/solid/quickstart-file-based/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/solid/quickstart-file-based/src/routes/about.tsx b/examples/solid/quickstart-file-based/src/routes/about.tsx index 4596223513..5cc1a89442 100644 --- a/examples/solid/quickstart-file-based/src/routes/about.tsx +++ b/examples/solid/quickstart-file-based/src/routes/about.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: AboutComponent, }) diff --git a/examples/solid/quickstart-file-based/src/routes/index.tsx b/examples/solid/quickstart-file-based/src/routes/index.tsx index c71b5d33f2..e64f9b04f0 100644 --- a/examples/solid/quickstart-file-based/src/routes/index.tsx +++ b/examples/solid/quickstart-file-based/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: HomeComponent, }) diff --git a/examples/solid/start-bare/.tanstack-start/server-routes/routeTree.gen.ts b/examples/solid/start-bare/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/examples/solid/start-bare/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/solid/start-bare/app.config.ts b/examples/solid/start-bare/app.config.ts deleted file mode 100644 index 19c03a0458..0000000000 --- a/examples/solid/start-bare/app.config.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' -import tailwindcss from '@tailwindcss/vite' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - tailwindcss(), - ], - }, -}) diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 2a94ab0a76..d5b05f1bed 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/solid-router": "^1.120.3", @@ -15,7 +15,7 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vinxi": "0.5.3", + "vite": "6.1.0", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/solid/start-bare/src/client.tsx b/examples/solid/start-bare/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/examples/solid/start-bare/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/examples/solid/start-bare/src/routeTree.gen.ts b/examples/solid/start-bare/src/routeTree.gen.ts index cb367c516c..ba17474a57 100644 --- a/examples/solid/start-bare/src/routeTree.gen.ts +++ b/examples/solid/start-bare/src/routeTree.gen.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as IndexImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/solid/start-bare/src/routes/about.tsx b/examples/solid/start-bare/src/routes/about.tsx index d66c7db828..f0d5d234a0 100644 --- a/examples/solid/start-bare/src/routes/about.tsx +++ b/examples/solid/start-bare/src/routes/about.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/solid/start-bare/src/routes/index.tsx b/examples/solid/start-bare/src/routes/index.tsx index 6a91bd1999..2f6c3c11e9 100644 --- a/examples/solid/start-bare/src/routes/index.tsx +++ b/examples/solid/start-bare/src/routes/index.tsx @@ -1,6 +1,5 @@ -import { createFileRoute } from '@tanstack/solid-router' import Counter from '~/components/Counter' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/examples/solid/start-bare/src/ssr.tsx b/examples/solid/start-bare/src/ssr.tsx deleted file mode 100644 index 6d10bea05f..0000000000 --- a/examples/solid/start-bare/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/solid/start-bare/src/tanstack-start.d.ts b/examples/solid/start-bare/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/solid/start-bare/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/solid/start-bare/vite.config.ts b/examples/solid/start-bare/vite.config.ts new file mode 100644 index 0000000000..e5bc95116e --- /dev/null +++ b/examples/solid/start-bare/vite.config.ts @@ -0,0 +1,17 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import tailwindcss from '@tailwindcss/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + tailwindcss(), + ], +}) diff --git a/examples/solid/start-basic/.tanstack-start/server-routes/routeTree.gen.ts b/examples/solid/start-basic/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..e36fccb479 --- /dev/null +++ b/examples/solid/start-basic/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api/users' +import { ServerRoute as ApiUsersUserIdRouteImport } from './../../src/routes/api/users.$userId' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersUserIdRoute = ApiUsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$userId': { + id: '/api/users/$userId' + path: '/$userId' + fullPath: '/api/users/$userId' + preLoaderRoute: typeof ApiUsersUserIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api/users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$userId' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$userId']['parentRoute'], + FileRoutesByPath['/api/users/$userId']['id'], + FileRoutesByPath['/api/users/$userId']['path'], + FileRoutesByPath['/api/users/$userId']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersUserIdRoute: typeof ApiUsersUserIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersUserIdRoute: ApiUsersUserIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$userId' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$userId' + id: '__root__' | '/api/users' | '/api/users/$userId' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api/users.ts", + "children": [ + "/api/users/$userId" + ] + }, + "/api/users/$userId": { + "filePath": "api/users.$userId.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/solid/start-basic/app.config.ts b/examples/solid/start-basic/app.config.ts deleted file mode 100644 index 2a06e3d3f0..0000000000 --- a/examples/solid/start-basic/app.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { defineConfig } from '@tanstack/solid-start/config' -import tsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - tsr: { - appDirectory: 'src', - }, - vite: { - plugins: [ - tsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], - }, -}) diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 9503c2499a..eb253dfe8d 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -4,9 +4,9 @@ "sideEffects": false, "type": "module", "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" + "dev": "vite dev", + "build": "vite build", + "start": "vite start" }, "dependencies": { "@tanstack/solid-router": "^1.120.3", @@ -15,8 +15,7 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4", - "vinxi": "0.5.3" + "vite": "6.1.4" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/examples/solid/start-basic/src/api.ts b/examples/solid/start-basic/src/api.ts deleted file mode 100644 index ed511bcd26..0000000000 --- a/examples/solid/start-basic/src/api.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { - createStartAPIHandler, - defaultAPIFileRouteHandler, -} from '@tanstack/solid-start/api' - -export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/examples/solid/start-basic/src/client.tsx b/examples/solid/start-basic/src/client.tsx deleted file mode 100644 index ba0f02fac0..0000000000 --- a/examples/solid/start-basic/src/client.tsx +++ /dev/null @@ -1,8 +0,0 @@ -/// -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrate(() => , document.body) diff --git a/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx index 0dff3919fd..bf759681a4 100644 --- a/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx +++ b/examples/solid/start-basic/src/components/DefaultCatchBoundary.tsx @@ -28,7 +28,7 @@ export function DefaultCatchBoundary({ error }: ErrorComponentProps) { > Try Again - {isRoot() ? ( + {isRoot ? ( rootRoute, } as any) -const RedirectRoute = RedirectImport.update({ +const RedirectRoute = RedirectRouteImport.update({ id: '/redirect', path: '/redirect', getParentRoute: () => rootRoute, } as any) -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const DeferredRoute = DeferredImport.update({ +const DeferredRoute = DeferredRouteImport.update({ id: '/deferred', path: '/deferred', getParentRoute: () => rootRoute, } as any) -const PathlessLayoutRoute = PathlessLayoutImport.update({ +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ id: '/_pathlessLayout', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const UsersIndexRoute = UsersIndexImport.update({ +const UsersIndexRoute = UsersIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => UsersRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRoute, } as any) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/$userId', path: '/$userId', getParentRoute: () => UsersRoute, } as any) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, } as any) -const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutImport.update( - { +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', getParentRoute: () => PathlessLayoutRoute, - } as any, -) + } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/posts_/$postId/deep', path: '/posts/$postId/deep', getParentRoute: () => rootRoute, } as any) const PathlessLayoutNestedLayoutRouteBRoute = - PathlessLayoutNestedLayoutRouteBImport.update({ + PathlessLayoutNestedLayoutRouteBRouteImport.update({ id: '/route-b', path: '/route-b', getParentRoute: () => PathlessLayoutNestedLayoutRoute, } as any) const PathlessLayoutNestedLayoutRouteARoute = - PathlessLayoutNestedLayoutRouteAImport.update({ + PathlessLayoutNestedLayoutRouteARouteImport.update({ id: '/route-a', path: '/route-a', getParentRoute: () => PathlessLayoutNestedLayoutRoute, @@ -122,103 +123,232 @@ declare module '@tanstack/solid-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout': { id: '/_pathlessLayout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutRouteImport parentRoute: typeof rootRoute } '/deferred': { id: '/deferred' path: '/deferred' fullPath: '/deferred' - preLoaderRoute: typeof DeferredImport + preLoaderRoute: typeof DeferredRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } '/redirect': { id: '/redirect' path: '/redirect' fullPath: '/redirect' - preLoaderRoute: typeof RedirectImport + preLoaderRoute: typeof RedirectRouteImport parentRoute: typeof rootRoute } '/users': { id: '/users' path: '/users' fullPath: '/users' - preLoaderRoute: typeof UsersImport + preLoaderRoute: typeof UsersRouteImport parentRoute: typeof rootRoute } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' fullPath: '' - preLoaderRoute: typeof PathlessLayoutNestedLayoutImport - parentRoute: typeof PathlessLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport } '/posts/$postId': { id: '/posts/$postId' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport } '/users/$userId': { id: '/users/$userId' path: '/$userId' fullPath: '/users/$userId' - preLoaderRoute: typeof UsersUserIdImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport } '/users/': { id: '/users/' path: '/' fullPath: '/users/' - preLoaderRoute: typeof UsersIndexImport - parentRoute: typeof UsersImport + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport } '/_pathlessLayout/_nested-layout/route-a': { id: '/_pathlessLayout/_nested-layout/route-a' path: '/route-a' fullPath: '/route-a' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteAImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/_pathlessLayout/_nested-layout/route-b': { id: '/_pathlessLayout/_nested-layout/route-b' path: '/route-b' fullPath: '/route-b' - preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBImport - parentRoute: typeof PathlessLayoutNestedLayoutImport + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport } '/posts_/$postId/deep': { id: '/posts_/$postId/deep' path: '/posts/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/solid/start-basic/src/routes/__root.tsx b/examples/solid/start-basic/src/routes/__root.tsx index a9380d3209..374a4fb944 100644 --- a/examples/solid/start-basic/src/routes/__root.tsx +++ b/examples/solid/start-basic/src/routes/__root.tsx @@ -1,6 +1,13 @@ -import { Link, Outlet, createRootRoute } from '@tanstack/solid-router' - -import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/solid-router' +import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' +import type * as Solid from 'solid-js' +import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' import { NotFound } from '~/components/NotFound' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo' @@ -8,6 +15,9 @@ import { seo } from '~/utils/seo' export const Route = createRootRoute({ head: () => ({ meta: [ + { + charset: 'utf-8', + }, { name: 'viewport', content: 'width=device-width, initial-scale=1', @@ -41,14 +51,29 @@ export const Route = createRootRoute({ { rel: 'icon', href: '/favicon.ico' }, ], }), - errorComponent: (props) =>

{props.error.stack}

, + errorComponent: (props) => { + return ( + + + + ) + }, notFoundComponent: () => , component: RootComponent, }) function RootComponent() { + return ( + + + + ) +} + +function RootDocument({ children }: { children: Solid.JSX.Element }) { return ( <> +
{' '} - Deferred + Pathless Layout {' '} - redirect + Deferred {' '}
- - +
+ {children} + + ) } diff --git a/examples/solid/start-basic/src/routes/_pathlessLayout.tsx b/examples/solid/start-basic/src/routes/_pathlessLayout.tsx index af197bc038..c549175638 100644 --- a/examples/solid/start-basic/src/routes/_pathlessLayout.tsx +++ b/examples/solid/start-basic/src/routes/_pathlessLayout.tsx @@ -1,6 +1,6 @@ -import { Outlet, createFileRoute } from '@tanstack/solid-router' +import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx index 24e4b2545b..03bcac9d47 100644 --- a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,6 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ +export const Route = createFileRoute({ component: LayoutComponent, }) diff --git a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a22902a271..a0bd5240b7 100644 --- a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( - { - component: LayoutAComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutAComponent, +}) function LayoutAComponent() { return
I'm A!
diff --git a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 36231d2153..2864ec1f28 100644 --- a/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/solid/start-basic/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,10 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( - { - component: LayoutBComponent, - }, -) +export const Route = createFileRoute({ + component: LayoutBComponent, +}) function LayoutBComponent() { return
I'm B!
diff --git a/examples/solid/start-basic/src/routes/api/users.$id.ts b/examples/solid/start-basic/src/routes/api/users.$id.ts deleted file mode 100644 index b1786f6a30..0000000000 --- a/examples/solid/start-basic/src/routes/api/users.$id.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { json } from '@tanstack/solid-start' -import { createAPIFileRoute } from '@tanstack/solid-start/api' -import axios from 'redaxios' -import type { User } from '../../utils/users' - -export const APIRoute = createAPIFileRoute('/api/users/$id')({ - GET: async ({ request, params }) => { - console.info(`Fetching users by id=${params.id}... @`, request.url) - try { - const res = await axios.get( - 'https://jsonplaceholder.typicode.com/users/' + params.id, - ) - - return json({ - id: res.data.id, - name: res.data.name, - email: res.data.email, - }) - } catch (e) { - console.error(e) - return json({ error: 'User not found' }, { status: 404 }) - } - }, -}) diff --git a/examples/solid/start-basic/src/routes/api/users.$userId.ts b/examples/solid/start-basic/src/routes/api/users.$userId.ts new file mode 100644 index 0000000000..69d966d982 --- /dev/null +++ b/examples/solid/start-basic/src/routes/api/users.$userId.ts @@ -0,0 +1,27 @@ +import { json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params, request }) => { + console.info(`Fetching users by id=${params.userId}... @`, request.url) + try { + const res = await fetch( + 'https://jsonplaceholder.typicode.com/users/' + params.userId, + ) + if (!res.ok) { + throw new Error('Failed to fetch user') + } + + const user = (await res.json()) as User + + return json({ + id: user.id, + name: user.name, + email: user.email, + }) + } catch (e) { + console.error(e) + return json({ error: 'User not found' }, { status: 404 }) + } + }, +}) diff --git a/examples/solid/start-basic/src/routes/api/users.ts b/examples/solid/start-basic/src/routes/api/users.ts index c10bcfc94a..c0a6a1a6a2 100644 --- a/examples/solid/start-basic/src/routes/api/users.ts +++ b/examples/solid/start-basic/src/routes/api/users.ts @@ -1,17 +1,58 @@ -import { json } from '@tanstack/solid-start' -import { createAPIFileRoute } from '@tanstack/solid-start/api' -import axios from 'redaxios' -import type { User } from '../../utils/users' +import { createMiddleware, json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' -export const APIRoute = createAPIFileRoute('/api/users')({ - GET: async ({ request }) => { - console.info('Fetching users... @', request.url) - const res = await axios.get>( - 'https://jsonplaceholder.typicode.com/users', - ) - - const list = res.data.slice(0, 10) +const userLoggerMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: /users') + const result = await next() + result.response.headers.set('x-users', 'true') + console.info('Out: /users') + return result + }, +) - return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) +const testParentMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: testParentMiddleware') + const result = await next() + result.response.headers.set('x-test-parent', 'true') + console.info('Out: testParentMiddleware') + return result }, -}) +) + +const testMiddleware = createMiddleware({ type: 'request' }) + .middleware([testParentMiddleware]) + .server(async ({ next, request }) => { + console.info('In: testMiddleware') + const result = await next() + result.response.headers.set('x-test', 'true') + + // if (Math.random() > 0.5) { + // throw new Response(null, { + // status: 302, + // headers: { Location: 'https://www.google.com' }, + // }) + // } + + console.info('Out: testMiddleware') + return result + }) + +export const ServerRoute = createServerFileRoute() + .middleware([testMiddleware, userLoggerMiddleware, testParentMiddleware]) + .methods({ + GET: async ({ request }) => { + console.info('Fetching users... @', request.url) + const res = await fetch('https://jsonplaceholder.typicode.com/users') + if (!res.ok) { + throw new Error('Failed to fetch users') + } + + const data = (await res.json()) as Array + + const list = data.slice(0, 10) + + return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) + }, + }) diff --git a/examples/solid/start-basic/src/routes/deferred.tsx b/examples/solid/start-basic/src/routes/deferred.tsx index 1860f3af9a..c510571e5d 100644 --- a/examples/solid/start-basic/src/routes/deferred.tsx +++ b/examples/solid/start-basic/src/routes/deferred.tsx @@ -1,6 +1,6 @@ -import { Await, createFileRoute } from '@tanstack/solid-router' +import { Await } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { createSignal, Suspense } from 'solid-js' +import { Suspense, createSignal } from 'solid-js' const personServerFn = createServerFn({ method: 'GET' }) .validator((d: string) => d) @@ -15,7 +15,7 @@ const slowServerFn = createServerFn({ method: 'GET' }) return { name, randomNumber: Math.floor(Math.random() * 100) } }) -export const Route = createFileRoute('/deferred')({ +export const Route = createFileRoute({ loader: async () => { return { deferredStuff: new Promise((r) => diff --git a/examples/solid/start-basic/src/routes/index.tsx b/examples/solid/start-basic/src/routes/index.tsx index a128aeca0e..2f35891abb 100644 --- a/examples/solid/start-basic/src/routes/index.tsx +++ b/examples/solid/start-basic/src/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, }) diff --git a/examples/solid/start-basic/src/routes/posts.$postId.tsx b/examples/solid/start-basic/src/routes/posts.$postId.tsx index d13735a4db..7d06791adb 100644 --- a/examples/solid/start-basic/src/routes/posts.$postId.tsx +++ b/examples/solid/start-basic/src/routes/posts.$postId.tsx @@ -1,9 +1,9 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' import { fetchPost } from '../utils/posts' import { NotFound } from '~/components/NotFound' import { PostErrorComponent } from '~/components/PostError' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostComponent, diff --git a/examples/solid/start-basic/src/routes/posts.index.tsx b/examples/solid/start-basic/src/routes/posts.index.tsx index 33d0386c19..13529228bb 100644 --- a/examples/solid/start-basic/src/routes/posts.index.tsx +++ b/examples/solid/start-basic/src/routes/posts.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: PostsIndexComponent, }) diff --git a/examples/solid/start-basic/src/routes/posts.tsx b/examples/solid/start-basic/src/routes/posts.tsx index 326372478f..4f0b47fa08 100644 --- a/examples/solid/start-basic/src/routes/posts.tsx +++ b/examples/solid/start-basic/src/routes/posts.tsx @@ -1,7 +1,7 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' +import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../utils/posts' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ loader: async () => fetchPosts(), component: PostsComponent, }) diff --git a/examples/solid/start-basic/src/routes/posts_.$postId.deep.tsx b/examples/solid/start-basic/src/routes/posts_.$postId.deep.tsx index 7c52bc19eb..b71b51e8cc 100644 --- a/examples/solid/start-basic/src/routes/posts_.$postId.deep.tsx +++ b/examples/solid/start-basic/src/routes/posts_.$postId.deep.tsx @@ -1,8 +1,8 @@ -import { Link, createFileRoute } from '@tanstack/solid-router' +import { Link } from '@tanstack/solid-router' import { fetchPost } from '../utils/posts' import { PostErrorComponent } from '~/components/PostError' -export const Route = createFileRoute('/posts_/$postId/deep')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => fetchPost({ data: postId, diff --git a/examples/solid/start-basic/src/routes/redirect.tsx b/examples/solid/start-basic/src/routes/redirect.tsx index ca017f0635..d80d290638 100644 --- a/examples/solid/start-basic/src/routes/redirect.tsx +++ b/examples/solid/start-basic/src/routes/redirect.tsx @@ -1,6 +1,6 @@ -import { createFileRoute, redirect } from '@tanstack/solid-router' +import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute('/redirect')({ +export const Route = createFileRoute({ beforeLoad: async () => { throw redirect({ to: '/posts', diff --git a/examples/solid/start-basic/src/routes/users.$userId.tsx b/examples/solid/start-basic/src/routes/users.$userId.tsx index a2d99fbf6b..9bdb09d835 100644 --- a/examples/solid/start-basic/src/routes/users.$userId.tsx +++ b/examples/solid/start-basic/src/routes/users.$userId.tsx @@ -1,18 +1,20 @@ -import { createFileRoute } from '@tanstack/solid-router' -import axios from 'redaxios' -import type { User } from '~/utils/users' -import { DEPLOY_URL } from '~/utils/users' -import { NotFound } from '~/components/NotFound' -import { UserErrorComponent } from '~/components/UserError' +import { NotFound } from 'src/components/NotFound' +import { UserErrorComponent } from 'src/components/UserError' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ loader: async ({ params: { userId } }) => { - return await axios - .get(DEPLOY_URL + '/api/users/' + userId) - .then((r) => r.data) - .catch(() => { - throw new Error('Failed to fetch user') - }) + try { + const res = await fetch('/api/users/' + userId) + if (!res.ok) { + throw new Error('Unexpected status code') + } + + const data = await res.json() + + return data + } catch { + throw new Error('Failed to fetch user') + } }, errorComponent: UserErrorComponent, component: UserComponent, @@ -28,6 +30,14 @@ function UserComponent() {

{user().name}

{user().email}
+
) } diff --git a/examples/solid/start-basic/src/routes/users.index.tsx b/examples/solid/start-basic/src/routes/users.index.tsx index bbc96801a9..f30b0712b9 100644 --- a/examples/solid/start-basic/src/routes/users.index.tsx +++ b/examples/solid/start-basic/src/routes/users.index.tsx @@ -1,9 +1,14 @@ -import { createFileRoute } from '@tanstack/solid-router' - -export const Route = createFileRoute('/users/')({ +export const Route = createFileRoute({ component: UsersIndexComponent, }) function UsersIndexComponent() { - return
Select a user.
+ return ( +
+ Select a user or{' '} + + view as JSON + +
+ ) } diff --git a/examples/solid/start-basic/src/routes/users.tsx b/examples/solid/start-basic/src/routes/users.tsx index 2caca046e0..c3a2a1fe15 100644 --- a/examples/solid/start-basic/src/routes/users.tsx +++ b/examples/solid/start-basic/src/routes/users.tsx @@ -1,16 +1,17 @@ -import { Link, Outlet, createFileRoute } from '@tanstack/solid-router' -import axios from 'redaxios' -import { DEPLOY_URL } from '../utils/users' +import { Link, Outlet } from '@tanstack/solid-router' import type { User } from '../utils/users' -export const Route = createFileRoute('/users')({ +export const Route = createFileRoute({ loader: async () => { - return await axios - .get>(DEPLOY_URL + '/api/users') - .then((r) => r.data) - .catch(() => { - throw new Error('Failed to fetch users') - }) + const res = await fetch('/api/users') + + if (!res.ok) { + throw new Error('Unexpected status code') + } + + const data = (await res.json()) as Array + + return data }, component: UsersComponent, }) diff --git a/examples/solid/start-basic/src/ssr.tsx b/examples/solid/start-basic/src/ssr.tsx deleted file mode 100644 index 6d10bea05f..0000000000 --- a/examples/solid/start-basic/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/solid/start-basic/src/tanstack-start.d.ts b/examples/solid/start-basic/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/examples/solid/start-basic/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/solid/start-basic/src/utils/loggingMiddleware.tsx b/examples/solid/start-basic/src/utils/loggingMiddleware.tsx index 928fedfd25..fae87c5965 100644 --- a/examples/solid/start-basic/src/utils/loggingMiddleware.tsx +++ b/examples/solid/start-basic/src/utils/loggingMiddleware.tsx @@ -1,6 +1,6 @@ import { createMiddleware } from '@tanstack/solid-start' -const preLogMiddleware = createMiddleware() +const preLogMiddleware = createMiddleware({ type: 'function' }) .client(async (ctx) => { const clientTime = new Date() @@ -25,7 +25,7 @@ const preLogMiddleware = createMiddleware() }) }) -export const logMiddleware = createMiddleware() +export const logMiddleware = createMiddleware({ type: 'function' }) .middleware([preLogMiddleware]) .client(async (ctx) => { const res = await ctx.next() diff --git a/examples/solid/start-basic/src/utils/posts.tsx b/examples/solid/start-basic/src/utils/posts.tsx index 96eaa78afc..e29706d38c 100644 --- a/examples/solid/start-basic/src/utils/posts.tsx +++ b/examples/solid/start-basic/src/utils/posts.tsx @@ -8,7 +8,7 @@ export type PostType = { body: string } -export const fetchPost = createServerFn({ method: 'GET' }) +export const fetchPost = createServerFn({ method: 'GET', type: 'static' }) .validator((d: string) => d) .handler(async ({ data }) => { console.info(`Fetching post with id ${data}...`) @@ -26,11 +26,12 @@ export const fetchPost = createServerFn({ method: 'GET' }) return post }) -export const fetchPosts = createServerFn({ method: 'GET' }).handler( - async () => { - console.info('Fetching posts...') - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) - }, -) +export const fetchPosts = createServerFn({ + method: 'GET', + type: 'static', +}).handler(async () => { + console.info('Fetching posts...') + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) +}) diff --git a/examples/solid/start-basic/src/utils/users.tsx b/examples/solid/start-basic/src/utils/users.tsx index b810f455fe..7ba645b383 100644 --- a/examples/solid/start-basic/src/utils/users.tsx +++ b/examples/solid/start-basic/src/utils/users.tsx @@ -3,5 +3,3 @@ export type User = { name: string email: string } - -export const DEPLOY_URL = 'http://localhost:3000' diff --git a/examples/solid/start-basic/vite.config.ts b/examples/solid/start-basic/vite.config.ts new file mode 100644 index 0000000000..3af67d62ad --- /dev/null +++ b/examples/solid/start-basic/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({}), + ], +}) diff --git a/package.json b/package.json index 9ac5606a3a..c74f5974b4 100644 --- a/package.json +++ b/package.json @@ -107,12 +107,10 @@ "@tanstack/solid-start-plugin": "workspace:*", "@tanstack/solid-start-router-manifest": "workspace:*", "@tanstack/solid-start-server": "workspace:*", - "@tanstack/start-api-routes": "workspace:*", "@tanstack/start-server-functions-fetcher": "workspace:*", - "@tanstack/start-server-functions-handler": "workspace:*", "@tanstack/start-server-functions-client": "workspace:*", - "@tanstack/start-server-functions-ssr": "workspace:*", "@tanstack/start-server-functions-server": "workspace:*", + "@tanstack/start-plugin-core": "workspace:*", "@tanstack/start-client-core": "workspace:*", "@tanstack/start-server-core": "workspace:*", "@tanstack/eslint-plugin-router": "workspace:*", diff --git a/packages/directive-functions-plugin/src/compilers.ts b/packages/directive-functions-plugin/src/compilers.ts index 463f5e879e..43830231b9 100644 --- a/packages/directive-functions-plugin/src/compilers.ts +++ b/packages/directive-functions-plugin/src/compilers.ts @@ -40,6 +40,8 @@ export type CompileDirectivesOpts = ParseAstOptions & { }) => string replacer: ReplacerFn // devSplitImporter: string + filename: string + root: string } function buildDirectiveSplitParam(opts: CompileDirectivesOpts) { @@ -230,6 +232,8 @@ export function findDirectives( directiveLabel: string replacer?: ReplacerFn directiveSplitParam: string + filename: string + root: string }, ): Record { const directiveFnsById: Record = {} diff --git a/packages/directive-functions-plugin/src/index.ts b/packages/directive-functions-plugin/src/index.ts index 25ed1df746..d0fd8aee06 100644 --- a/packages/directive-functions-plugin/src/index.ts +++ b/packages/directive-functions-plugin/src/index.ts @@ -15,23 +15,28 @@ export type { ReplacerFn, } from './compilers' -export type DirectiveFunctionsViteOptions = Pick< +export type DirectiveFunctionsViteEnvOptions = Pick< CompileDirectivesOpts, - 'directive' | 'directiveLabel' | 'getRuntimeCode' | 'replacer' - // | 'devSplitImporter' + 'getRuntimeCode' | 'replacer' > & { envLabel: string } +export type DirectiveFunctionsViteOptions = Pick< + CompileDirectivesOpts, + 'directive' | 'directiveLabel' +> & + DirectiveFunctionsViteEnvOptions & { + onDirectiveFnsById?: (directiveFnsById: Record) => void + } + const createDirectiveRx = (directive: string) => new RegExp(`"${directive}"|'${directive}'`, 'gm') export function TanStackDirectiveFunctionsPlugin( - opts: DirectiveFunctionsViteOptions & { - onDirectiveFnsById?: (directiveFnsById: Record) => void - }, + opts: DirectiveFunctionsViteOptions, ): Plugin { - let ROOT: string = process.cwd() + let root: string = process.cwd() const directiveRx = createDirectiveRx(opts.directive) @@ -39,36 +44,123 @@ export function TanStackDirectiveFunctionsPlugin( name: 'tanstack-start-directive-vite-plugin', enforce: 'pre', configResolved: (config) => { - ROOT = config.root + root = config.root }, transform(code, id) { - const url = pathToFileURL(id) - url.searchParams.delete('v') - id = fileURLToPath(url).replace(/\\/g, '/') + return transformCode({ ...opts, code, id, directiveRx, root }) + }, + } +} - if (!code.match(directiveRx)) { - return null - } +export type DirectiveFunctionsVitePluginEnvOptions = Pick< + CompileDirectivesOpts, + 'directive' | 'directiveLabel' +> & { + environments: { + client: DirectiveFunctionsViteEnvOptions & { envName?: string } + server: DirectiveFunctionsViteEnvOptions & { envName?: string } + } + onDirectiveFnsById?: (directiveFnsById: Record) => void +} - if (debug) console.info(`${opts.envLabel}: Compiling Directives: `, id) +export function TanStackDirectiveFunctionsPluginEnv( + opts: DirectiveFunctionsVitePluginEnvOptions, +): Plugin { + opts = { + ...opts, + environments: { + client: { + envName: 'client', + ...opts.environments.client, + }, + server: { + envName: 'server', + ...opts.environments.server, + }, + }, + } - const { compiledResult, directiveFnsById } = compileDirectives({ + let root: string = process.cwd() + + const directiveRx = createDirectiveRx(opts.directive) + + return { + name: 'tanstack-start-directive-vite-plugin', + enforce: 'pre', + buildStart() { + root = this.environment.config.root + }, + // applyToEnvironment(env) { + // return [ + // opts.environments.client.envName, + // opts.environments.server.envName, + // ].includes(env.name) + // }, + transform(code, id) { + const envOptions = [ + opts.environments.client, + opts.environments.server, + ].find((e) => e.envName === this.environment.name) + + if (!envOptions) { + throw new Error(`Environment ${this.environment.name} not found`) + } + + return transformCode({ ...opts, + ...envOptions, code, - root: ROOT, - filename: id, - // globalThis.app currently refers to Vinxi's app instance. In the future, it can just be the - // vite dev server instance we get from Nitro. + id, + directiveRx, + root, }) + }, + } +} - opts.onDirectiveFnsById?.(directiveFnsById) +function transformCode({ + code, + id, + directiveRx, + envLabel, + directive, + directiveLabel, + getRuntimeCode, + replacer, + onDirectiveFnsById, + root, +}: DirectiveFunctionsViteOptions & { + code: string + id: string + directiveRx: RegExp + root: string +}) { + const url = pathToFileURL(id) + url.searchParams.delete('v') + id = fileURLToPath(url).replace(/\\/g, '/') - if (debug) { - logDiff(code, compiledResult.code) - console.log('Output:\n', compiledResult.code + '\n\n') - } + if (!code.match(directiveRx)) { + return null + } - return compiledResult - }, + if (debug) console.info(`${envLabel}: Compiling Directives: `, id) + + const { compiledResult, directiveFnsById } = compileDirectives({ + directive, + directiveLabel, + getRuntimeCode, + replacer, + code, + root, + filename: id, + }) + + onDirectiveFnsById?.(directiveFnsById) + + if (debug) { + logDiff(code, compiledResult.code) + console.log('Output:\n', compiledResult.code + '\n\n') } + + return compiledResult } diff --git a/packages/directive-functions-plugin/tests/compiler.test.ts b/packages/directive-functions-plugin/tests/compiler.test.ts index a2c7fd3fc5..e405a7411e 100644 --- a/packages/directive-functions-plugin/tests/compiler.test.ts +++ b/packages/directive-functions-plugin/tests/compiler.test.ts @@ -713,8 +713,6 @@ describe('server function compilation', () => { .extractedFilename, }) - console.log(ssr.directiveFnsById) - expect(client.compiledResult.code).toMatchInlineSnapshot(` "'use server'; diff --git a/packages/react-router-with-query/src/index.tsx b/packages/react-router-with-query/src/index.tsx index e26bcf2975..7858816513 100644 --- a/packages/react-router-with-query/src/index.tsx +++ b/packages/react-router-with-query/src/index.tsx @@ -117,12 +117,8 @@ export function routerWithQueryClient( ...ogMutationCacheConfig, onError: (error, _variables, _context, _mutation) => { if (isRedirect(error)) { - return router.navigate( - router.resolveRedirect({ - ...error, - _fromLocation: router.state.location, - }), - ) + error.options._fromLocation = router.state.location + return router.navigate(router.resolveRedirect(error).options) } return ogMutationCacheConfig.onError?.( @@ -139,12 +135,8 @@ export function routerWithQueryClient( ...ogQueryCacheConfig, onError: (error, _query) => { if (isRedirect(error)) { - return router.navigate( - router.resolveRedirect({ - ...error, - _fromLocation: router.state.location, - }), - ) + error.options._fromLocation = router.state.location + return router.navigate(router.resolveRedirect(error).options) } return ogQueryCacheConfig.onError?.(error, _query) diff --git a/packages/react-router/src/HeadContent.tsx b/packages/react-router/src/HeadContent.tsx index 638dee8acc..b0856e5d49 100644 --- a/packages/react-router/src/HeadContent.tsx +++ b/packages/react-router/src/HeadContent.tsx @@ -58,8 +58,8 @@ export const useTags = () => { }, [routeMeta]) const links = useRouterState({ - select: (state) => - state.matches + select: (state) => { + const constructed = state.matches .map((match) => match.links!) .filter(Boolean) .flat(1) @@ -68,7 +68,30 @@ export const useTags = () => { attrs: { ...link, }, - })) as Array, + })) satisfies Array + + const manifest = router.ssr?.manifest + + // These are the assets extracted from the ViteManifest + // using the `startManifestPlugin` + const assets = state.matches + .map((match) => manifest?.routes[match.routeId]?.assets ?? []) + .filter(Boolean) + .flat(1) + .filter((asset) => asset.tag === 'link') + .map( + (asset) => + ({ + tag: 'link', + attrs: { + ...asset.attrs, + suppressHydrationWarning: true, + }, + }) satisfies RouterManagedTag, + ) + + return [...constructed, ...assets] + }, structuralSharing: true as any, }) diff --git a/packages/react-router/src/RouterProvider.tsx b/packages/react-router/src/RouterProvider.tsx index 92e882fef5..9c845df096 100644 --- a/packages/react-router/src/RouterProvider.tsx +++ b/packages/react-router/src/RouterProvider.tsx @@ -17,15 +17,17 @@ export function RouterContextProvider< }: RouterProps & { children: React.ReactNode }) { - // Allow the router to update options on the router instance - router.update({ - ...router.options, - ...rest, - context: { - ...router.options.context, - ...rest.context, - }, - } as any) + if (Object.keys(rest).length > 0) { + // Allow the router to update options on the router instance + router.update({ + ...router.options, + ...rest, + context: { + ...router.options.context, + ...rest.context, + }, + } as any) + } const routerContext = getRouterContext() diff --git a/packages/react-router/src/Scripts.tsx b/packages/react-router/src/Scripts.tsx index 2c28537164..bc2b84c6d0 100644 --- a/packages/react-router/src/Scripts.tsx +++ b/packages/react-router/src/Scripts.tsx @@ -50,6 +50,7 @@ export const Scripts = () => { children, })), }), + structuralSharing: true as any, }) const allScripts = [...scripts, ...assetScripts] as Array diff --git a/packages/react-router/src/fileRoute.ts b/packages/react-router/src/fileRoute.ts index d645cc840d..0b77e986e7 100644 --- a/packages/react-router/src/fileRoute.ts +++ b/packages/react-router/src/fileRoute.ts @@ -28,6 +28,7 @@ import type { RouteIds, RouteLoaderFn, UpdatableRouteOptions, + UseNavigateResult, } from '@tanstack/router-core' import type { UseLoaderDepsRoute } from './useLoaderDeps' import type { UseLoaderDataRoute } from './useLoaderData' @@ -41,8 +42,13 @@ export function createFileRoute< TFullPath extends RouteConstraints['TFullPath'] = FileRoutesByPath[TFilePath]['fullPath'], >( - path: TFilePath, + path?: TFilePath, ): FileRoute['createRoute'] { + if (typeof path === 'object') { + return new FileRoute(path, { + silent: true, + }).createRoute(path) as any + } return new FileRoute(path, { silent: true, }).createRoute @@ -63,7 +69,7 @@ export class FileRoute< silent?: boolean constructor( - public path: TFilePath, + public path?: TFilePath, _opts?: { silent: boolean }, ) { this.silent = _opts?.silent @@ -159,6 +165,18 @@ export function FileRouteLoader< return (loaderFn) => loaderFn as any } +declare module '@tanstack/router-core' { + export interface LazyRoute { + useMatch: UseMatchRoute + useRouteContext: UseRouteContextRoute + useSearch: UseSearchRoute + useParams: UseParamsRoute + useLoaderDeps: UseLoaderDepsRoute + useLoaderData: UseLoaderDataRoute + useNavigate: () => UseNavigateResult + } +} + export class LazyRoute { options: { id: string @@ -214,7 +232,7 @@ export class LazyRoute { return useLoaderData({ ...opts, from: this.options.id } as any) } - useNavigate = () => { + useNavigate = (): UseNavigateResult => { const router = useRouter() return useNavigate({ from: router.routesById[this.options.id].fullPath }) } @@ -236,6 +254,10 @@ export function createLazyRoute< export function createLazyFileRoute< TFilePath extends keyof FileRoutesByPath, TRoute extends FileRoutesByPath[TFilePath]['preLoaderRoute'], ->(id: TFilePath) { +>(id: TFilePath): (opts: LazyRouteOptions) => LazyRoute { + if (typeof id === 'object') { + return new LazyRoute(id) as any + } + return (opts: LazyRouteOptions) => new LazyRoute({ id, ...opts }) } diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index b848fc7210..fd310f2058 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -126,6 +126,7 @@ export type { RouteById, RootRouteOptions, SerializerExtensions, + CreateFileRoute, } from '@tanstack/router-core' export type * from './serializer' @@ -237,6 +238,7 @@ export type { RouteConstraints, RouteMask, MatchRouteOptions, + CreateLazyFileRoute, } from '@tanstack/router-core' export type { UseLinkPropsOptions, diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts index 16b25cdcc9..3680337ba6 100644 --- a/packages/react-router/src/router.ts +++ b/packages/react-router/src/router.ts @@ -1,4 +1,5 @@ import { RouterCore } from '@tanstack/router-core' +import { createFileRoute, createLazyFileRoute } from './fileRoute' import type { RouterHistory } from '@tanstack/history' import type { AnyRoute, @@ -105,3 +106,11 @@ export class Router< super(options) } } + +if (typeof globalThis !== 'undefined') { + ;(globalThis as any).createFileRoute = createFileRoute + ;(globalThis as any).createLazyFileRoute = createLazyFileRoute +} else if (typeof window !== 'undefined') { + ;(window as any).createFileRoute = createFileRoute + ;(window as any).createFileRoute = createLazyFileRoute +} diff --git a/packages/react-router/src/useBlocker.tsx b/packages/react-router/src/useBlocker.tsx index 1757dee80d..84a8eba9db 100644 --- a/packages/react-router/src/useBlocker.tsx +++ b/packages/react-router/src/useBlocker.tsx @@ -177,7 +177,10 @@ export function useBlocker( location: HistoryLocation, ): AnyShouldBlockFnLocation { const parsedLocation = router.parseLocation(undefined, location) - const matchedRoutes = router.getMatchedRoutes(parsedLocation) + const matchedRoutes = router.getMatchedRoutes( + parsedLocation.pathname, + undefined, + ) if (matchedRoutes.foundRoute === undefined) { throw new Error(`No route found for location ${location.href}`) } diff --git a/packages/react-router/tests/ClientOnly.test.tsx b/packages/react-router/tests/ClientOnly.test.tsx index b238d4e349..4bfe863d0b 100644 --- a/packages/react-router/tests/ClientOnly.test.tsx +++ b/packages/react-router/tests/ClientOnly.test.tsx @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import React from 'react' import ReactDOMServer from 'react-dom/server' -import { cleanup, render, screen } from '@testing-library/react' +import { act, cleanup, render, screen } from '@testing-library/react' import { RouterProvider, createMemoryHistory, @@ -10,16 +10,14 @@ import { createRouter, } from '../src' import { ClientOnly } from '../src/ClientOnly' -import type { RouterHistory } from '../src' afterEach(() => { vi.resetAllMocks() cleanup() }) -function createTestRouter(initialHistory?: RouterHistory) { - const history = - initialHistory ?? createMemoryHistory({ initialEntries: ['/'] }) +function createTestRouter(opts: { isServer: boolean }) { + const history = createMemoryHistory({ initialEntries: ['/'] }) const rootRoute = createRootRoute({}) @@ -35,9 +33,18 @@ function createTestRouter(initialHistory?: RouterHistory) {
), }) + const otherRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/other', + component: () => ( +
+

Other Route

+
+ ), + }) - const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree, history }) + const routeTree = rootRoute.addChildren([indexRoute, otherRoute]) + const router = createRouter({ routeTree, history, ...opts }) return { router, @@ -47,7 +54,7 @@ function createTestRouter(initialHistory?: RouterHistory) { describe('ClientOnly', () => { it('should render fallback during SSR', async () => { - const { router } = createTestRouter() + const { router } = createTestRouter({ isServer: true }) await router.load() // Initial render (SSR) @@ -59,7 +66,7 @@ describe('ClientOnly', () => { }) it('should render client content after hydration', async () => { - const { router } = createTestRouter() + const { router } = createTestRouter({ isServer: false }) await router.load() // Mock useSyncExternalStore to simulate hydration @@ -67,12 +74,12 @@ describe('ClientOnly', () => { render() - expect(screen.getByText('Client Only Content')).toBeInTheDocument() + expect(await screen.findByTestId('client-only-content')).toBeInTheDocument() expect(screen.queryByText('Loading...')).not.toBeInTheDocument() }) it('should handle navigation with client-only content', async () => { - const { router } = createTestRouter() + const { router } = createTestRouter({ isServer: false }) await router.load() // Simulate hydration @@ -81,11 +88,15 @@ describe('ClientOnly', () => { // Re-render after hydration render() + expect(await screen.findByTestId('client-only-content')).toBeInTheDocument() + // Navigate to a different route and back - await router.navigate({ to: '/other' }) - await router.navigate({ to: '/' }) + await act(() => router.navigate({ to: '/other' })) + expect(await screen.findByTestId('other-route')).toBeInTheDocument() + + await act(() => router.navigate({ to: '/' })) // Content should still be visible after navigation - expect(screen.getByText('Client Only Content')).toBeInTheDocument() + expect(await screen.findByTestId('client-only-content')).toBeInTheDocument() }) }) diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx index 13a9f0571c..b4ab8623a7 100644 --- a/packages/react-router/tests/Scripts.test.tsx +++ b/packages/react-router/tests/Scripts.test.tsx @@ -1,9 +1,10 @@ import { describe, expect, test } from 'vitest' -import { render } from '@testing-library/react' +import { act, render, screen } from '@testing-library/react' import ReactDOMServer from 'react-dom/server' import { HeadContent, + Outlet, RouterProvider, createMemoryHistory, createRootRoute, @@ -15,7 +16,6 @@ import { Scripts } from '../src/Scripts' describe('ssr scripts', () => { test('it works', async () => { const rootRoute = createRootRoute({ - // loader: () => new Promise((r) => setTimeout(r, 1)), head: () => { return { scripts: [ @@ -29,14 +29,19 @@ describe('ssr scripts', () => { } }, component: () => { - return + return ( +
+
root
+ + +
+ ) }, }) const indexRoute = createRoute({ path: '/', getParentRoute: () => rootRoute, - // loader: () => new Promise((r) => setTimeout(r, 2)), head: () => { return { scripts: [ @@ -53,10 +58,9 @@ describe('ssr scripts', () => { initialEntries: ['/'], }), routeTree: rootRoute.addChildren([indexRoute]), + isServer: true, }) - router.isServer = true - await router.load() expect(router.state.matches.map((d) => d.headScripts).flat(1)).toEqual([ @@ -73,7 +77,13 @@ describe('ssr scripts', () => { undefined, // 'script2.js' opted out by certain conditions, such as `NODE_ENV=production`. ], component: () => { - return + return ( +
+
root
+ + +
+ ) }, }) @@ -81,6 +91,9 @@ describe('ssr scripts', () => { path: '/', getParentRoute: () => rootRoute, scripts: () => [{ src: 'script3.js' }], + component: () => { + return
index
+ }, }) const router = createRouter({ @@ -88,10 +101,9 @@ describe('ssr scripts', () => { initialEntries: ['/'], }), routeTree: rootRoute.addChildren([indexRoute]), + isServer: true, }) - router.isServer = true - await router.load() expect(router.state.matches.map((d) => d.scripts).flat(1)).toEqual([ @@ -100,10 +112,14 @@ describe('ssr scripts', () => { { src: 'script3.js' }, ]) - const { container } = render() + const { container } = await act(() => + render(), + ) + expect(await screen.findByTestId('root')).toBeInTheDocument() + expect(await screen.findByTestId('index')).toBeInTheDocument() expect(container.innerHTML).toEqual( - ``, + `
root
index
`, ) }) }) @@ -180,10 +196,9 @@ describe('ssr HeadContent', () => { initialEntries: ['/'], }), routeTree: rootRoute.addChildren([indexRoute]), + isServer: true, }) - router.isServer = true - await router.load() expect(router.state.matches.map((d) => d.meta).flat(1)).toEqual([ @@ -202,7 +217,7 @@ describe('ssr HeadContent', () => { , ) expect(html).toEqual( - `Index`, + `Index`, ) }) }) diff --git a/packages/react-router/tests/blocker.test.tsx b/packages/react-router/tests/blocker.test.tsx index 545a99699a..60d1e8a821 100644 --- a/packages/react-router/tests/blocker.test.tsx +++ b/packages/react-router/tests/blocker.test.tsx @@ -1,11 +1,12 @@ import React from 'react' import '@testing-library/jest-dom/vitest' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import combinate from 'combinate' import { Link, RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, @@ -13,9 +14,17 @@ import { useBlocker, useNavigate, } from '../src' -import type { ShouldBlockFn } from '../src' +import type { RouterHistory, ShouldBlockFn } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() window.history.replaceState(null, 'root', '/') vi.resetAllMocks() cleanup() @@ -91,6 +100,7 @@ async function setup({ blockerFn, disabled, ignoreBlocker }: BlockerTestOpts) { fooRoute, barRoute, ]), + history, }) render() diff --git a/packages/react-router/tests/errorComponent.test.tsx b/packages/react-router/tests/errorComponent.test.tsx index fd6a5fa8ca..2c0062a9ac 100644 --- a/packages/react-router/tests/errorComponent.test.tsx +++ b/packages/react-router/tests/errorComponent.test.tsx @@ -1,14 +1,15 @@ -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { Link, RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, } from '../src' -import type { ErrorComponentProps } from '../src' +import type { ErrorComponentProps, RouterHistory } from '../src' function MyErrorComponent(props: ErrorComponentProps) { return
Error: {props.error.message}
@@ -23,7 +24,15 @@ function throwFn() { throw new Error('error thrown') } +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) + afterEach(() => { + history.destroy() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') cleanup() @@ -71,6 +80,7 @@ describe.each([{ preload: false }, { preload: 'intent' }] as const)( const router = createRouter({ routeTree, defaultPreload: options.preload, + history, }) render() @@ -89,7 +99,9 @@ describe.each([{ preload: false }, { preload: 'intent' }] as const)( undefined, { timeout: 1500 }, ) - expect(screen.findByText('About route content')).rejects.toThrow() + await expect( + screen.findByText('About route content'), + ).rejects.toThrow() expect(errorComponent).toBeInTheDocument() }, ) @@ -114,6 +126,7 @@ describe.each([{ preload: false }, { preload: 'intent' }] as const)( const router = createRouter({ routeTree, defaultPreload: options.preload, + history, }) render() @@ -123,7 +136,9 @@ describe.each([{ preload: false }, { preload: 'intent' }] as const)( undefined, { timeout: 750 }, ) - expect(screen.findByText('Index route content')).rejects.toThrow() + await expect( + screen.findByText('Index route content'), + ).rejects.toThrow() expect(errorComponent).toBeInTheDocument() }, ) diff --git a/packages/react-router/tests/index.test.tsx b/packages/react-router/tests/index.test.tsx deleted file mode 100644 index 657db70915..0000000000 --- a/packages/react-router/tests/index.test.tsx +++ /dev/null @@ -1,564 +0,0 @@ -import { expect, test } from 'vitest' - -// keeping this dummy test in since in the future -// we may want to grab the commented out tests from here - -test('index true=true', () => { - expect(true).toBe(true) -}) -// import { render } from '@testing-library/react' - -// import React from 'react' - -// import { -// Outlet, -// RouterProvider, -// cleanPath, -// createMemoryHistory, -// createRootRoute, -// createRoute, -// createRouter, -// // Location, -// matchPathname, -// // ParsedLocation, -// parsePathname, -// redirect, -// // Route, -// // createMemoryHistory, -// resolvePath, -// // Segment, -// trimPath, -// trimPathLeft, -// } from '../src' - -// import { createTimer, sleep } from './utils' - -// function RouterInstance(opts?: { initialEntries?: string[] }) { -// return new RouterInstance({ -// routes: [], -// history: createMemoryHistory({ -// initialEntries: opts?.initialEntries ?? ['/'], -// }), -// }) -// } - -// function createLocation(location: Partial): ParsedLocation { -// return { -// pathname: '', -// href: '', -// search: {}, -// searchStr: '', -// state: {}, -// hash: '', -// ...location, -// } -// } - -// describe('Router', () => { -// test('mounts to /', async () => { -// const router = RouterInstance() - -// const routes = [ -// { -// path: '/', -// }, -// ] - -// router.update({ -// routes, -// }) - -// const promise = router.mount() -// expect(router.store.pendingMatches[0].id).toBe('/') - -// await promise -// expect(router.state.matches[0].id).toBe('/') -// }) - -// test('mounts to /a', async () => { -// const router = RouterInstance({ initialEntries: ['/a'] }) -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: '/a', -// }, -// ] - -// router.update({ -// routes, -// }) - -// let promise = router.mount() - -// expect(router.store.pendingMatches[0].id).toBe('/a') -// await promise -// expect(router.state.matches[0].id).toBe('/a') -// }) - -// test('mounts to /a/b', async () => { -// const router = RouterInstance({ -// initialEntries: ['/a/b'], -// }) - -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: '/a', -// children: [ -// { -// path: '/b', -// }, -// ], -// }, -// ] - -// router.update({ -// routes, -// }) - -// let promise = router.mount() - -// expect(router.store.pendingMatches[1].id).toBe('/a/b') -// await promise -// expect(router.state.matches[1].id).toBe('/a/b') -// }) - -// test('navigates to /a', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// }, -// ] - -// router.update({ -// routes, -// }) - -// let promise = router.mount() - -// expect(router.store.pendingMatches[0].id).toBe('/') - -// await promise -// expect(router.state.matches[0].id).toBe('/') - -// promise = router.navigate({ to: 'a' }) -// expect(router.state.matches[0].id).toBe('/') -// expect(router.store.pendingMatches[0].id).toBe('a') - -// await promise -// expect(router.state.matches[0].id).toBe('a') -// expect(router.store.pending).toBe(undefined) -// }) - -// test('navigates to /a to /a/b', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// children: [ -// { -// path: 'b', -// }, -// ], -// }, -// ] - -// router.update({ -// routes, -// }) - -// await router.mount() -// expect(router.state.location.href).toBe('/') - -// let promise = router.navigate({ to: 'a' }) -// expect(router.store.pendingLocation.href).toBe('/a') -// await promise -// expect(router.state.location.href).toBe('/a') - -// promise = router.navigate({ to: './b' }) -// expect(router.store.pendingLocation.href).toBe('/a/b') -// await promise -// expect(router.state.location.href).toBe('/a/b') - -// expect(router.store.pending).toBe(undefined) -// }) - -// test('async navigates to /a/b', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// loader: () => sleep(10).then((d) => ({ a: true })), -// children: [ -// { -// path: 'b', -// loader: () => sleep(10).then((d) => ({ b: true })), -// }, -// ], -// }, -// ] - -// const timer = createTimer() - -// router.update({ -// routes, -// }) - -// router.mount() - -// timer.start() -// await router.navigate({ to: 'a/b' }) -// expect(router.store.loaderData).toEqual({ -// a: true, -// b: true, -// }) -// expect(timer.getTime()).toBeLessThan(30) -// }) - -// test('async navigates with import + loader', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// import: async () => { -// await sleep(10) -// return { -// loader: () => sleep(10).then((d) => ({ a: true })), -// } -// }, -// children: [ -// { -// path: 'b', -// import: async () => { -// await sleep(10) -// return { -// loader: () => -// sleep(10).then((d) => ({ -// b: true, -// })), -// } -// }, -// }, -// ], -// }, -// ] - -// const timer = createTimer() - -// router.update({ -// routes, -// }) - -// router.mount() - -// timer.start() -// await router.navigate({ to: 'a/b' }) -// expect(router.store.loaderData).toEqual({ -// a: true, -// b: true, -// }) -// expect(timer.getTime()).toBeLessThan(28) -// }) - -// test('async navigates with import + elements + loader', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// import: async () => { -// await sleep(10) -// return { -// element: async () => { -// await sleep(20) -// return 'element' -// }, -// loader: () => sleep(30).then((d) => ({ a: true })), -// } -// }, -// children: [ -// { -// path: 'b', -// import: async () => { -// await sleep(10) -// return { -// element: async () => { -// await sleep(20) -// return 'element' -// }, -// loader: () => -// sleep(30).then((d) => ({ -// b: true, -// })), -// } -// }, -// }, -// ], -// }, -// ] - -// const timer = createTimer() - -// router.update({ -// routes, -// }) - -// router.mount() - -// await router.navigate({ to: 'a/b' }) -// expect(router.store.loaderData).toEqual({ -// a: true, -// b: true, -// }) -// expect(timer.getTime()).toBeLessThan(55) -// }) - -// test('async navigates with pending state', async () => { -// const router = RouterInstance() -// const routes: Route[] = [ -// { -// path: '/', -// }, -// { -// path: 'a', -// pendingMs: 10, -// loader: () => sleep(20), -// children: [ -// { -// path: 'b', -// pendingMs: 30, -// loader: () => sleep(40), -// }, -// ], -// }, -// ] - -// router.update({ -// routes, -// }) - -// await router.mount() - -// const timer = createTimer() -// await router.navigate({ to: 'a/b' }) -// expect(timer.getTime()).toBeLessThan(46) -// }) -// }) - -// describe('matchRoute', () => { -// describe('fuzzy', () => { -// ;( -// [ -// [ -// '/', -// { -// to: '/', -// fuzzy: true, -// }, -// {}, -// ], -// [ -// '/a', -// { -// to: '/', -// fuzzy: true, -// }, -// {}, -// ], -// [ -// '/a', -// { -// to: '/$', -// fuzzy: true, -// }, -// { '*': 'a' }, -// ], -// [ -// '/a/b', -// { -// to: '/$', -// fuzzy: true, -// }, -// { '*': 'a/b' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/$', -// fuzzy: true, -// }, -// { '*': 'a/b/c' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/', -// fuzzy: true, -// }, -// {}, -// ], -// [ -// '/a/b', -// { -// to: '/a/b/', -// fuzzy: true, -// }, -// {}, -// ], -// ] as const -// ).forEach(([a, b, eq]) => { -// test(`${a} == ${b.to}`, () => { -// expect(matchPathname('', a, b)).toEqual(eq) -// }) -// }) -// }) - -// describe('exact', () => { -// ;( -// [ -// [ -// '/a/b/c', -// { -// to: '/', -// }, -// undefined, -// ], -// [ -// '/a/b/c', -// { -// to: '/a/b', -// }, -// undefined, -// ], -// [ -// '/a/b/c', -// { -// to: '/a/b/c', -// }, -// {}, -// ], -// ] as const -// ).forEach(([a, b, eq]) => { -// test(`${a} == ${b.to}`, () => { -// expect(matchPathname('', a, b)).toEqual(eq) -// }) -// }) -// }) - -// describe('basepath', () => { -// ;( -// [ -// [ -// '/base', -// '/base', -// { -// to: '/', -// }, -// {}, -// ], -// [ -// '/base', -// '/base/a', -// { -// to: '/a', -// }, -// {}, -// ], -// [ -// '/base', -// '/base/a/b/c', -// { -// to: '/a/b/c', -// }, -// {}, -// ], -// [ -// '/base', -// '/base/posts', -// { -// fuzzy: true, -// to: '/', -// }, -// {}, -// ], -// [ -// '/base', -// '/base/a', -// { -// to: '/b', -// }, -// undefined, -// ], -// ] as const -// ).forEach(([a, b, c, eq]) => { -// test(`${b} == ${a} + ${c.to}`, () => { -// expect(matchPathname(a, b, c)).toEqual(eq) -// }) -// }) -// }) - -// describe('params', () => { -// ;( -// [ -// [ -// '/a/b', -// { -// to: '/a/$b', -// }, -// { b: 'b' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/a/$b/$c', -// }, -// { b: 'b', c: 'c' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/$a/$b/$c', -// }, -// { a: 'a', b: 'b', c: 'c' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/$a/$', -// }, -// { a: 'a', '*': 'b/c' }, -// ], -// [ -// '/a/b/c', -// { -// to: '/a/$b/c', -// }, -// { b: 'b' }, -// ], -// ] as const -// ).forEach(([a, b, eq]) => { -// test(`${a} == ${b.to}`, () => { -// expect(matchPathname('', a, b)).toEqual(eq) -// }) -// }) -// }) -// }) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 65ebcbe66c..200c857ab5 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -16,6 +16,7 @@ import { Link, Outlet, RouterProvider, + createBrowserHistory, createLink, createMemoryHistory, createRootRoute, @@ -38,9 +39,11 @@ import { getSearchParamsFromURI, sleep, } from './utils' +import type { RouterHistory } from '../src' const ioObserveMock = vi.fn() const ioDisconnectMock = vi.fn() +let history: RouterHistory beforeEach(() => { const io = getIntersectionObserverMock({ @@ -48,10 +51,13 @@ beforeEach(() => { disconnect: ioDisconnectMock, }) vi.stubGlobal('IntersectionObserver', io) - window.history.replaceState(null, 'root', '/') + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') }) afterEach(() => { + history.destroy() + window.history.replaceState(null, 'root', '/') vi.resetAllMocks() cleanup() }) @@ -99,6 +105,7 @@ describe('Link', () => { const memoedRouter = React.useMemo(() => { const router = createRouter({ routeTree: memoedRouteTree, + history, }) return router @@ -148,6 +155,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -196,6 +204,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -269,6 +278,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), + history, }) render() @@ -345,7 +355,7 @@ describe('Link', () => { expect(indexFooBarLink).not.toHaveAttribute('data-status', 'active') // navigate to /?foo=bar - fireEvent.click(indexFooBarLink) + await act(() => fireEvent.click(indexFooBarLink)) expect(indexExactLink).toHaveClass('inactive') expect(indexExactLink).not.toHaveClass('active') @@ -441,6 +451,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -484,13 +495,14 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsHeading = await screen.findByRole('heading', { name: 'Posts' }) expect(postsHeading).toBeInTheDocument() @@ -544,6 +556,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, basepath: '/app', }) @@ -551,7 +564,7 @@ describe('Link', () => { const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsHeading = await screen.findByRole('heading', { name: 'Posts' }) expect(postsHeading).toBeInTheDocument() @@ -609,6 +622,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -617,7 +631,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts?page=0') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsHeading = await screen.findByRole('heading', { name: 'Posts' }) expect(postsHeading).toBeInTheDocument() @@ -680,6 +694,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -688,7 +703,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts?page=invalid') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) await waitFor(() => expect(onError).toHaveBeenCalledOnce()) @@ -747,6 +762,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -755,7 +771,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts?page=2') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const pageFour = await screen.findByText('Page: 4') expect(pageFour).toBeInTheDocument() @@ -814,6 +830,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -822,7 +839,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts?page=2') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const errorText = await screen.findByText('Something went wrong!') expect(errorText).toBeInTheDocument() @@ -880,13 +897,14 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsErrorText = await screen.findByText('PostsError') expect(postsErrorText).toBeInTheDocument() @@ -895,9 +913,9 @@ describe('Link', () => { expect(postsOnError).toHaveBeenCalledWith(error) const indexLink = await screen.findByRole('link', { name: 'Index' }) - fireEvent.click(indexLink) + await act(() => fireEvent.click(indexLink)) - expect(screen.findByText('IndexError')).rejects.toThrow() + await expect(screen.findByText('IndexError')).rejects.toThrow() expect(indexOnError).not.toHaveBeenCalledOnce() }) @@ -941,13 +959,14 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute, authRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const authText = await screen.findByText('Auth!') expect(authText).toBeInTheDocument() @@ -995,13 +1014,14 @@ describe('Link', () => { const router = createRouter({ context: { userId: 'userId' }, routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const userId = await screen.findByText('UserId: userId') expect(userId).toBeInTheDocument() @@ -1041,13 +1061,14 @@ describe('Link', () => { const router = createRouter({ context: { userId: 'userId' }, routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const errorText = await screen.findByText('Oops! Something went wrong!') expect(errorText).toBeInTheDocument() @@ -1089,13 +1110,14 @@ describe('Link', () => { const router = createRouter({ context: { userId: 'userId' }, routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const errorText = await screen.findByText('Oops! Something went wrong!') expect(errorText).toBeInTheDocument() @@ -1151,13 +1173,14 @@ describe('Link', () => { indexRoute, postsRoute.addChildren([postRoute]), ]), + history, }) render() const postLink = await screen.findByRole('link', { name: 'Post' }) - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const errorText = await screen.findByText('Oops! Something went wrong!') expect(errorText).toBeInTheDocument() @@ -1183,6 +1206,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), + history, }) render() @@ -1243,6 +1267,7 @@ describe('Link', () => { indexRoute, postsRoute.addChildren([postRoute]), ]), + history, }) render() @@ -1253,7 +1278,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const paramText = await screen.findByText('Params: id1') expect(paramText).toBeInTheDocument() @@ -1330,6 +1355,7 @@ describe('Link', () => { indexRoute, postsRoute.addChildren([postsIndexRoute, postRoute]), ]), + history, }) render() @@ -1338,7 +1364,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsText = await screen.findByText('Posts Index') expect(postsText).toBeInTheDocument() @@ -1349,7 +1375,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const paramText = await screen.findByText('Params: id1') expect(paramText).toBeInTheDocument() @@ -1428,6 +1454,7 @@ describe('Link', () => { indexRoute, postsRoute.addChildren([postsIndexRoute, postRoute]), ]), + history, }) render() @@ -1436,7 +1463,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const postsIndexText = await screen.findByText('Posts Index') expect(postsIndexText).toBeInTheDocument() @@ -1447,7 +1474,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const paramText = await screen.findByText('Params: id1') expect(paramText).toBeInTheDocument() @@ -1556,6 +1583,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -1564,7 +1592,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -1577,7 +1605,7 @@ describe('Link', () => { expect(informationLink).toHaveAttribute('href', '/posts/id1/info') - fireEvent.click(informationLink) + await act(() => fireEvent.click(informationLink)) const informationText = await screen.findByText('Information') expect(informationText).toBeInTheDocument() @@ -1693,6 +1721,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -1701,7 +1730,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -1714,7 +1743,7 @@ describe('Link', () => { expect(informationLink).toHaveAttribute('href', '/posts/id1/info') - fireEvent.click(informationLink) + await act(() => fireEvent.click(informationLink)) const informationText = await screen.findByText('Information') expect(informationText).toBeInTheDocument() @@ -1830,6 +1859,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -1838,7 +1868,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -1851,7 +1881,7 @@ describe('Link', () => { expect(informationLink).toHaveAttribute('href', '/posts/id1/info') - fireEvent.click(informationLink) + await act(() => fireEvent.click(informationLink)) const informationText = await screen.findByText('Information') expect(informationText).toBeInTheDocument() @@ -1955,6 +1985,7 @@ describe('Link', () => { postsRoute.addChildren([postRoute.addChildren([detailsRoute])]), ]), ]), + history, }) render() @@ -1963,7 +1994,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -1976,7 +2007,7 @@ describe('Link', () => { expect(rootLink).toHaveAttribute('href', '/') - fireEvent.click(rootLink) + await act(() => fireEvent.click(rootLink)) const indexText = await screen.findByText('Index') expect(indexText).toBeInTheDocument() @@ -2099,6 +2130,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -2107,7 +2139,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details?page=2') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -2123,7 +2155,7 @@ describe('Link', () => { '/posts/id1/info?page=2&more=true', ) - fireEvent.click(informationLink) + await act(() => fireEvent.click(informationLink)) const informationText = await screen.findByText('Information') expect(informationText).toBeInTheDocument() @@ -2239,6 +2271,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -2247,7 +2280,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -2260,7 +2293,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const postsText = await screen.findByText('Posts') expect(postsText).toBeInTheDocument() @@ -2383,6 +2416,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -2391,7 +2425,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const paramsText1 = await screen.findByText('Params: id1') expect(paramsText1).toBeInTheDocument() @@ -2404,7 +2438,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const postsText = await screen.findByText('Posts') expect(postsText).toBeInTheDocument() @@ -2540,6 +2574,7 @@ describe('Link', () => { ]), ]), ]), + history, }) render() @@ -2548,7 +2583,7 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const invoicesErrorText = await screen.findByText( 'Invariant failed: Could not find match for from: /invoices', @@ -2633,6 +2668,7 @@ describe('Link', () => { const router = createRouter({ routeTree, routeMasks: [routeMask], + history, }) render() @@ -2720,6 +2756,7 @@ describe('Link', () => { const router = createRouter({ routeTree, + history, }) render() @@ -2838,6 +2875,7 @@ describe('Link', () => { const router = createRouter({ routeTree, defaultPreload: 'intent', + history, }) render() @@ -2848,13 +2886,13 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.mouseOver(postLink) + await act(() => fireEvent.mouseOver(postLink)) await waitFor(() => expect(loaderFn).toHaveBeenCalled()) await waitFor(() => expect(search).toHaveBeenCalledWith({ postPage: 0 })) - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const loginText = await screen.findByText('Login!') expect(loginText).toBeInTheDocument() @@ -2926,7 +2964,7 @@ describe('Link', () => { }) const LoginComponent = () => { - return <>Login! + return
Login!
} const loginRoute = createRoute({ @@ -2944,6 +2982,7 @@ describe('Link', () => { const router = createRouter({ routeTree, + history, }) render() @@ -2954,10 +2993,9 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) - const loginText = await screen.findByText('Login!') - expect(loginText).toBeInTheDocument() + expect(await screen.findByTestId('login')).toBeInTheDocument() expect(ErrorComponent).not.toHaveBeenCalled() }) @@ -3044,6 +3082,7 @@ describe('Link', () => { const router = createRouter({ routeTree, + history, }) render() @@ -3054,7 +3093,7 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const loginText = await screen.findByText('Login!') expect(loginText).toBeInTheDocument() @@ -3139,6 +3178,7 @@ describe('Link', () => { const router = createRouter({ routeTree, defaultPreload: 'intent', + history, }) render() @@ -3149,11 +3189,11 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.mouseOver(postLink) + await act(() => fireEvent.mouseOver(postLink)) await waitFor(() => expect(search).toHaveBeenCalledWith({ postPage: 0 })) - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const loginText = await screen.findByText('Login!') expect(loginText).toBeInTheDocument() @@ -3240,6 +3280,7 @@ describe('Link', () => { const router = createRouter({ routeTree, defaultPreload: 'intent', + history, }) render() @@ -3250,11 +3291,11 @@ describe('Link', () => { expect(postLink).toHaveAttribute('href', '/posts/id1') - fireEvent.mouseOver(postLink) + await act(() => fireEvent.mouseOver(postLink)) await waitFor(() => expect(search).toHaveBeenCalledWith({ postPage: 0 })) - fireEvent.click(postLink) + await act(() => fireEvent.click(postLink)) const loginText = await screen.findByText('Login!') expect(loginText).toBeInTheDocument() @@ -3332,13 +3373,14 @@ describe('Link', () => { const router = createRouter({ routeTree, + history, }) render() const postsLink = await screen.findByRole('link', { name: 'Go to posts' }) - fireEvent.click(postsLink) + await act(() => fireEvent.click(postsLink)) const fromPostsLink = await screen.findByRole('link', { name: 'From posts', @@ -3350,7 +3392,7 @@ describe('Link', () => { name: 'To invoices', }) - fireEvent.click(toInvoicesLink) + await act(() => fireEvent.click(toInvoicesLink)) const fromInvoicesLink = await screen.findByRole('link', { name: 'From invoices', @@ -3364,7 +3406,7 @@ describe('Link', () => { name: 'To posts', }) - fireEvent.click(toPostsLink) + await act(() => fireEvent.click(toPostsLink)) const onPostsText = await screen.findByText('On Posts') expect(onPostsText).toBeInTheDocument() @@ -3402,7 +3444,7 @@ describe('Link', () => { }) const routeTree = rootRoute.addChildren([indexRoute, postRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -3464,7 +3506,7 @@ describe('Link', () => { }) const routeTree = rootRoute.addChildren([indexRoute, postRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -3528,7 +3570,7 @@ describe('Link', () => { }) const routeTree = rootRoute.addChildren([indexRoute, postRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -3597,7 +3639,7 @@ describe('Link', () => { }) const routeTree = rootRoute.addChildren([indexRoute, postRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -3633,6 +3675,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), defaultPreload: preload, + history, }) render() @@ -3665,6 +3708,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), defaultPreload: preload, + history, }) render() @@ -3692,6 +3736,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), defaultPreload: 'viewport', + history, }) render() @@ -3736,6 +3781,7 @@ describe('Link', () => { const router = createRouter({ routeTree: rootRoute.addChildren([aboutRoute, indexRoute]), defaultPreload: 'render', + history, }) render() @@ -3776,6 +3822,7 @@ describe('Link', () => { defaultPreload: 'intent', defaultPendingMs: 200, defaultPendingComponent: () =>

Loading...

, + history, }) render() @@ -3889,6 +3936,7 @@ describe('Link', () => { const router = createRouter({ routeTree, defaultPreload: 'intent', + history, }) render() @@ -3940,6 +3988,7 @@ describe('createLink', () => { }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), + history, }) render() @@ -3969,6 +4018,7 @@ describe('createLink', () => { }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), + history, }) render() @@ -4048,6 +4098,7 @@ describe('createLink', () => { }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -4309,6 +4360,7 @@ describe('search middleware', () => { postsRoute.addChildren([postsNewRoute]), invoicesRoute, ]), + history, }) window.history.replaceState(null, 'root', '/?root=abc') @@ -4400,6 +4452,7 @@ describe('search middleware', () => { indexRoute, postsRoute.addChildren([postRoute]), ]), + history, }) render() diff --git a/packages/react-router/tests/loaders.test.tsx b/packages/react-router/tests/loaders.test.tsx index 85a9dc15f9..ab1e671fad 100644 --- a/packages/react-router/tests/loaders.test.tsx +++ b/packages/react-router/tests/loaders.test.tsx @@ -6,21 +6,31 @@ import { screen, } from '@testing-library/react' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { z } from 'zod' import { Link, Outlet, RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, } from '../src' import { sleep } from './utils' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') cleanup() @@ -45,7 +55,7 @@ describe('loaders are being called', () => { component: () =>
Index page
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -96,7 +106,7 @@ describe('loaders are being called', () => { nestedRoute.addChildren([fooRoute]), indexRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -152,7 +162,7 @@ describe('loaders parentMatchPromise', () => { nestedRoute.addChildren([fooRoute]), indexRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -190,7 +200,7 @@ test('reproducer for #2031', async () => { }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -220,6 +230,7 @@ test('reproducer for #2053', async () => { const router = createRouter({ routeTree, + history, }) render() @@ -244,6 +255,7 @@ test('reproducer for #2198 - throw error from beforeLoad upon initial load', asy const routeTree = rootRoute.addChildren([indexRoute]) const router = createRouter({ routeTree, + history, defaultErrorComponent: () => { return
defaultErrorComponent
}, @@ -271,6 +283,7 @@ test('throw error from loader upon initial load', async () => { const routeTree = rootRoute.addChildren([indexRoute]) const router = createRouter({ routeTree, + history, defaultErrorComponent: () => { return
defaultErrorComponent
}, @@ -309,6 +322,7 @@ test('throw error from beforeLoad when navigating to route', async () => { const routeTree = rootRoute.addChildren([indexRoute, fooRoute]) const router = createRouter({ routeTree, + history, defaultErrorComponent: () => { return
defaultErrorComponent
}, diff --git a/packages/react-router/tests/redirect.test.tsx b/packages/react-router/tests/redirect.test.tsx index 91f0196841..56d0d80049 100644 --- a/packages/react-router/tests/redirect.test.tsx +++ b/packages/react-router/tests/redirect.test.tsx @@ -6,11 +6,13 @@ import { screen, } from '@testing-library/react' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' +import invariant from 'tiny-invariant' import { Link, RouterProvider, + createBrowserHistory, createMemoryHistory, createRootRoute, createRoute, @@ -20,8 +22,17 @@ import { } from '../src' import { sleep } from './utils' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() vi.clearAllMocks() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') @@ -80,7 +91,7 @@ describe('redirect', () => { aboutRoute, indexRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -157,7 +168,7 @@ describe('redirect', () => { aboutRoute, indexRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -235,7 +246,7 @@ describe('redirect', () => { indexRoute, finalRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() @@ -280,11 +291,18 @@ describe('redirect', () => { routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), // Mock server mode isServer: true, + history: createMemoryHistory({ + initialEntries: ['/'], + }), }) await router.load() - expect(router.state.redirect).toEqual({ + expect(router.state.redirect).toBeDefined() + expect(router.state.redirect).toBeInstanceOf(Response) + invariant(router.state.redirect) + + expect(router.state.redirect.options).toEqual({ _fromLocation: expect.objectContaining({ hash: '', href: '/', @@ -293,12 +311,7 @@ describe('redirect', () => { searchStr: '', }), to: '/about', - headers: {}, - reloadDocument: false, href: '/about', - isRedirect: true, - routeId: '/', - routerCode: 'BEFORE_LOAD', statusCode: 307, }) }) @@ -329,27 +342,33 @@ describe('redirect', () => { initialEntries: ['/'], }), routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), + // Mock server mode + isServer: true, }) - // Mock server mode - router.isServer = true - await router.load() - expect(router.state.redirect).toEqual({ - _fromLocation: expect.objectContaining({ + const currentRedirect = router.state.redirect + + expect(currentRedirect).toBeDefined() + expect(currentRedirect).toBeInstanceOf(Response) + invariant(currentRedirect) + expect(currentRedirect.status).toEqual(307) + expect(currentRedirect.headers.get('Location')).toEqual('/about') + expect(currentRedirect.options).toEqual({ + _fromLocation: { hash: '', href: '/', pathname: '/', search: {}, searchStr: '', - }), - to: '/about', - headers: {}, + state: { + __TSR_index: 0, + key: currentRedirect.options._fromLocation!.state.key, + }, + }, href: '/about', - isRedirect: true, - reloadDocument: false, - routeId: '/', + to: '/about', statusCode: 307, }) }) diff --git a/packages/react-router/tests/route.test.tsx b/packages/react-router/tests/route.test.tsx index 9c6fbbfc0e..8b4d6dabab 100644 --- a/packages/react-router/tests/route.test.tsx +++ b/packages/react-router/tests/route.test.tsx @@ -1,16 +1,26 @@ import React from 'react' -import { afterEach, describe, expect, it, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest' import { cleanup, render, screen } from '@testing-library/react' import { RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, getRouteApi, } from '../src' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') cleanup() @@ -162,7 +172,7 @@ describe('onEnter event', () => { }, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree, context: { foo: 'bar' } }) + const router = createRouter({ routeTree, context: { foo: 'bar' }, history }) await router.load() @@ -183,7 +193,7 @@ describe('onEnter event', () => { }, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree, context: { foo: 'bar' } }) + const router = createRouter({ routeTree, context: { foo: 'bar' }, history }) render() @@ -215,7 +225,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -255,7 +265,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -287,7 +297,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -317,7 +327,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -344,7 +354,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -374,7 +384,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() diff --git a/packages/react-router/tests/routeContext.test.tsx b/packages/react-router/tests/routeContext.test.tsx index c62decee7f..7a38a272d9 100644 --- a/packages/react-router/tests/routeContext.test.tsx +++ b/packages/react-router/tests/routeContext.test.tsx @@ -122,7 +122,6 @@ describe('context function', () => { await clickButton('detail-1') await findByText('Detail page: 1') - console.log(mockContextFn.mock.calls) expect(mockContextFn).toHaveBeenCalledOnce() expect(mockContextFn).toHaveBeenCalledWith({ id: 1 }) mockContextFn.mockClear() @@ -1457,7 +1456,7 @@ describe('beforeLoad in the route definition', () => { } await check(1) - await router.invalidate() + await act(async () => await router.invalidate()) await check(2) }) }) diff --git a/packages/react-router/tests/router.test.tsx b/packages/react-router/tests/router.test.tsx index 1a295a3b0b..0b720dd58d 100644 --- a/packages/react-router/tests/router.test.tsx +++ b/packages/react-router/tests/router.test.tsx @@ -13,6 +13,7 @@ import { Outlet, RouterProvider, SearchParamError, + createBrowserHistory, createMemoryHistory, createRootRoute, createRoute, @@ -24,14 +25,23 @@ import type { AnyRoute, AnyRouter, MakeRemountDepsOptionsUnion, + RouterHistory, RouterOptions, ValidatorFn, ValidatorObj, } from '../src' +let history: RouterHistory +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) + afterEach(() => { - vi.resetAllMocks() + history.destroy() window.history.replaceState(null, 'root', '/') + vi.clearAllMocks() + vi.resetAllMocks() cleanup() }) @@ -48,7 +58,10 @@ export function validateSearchParams< expect(router.state.location.search).toEqual(expected) } -function createTestRouter(options?: RouterOptions) { +function createTestRouter( + options: RouterOptions & + Required, 'history'>>, +) { const rootRoute = createRootRoute({ validateSearch: z.object({ root: z.string().optional() }), component: () => { @@ -975,6 +988,7 @@ describe('router rendering stability', () => { const router = createRouter({ routeTree, defaultRemountDeps: opts?.remountDeps.default, + history: createMemoryHistory({ initialEntries: ['/'] }), }) await act(() => render()) @@ -1196,6 +1210,15 @@ describe('invalidate', () => { }) describe('search params in URL', () => { + let history: RouterHistory + beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') + }) + afterEach(() => { + history.destroy() + window.history.replaceState(null, 'root', '/') + }) const testCases = [ { route: '/', search: { root: 'world' } }, { route: '/', search: { root: 'world', unknown: 'asdf' } }, @@ -1212,7 +1235,7 @@ describe('search params in URL', () => { it.each(testCases)( 'at $route with search params $search', async ({ route, search }) => { - const { router } = createTestRouter({ search: { strict } }) + const { router } = createTestRouter({ search: { strict }, history }) window.history.replaceState( null, '', @@ -1238,7 +1261,7 @@ describe('search params in URL', () => { describe('removes unknown search params in the URL when search.strict=true', () => { it.each(testCases)('%j', async ({ route, search }) => { - const { router } = createTestRouter({ search: { strict: true } }) + const { router } = createTestRouter({ search: { strict: true }, history }) window.history.replaceState( null, '', @@ -1264,7 +1287,7 @@ describe('search params in URL', () => { describe.each([false, true, undefined])('default search params', (strict) => { let router: AnyRouter beforeEach(() => { - const result = createTestRouter({ search: { strict } }) + const result = createTestRouter({ search: { strict }, history }) router = result.router }) @@ -1584,6 +1607,7 @@ const createHistoryRouter = () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) return { router } @@ -1716,7 +1740,13 @@ it('does not push to history if url and state are the same', async () => { }) describe('does not strip search params if search validation fails', () => { + let history: RouterHistory + + beforeEach(() => { + history = createBrowserHistory() + }) afterEach(() => { + history.destroy() window.history.replaceState(null, 'root', '/') cleanup() }) @@ -1751,7 +1781,7 @@ describe('does not strip search params if search validation fails', () => { const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) return router } diff --git a/packages/react-router/tests/searchMiddleware.test.tsx b/packages/react-router/tests/searchMiddleware.test.tsx index 36b4ebb58e..6629dab085 100644 --- a/packages/react-router/tests/searchMiddleware.test.tsx +++ b/packages/react-router/tests/searchMiddleware.test.tsx @@ -1,9 +1,10 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { Link, RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, @@ -11,12 +12,21 @@ import { stripSearchParams, } from '../src' import { getSearchParamsFromURI } from './utils' -import type { AnyRouter } from '../src' +import type { AnyRouter, RouterHistory } from '../src' import type { SearchMiddleware } from '@tanstack/router-core' +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) + afterEach(() => { - vi.resetAllMocks() + history.destroy() window.history.replaceState(null, 'root', '/') + vi.clearAllMocks() + vi.resetAllMocks() cleanup() }) @@ -70,6 +80,7 @@ function setupTest(opts: { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) window.history.replaceState( null, diff --git a/packages/react-router/tests/useBlocker.test.tsx b/packages/react-router/tests/useBlocker.test.tsx index 01dc7cf548..3b780775bd 100644 --- a/packages/react-router/tests/useBlocker.test.tsx +++ b/packages/react-router/tests/useBlocker.test.tsx @@ -1,20 +1,32 @@ import React from 'react' import '@testing-library/jest-dom/vitest' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { z } from 'zod' import { RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, useBlocker, useNavigate, } from '../src' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() window.history.replaceState(null, 'root', '/') + vi.clearAllMocks() + vi.resetAllMocks() cleanup() }) @@ -56,6 +68,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -108,6 +121,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -160,6 +174,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -216,6 +231,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -302,6 +318,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -394,6 +411,7 @@ describe('useBlocker', () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute, invoicesRoute]), + history, }) type Router = typeof router diff --git a/packages/react-router/tests/useMatch.test.tsx b/packages/react-router/tests/useMatch.test.tsx index 67f68e3011..9bf809f666 100644 --- a/packages/react-router/tests/useMatch.test.tsx +++ b/packages/react-router/tests/useMatch.test.tsx @@ -39,6 +39,8 @@ describe('useMatch', () => { ), }) + history = history || createMemoryHistory({ initialEntries: ['/'] }) + const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: '/posts', diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index 7449de1918..61458a8e56 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1,6 +1,6 @@ import React from 'react' import '@testing-library/jest-dom/vitest' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, configure, @@ -14,6 +14,7 @@ import { Navigate, Outlet, RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouteMask, @@ -22,9 +23,20 @@ import { useNavigate, useParams, } from '../src' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() window.history.replaceState(null, 'root', '/') + vi.clearAllMocks() + vi.resetAllMocks() cleanup() }) @@ -62,6 +74,7 @@ test('when navigating to /posts', async () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) render() @@ -275,6 +288,7 @@ test('when navigating from /posts to ../posts/$postId', async () => { indexRoute, postsRoute.addChildren([postsIndexRoute, postRoute]), ]), + history, }) render() @@ -412,6 +426,7 @@ test('when navigating from /posts/$postId to /posts/$postId/info and the current ]), ]), ]), + history, }) render() @@ -555,6 +570,7 @@ test('when navigating from /posts/$postId to ./info and the current route is /po ]), ]), ]), + history, }) render() @@ -698,6 +714,7 @@ test('when navigating from /posts/$postId to ../$postId and the current route is ]), ]), ]), + history, }) render() @@ -849,6 +866,7 @@ test('when navigating from /posts/$postId with an index to ../$postId and the cu ]), ]), ]), + history, }) render() @@ -1029,6 +1047,7 @@ test('when navigating from /invoices to ./invoiceId and the current route is /po ]), ]), ]), + history, }) render() @@ -1132,6 +1151,7 @@ test('when navigating to /posts/$postId/info which is masked as /posts/$postId', const router = createRouter({ routeTree, routeMasks: [routeMask], + history, }) render() @@ -1226,6 +1246,7 @@ test('when navigating to /posts/$postId/info which is imperatively masked as /po const router = createRouter({ routeTree, + history, }) render() @@ -1283,6 +1304,7 @@ test('when setting search params with 2 parallel navigate calls', async () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), + history, }) render() @@ -1327,6 +1349,7 @@ test(' navigates only once in ', async () => { const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), + history, }) const navigateSpy = vi.spyOn(router, 'navigate') diff --git a/packages/react-start-client/README.md b/packages/react-start-client/README.md index bb009b0c87..ba94d88108 100644 --- a/packages/react-start-client/README.md +++ b/packages/react-start-client/README.md @@ -1,33 +1,9 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! +# TanStack React Start - Client - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +This package is not meant to be used directly. It is a dependency of [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +TanStack React Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index a83ed07e55..c242f42005 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -69,8 +69,7 @@ "cookie-es": "^1.2.2", "jsesc": "^3.1.0", "tiny-invariant": "^1.3.3", - "tiny-warning": "^1.0.3", - "vinxi": "^0.5.3" + "tiny-warning": "^1.0.3" }, "devDependencies": { "@testing-library/react": "^16.2.0", diff --git a/packages/react-start-client/src/index.tsx b/packages/react-start-client/src/index.tsx index 6b9c30ee8f..3aebc26282 100644 --- a/packages/react-start-client/src/index.tsx +++ b/packages/react-start-client/src/index.tsx @@ -1,6 +1,15 @@ -/// -export { mergeHeaders } from '@tanstack/start-client-core' -export { startSerializer } from '@tanstack/start-client-core' +export { + mergeHeaders, + startSerializer, + createIsomorphicFn, + createServerFn, + createMiddleware, + registerGlobalMiddleware, + globalMiddleware, + serverOnly, + clientOnly, + json, +} from '@tanstack/start-client-core' export { type DehydratedRouter, type ClientExtractedBaseEntry, @@ -10,16 +19,10 @@ export { type ClientExtractedPromise, type ClientExtractedStream, type ResolvePromiseState, -} from '@tanstack/start-client-core' -export { - createIsomorphicFn, type IsomorphicFn, type ServerOnlyFn, type ClientOnlyFn, type IsomorphicFnBase, -} from '@tanstack/start-client-core' -export { createServerFn } from '@tanstack/start-client-core' -export { type ServerFn as FetchFn, type ServerFnCtx as FetchFnCtx, type CompiledFetcherFnOptions, @@ -31,43 +34,33 @@ export { type ServerFn, type ServerFnCtx, type ServerFnResponseType, -} from '@tanstack/start-client-core' -export { type JsonResponse } from '@tanstack/start-client-core' -export { - createMiddleware, + type JsonResponse, type IntersectAllValidatorInputs, type IntersectAllValidatorOutputs, - type MiddlewareServerFn, - type AnyMiddleware, - type MiddlewareOptions, - type MiddlewareWithTypes, - type MiddlewareValidator, - type MiddlewareServer, - type MiddlewareAfterClient, - type MiddlewareAfterMiddleware, - type MiddlewareAfterServer, - type Middleware, - type MiddlewareClientFnOptions, - type MiddlewareClientFnResult, - type MiddlewareClientNextFn, - type ClientResultWithContext, + type FunctionMiddlewareServerFn, + type AnyFunctionMiddleware, + type FunctionMiddlewareOptions, + type FunctionMiddlewareWithTypes, + type FunctionMiddlewareValidator, + type FunctionMiddlewareServer, + type FunctionMiddlewareAfterClient, + type FunctionMiddlewareAfterServer, + type FunctionMiddleware, + type FunctionMiddlewareClientFnOptions, + type FunctionMiddlewareClientFnResult, + type FunctionMiddlewareClientNextFn, + type FunctionClientResultWithContext, type AssignAllClientContextBeforeNext, type AssignAllMiddleware, type AssignAllServerContext, - type MiddlewareAfterValidator, - type MiddlewareClientFn, - type MiddlewareServerFnResult, - type MiddlewareClient, - type MiddlewareServerFnOptions, - type MiddlewareServerNextFn, - type ServerResultWithContext, -} from '@tanstack/start-client-core' -export { - registerGlobalMiddleware, - globalMiddleware, + type FunctionMiddlewareAfterValidator, + type FunctionMiddlewareClientFn, + type FunctionMiddlewareServerFnResult, + type FunctionMiddlewareClient, + type FunctionMiddlewareServerFnOptions, + type FunctionMiddlewareServerNextFn, + type FunctionServerResultWithContext, } from '@tanstack/start-client-core' -export { serverOnly, clientOnly } from '@tanstack/start-client-core' -export { json } from '@tanstack/start-client-core' export { Meta } from './Meta' export { Scripts } from './Scripts' export { StartClient } from './StartClient' diff --git a/packages/react-start-client/src/renderRSC.tsx b/packages/react-start-client/src/renderRSC.tsx index 6201bfa476..4832f074b6 100644 --- a/packages/react-start-client/src/renderRSC.tsx +++ b/packages/react-start-client/src/renderRSC.tsx @@ -1,6 +1,4 @@ // TODO: RSCs -// // @ts-expect-error -// import * as reactDom from '@vinxi/react-server-dom/client' import { isValidElement } from 'react' import invariant from 'tiny-invariant' import type React from 'react' diff --git a/packages/react-start-client/src/useServerFn.ts b/packages/react-start-client/src/useServerFn.ts index c046bcb9ed..971b3a6685 100644 --- a/packages/react-start-client/src/useServerFn.ts +++ b/packages/react-start-client/src/useServerFn.ts @@ -17,12 +17,8 @@ export function useServerFn) => Promise>( return res } catch (err) { if (isRedirect(err)) { - const resolvedRedirect = router.resolveRedirect({ - ...err, - _fromLocation: router.state.location, - }) - - return router.navigate(resolvedRedirect) + err.options._fromLocation = router.state.location + return router.navigate(router.resolveRedirect(err).options) } throw err diff --git a/packages/react-start-config/README.md b/packages/react-start-config/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/react-start-config/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/react-start-config/eslint.config.js b/packages/react-start-config/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/react-start-config/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/react-start-config/package.json b/packages/react-start-config/package.json deleted file mode 100644 index 23efef7bfd..0000000000 --- a/packages/react-start-config/package.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "name": "@tanstack/react-start-config", - "version": "1.120.3", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/react-start-config" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "build": "tsc", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0;vitest", - "test:eslint": "eslint ./src", - "test:types": "exit 0; vitest" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/router-core": "workspace:^", - "@tanstack/router-generator": "workspace:^", - "@tanstack/router-plugin": "workspace:^", - "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/react-start-plugin": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@vitejs/plugin-react": "^4.3.4", - "import-meta-resolve": "^4.1.0", - "nitropack": "^2.10.4", - "ofetch": "^1.4.1", - "vite": "^6.1.0", - "vinxi": "0.5.3", - "zod": "^3.24.2" - }, - "peerDependencies": { - "react": ">=18.0.0 || >=19.0.0", - "react-dom": ">=18.0.0 || >=19.0.0", - "vite": "^6.0.0" - } -} diff --git a/packages/react-start-config/src/index.ts b/packages/react-start-config/src/index.ts deleted file mode 100644 index ac30bf2140..0000000000 --- a/packages/react-start-config/src/index.ts +++ /dev/null @@ -1,663 +0,0 @@ -import path from 'node:path' -import { existsSync, readFileSync } from 'node:fs' -import { readFile } from 'node:fs/promises' -import { fileURLToPath } from 'node:url' -import viteReact from '@vitejs/plugin-react' -import { resolve } from 'import-meta-resolve' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' -import { getConfig } from '@tanstack/router-generator' -import { createApp } from 'vinxi' -import { config } from 'vinxi/plugins/config' -// // @ts-expect-error -// import { serverComponents } from '@vinxi/server-components/plugin' -import { createTanStackServerFnPlugin } from '@tanstack/server-functions-plugin' -import { createTanStackStartPlugin } from '@tanstack/react-start-plugin' -import { createFetch } from 'ofetch' -import { createNitro } from 'nitropack' -import { tanstackStartVinxiFileRouter } from './vinxi-file-router.js' -import { - checkDeploymentPresetInput, - getUserViteConfig, - inlineConfigSchema, - serverSchema, -} from './schema.js' -import type { configSchema } from '@tanstack/router-generator' -import type { z } from 'zod' -import type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' -import type { App as VinxiApp } from 'vinxi' -import type { Manifest } from '@tanstack/router-core' -import type * as vite from 'vite' - -export type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' - -function setTsrDefaults(config: TanStackStartOutputConfig['tsr']) { - // Normally these are `./src/___`, but we're using `./app/___` for Start stuff - const appDirectory = config?.appDirectory ?? './app' - return { - ...config, - appDirectory: config?.appDirectory ?? appDirectory, - routesDirectory: - config?.routesDirectory ?? path.join(appDirectory, 'routes'), - generatedRouteTree: - config?.generatedRouteTree ?? path.join(appDirectory, 'routeTree.gen.ts'), - } -} - -function mergeSsrOptions(options: Array) { - let ssrOptions: vite.SSROptions = {} - let noExternal: vite.SSROptions['noExternal'] = [] - for (const option of options) { - if (!option) { - continue - } - - if (option.noExternal) { - if (option.noExternal === true) { - noExternal = true - } else if (noExternal !== true) { - if (Array.isArray(option.noExternal)) { - noExternal.push(...option.noExternal) - } else { - noExternal.push(option.noExternal) - } - } - } - - ssrOptions = { - ...ssrOptions, - ...option, - noExternal, - } - } - - return ssrOptions -} - -export async function defineConfig( - inlineConfig: TanStackStartInputConfig = {}, -): Promise { - const opts = inlineConfigSchema.parse(inlineConfig) - - const { preset: configDeploymentPreset, ...serverOptions } = - serverSchema.parse(opts.server || {}) - - const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) - const tsr = setTsrDefaults(opts.tsr) - const tsrConfig = getConfig(tsr) - - const appDirectory = tsr.appDirectory - const publicDir = opts.routers?.public?.dir || './public' - - const publicBase = opts.routers?.public?.base || '/' - const clientBase = opts.routers?.client?.base || '/_build' - const apiBase = opts.tsr?.apiBase || '/api' - const serverBase = opts.routers?.server?.base || '/_server' - - const apiMiddleware = opts.routers?.api?.middleware || undefined - const serverMiddleware = opts.routers?.server?.middleware || undefined - const ssrMiddleware = opts.routers?.ssr?.middleware || undefined - - const clientEntry = - opts.routers?.client?.entry || path.join(appDirectory, 'client.tsx') - const ssrEntry = - opts.routers?.ssr?.entry || path.join(appDirectory, 'ssr.tsx') - const apiEntry = opts.routers?.api?.entry || path.join(appDirectory, 'api.ts') - const globalMiddlewareEntry = - opts.routers?.server?.globalMiddlewareEntry || - path.join(appDirectory, 'global-middleware.ts') - const apiEntryExists = existsSync(apiEntry) - - const viteConfig = getUserViteConfig(opts.vite) - - const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module - manifestVirtualImportId: 'tsr:server-fn-manifest', - client: { - getRuntimeCode: () => - `import { createClientRpc } from '@tanstack/react-start/server-functions-client'`, - replacer: (opts) => - `createClientRpc('${opts.functionId}', '${serverBase}')`, - }, - ssr: { - getRuntimeCode: () => - `import { createSsrRpc } from '@tanstack/react-start/server-functions-ssr'`, - replacer: (opts) => `createSsrRpc('${opts.functionId}', '${serverBase}')`, - }, - server: { - getRuntimeCode: () => - `import { createServerRpc } from '@tanstack/react-start/server-functions-server'`, - replacer: (opts) => - `createServerRpc('${opts.functionId}', '${serverBase}', ${opts.fn})`, - }, - }) - - const TanStackStartPlugin = createTanStackStartPlugin({ - globalMiddlewareEntry, - }) - - // Create a dummy nitro app to get the resolved public output path - const dummyNitroApp = await createNitro({ - preset: deploymentPreset, - compatibilityDate: '2024-12-01', - }) - - const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir - await dummyNitroApp.close() - - let vinxiApp = createApp({ - server: { - ...serverOptions, - preset: deploymentPreset, - experimental: { - ...serverOptions.experimental, - asyncContext: true, - }, - }, - routers: [ - { - name: 'public', - type: 'static', - dir: publicDir, - base: publicBase, - }, - { - name: 'client', - type: 'client', - target: 'browser', - handler: clientEntry, - base: clientBase, - // @ts-expect-error - build: { - sourcemap: true, - }, - plugins: () => { - const routerType = 'client' - const clientViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-client', { - ...viteConfig.userConfig, - ...clientViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(clientViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - clientViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(clientViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: true, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.client, - TanStackServerFnsPlugin.client, - ...(viteConfig.plugins || []), - ...(clientViteConfig.plugins || []), - viteReact(opts.react), - // TODO: RSCS - enable this - // serverComponents.client(), - ] - }, - }, - { - name: 'ssr', - type: 'http', - target: 'server', - handler: ssrEntry, - middleware: ssrMiddleware, - // @ts-expect-error - link: { - client: 'client', - }, - plugins: () => { - const routerType = 'ssr' - const ssrViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-ssr', { - ...viteConfig.userConfig, - ...ssrViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(ssrViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - ssrViteConfig.userConfig.ssr, - { - noExternal, - external: ['@vinxi/react-server-dom/client'], - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(ssrViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.ssr, - TanStackServerFnsPlugin.ssr, - tsrRoutesManifest({ - tsrConfig, - clientBase, - }), - ...(getUserViteConfig(opts.vite).plugins || []), - ...(getUserViteConfig(opts.routers?.ssr?.vite).plugins || []), - viteReact(opts.react), - ] - }, - }, - { - name: 'server', - type: 'http', - target: 'server', - base: serverBase, - middleware: serverMiddleware, - // TODO: RSCS - enable this - // worker: true, - handler: importToProjectRelative( - '@tanstack/start-server-functions-handler', - ), - plugins: () => { - const routerType = 'server' - const serverViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-server', { - ...viteConfig.userConfig, - ...serverViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(serverViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - serverViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(serverViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.server, - TanStackServerFnsPlugin.server, - // TODO: RSCS - remove this - // resolve: { - // conditions: [], - // }, - // TODO: RSCs - add this - // serverComponents.serverActions({ - // resolve: { - // conditions: [ - // 'react-server', - // // 'node', - // 'import', - // process.env.NODE_ENV, - // ], - // }, - // runtime: '@vinxi/react-server-dom/runtime', - // transpileDeps: ['react', 'react-dom', '@vinxi/react-server-dom'], - // }), - ...(viteConfig.plugins || []), - ...(serverViteConfig.plugins || []), - ] - }, - }, - ], - }) - - const noExternal = [ - '@tanstack/start', - '@tanstack/react-start', - '@tanstack/react-start/server', - '@tanstack/react-start-client', - '@tanstack/react-start-server', - '@tanstack/start-server-functions-fetcher', - '@tanstack/start-server-functions-handler', - '@tanstack/start-server-functions-client', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-server-functions-server', - '@tanstack/react-start-router-manifest', - '@tanstack/react-start-config', - '@tanstack/start-api-routes', - '@tanstack/server-functions-plugin', - 'tsr:routes-manifest', - 'tsr:server-fn-manifest', - ] - - // If API routes handler exists, add a router for it - if (apiEntryExists) { - vinxiApp = vinxiApp.addRouter({ - name: 'api', - type: 'http', - target: 'server', - base: apiBase, - handler: apiEntry, - middleware: apiMiddleware, - routes: tanstackStartVinxiFileRouter({ tsrConfig, apiBase }), - plugins: () => { - const viteConfig = getUserViteConfig(opts.vite) - const apiViteConfig = getUserViteConfig(opts.routers?.api?.vite) - - return [ - config('tsr-vite-config-api', { - ...viteConfig.userConfig, - ...apiViteConfig.userConfig, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - apiViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(apiViteConfig.userConfig.optimizeDeps || {}), - }, - define: { - ...(viteConfig.userConfig.define || {}), - ...(apiViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - ...(viteConfig.plugins || []), - ...(apiViteConfig.plugins || []), - ] - }, - }) - } - - // Because Vinxi doesn't use the normal nitro dev server, it doesn't - // supply $fetch during dev. We need to hook into the dev server creation, - // nab the proper utils from the custom nitro instance that is used - // during dev and supply the $fetch to app. - // Hopefully and likely, this will just get removed when we move to - // Nitro directly. - vinxiApp.hooks.hook('app:dev:nitro:config', (devServer) => { - vinxiApp.hooks.hook( - 'app:dev:server:created', - ({ devApp: { localFetch } }) => { - const $fetch = createFetch({ - fetch: localFetch, - defaults: { - baseURL: devServer.nitro.options.runtimeConfig.app.baseURL, - }, - }) - - // @ts-expect-error - globalThis.$fetch = $fetch - }, - ) - }) - - return vinxiApp -} - -function importToProjectRelative(p: string) { - const resolved = fileURLToPath(resolve(p, import.meta.url)) - - const relative = path.relative(process.cwd(), resolved) - - return relative -} - -function tsrRoutesManifest(opts: { - tsrConfig: z.infer - clientBase: string -}): vite.Plugin { - let config: vite.ResolvedConfig - - return { - name: 'tsr-routes-manifest', - configResolved(resolvedConfig) { - config = resolvedConfig - }, - resolveId(id) { - if (id === 'tsr:routes-manifest') { - return id - } - return - }, - async load(id) { - if (id === 'tsr:routes-manifest') { - // If we're in development, return a dummy manifest - - if (config.command === 'serve') { - return `export default () => ({ - routes: {} - })` - } - - const clientViteManifestPath = path.resolve( - config.build.outDir, - `../client/${opts.clientBase}/.vite/manifest.json`, - ) - - type ViteManifest = Record< - string, - { - file: string - isEntry: boolean - imports: Array - } - > - - let manifest: ViteManifest - try { - manifest = JSON.parse(await readFile(clientViteManifestPath, 'utf-8')) - } catch (err) { - console.error(err) - throw new Error( - `Could not find the production client vite manifest at '${clientViteManifestPath}'!`, - ) - } - - const routeTreePath = path.resolve(opts.tsrConfig.generatedRouteTree) - - let routeTreeContent: string - try { - routeTreeContent = readFileSync(routeTreePath, 'utf-8') - } catch (err) { - console.error(err) - throw new Error( - `Could not find the generated route tree at '${routeTreePath}'!`, - ) - } - - // Extract the routesManifest JSON from the route tree file. - // It's located between the /* ROUTE_MANIFEST_START and ROUTE_MANIFEST_END */ comment block. - - const routerManifest = JSON.parse( - routeTreeContent.match( - /\/\* ROUTE_MANIFEST_START([\s\S]*?)ROUTE_MANIFEST_END \*\//, - )?.[1] || '{ routes: {} }', - ) as Manifest - - const routes = routerManifest.routes - - let entryFile: - | { - file: string - imports: Array - } - | undefined - - const filesByRouteFilePath: ViteManifest = Object.fromEntries( - Object.entries(manifest).map(([k, v]) => { - if (v.isEntry) { - entryFile = v - } - - const rPath = k.split('?')[0] - - return [rPath, v] - }, {}), - ) - - // Add preloads to the routes from the vite manifest - Object.entries(routes).forEach(([k, v]) => { - const file = - filesByRouteFilePath[ - path.join(opts.tsrConfig.routesDirectory, v.filePath as string) - ] - - if (file) { - const preloads = file.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ) - - preloads.unshift(path.join(opts.clientBase, file.file)) - - routes[k] = { - ...v, - preloads, - } - } - }) - - if (entryFile) { - routes.__root__!.preloads = [ - path.join(opts.clientBase, entryFile.file), - ...entryFile.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ), - ] - } - - const recurseRoute = ( - route: { - preloads?: Array - children?: Array - }, - seenPreloads = {} as Record, - ) => { - route.preloads = route.preloads?.filter((preload) => { - if (seenPreloads[preload]) { - return false - } - seenPreloads[preload] = true - return true - }) - - if (route.children) { - route.children.forEach((child) => { - const childRoute = routes[child]! - recurseRoute(childRoute, { ...seenPreloads }) - }) - } - } - - // @ts-expect-error - recurseRoute(routes.__root__) - - const routesManifest = { - routes, - } - - if (process.env.TSR_VITE_DEBUG) { - console.info( - 'Routes Manifest: \n' + JSON.stringify(routesManifest, null, 2), - ) - } - - return `export default () => (${JSON.stringify(routesManifest)})` - } - return - }, - } -} - -function injectDefineEnv( - key: TKey, - value: TValue, -): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { - return { - [`process.env.${key}`]: JSON.stringify(value), - [`import.meta.env.${key}`]: JSON.stringify(value), - } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } -} diff --git a/packages/react-start-config/src/schema.ts b/packages/react-start-config/src/schema.ts deleted file mode 100644 index 4529483793..0000000000 --- a/packages/react-start-config/src/schema.ts +++ /dev/null @@ -1,198 +0,0 @@ -import { configSchema } from '@tanstack/router-generator' -import { z } from 'zod' -import type { PluginOption } from 'vite' -import type { AppOptions as VinxiAppOptions } from 'vinxi' -import type { NitroOptions } from 'nitropack' -import type { Options as ViteReactOptions } from '@vitejs/plugin-react' -import type { CustomizableConfig } from 'vinxi/dist/types/lib/vite-dev' - -type StartUserViteConfig = CustomizableConfig | (() => CustomizableConfig) - -export function getUserViteConfig(config?: StartUserViteConfig): { - plugins: Array | undefined - userConfig: CustomizableConfig -} { - const { plugins, ...userConfig } = - typeof config === 'function' ? config() : { ...config } - return { plugins, userConfig } -} - -/** - * Not all the deployment presets are fully functional or tested. - * @see https://github.com/TanStack/router/pull/2002 - */ -const vinxiDeploymentPresets = [ - 'alwaysdata', // untested - 'aws-amplify', // untested - 'aws-lambda', // untested - 'azure', // untested - 'azure-functions', // untested - 'base-worker', // untested - 'bun', // ✅ working - 'cleavr', // untested - 'cli', // untested - 'cloudflare', // untested - 'cloudflare-module', // untested - 'cloudflare-pages', // ✅ working - 'cloudflare-pages-static', // untested - 'deno', // untested - 'deno-deploy', // untested - 'deno-server', // untested - 'digital-ocean', // untested - 'edgio', // untested - 'firebase', // untested - 'flight-control', // untested - 'github-pages', // untested - 'heroku', // untested - 'iis', // untested - 'iis-handler', // untested - 'iis-node', // untested - 'koyeb', // untested - 'layer0', // untested - 'netlify', // ✅ working - 'netlify-builder', // untested - 'netlify-edge', // untested - 'netlify-static', // untested - 'nitro-dev', // untested - 'nitro-prerender', // untested - 'node', // partially working - 'node-cluster', // untested - 'node-server', // ✅ working - 'platform-sh', // untested - 'service-worker', // untested - 'static', // 🟧 partially working - 'stormkit', // untested - 'vercel', // ✅ working - 'vercel-edge', // untested - 'vercel-static', // untested - 'winterjs', // untested - 'zeabur', // untested - 'zeabur-static', // untested -] as const - -type DeploymentPreset = (typeof vinxiDeploymentPresets)[number] | (string & {}) - -const testedDeploymentPresets: Array = [ - 'bun', - 'netlify', - 'vercel', - 'cloudflare-pages', - 'node-server', -] - -export function checkDeploymentPresetInput( - preset?: string, -): DeploymentPreset | undefined { - if (preset) { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) - } - } - - return preset -} - -type HTTPSOptions = { - cert?: string - key?: string - pfx?: string - passphrase?: string - validityDays?: number - domains?: Array -} - -type ServerOptions_ = VinxiAppOptions['server'] & { - https?: boolean | HTTPSOptions -} - -type ServerOptions = { - [K in keyof ServerOptions_]: ServerOptions_[K] -} - -export const serverSchema = z - .object({ - routeRules: z.custom().optional(), - preset: z.custom().optional(), - static: z.boolean().optional(), - prerender: z - .object({ - routes: z.array(z.string()), - ignore: z - .array( - z.custom< - string | RegExp | ((path: string) => undefined | null | boolean) - >(), - ) - .optional(), - crawlLinks: z.boolean().optional(), - }) - .optional(), - }) - .and(z.custom()) - -const viteSchema = z.custom() - -const viteReactSchema = z.custom() - -const routersSchema = z.object({ - ssr: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - client: z - .object({ - entry: z.string().optional(), - base: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - server: z - .object({ - base: z.string().optional(), - globalMiddlewareEntry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - api: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - public: z - .object({ - dir: z.string().optional(), - base: z.string().optional(), - }) - .optional(), -}) - -const tsrConfig = configSchema.partial().extend({ - appDirectory: z.string().optional(), -}) - -export const inlineConfigSchema = z.object({ - react: viteReactSchema.optional(), - vite: viteSchema.optional(), - tsr: tsrConfig.optional(), - routers: routersSchema.optional(), - server: serverSchema.optional(), -}) - -export type TanStackStartInputConfig = z.input -export type TanStackStartOutputConfig = z.infer diff --git a/packages/react-start-config/src/vinxi-file-router.ts b/packages/react-start-config/src/vinxi-file-router.ts deleted file mode 100644 index 9e6d829d1b..0000000000 --- a/packages/react-start-config/src/vinxi-file-router.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { - BaseFileSystemRouter as VinxiBaseFileSystemRouter, - analyzeModule as vinxiFsRouterAnalyzeModule, - cleanPath as vinxiFsRouterCleanPath, -} from 'vinxi/fs-router' -import { - CONSTANTS as GENERATOR_CONSTANTS, - startAPIRouteSegmentsFromTSRFilePath, -} from '@tanstack/router-generator' -import type { configSchema } from '@tanstack/router-generator' -import type { - AppOptions as VinxiAppOptions, - RouterSchemaInput as VinxiRouterSchemaInput, -} from 'vinxi' -import type { z } from 'zod' - -export function tanstackStartVinxiFileRouter(opts: { - tsrConfig: z.infer - apiBase: string -}) { - const apiBaseSegment = opts.apiBase.split('/').filter(Boolean).join('/') - const isAPIPath = new RegExp(`/${apiBaseSegment}/`) - - return function (router: VinxiRouterSchemaInput, app: VinxiAppOptions) { - // Our own custom File Router that extends the VinxiBaseFileSystemRouter - // for splitting the API routes into its own "bundle" - // and adding the $APIRoute metadata to the route object - // This could be customized in future to support more complex splits - class TanStackStartFsRouter extends VinxiBaseFileSystemRouter { - toPath(src: string): string { - const inputPath = vinxiFsRouterCleanPath(src, this.config) - - const segments = startAPIRouteSegmentsFromTSRFilePath( - inputPath, - opts.tsrConfig, - ) - - const pathname = segments - .map((part) => { - if (part.type === 'splat') { - return `*splat` - } - - if (part.type === 'param') { - return `:${part.value}?` - } - - return part.value - }) - .join('/') - - return pathname.length > 0 ? `/${pathname}` : '/' - } - - toRoute(src: string) { - const webPath = this.toPath(src) - - const [_, exports] = vinxiFsRouterAnalyzeModule(src) - - const hasAPIRoute = exports.find( - (exp) => exp.n === GENERATOR_CONSTANTS.APIRouteExportVariable, - ) - - return { - path: webPath, - filePath: src, - $APIRoute: - isAPIPath.test(webPath) && hasAPIRoute - ? { - src, - pick: [GENERATOR_CONSTANTS.APIRouteExportVariable], - } - : undefined, - } - } - } - - return new TanStackStartFsRouter( - { - dir: opts.tsrConfig.routesDirectory, - extensions: ['js', 'jsx', 'ts', 'tsx'], - }, - router, - app, - ) - } -} diff --git a/packages/react-start-config/tsconfig.json b/packages/react-start-config/tsconfig.json deleted file mode 100644 index 940a9cce0a..0000000000 --- a/packages/react-start-config/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src/index.ts"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist/esm", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/react-start-plugin/README.md b/packages/react-start-plugin/README.md index 90488bbcd8..45e57a4d5b 100644 --- a/packages/react-start-plugin/README.md +++ b/packages/react-start-plugin/README.md @@ -1,5 +1,9 @@ -# TanStack Start Vite Plugin +# TanStack React Start - Plugin -See https://tanstack.com/router/latest/docs/framework/react/routing/file-based-routing +This package is not meant to be used directly. It is a dependency of [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start). + +TanStack React Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). + +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index f13d4951cc..a7ae54fd97 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -27,7 +27,7 @@ "clean": "rimraf ./dist && rimraf ./coverage", "clean:snapshots": "rimraf **/*snapshot* --glob", "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "vitest", + "test:unit": "exit 0; vitest", "test:eslint": "eslint ./src", "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", @@ -65,22 +65,12 @@ "node": ">=12" }, "dependencies": { - "@babel/code-frame": "7.26.2", - "@babel/core": "^7.26.8", - "@babel/plugin-syntax-jsx": "^7.25.9", - "@babel/plugin-syntax-typescript": "^7.25.9", - "@babel/template": "^7.26.8", - "@babel/traverse": "^7.26.8", - "@babel/types": "^7.26.8", + "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", - "babel-dead-code-elimination": "^1.0.10", - "tiny-invariant": "^1.3.3", - "vite": "6.1.4" - }, - "devDependencies": { - "@types/babel__code-frame": "^7.0.6", - "@types/babel__core": "^7.20.5", - "@types/babel__template": "^7.4.4", - "@types/babel__traverse": "^7.20.6" + "@tanstack/server-functions-plugin": "workspace:^", + "@tanstack/start-plugin-core": "workspace:^", + "@vitejs/plugin-react": "^4.3.4", + "vite": "6.1.4", + "zod": "^3.24.2" } } diff --git a/packages/react-start-plugin/src/compilers.ts b/packages/react-start-plugin/src/compilers.ts deleted file mode 100644 index ca806fc991..0000000000 --- a/packages/react-start-plugin/src/compilers.ts +++ /dev/null @@ -1,584 +0,0 @@ -import * as babel from '@babel/core' -import * as t from '@babel/types' -import { codeFrameColumns } from '@babel/code-frame' -import { - deadCodeElimination, - findReferencedIdentifiers, -} from 'babel-dead-code-elimination' -import { generateFromAst, parseAst } from '@tanstack/router-utils' -import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' - -// build these once and reuse them -const handleServerOnlyCallExpression = - buildEnvOnlyCallExpressionHandler('server') -const handleClientOnlyCallExpression = - buildEnvOnlyCallExpressionHandler('client') - -type CompileOptions = ParseAstOptions & { - env: 'server' | 'client' | 'ssr' - dce?: boolean -} - -type IdentifierConfig = { - name: string - type: 'ImportSpecifier' | 'ImportNamespaceSpecifier' - namespaceId: string - handleCallExpression: ( - path: babel.NodePath, - opts: CompileOptions, - ) => void - paths: Array -} - -export function compileStartOutput(opts: CompileOptions): GeneratorResult { - const ast = parseAst(opts) - - const doDce = opts.dce ?? true - // find referenced identifiers *before* we transform anything - const refIdents = doDce ? findReferencedIdentifiers(ast) : undefined - - babel.traverse(ast, { - Program: { - enter(programPath) { - const identifiers: { - createServerFn: IdentifierConfig - createMiddleware: IdentifierConfig - serverOnly: IdentifierConfig - clientOnly: IdentifierConfig - createIsomorphicFn: IdentifierConfig - } = { - createServerFn: { - name: 'createServerFn', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateServerFnCallExpression, - paths: [], - }, - createMiddleware: { - name: 'createMiddleware', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateMiddlewareCallExpression, - paths: [], - }, - serverOnly: { - name: 'serverOnly', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleServerOnlyCallExpression, - paths: [], - }, - clientOnly: { - name: 'clientOnly', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleClientOnlyCallExpression, - paths: [], - }, - createIsomorphicFn: { - name: 'createIsomorphicFn', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateIsomorphicFnCallExpression, - paths: [], - }, - } - - const identifierKeys = Object.keys(identifiers) as Array< - keyof typeof identifiers - > - - programPath.traverse({ - ImportDeclaration: (path) => { - if (path.node.source.value !== '@tanstack/react-start') { - return - } - - // handle a destructured imports being renamed like "import { createServerFn as myCreateServerFn } from '@tanstack/react-start';" - path.node.specifiers.forEach((specifier) => { - identifierKeys.forEach((identifierKey) => { - const identifier = identifiers[identifierKey] - - if ( - specifier.type === 'ImportSpecifier' && - specifier.imported.type === 'Identifier' - ) { - if (specifier.imported.name === identifierKey) { - identifier.name = specifier.local.name - identifier.type = 'ImportSpecifier' - } - } - - // handle namespace imports like "import * as TanStackStart from '@tanstack/react-start';" - if (specifier.type === 'ImportNamespaceSpecifier') { - identifier.type = 'ImportNamespaceSpecifier' - identifier.namespaceId = specifier.local.name - identifier.name = `${identifier.namespaceId}.${identifierKey}` - } - }) - }) - }, - CallExpression: (path) => { - identifierKeys.forEach((identifierKey) => { - // Check to see if the call expression is a call to the - // identifiers[identifierKey].name - if ( - t.isIdentifier(path.node.callee) && - path.node.callee.name === identifiers[identifierKey].name - ) { - // The identifier could be a call to the original function - // in the source code. If this is case, we need to ignore it. - // Check the scope to see if the identifier is a function declaration. - // if it is, then we can ignore it. - - if ( - path.scope.getBinding(identifiers[identifierKey].name)?.path - .node.type === 'FunctionDeclaration' - ) { - return - } - - return identifiers[identifierKey].paths.push(path) - } - - if (t.isMemberExpression(path.node.callee)) { - if ( - t.isIdentifier(path.node.callee.object) && - t.isIdentifier(path.node.callee.property) - ) { - const callname = [ - path.node.callee.object.name, - path.node.callee.property.name, - ].join('.') - - if (callname === identifiers[identifierKey].name) { - identifiers[identifierKey].paths.push(path) - } - } - } - - return - }) - }, - }) - - identifierKeys.forEach((identifierKey) => { - identifiers[identifierKey].paths.forEach((path) => { - identifiers[identifierKey].handleCallExpression( - path as babel.NodePath, - opts, - ) - }) - }) - }, - }, - }) - - if (doDce) { - deadCodeElimination(ast, refIdents) - } - - return generateFromAst(ast, { - sourceMaps: true, - sourceFileName: opts.filename, - filename: opts.filename, - }) -} - -function handleCreateServerFnCallExpression( - path: babel.NodePath, - opts: ParseAstOptions, -) { - // The function is the 'fn' property of the object passed to createServerFn - - // const firstArg = path.node.arguments[0] - // if (t.isObjectExpression(firstArg)) { - // // Was called with some options - // } - - // Traverse the member expression and find the call expressions for - // the validator, handler, and middleware methods. Check to make sure they - // are children of the createServerFn call expression. - - const calledOptions = path.node.arguments[0] - ? (path.get('arguments.0') as babel.NodePath) - : null - - const shouldValidateClient = !!calledOptions?.node.properties.find((prop) => { - return ( - t.isObjectProperty(prop) && - t.isIdentifier(prop.key) && - prop.key.name === 'validateClient' && - t.isBooleanLiteral(prop.value) && - prop.value.value === true - ) - }) - - const callExpressionPaths = { - middleware: null as babel.NodePath | null, - validator: null as babel.NodePath | null, - handler: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createServerFn call expression:', - // rootCallExpression.toString(), - // ) - - // Check if the call is assigned to a variable - if (!rootCallExpression.parentPath.isVariableDeclarator()) { - throw new Error('createServerFn must be assigned to a variable!') - } - - // Get the identifier name of the variable - const variableDeclarator = rootCallExpression.parentPath.node - const existingVariableName = (variableDeclarator.id as t.Identifier).name - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if (callExpressionPaths.validator) { - const innerInputExpression = callExpressionPaths.validator.node.arguments[0] - - if (!innerInputExpression) { - throw new Error( - 'createServerFn().validator() must be called with a validator!', - ) - } - - // If we're on the client, and we're not validating the client, remove the validator call expression - if ( - opts.env === 'client' && - !shouldValidateClient && - t.isMemberExpression(callExpressionPaths.validator.node.callee) - ) { - callExpressionPaths.validator.replaceWith( - callExpressionPaths.validator.node.callee.object, - ) - } - } - - // First, we need to move the handler function to a nested function call - // that is applied to the arguments passed to the server function. - - const handlerFnPath = callExpressionPaths.handler?.get( - 'arguments.0', - ) as babel.NodePath - - if (!callExpressionPaths.handler || !handlerFnPath.node) { - throw codeFrameError( - opts.code, - path.node.callee.loc!, - `createServerFn must be called with a "handler" property!`, - ) - } - - const handlerFn = handlerFnPath.node - - // So, the way we do this is we give the handler function a way - // to access the serverFn ctx on the server via function scope. - // The 'use server' extracted function will be called with the - // payload from the client, then use the scoped serverFn ctx - // to execute the handler function. - // This way, we can do things like data and middleware validation - // in the __execute function without having to AST transform the - // handler function too much itself. - - // .handler((optsOut, ctx) => { - // return ((optsIn) => { - // 'use server' - // ctx.__execute(handlerFn, optsIn) - // })(optsOut) - // }) - - // If the handler function is an identifier and we're on the client, we need to - // remove the bound function from the file. - // If we're on the server, you can leave it, since it will get referenced - // as a second argument. - - if (t.isIdentifier(handlerFn)) { - if (opts.env === 'client' || opts.env === 'ssr') { - // Find the binding for the handler function - const binding = handlerFnPath.scope.getBinding(handlerFn.name) - // Remove it - if (binding) { - binding.path.remove() - } - } - // If the env is server, just leave it alone - } - - handlerFnPath.replaceWith( - t.arrowFunctionExpression( - [t.identifier('opts'), t.identifier('signal')], - t.blockStatement( - // Everything in here is server-only, since the client - // will strip out anything in the 'use server' directive. - [ - t.returnStatement( - t.callExpression( - t.identifier(`${existingVariableName}.__executeServer`), - [t.identifier('opts'), t.identifier('signal')], - ), - ), - ], - [t.directive(t.directiveLiteral('use server'))], - ), - ), - ) - - if (opts.env === 'server') { - callExpressionPaths.handler.node.arguments.push(handlerFn) - } -} - -function handleCreateMiddlewareCallExpression( - path: babel.NodePath, - opts: ParseAstOptions, -) { - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createMiddleware call expression:', - // rootCallExpression.toString(), - // ) - - const callExpressionPaths = { - middleware: null as babel.NodePath | null, - validator: null as babel.NodePath | null, - client: null as babel.NodePath | null, - server: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if (callExpressionPaths.validator) { - const innerInputExpression = callExpressionPaths.validator.node.arguments[0] - - if (!innerInputExpression) { - throw new Error( - 'createMiddleware().validator() must be called with a validator!', - ) - } - - // If we're on the client or ssr, remove the validator call expression - if (opts.env === 'client' || opts.env === 'ssr') { - if (t.isMemberExpression(callExpressionPaths.validator.node.callee)) { - callExpressionPaths.validator.replaceWith( - callExpressionPaths.validator.node.callee.object, - ) - } - } - } - - const serverFnPath = callExpressionPaths.server?.get( - 'arguments.0', - ) as babel.NodePath - - if ( - callExpressionPaths.server && - serverFnPath.node && - (opts.env === 'client' || opts.env === 'ssr') - ) { - // If we're on the client, remove the server call expression - if (t.isMemberExpression(callExpressionPaths.server.node.callee)) { - callExpressionPaths.server.replaceWith( - callExpressionPaths.server.node.callee.object, - ) - } - } -} - -function buildEnvOnlyCallExpressionHandler(env: 'client' | 'server') { - return function envOnlyCallExpressionHandler( - path: babel.NodePath, - opts: ParseAstOptions, - ) { - // if (debug) - // console.info(`Handling ${env}Only call expression:`, path.toString()) - - const isEnvMatch = - env === 'client' - ? opts.env === 'client' - : opts.env === 'server' || opts.env === 'ssr' - - if (isEnvMatch) { - // extract the inner function from the call expression - const innerInputExpression = path.node.arguments[0] - - if (!t.isExpression(innerInputExpression)) { - throw new Error( - `${env}Only() functions must be called with a function!`, - ) - } - - path.replaceWith(innerInputExpression) - return - } - - // If we're on the wrong environment, replace the call expression - // with a function that always throws an error. - path.replaceWith( - t.arrowFunctionExpression( - [], - t.blockStatement([ - t.throwStatement( - t.newExpression(t.identifier('Error'), [ - t.stringLiteral( - `${env}Only() functions can only be called on the ${env}!`, - ), - ]), - ), - ]), - ), - ) - } -} - -function handleCreateIsomorphicFnCallExpression( - path: babel.NodePath, - opts: CompileOptions, -) { - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createIsomorphicFn call expression:', - // rootCallExpression.toString(), - // ) - - const callExpressionPaths = { - client: null as babel.NodePath | null, - server: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if ( - validMethods.every( - (method) => - !callExpressionPaths[method as keyof typeof callExpressionPaths], - ) - ) { - const variableId = rootCallExpression.parentPath.isVariableDeclarator() - ? rootCallExpression.parentPath.node.id - : null - console.warn( - 'createIsomorphicFn called without a client or server implementation!', - 'This will result in a no-op function.', - 'Variable name:', - t.isIdentifier(variableId) ? variableId.name : 'unknown', - ) - } - - const resolvedEnv = opts.env === 'ssr' ? 'server' : opts.env - - const envCallExpression = callExpressionPaths[resolvedEnv] - - if (!envCallExpression) { - // if we don't have an implementation for this environment, default to a no-op - rootCallExpression.replaceWith( - t.arrowFunctionExpression([], t.blockStatement([])), - ) - return - } - - const innerInputExpression = envCallExpression.node.arguments[0] - - if (!t.isExpression(innerInputExpression)) { - throw new Error( - `createIsomorphicFn().${resolvedEnv}(func) must be called with a function!`, - ) - } - - rootCallExpression.replaceWith(innerInputExpression) -} - -function getRootCallExpression(path: babel.NodePath) { - // Find the highest callExpression parent - let rootCallExpression: babel.NodePath = path - - // Traverse up the chain of CallExpressions - while (rootCallExpression.parentPath.isMemberExpression()) { - const parent = rootCallExpression.parentPath - if (parent.parentPath.isCallExpression()) { - rootCallExpression = parent.parentPath - } - } - - return rootCallExpression -} - -function codeFrameError( - code: string, - loc: { - start: { line: number; column: number } - end: { line: number; column: number } - }, - message: string, -) { - const frame = codeFrameColumns( - code, - { - start: loc.start, - end: loc.end, - }, - { - highlightCode: true, - message, - }, - ) - - return new Error(frame) -} diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 6ab529afca..72b2cc8de8 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -1,143 +1,122 @@ -import { fileURLToPath, pathToFileURL } from 'node:url' import path from 'node:path' -import { existsSync } from 'node:fs' -import { logDiff } from '@tanstack/router-utils' -import { compileStartOutput } from './compilers' -import type { Plugin } from 'vite' - -const debug = - process.env.TSR_VITE_DEBUG && - ['true', 'react-start-plugin'].includes(process.env.TSR_VITE_DEBUG) - -export type TanStackStartViteOptions = { - globalMiddlewareEntry: string -} - -const transformFuncs = [ - 'createServerFn', - 'createMiddleware', - 'serverOnly', - 'clientOnly', - 'createIsomorphicFn', -] -const tokenRegex = new RegExp(transformFuncs.join('|')) -// const eitherFuncRegex = new RegExp( -// `(function ${transformFuncs.join('|function ')})`, -// ) - -export function createTanStackStartPlugin(opts: TanStackStartViteOptions): { - client: Array - ssr: Array - server: Array -} { - const globalMiddlewarePlugin = (): Plugin => { - let entry: string | null = null - let resolvedGlobalMiddlewareEntry: string | null = null - let globalMiddlewareEntryExists = false - let ROOT: string = process.cwd() - return { - name: 'vite-plugin-tanstack-start-ensure-global-middleware', - enforce: 'pre', - configResolved: (config) => { - ROOT = config.root - entry = path.resolve(ROOT, (config as any).router.handler) - resolvedGlobalMiddlewareEntry = path.resolve( - ROOT, - opts.globalMiddlewareEntry, - ) - globalMiddlewareEntryExists = existsSync(resolvedGlobalMiddlewareEntry) - - if (!entry) { - throw new Error( - '@tanstack/react-start-plugin: No server entry found!', - ) +import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import viteReact from '@vitejs/plugin-react' +import { + TanStackStartServerRoutesVite, + TanStackStartVitePluginCore, +} from '@tanstack/start-plugin-core' +import { getTanStackStartOptions } from './schema' +import type { TanStackStartInputConfig, WithReactPlugin } from './schema' +import type { PluginOption } from 'vite' + +export type { + TanStackStartInputConfig, + TanStackStartOutputConfig, + WithReactPlugin, +} from './schema' + +export function TanStackStartVitePlugin( + opts?: TanStackStartInputConfig & WithReactPlugin, +): Array { + type OptionsWithReact = ReturnType & + WithReactPlugin + const options: OptionsWithReact = getTanStackStartOptions(opts) + + return [ + tanstackRouter({ + verboseFileRoutes: false, + ...options.tsr, + target: 'react', + enableRouteGeneration: true, + autoCodeSplitting: true, + }), + TanStackStartVitePluginCore('react', options), + { + name: 'tanstack-react-start:resolve-entries', + resolveId(id) { + if ( + [ + '/~start/server-entry', + '/~start/default-server-entry', + '/~start/default-client-entry', + ].includes(id) + ) { + return `${id}.tsx` } - }, - transform(code, id) { - if (entry && id.includes(entry)) { - if (globalMiddlewareEntryExists) { - return { - code: `${code}\n\nimport '${path.resolve(ROOT, opts.globalMiddlewareEntry)}'`, - map: null, - } - } + if (id === '/~start/server-entry.tsx') { + return id } + return null }, - } - } - - return { - client: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'client' }), - ], - ssr: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'ssr' }), - ], - server: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'server' }), - ], - } -} - -export function TanStackStartServerFnsAndMiddleware(opts: { - env: 'server' | 'ssr' | 'client' -}): Plugin { - let ROOT: string = process.cwd() - - return { - name: 'vite-plugin-tanstack-start-create-server-fn', - enforce: 'pre', - configResolved: (config) => { - ROOT = config.root - }, - transform(code, id) { - const url = pathToFileURL(id) - url.searchParams.delete('v') - id = fileURLToPath(url).replace(/\\/g, '/') - - const includesToken = tokenRegex.test(code) - // const includesEitherFunc = eitherFuncRegex.test(code) + load(id) { + const routerImportPath = JSON.stringify( + path.resolve(options.root, options.tsr.srcDirectory, 'router'), + ) - if ( - !includesToken - // includesEitherFunc - // /node_modules/.test(id) - ) { - return null - } + if (id === '/~start/server-entry.tsx') { + return ` +import { toWebRequest, defineEventHandler, __setGlobalOrigin, __getAbsoluteUrl } from '@tanstack/react-start/server'; +import serverEntry from '${options.serverEntryPath}'; + +export default defineEventHandler(function(event) { + const request = toWebRequest(event); + __setGlobalOrigin(__getAbsoluteUrl(request)); + return serverEntry({ request }); +}) +` + } - if (code.includes('@react-refresh')) { - throw new Error( - `We detected that the '@vitejs/plugin-react' was passed before '@tanstack/react-start-plugin'. Please make sure that '@tanstack/router-vite-plugin' is passed before '@vitejs/plugin-react' and try again: -e.g. + if (id === '/~start/default-client-entry.tsx') { + return ` +import { hydrateRoot } from 'react-dom/client' +import { StartClient } from '@tanstack/react-start' +import { createRouter } from ${routerImportPath} -plugins: [ - TanStackStartVite(), // Place this before viteReact() - viteReact(), -] -`, - ) - } +const router = createRouter() - if (debug) console.info(`${opts.env} Compiling Start: `, id) +hydrateRoot(document, ) +` + } - const compiled = compileStartOutput({ - code, - root: ROOT, - filename: id, - env: opts.env, - }) + if (id === '/~start/default-server-entry.tsx') { + return ` +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { createRouter } from ${routerImportPath} - if (debug) { - logDiff(code, compiled.code) - console.log('Output:\n', compiled.code + '\n\n') - } +export default createStartHandler({ + createRouter, +})(defaultStreamHandler) +` + } - return compiled + return null + }, }, - } + TanStackServerFnPluginEnv({ + // This is the ID that will be available to look up and import + // our server function manifest and resolve its module + manifestVirtualImportId: 'tanstack:server-fn-manifest', + client: { + getRuntimeCode: () => + `import { createClientRpc } from '@tanstack/react-start/server-functions-client'`, + replacer: (d) => + `createClientRpc('${d.functionId}', '${options.serverFns.base}')`, + }, + server: { + getRuntimeCode: () => + `import { createServerRpc } from '@tanstack/react-start/server-functions-server'`, + replacer: (d) => + `createServerRpc('${d.functionId}', '${options.serverFns.base}', ${d.fn})`, + }, + }), + TanStackStartServerRoutesVite({ + ...options.tsr, + target: 'react', + }), + viteReact(options.react), + ] } + +export { TanStackStartVitePlugin as tanstackStart } diff --git a/packages/react-start-plugin/src/schema.ts b/packages/react-start-plugin/src/schema.ts new file mode 100644 index 0000000000..4522cc801a --- /dev/null +++ b/packages/react-start-plugin/src/schema.ts @@ -0,0 +1,31 @@ +import { z } from 'zod' +import { + createTanStackConfig, + createTanStackStartOptionsSchema, +} from '@tanstack/start-plugin-core' +import type { Options as ViteReactOptions } from '@vitejs/plugin-react' + +export type WithReactPlugin = { + react?: ViteReactOptions +} + +const frameworkPlugin = { + react: z.custom().optional(), +} + +// eslint-disable-next-line unused-imports/no-unused-vars +const TanStackStartOptionsSchema = + createTanStackStartOptionsSchema(frameworkPlugin) + +const defaultConfig = createTanStackConfig(frameworkPlugin) + +export function getTanStackStartOptions(opts?: TanStackStartInputConfig) { + return defaultConfig.parse(opts) +} + +export type TanStackStartInputConfig = z.input< + typeof TanStackStartOptionsSchema +> +export type TanStackStartOutputConfig = ReturnType< + typeof getTanStackStartOptions +> diff --git a/packages/react-start-plugin/tsconfig.json b/packages/react-start-plugin/tsconfig.json index 37d21ef6ca..090ec3917d 100644 --- a/packages/react-start-plugin/tsconfig.json +++ b/packages/react-start-plugin/tsconfig.json @@ -3,6 +3,8 @@ "include": ["src", "vite.config.ts", "tests"], "exclude": ["tests/**/test-files/**", "tests/**/snapshots/**"], "compilerOptions": { - "jsx": "react-jsx" + "outDir": "dist/esm", + "target": "esnext", + "noEmit": true } } diff --git a/packages/react-start-plugin/vite.config.ts b/packages/react-start-plugin/vite.config.ts index 5389f0f739..2c711fd181 100644 --- a/packages/react-start-plugin/vite.config.ts +++ b/packages/react-start-plugin/vite.config.ts @@ -16,5 +16,6 @@ export default mergeConfig( tanstackViteConfig({ entry: './src/index.ts', srcDir: './src', + outDir: './dist', }), ) diff --git a/packages/react-start-router-manifest/README.md b/packages/react-start-router-manifest/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/react-start-router-manifest/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/react-start-router-manifest/eslint.config.js b/packages/react-start-router-manifest/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/react-start-router-manifest/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/react-start-router-manifest/package.json b/packages/react-start-router-manifest/package.json deleted file mode 100644 index f367442a9c..0000000000 --- a/packages/react-start-router-manifest/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "@tanstack/react-start-router-manifest", - "version": "1.120.3", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/react-start-router-manifest" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0; vitest", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "tsc" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/router-core": "workspace:^", - "tiny-invariant": "^1.3.3", - "vinxi": "0.5.3" - }, - "devDependencies": { - "typescript": "^5.7.2" - } -} diff --git a/packages/react-start-router-manifest/src/index.ts b/packages/react-start-router-manifest/src/index.ts deleted file mode 100644 index 3f0a37f609..0000000000 --- a/packages/react-start-router-manifest/src/index.ts +++ /dev/null @@ -1,88 +0,0 @@ -// @ts-expect-error -import tsrGetManifest from 'tsr:routes-manifest' -import { getManifest } from 'vinxi/manifest' -import { default as invariant } from 'tiny-invariant' -import type { Manifest } from '@tanstack/router-core' - -function sanitizeBase(base: string) { - return base.replace(/^\/|\/$/g, '') -} - -/** - * @description Returns the full, unfiltered router manifest. This includes relationships - * between routes, assets, and preloads and is NOT what you want to serialize and - * send to the client. - */ -export function getFullRouterManifest() { - const routerManifest = tsrGetManifest() as Manifest - - const rootRoute = (routerManifest.routes.__root__ = - routerManifest.routes.__root__ || {}) - - rootRoute.assets = rootRoute.assets || [] - - let script = '' - // Always fake that HMR is ready - if (process.env.NODE_ENV === 'development') { - const CLIENT_BASE = sanitizeBase(process.env.TSS_CLIENT_BASE || '') - - if (!CLIENT_BASE) { - throw new Error( - 'tanstack/start-router-manifest: TSS_CLIENT_BASE must be defined in your environment for getFullRouterManifest()', - ) - } - script = `import RefreshRuntime from "/${CLIENT_BASE}/@react-refresh"; - RefreshRuntime.injectIntoGlobalHook(window) - window.$RefreshReg$ = () => {} - window.$RefreshSig$ = () => (type) => type - window.__vite_plugin_react_preamble_installed__ = true;` - } - - // Get the entry for the client from vinxi - const vinxiClientManifest = getManifest('client') - - const importPath = - vinxiClientManifest.inputs[vinxiClientManifest.handler]?.output.path - if (!importPath) { - invariant(importPath, 'Could not find client entry in vinxi manifest') - } - - rootRoute.assets.push({ - tag: 'script', - attrs: { - type: 'module', - suppressHydrationWarning: true, - async: true, - }, - children: `${script}import("${importPath}")`, - }) - - return routerManifest -} - -/** - * @description Returns the router manifest that should be sent to the client. - * This includes only the assets and preloads for the current route and any - * special assets that are needed for the client. It does not include relationships - * between routes or any other data that is not needed for the client. - */ -export function getRouterManifest() { - const routerManifest = getFullRouterManifest() - - // Strip out anything that isn't needed for the client - return { - ...routerManifest, - routes: Object.fromEntries( - Object.entries(routerManifest.routes).map(([k, v]: any) => { - const { preloads, assets } = v - return [ - k, - { - preloads, - assets, - }, - ] - }), - ), - } -} diff --git a/packages/react-start-router-manifest/tsconfig.json b/packages/react-start-router-manifest/tsconfig.json deleted file mode 100644 index 940a9cce0a..0000000000 --- a/packages/react-start-router-manifest/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src/index.ts"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist/esm", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/react-start-router-manifest/vite.config.ts b/packages/react-start-router-manifest/vite.config.ts deleted file mode 100644 index d6472068fb..0000000000 --- a/packages/react-start-router-manifest/vite.config.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import packageJson from './package.json' -import type { ViteUserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [] as ViteUserConfig['plugins'], - test: { - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - externalDeps: ['tsr:routes-manifest'], - }), -) diff --git a/packages/react-start-server/README.md b/packages/react-start-server/README.md index bb009b0c87..7be47d33fd 100644 --- a/packages/react-start-server/README.md +++ b/packages/react-start-server/README.md @@ -1,33 +1,9 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! +# TanStack React Start - Server - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +This package is not meant to be used directly. It is a dependency of [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +TanStack React Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 9bbf439abe..0a04a3c2b4 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -68,6 +68,7 @@ "@tanstack/start-client-core": "workspace:^", "@tanstack/start-server-core": "workspace:^", "tiny-warning": "^1.0.3", + "tiny-invariant": "^1.3.3", "h3": "1.13.0", "isbot": "^5.1.22", "jsesc": "^3.1.0", diff --git a/packages/react-start-server/tsconfig.json b/packages/react-start-server/tsconfig.json index 134e51f065..b447592593 100644 --- a/packages/react-start-server/tsconfig.json +++ b/packages/react-start-server/tsconfig.json @@ -8,6 +8,6 @@ "src", "tests", "vite.config.ts", - "../start-client/src/tsrScript.ts" + "../start-server-core/src/server-functions-handler.ts" ] } diff --git a/packages/react-start-server/vite.config.ts b/packages/react-start-server/vite.config.ts index e05e5cc394..010f101521 100644 --- a/packages/react-start-server/vite.config.ts +++ b/packages/react-start-server/vite.config.ts @@ -19,5 +19,6 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', + externalDeps: ['tanstack:server-fn-manifest', 'tanstack:start-manifest'], }), ) diff --git a/packages/react-start/README.md b/packages/react-start/README.md index bb009b0c87..a36c48bd14 100644 --- a/packages/react-start/README.md +++ b/packages/react-start/README.md @@ -1,33 +1,42 @@ -> 🤫 we're cooking up something special! - -# TanStack Start +# TanStack React Start -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +![TanStack React Start Header](https://github.com/tanstack/router/raw/main/media/header.png) -🤖 Type-safe router w/ built-in caching & URL state management for React! +SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router) and Vite. Ready to deploy to your favorite hosting provider. #TanStack - + + - - - - - - semantic-release - + + + + + + + + + semantic-release + + Join the discussion on Github -Best of JS + + + Best of JS + + - + + - + + Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Visit [tanstack.com/start](https://tanstack.com/start) for docs, guides, API and more! diff --git a/packages/react-start/package.json b/packages/react-start/package.json index a08b503980..0c10b3a616 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -62,34 +62,14 @@ "default": "./dist/cjs/server.cjs" } }, - "./config": { + "./plugin/vite": { "import": { - "types": "./dist/esm/config.d.ts", - "default": "./dist/esm/config.js" + "types": "./dist/esm/plugin-vite.d.ts", + "default": "./dist/esm/plugin-vite.js" }, "require": { - "types": "./dist/cjs/config.d.cts", - "default": "./dist/cjs/config.cjs" - } - }, - "./api": { - "import": { - "types": "./dist/esm/api.d.ts", - "default": "./dist/esm/api.js" - }, - "require": { - "types": "./dist/cjs/api.d.cts", - "default": "./dist/cjs/api.cjs" - } - }, - "./router-manifest": { - "import": { - "types": "./dist/esm/router-manifest.d.ts", - "default": "./dist/esm/router-manifest.js" - }, - "require": { - "types": "./dist/cjs/router-manifest.d.cts", - "default": "./dist/cjs/router-manifest.cjs" + "types": "./dist/cjs/plugin-vite.d.cts", + "default": "./dist/cjs/plugin-vite.cjs" } }, "./server-functions-client": { @@ -112,26 +92,6 @@ "default": "./dist/cjs/server-functions-server.cjs" } }, - "./server-functions-handler": { - "import": { - "types": "./dist/esm/server-functions-handler.d.ts", - "default": "./dist/esm/server-functions-handler.js" - }, - "require": { - "types": "./dist/cjs/server-functions-handler.d.cts", - "default": "./dist/cjs/server-functions-handler.cjs" - } - }, - "./server-functions-ssr": { - "import": { - "types": "./dist/esm/server-functions-ssr.d.ts", - "default": "./dist/esm/server-functions-ssr.js" - }, - "require": { - "types": "./dist/cjs/server-functions-ssr.d.cts", - "default": "./dist/cjs/server-functions-ssr.cjs" - } - }, "./package.json": "./package.json" }, "sideEffects": false, @@ -145,13 +105,9 @@ "dependencies": { "@tanstack/react-start-client": "workspace:^", "@tanstack/react-start-server": "workspace:^", - "@tanstack/react-start-config": "workspace:^", - "@tanstack/react-start-router-manifest": "workspace:^", + "@tanstack/react-start-plugin": "workspace:^", "@tanstack/start-server-functions-client": "workspace:^", - "@tanstack/start-server-functions-server": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@tanstack/start-server-functions-ssr": "workspace:^", - "@tanstack/start-api-routes": "workspace:^" + "@tanstack/start-server-functions-server": "workspace:^" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", diff --git a/packages/react-start/src/api.tsx b/packages/react-start/src/api.tsx deleted file mode 100644 index fff3bec5ea..0000000000 --- a/packages/react-start/src/api.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-api-routes' diff --git a/packages/react-start/src/config.tsx b/packages/react-start/src/config.tsx deleted file mode 100644 index 57a7ae394d..0000000000 --- a/packages/react-start/src/config.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/react-start-config' diff --git a/packages/react-start/src/plugin-vite.ts b/packages/react-start/src/plugin-vite.ts new file mode 100644 index 0000000000..d991c3b71c --- /dev/null +++ b/packages/react-start/src/plugin-vite.ts @@ -0,0 +1 @@ +export * from '@tanstack/react-start-plugin' diff --git a/packages/react-start/src/router-manifest.tsx b/packages/react-start/src/router-manifest.tsx deleted file mode 100644 index ce430d7884..0000000000 --- a/packages/react-start/src/router-manifest.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/react-start-router-manifest' diff --git a/packages/react-start/src/server-functions-handler.tsx b/packages/react-start/src/server-functions-handler.tsx deleted file mode 100644 index c3cc9770d2..0000000000 --- a/packages/react-start/src/server-functions-handler.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-server-functions-handler' diff --git a/packages/react-start/src/server-functions-ssr.tsx b/packages/react-start/src/server-functions-ssr.tsx deleted file mode 100644 index 7359e26f45..0000000000 --- a/packages/react-start/src/server-functions-ssr.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-server-functions-ssr' diff --git a/packages/react-start/vite.config.ts b/packages/react-start/vite.config.ts index 46bc2ea875..99fd4a8b00 100644 --- a/packages/react-start/vite.config.ts +++ b/packages/react-start/vite.config.ts @@ -17,22 +17,16 @@ export default mergeConfig( entry: [ './src/client.tsx', './src/server.tsx', - './src/config.tsx', - './src/router-manifest.tsx', + './src/plugin-vite.ts', './src/server-functions-client.tsx', './src/server-functions-server.tsx', - './src/server-functions-ssr.tsx', - './src/api.tsx', ], externalDeps: [ '@tanstack/react-start-client', '@tanstack/react-start-server', - '@tanstack/react-start-config', - '@tanstack/react-start-router-manifest', + '@tanstack/react-start-plugin', '@tanstack/start-server-functions-client', '@tanstack/start-server-functions-server', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-api-routes', ], }), ) diff --git a/packages/router-core/src/fileRoute.ts b/packages/router-core/src/fileRoute.ts index 8d2e5b33a5..2c689c3929 100644 --- a/packages/router-core/src/fileRoute.ts +++ b/packages/router-core/src/fileRoute.ts @@ -2,6 +2,10 @@ import type { AnyContext, AnyPathParams, AnyRoute, + FileBaseRouteOptions, + ResolveParams, + Route, + RouteConstraints, UpdatableRouteOptions, } from './route' import type { AnyValidator } from './validators' @@ -28,6 +32,87 @@ export interface FileRoutesByPath { // } } +export interface FileRouteOptions< + TFilePath extends string, + TParentRoute extends AnyRoute, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TSearchValidator = undefined, + TParams = ResolveParams, + TRouteContextFn = AnyContext, + TBeforeLoadFn = AnyContext, + TLoaderDeps extends Record = {}, + TLoaderFn = undefined, +> extends FileBaseRouteOptions< + TParentRoute, + TId, + TPath, + TSearchValidator, + TParams, + TLoaderDeps, + TLoaderFn, + AnyContext, + TRouteContextFn, + TBeforeLoadFn + >, + UpdatableRouteOptions< + TParentRoute, + TId, + TFullPath, + TParams, + TSearchValidator, + TLoaderFn, + TLoaderDeps, + AnyContext, + TRouteContextFn, + TBeforeLoadFn + > {} + +export type CreateFileRoute< + TFilePath extends string, + TParentRoute extends AnyRoute, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], +> = < + TSearchValidator = undefined, + TParams = ResolveParams, + TRouteContextFn = AnyContext, + TBeforeLoadFn = AnyContext, + TLoaderDeps extends Record = {}, + TLoaderFn = undefined, +>( + options?: FileRouteOptions< + TFilePath, + TParentRoute, + TId, + TPath, + TFullPath, + TSearchValidator, + TParams, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn + >, +) => Route< + TParentRoute, + TPath, + TFullPath, + TFilePath, + TId, + TSearchValidator, + TParams, + AnyContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + unknown, + unknown +> + export type LazyRouteOptions = Pick< UpdatableRouteOptions< AnyRoute, @@ -44,8 +129,12 @@ export type LazyRouteOptions = Pick< 'component' | 'errorComponent' | 'pendingComponent' | 'notFoundComponent' > -export interface LazyRoute { +export interface LazyRoute { options: { id: string } & LazyRouteOptions } + +export type CreateLazyFileRoute = ( + opts: LazyRouteOptions, +) => LazyRoute diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 4988400855..d254cdd0f9 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -60,8 +60,10 @@ export type { InferFileRouteTypes, FileRouteTypes, FileRoutesByPath, + CreateFileRoute, LazyRoute, LazyRouteOptions, + CreateLazyFileRoute, } from './fileRoute' export type { @@ -149,8 +151,6 @@ export type { StringifyParamsFn, ParamsOptions, UpdatableStaticRouteOption, - LooseReturnType, - LooseAsyncReturnType, ContextReturnType, ContextAsyncReturnType, ResolveRouteContext, @@ -209,6 +209,8 @@ export { SearchParamError, PathParamError, getInitialRouterState, + processRouteTree, + getMatchedRoutes, } from './router' export type { ViewTransitionOptions, @@ -322,6 +324,8 @@ export type { MergeAll, ValidateJSON, StrictOrFrom, + LooseReturnType, + LooseAsyncReturnType, } from './utils' export type { @@ -370,7 +374,13 @@ export type { UseLoaderDataResult, ResolveUseLoaderData } from './useLoaderData' export type { Redirect, ResolvedRedirect, AnyRedirect } from './redirect' -export { redirect, isRedirect, isResolvedRedirect } from './redirect' +export { + redirect, + isRedirect, + isResolvedRedirect, + tsrRedirectHeaderKey, + parseRedirect, +} from './redirect' export type { NotFoundError } from './not-found' export { isNotFound, notFound } from './not-found' diff --git a/packages/router-core/src/link.ts b/packages/router-core/src/link.ts index 26d038e769..2ff538bee1 100644 --- a/packages/router-core/src/link.ts +++ b/packages/router-core/src/link.ts @@ -591,6 +591,11 @@ export interface LinkOptionsProps { * @default false */ disabled?: boolean + /** + * When the preload strategy is set to `intent`, this controls the proximity of the link to the cursor before it is preloaded. + * If the user exits this proximity before this delay, the preload will be cancelled. + */ + preloadIntentProximity?: number } export type LinkOptions< diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 4d002673cd..e1f6d737df 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -5,6 +5,9 @@ import type { AnyPathParams } from './route' export interface Segment { type: 'pathname' | 'param' | 'wildcard' value: string + // Add a new property to store the static segment if present + prefixSegment?: string + suffixSegment?: string } export function joinPaths(paths: Array) { @@ -137,10 +140,52 @@ export function resolvePath({ } } - const joined = joinPaths([basepath, ...baseSegments.map((d) => d.value)]) + const segmentValues = baseSegments.map((segment) => { + if (segment.type === 'param') { + const param = segment.value.substring(1) + if (segment.prefixSegment && segment.suffixSegment) { + return `${segment.prefixSegment}{$${param}}${segment.suffixSegment}` + } else if (segment.prefixSegment) { + return `${segment.prefixSegment}{$${param}}` + } else if (segment.suffixSegment) { + return `{$${param}}${segment.suffixSegment}` + } + } + if (segment.type === 'wildcard') { + if (segment.prefixSegment && segment.suffixSegment) { + return `${segment.prefixSegment}{$}${segment.suffixSegment}` + } else if (segment.prefixSegment) { + return `${segment.prefixSegment}{$}` + } else if (segment.suffixSegment) { + return `{$}${segment.suffixSegment}` + } + } + return segment.value + }) + const joined = joinPaths([basepath, ...segmentValues]) return cleanPath(joined) } +const PARAM_RE = /^\$.{1,}$/ // $paramName +const PARAM_W_CURLY_BRACES_RE = /^(.*?)\{(\$[a-zA-Z_$][a-zA-Z0-9_$]*)\}(.*)$/ // prefix{$paramName}suffix +const WILDCARD_RE = /^\$$/ // $ +const WILDCARD_W_CURLY_BRACES_RE = /^(.*?)\{\$\}(.*)$/ // prefix{$}suffix + +/** + * Required: `/foo/$bar` ✅ + * Prefix and Suffix: `/foo/prefix${bar}suffix` ✅ + * Wildcard: `/foo/$` ✅ + * Wildcard with Prefix and Suffix: `/foo/prefix{$}suffix` ✅ + * + * Future: + * Optional: `/foo/{-bar}` + * Optional named segment: `/foo/{bar}` + * Optional named segment with Prefix and Suffix: `/foo/prefix{-bar}suffix` + * Escape special characters: + * - `/foo/[$]` - Static route + * - `/foo/[$]{$foo} - Dynamic route with a static prefix of `$` + * - `/foo/{$foo}[$]` - Dynamic route with a static suffix of `$` + */ export function parsePathname(pathname?: string): Array { if (!pathname) { return [] @@ -167,20 +212,55 @@ export function parsePathname(pathname?: string): Array { segments.push( ...split.map((part): Segment => { - if (part === '$' || part === '*') { + // Check for wildcard with curly braces: prefix{$}suffix + const wildcardBracesMatch = part.match(WILDCARD_W_CURLY_BRACES_RE) + if (wildcardBracesMatch) { + const prefix = wildcardBracesMatch[1] + const suffix = wildcardBracesMatch[2] return { type: 'wildcard', - value: part, + value: '$', + prefixSegment: prefix || undefined, + suffixSegment: suffix || undefined, } } - if (part.charAt(0) === '$') { + // Check for the new parameter format: prefix{$paramName}suffix + const paramBracesMatch = part.match(PARAM_W_CURLY_BRACES_RE) + if (paramBracesMatch) { + const prefix = paramBracesMatch[1] + const paramName = paramBracesMatch[2] + const suffix = paramBracesMatch[3] return { type: 'param', - value: part, + value: '' + paramName, + prefixSegment: prefix || undefined, + suffixSegment: suffix || undefined, } } + // Check for bare parameter format: $paramName (without curly braces) + if (PARAM_RE.test(part)) { + const paramName = part.substring(1) + return { + type: 'param', + value: '$' + paramName, + prefixSegment: undefined, + suffixSegment: undefined, + } + } + + // Check for bare wildcard: $ (without curly braces) + if (WILDCARD_RE.test(part)) { + return { + type: 'wildcard', + value: '$', + prefixSegment: undefined, + suffixSegment: undefined, + } + } + + // Handle regular pathname segment return { type: 'pathname', value: part.includes('%25') @@ -248,9 +328,13 @@ export function interpolatePath({ interpolatedPathSegments.map((segment) => { if (segment.type === 'wildcard') { usedParams._splat = params._splat + const segmentPrefix = segment.prefixSegment || '' + const segmentSuffix = segment.suffixSegment || '' const value = encodeParam('_splat') - if (leaveWildcards) return `${segment.value}${value ?? ''}` - return value + if (leaveWildcards) { + return `${segmentPrefix}${segment.value}${value ?? ''}${segmentSuffix}` + } + return `${segmentPrefix}${value}${segmentSuffix}` } if (segment.type === 'param') { @@ -259,11 +343,14 @@ export function interpolatePath({ isMissingParams = true } usedParams[key] = params[key] + + const segmentPrefix = segment.prefixSegment || '' + const segmentSuffix = segment.suffixSegment || '' if (leaveParams) { const value = encodeParam(segment.value) - return `${segment.value}${value ?? ''}` + return `${segmentPrefix}${segment.value}${value ?? ''}${segmentSuffix}` } - return encodeParam(key) ?? 'undefined' + return `${segmentPrefix}${encodeParam(key) ?? 'undefined'}${segmentSuffix}` } return segment.value @@ -390,9 +477,57 @@ export function matchByPath( if (routeSegment) { if (routeSegment.type === 'wildcard') { - const _splat = decodeURI( - joinPaths(baseSegments.slice(i).map((d) => d.value)), - ) + // Capture all remaining segments for a wildcard + const remainingBaseSegments = baseSegments.slice(i) + + let _splat: string + + // If this is a wildcard with prefix/suffix, we need to handle the first segment specially + if (routeSegment.prefixSegment || routeSegment.suffixSegment) { + if (!baseSegment) return false + + const prefix = routeSegment.prefixSegment || '' + const suffix = routeSegment.suffixSegment || '' + + // Check if the base segment starts with prefix and ends with suffix + const baseValue = baseSegment.value + if ('prefixSegment' in routeSegment) { + if (!baseValue.startsWith(prefix)) { + return false + } + } + if ('suffixSegment' in routeSegment) { + if ( + !baseSegments[baseSegments.length - 1]?.value.endsWith(suffix) + ) { + return false + } + } + + let rejoinedSplat = decodeURI( + joinPaths(remainingBaseSegments.map((d) => d.value)), + ) + + // Remove the prefix and suffix from the rejoined splat + if (prefix && rejoinedSplat.startsWith(prefix)) { + rejoinedSplat = rejoinedSplat.slice(prefix.length) + } + + if (suffix && rejoinedSplat.endsWith(suffix)) { + rejoinedSplat = rejoinedSplat.slice( + 0, + rejoinedSplat.length - suffix.length, + ) + } + + _splat = rejoinedSplat + } else { + // If no prefix/suffix, just rejoin the remaining segments + _splat = decodeURI( + joinPaths(remainingBaseSegments.map((d) => d.value)), + ) + } + // TODO: Deprecate * params['*'] = _splat params['_splat'] = _splat @@ -426,11 +561,41 @@ export function matchByPath( if (baseSegment.value === '/') { return false } - if (baseSegment.value.charAt(0) !== '$') { - params[routeSegment.value.substring(1)] = decodeURIComponent( - baseSegment.value, - ) + + let _paramValue: string + + // If this param has prefix/suffix, we need to extract the actual parameter value + if (routeSegment.prefixSegment || routeSegment.suffixSegment) { + const prefix = routeSegment.prefixSegment || '' + const suffix = routeSegment.suffixSegment || '' + + // Check if the base segment starts with prefix and ends with suffix + const baseValue = baseSegment.value + if (prefix && !baseValue.startsWith(prefix)) { + return false + } + if (suffix && !baseValue.endsWith(suffix)) { + return false + } + + let paramValue = baseValue + if (prefix && paramValue.startsWith(prefix)) { + paramValue = paramValue.slice(prefix.length) + } + if (suffix && paramValue.endsWith(suffix)) { + paramValue = paramValue.slice( + 0, + paramValue.length - suffix.length, + ) + } + + _paramValue = decodeURIComponent(paramValue) + } else { + // If no prefix/suffix, just decode the base segment value + _paramValue = decodeURIComponent(baseSegment.value) } + + params[routeSegment.value.substring(1)] = _paramValue } } diff --git a/packages/router-core/src/redirect.ts b/packages/router-core/src/redirect.ts index 24de9024b2..84b82cc652 100644 --- a/packages/router-core/src/redirect.ts +++ b/packages/router-core/src/redirect.ts @@ -1,6 +1,7 @@ import type { NavigateOptions } from './link' import type { AnyRouter, RegisteredRouter } from './router' -import type { PickAsRequired } from './utils' + +export const tsrRedirectHeaderKey = 'X-Tanstack-Router-Redirect-Options' export type AnyRedirect = Redirect @@ -13,6 +14,17 @@ export type Redirect< TTo extends string | undefined = undefined, TMaskFrom extends string = TFrom, TMaskTo extends string = '.', +> = Response & { + options: NavigateOptions + redirectHandled?: boolean +} + +export type RedirectOptions< + TRouter extends AnyRouter = RegisteredRouter, + TFrom extends string = string, + TTo extends string | undefined = undefined, + TMaskFrom extends string = TFrom, + TMaskTo extends string = '.', > = { href?: string /** @@ -42,12 +54,7 @@ export type ResolvedRedirect< TTo extends string = '', TMaskFrom extends string = TFrom, TMaskTo extends string = '', -> = PickAsRequired< - Redirect, - 'code' | 'statusCode' | 'headers' -> & { - href: string -} +> = Redirect export function redirect< TRouter extends AnyRouter = RegisteredRouter, @@ -56,30 +63,38 @@ export function redirect< const TMaskFrom extends string = TFrom, const TMaskTo extends string = '', >( - opts: Redirect, + opts: RedirectOptions, ): Redirect { - ;(opts as any).isRedirect = true opts.statusCode = opts.statusCode || opts.code || 307 - opts.headers = opts.headers || {} - if (!opts.reloadDocument) { - opts.reloadDocument = false - try { - new URL(`${opts.href}`) - opts.reloadDocument = true - } catch {} - } + const headers = new Headers(opts.headers || {}) + + const response = new Response(null, { + status: opts.statusCode, + headers, + }) + + ;(response as Redirect).options = + opts if (opts.throw) { - throw opts + throw response } - return opts + return response as Redirect } export function isRedirect(obj: any): obj is AnyRedirect { - return !!obj?.isRedirect + return obj instanceof Response && !!(obj as any).options } -export function isResolvedRedirect(obj: any): obj is ResolvedRedirect { - return !!obj?.isRedirect && obj.href +export function isResolvedRedirect(obj: any): obj is AnyRedirect { + return isRedirect(obj) && !!obj.options.href +} + +export function parseRedirect(obj: any) { + if (typeof obj === 'object' && obj.isSerializedRedirect) { + return redirect(obj) + } + + return undefined } diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 6344357790..3157cb990b 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -1,3 +1,4 @@ +import invariant from 'tiny-invariant' import { joinPaths, trimPathLeft } from './path' import { notFound } from './not-found' import { rootRouteId } from './root' @@ -20,6 +21,8 @@ import type { Constrain, Expand, IntersectAssign, + LooseAsyncReturnType, + LooseReturnType, NoInfer, } from './utils' import type { @@ -270,20 +273,6 @@ export type TrimPathRight = T extends '/' ? TrimPathRight : T -export type LooseReturnType = T extends ( - ...args: Array -) => infer TReturn - ? TReturn - : never - -export type LooseAsyncReturnType = T extends ( - ...args: Array -) => infer TReturn - ? TReturn extends Promise - ? TReturn - : TReturn - : never - export type ContextReturnType = unknown extends TContextFn ? TContextFn : LooseReturnType extends never @@ -448,7 +437,7 @@ export interface RouteExtensions { } export type RouteLazyFn = ( - lazyFn: () => Promise, + lazyFn: () => Promise>, ) => TRoute export type RouteAddChildrenFn< @@ -602,7 +591,26 @@ export interface Route< > isRoot: TParentRoute extends AnyRoute ? true : false _componentsPromise?: Promise> - lazyFn?: () => Promise + lazyFn?: () => Promise< + LazyRoute< + Route< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + > + > _lazyPromise?: Promise rank: number to: TrimPathRight @@ -621,7 +629,24 @@ export interface Route< TBeforeLoadFn >, ) => this - lazy: RouteLazyFn + lazy: RouteLazyFn< + Route< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + > addChildren: RouteAddChildrenFn< TParentRoute, TPath, @@ -1336,7 +1361,26 @@ export class BaseRoute< children?: TChildren originalIndex?: number rank!: number - lazyFn?: () => Promise + lazyFn?: () => Promise< + LazyRoute< + Route< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + > + > _lazyPromise?: Promise _componentsPromise?: Promise> @@ -1409,7 +1453,8 @@ export class BaseRoute< if (isRoot) { this._path = rootRouteId as TPath } else if (!this.parentRoute) { - throw new Error( + invariant( + false, `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`, ) } @@ -1449,6 +1494,16 @@ export class BaseRoute< this._ssr = options?.ssr ?? opts.defaultSsr ?? true } + clone = (other: typeof this) => { + this._path = other._path + this._id = other._id + this._fullPath = other._fullPath + this._to = other._to + this._ssr = other._ssr + this.options.getParentRoute = other.options.getParentRoute + this.children = other.children + } + addChildren: RouteAddChildrenFn< TParentRoute, TPath, @@ -1562,7 +1617,24 @@ export class BaseRoute< return this } - lazy: RouteLazyFn = (lazyFn) => { + lazy: RouteLazyFn< + Route< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + > = (lazyFn) => { this.lazyFn = lazyFn return this } diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 3a510d6506..5f7fc3f0d0 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -28,7 +28,7 @@ import { isNotFound } from './not-found' import { setupScrollRestoration } from './scroll-restoration' import { defaultParseSearch, defaultStringifySearch } from './searchParams' import { rootRouteId } from './root' -import { isRedirect, isResolvedRedirect } from './redirect' +import { isRedirect } from './redirect' import type { SearchParser, SearchSerializer } from './searchParams' import type { AnyRedirect, ResolvedRedirect } from './redirect' import type { @@ -165,6 +165,14 @@ export interface RouterOptions< * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/preloading#preload-delay) */ defaultPreloadDelay?: number + /** + * The default `preloadIntentProximity` a route should use if no preloadIntentProximity is provided. + * + * @default 0 + * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultpreloadintentproximity-property) + * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/preloading#preload-intent-proximity) + */ + defaultPreloadIntentProximity?: number /** * The default `pendingMs` a route should use if no pendingMs is provided. * @@ -407,7 +415,7 @@ export interface RouterState< location: ParsedLocation> resolvedLocation?: ParsedLocation> statusCode: number - redirect?: ResolvedRedirect + redirect?: AnyRedirect } export interface BuildNextOptions { @@ -593,8 +601,8 @@ export type ParseLocationFn = ( ) => ParsedLocation> export type GetMatchRoutesFn = ( - next: ParsedLocation, - dest?: BuildNextOptions, + pathname: string, + routePathname: string | undefined, ) => { matchedRoutes: Array routeParams: Record @@ -882,7 +890,6 @@ export class RouterCore< } if ( - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition !this.history || (this.options.history && this.options.history !== this.history) ) { @@ -901,7 +908,6 @@ export class RouterCore< this.buildRouteTree() } - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition if (!this.__store) { this.__store = new Store(getInitialRouterState(this.latestLocation), { onUpdate: () => { @@ -920,7 +926,6 @@ export class RouterCore< if ( typeof window !== 'undefined' && 'CSS' in window && - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition typeof window.CSS?.supports === 'function' ) { this.isViewTransitionTypesSupported = window.CSS.supports( @@ -934,124 +939,29 @@ export class RouterCore< } buildRouteTree = () => { - this.routesById = {} as RoutesById - this.routesByPath = {} as RoutesByPath - - const notFoundRoute = this.options.notFoundRoute - if (notFoundRoute) { - notFoundRoute.init({ - originalIndex: 99999999999, - defaultSsr: this.options.defaultSsr, - }) - ;(this.routesById as any)[notFoundRoute.id] = notFoundRoute - } - - const recurseRoutes = (childRoutes: Array) => { - childRoutes.forEach((childRoute, i) => { - childRoute.init({ + const { routesById, routesByPath, flatRoutes } = processRouteTree({ + routeTree: this.routeTree, + initRoute: (route, i) => { + route.init({ originalIndex: i, defaultSsr: this.options.defaultSsr, }) - - const existingRoute = (this.routesById as any)[childRoute.id] - - invariant( - !existingRoute, - `Duplicate routes found with id: ${String(childRoute.id)}`, - ) - ;(this.routesById as any)[childRoute.id] = childRoute - - if (!childRoute.isRoot && childRoute.path) { - const trimmedFullPath = trimPathRight(childRoute.fullPath) - if ( - !(this.routesByPath as any)[trimmedFullPath] || - childRoute.fullPath.endsWith('/') - ) { - ;(this.routesByPath as any)[trimmedFullPath] = childRoute - } - } - - const children = childRoute.children - - if (children?.length) { - recurseRoutes(children) - } - }) - } - - recurseRoutes([this.routeTree]) - - const scoredRoutes: Array<{ - child: AnyRoute - trimmed: string - parsed: ReturnType - index: number - scores: Array - }> = [] - - const routes: Array = Object.values(this.routesById) - - routes.forEach((d, i) => { - if (d.isRoot || !d.path) { - return - } - - const trimmed = trimPathLeft(d.fullPath) - const parsed = parsePathname(trimmed) - - while (parsed.length > 1 && parsed[0]?.value === '/') { - parsed.shift() - } - - const scores = parsed.map((segment) => { - if (segment.value === '/') { - return 0.75 - } - - if (segment.type === 'param') { - return 0.5 - } - - if (segment.type === 'wildcard') { - return 0.25 - } - - return 1 - }) - - scoredRoutes.push({ child: d, trimmed, parsed, index: i, scores }) + }, }) - this.flatRoutes = scoredRoutes - .sort((a, b) => { - const minLength = Math.min(a.scores.length, b.scores.length) - - // Sort by min available score - for (let i = 0; i < minLength; i++) { - if (a.scores[i] !== b.scores[i]) { - return b.scores[i]! - a.scores[i]! - } - } - - // Sort by length of score - if (a.scores.length !== b.scores.length) { - return b.scores.length - a.scores.length - } + this.routesById = routesById as RoutesById + this.routesByPath = routesByPath as RoutesByPath + this.flatRoutes = flatRoutes as Array - // Sort by min available parsed value - for (let i = 0; i < minLength; i++) { - if (a.parsed[i]!.value !== b.parsed[i]!.value) { - return a.parsed[i]!.value > b.parsed[i]!.value ? 1 : -1 - } - } + const notFoundRoute = this.options.notFoundRoute - // Sort by original index - return a.index - b.index - }) - .map((d, i) => { - d.child.rank = i - return d.child + if (notFoundRoute) { + notFoundRoute.init({ + originalIndex: 99999999999, + defaultSsr: this.options.defaultSsr, }) + this.routesById[notFoundRoute.id] = notFoundRoute + } } subscribe: SubscribeFn = (eventType, fn) => { @@ -1165,8 +1075,8 @@ export class RouterCore< opts?: MatchRoutesOpts, ): Array { const { foundRoute, matchedRoutes, routeParams } = this.getMatchedRoutes( - next, - opts?.dest, + next.pathname, + opts?.dest?.to as string, ) let isGlobalNotFound = false @@ -1472,47 +1382,19 @@ export class RouterCore< return matches } - getMatchedRoutes: GetMatchRoutesFn = (next, dest) => { - let routeParams: Record = {} - const trimmedPath = trimPathRight(next.pathname) - const getMatchedParams = (route: AnyRoute) => { - const result = matchPathname(this.basepath, trimmedPath, { - to: route.fullPath, - caseSensitive: - route.options.caseSensitive ?? this.options.caseSensitive, - fuzzy: true, - }) - return result - } - - let foundRoute: AnyRoute | undefined = - dest?.to !== undefined ? this.routesByPath[dest.to!] : undefined - if (foundRoute) { - routeParams = getMatchedParams(foundRoute)! - } else { - foundRoute = this.flatRoutes.find((route) => { - const matchedParams = getMatchedParams(route) - - if (matchedParams) { - routeParams = matchedParams - return true - } - - return false - }) - } - - let routeCursor: AnyRoute = - foundRoute || (this.routesById as any)[rootRouteId] - - const matchedRoutes: Array = [routeCursor] - - while (routeCursor.parentRoute) { - routeCursor = routeCursor.parentRoute - matchedRoutes.unshift(routeCursor) - } - - return { matchedRoutes, routeParams, foundRoute } + getMatchedRoutes: GetMatchRoutesFn = ( + pathname: string, + routePathname: string | undefined, + ) => { + return getMatchedRoutes({ + pathname, + routePathname, + basepath: this.basepath, + caseSensitive: this.options.caseSensitive, + routesByPath: this.routesByPath, + routesById: this.routesById, + flatRoutes: this.flatRoutes, + }) } cancelMatch = (id: string) => { @@ -1812,11 +1694,17 @@ export class RouterCore< } } - const nextMatches = this.getMatchedRoutes(next, dest) + const nextMatches = this.getMatchedRoutes( + next.pathname, + dest.to as string, + ) const final = build(dest, nextMatches) if (maskedNext) { - const maskedMatches = this.getMatchedRoutes(maskedNext, maskedDest) + const maskedMatches = this.getMatchedRoutes( + maskedNext.pathname, + maskedDest?.to as string, + ) const maskedFinal = build(maskedDest, maskedMatches) final.maskedLocation = maskedFinal } @@ -1958,6 +1846,13 @@ export class RouterCore< } navigate: NavigateFn = ({ to, reloadDocument, href, ...rest }) => { + if (!reloadDocument && href) { + try { + new URL(`${href}`) + reloadDocument = true + } catch {} + } + if (reloadDocument) { if (!href) { const location = this.buildLocation({ to, ...rest } as any) @@ -1980,10 +1875,30 @@ export class RouterCore< latestLoadPromise: undefined | Promise - load: LoadFn = async (opts?: { sync?: boolean }): Promise => { + beforeLoad = () => { + // Cancel any pending matches + this.cancelMatches() this.latestLocation = this.parseLocation(this.latestLocation) - let redirect: ResolvedRedirect | undefined + // Match the routes + const pendingMatches = this.matchRoutes(this.latestLocation) + + // Ingest the new matches + this.__store.setState((s) => ({ + ...s, + status: 'pending', + isLoading: true, + location: this.latestLocation, + pendingMatches, + // If a cached moved to pendingMatches, remove it from cachedMatches + cachedMatches: s.cachedMatches.filter((d) => { + return !pendingMatches.find((e) => e.id === d.id) + }), + })) + } + + load: LoadFn = async (opts?: { sync?: boolean }): Promise => { + let redirect: AnyRedirect | undefined let notFound: NotFoundError | undefined let loadPromise: Promise @@ -1992,36 +1907,10 @@ export class RouterCore< loadPromise = new Promise((resolve) => { this.startTransition(async () => { try { + this.beforeLoad() const next = this.latestLocation const prevLocation = this.state.resolvedLocation - // Cancel any pending matches - this.cancelMatches() - - let pendingMatches!: Array - - batch(() => { - // this call breaks a route context of destination route after a redirect - // we should be fine not eagerly calling this since we call it later - // this.clearExpiredCache() - - // Match the routes - pendingMatches = this.matchRoutes(next) - - // Ingest the new matches - this.__store.setState((s) => ({ - ...s, - status: 'pending', - isLoading: true, - location: next, - pendingMatches, - // If a cached moved to pendingMatches, remove it from cachedMatches - cachedMatches: s.cachedMatches.filter((d) => { - return !pendingMatches.find((e) => e.id === d.id) - }), - })) - }) - if (!this.state.redirect) { this.emit({ type: 'onBeforeNavigate', @@ -2042,7 +1931,7 @@ export class RouterCore< await this.loadMatches({ sync: opts?.sync, - matches: pendingMatches, + matches: this.state.pendingMatches as Array, location: next, // eslint-disable-next-line @typescript-eslint/require-await onReady: async () => { @@ -2103,11 +1992,11 @@ export class RouterCore< }, }) } catch (err) { - if (isResolvedRedirect(err)) { + if (isRedirect(err)) { redirect = err if (!this.isServer) { this.navigate({ - ...redirect, + ...redirect.options, replace: true, ignoreBlocker: true, }) @@ -2119,7 +2008,7 @@ export class RouterCore< this.__store.setState((s) => ({ ...s, statusCode: redirect - ? redirect.statusCode + ? redirect.status : notFound ? 404 : s.matches.some((d) => d.status === 'error') @@ -2275,13 +2164,15 @@ export class RouterCore< } const handleRedirectAndNotFound = (match: AnyRouteMatch, err: any) => { - if (isResolvedRedirect(err)) { - if (!err.reloadDocument) { - throw err + if (isRedirect(err) || isNotFound(err)) { + if (isRedirect(err)) { + if (err.redirectHandled) { + if (!err.options.reloadDocument) { + throw err + } + } } - } - if (isRedirect(err) || isNotFound(err)) { updateMatch(match.id, (prev) => ({ ...prev, status: isRedirect(err) @@ -2305,7 +2196,9 @@ export class RouterCore< if (isRedirect(err)) { rendered = true - err = this.resolveRedirect({ ...err, _fromLocation: location }) + err.options._fromLocation = location + err.redirectHandled = true + err = this.resolveRedirect(err) throw err } else if (isNotFound(err)) { this._handleNotFound(matches, err, { @@ -2742,8 +2635,8 @@ export class RouterCore< loaderPromise: undefined, })) } catch (err) { - if (isResolvedRedirect(err)) { - await this.navigate(err) + if (isRedirect(err)) { + await this.navigate(err.options) } } })() @@ -2828,11 +2721,14 @@ export class RouterCore< return this.load({ sync: opts?.sync }) } - resolveRedirect = (err: AnyRedirect): ResolvedRedirect => { - const redirect = err as ResolvedRedirect + resolveRedirect = (redirect: AnyRedirect): AnyRedirect => { + if (!redirect.options.href) { + redirect.options.href = this.buildLocation(redirect.options).href + redirect.headers.set('Location', redirect.options.href) + } - if (!redirect.href) { - redirect.href = this.buildLocation(redirect as any).href + if (!redirect.headers.get('Location')) { + redirect.headers.set('Location', redirect.options.href) } return redirect @@ -2967,11 +2863,11 @@ export class RouterCore< return matches } catch (err) { if (isRedirect(err)) { - if (err.reloadDocument) { + if (err.options.reloadDocument) { return undefined } return await this.preloadRoute({ - ...(err as any), + ...err.options, _fromLocation: next, }) } @@ -3205,3 +3101,224 @@ function routeNeedsPreload(route: AnyRoute) { } return false } + +interface RouteLike { + id: string + isRoot?: boolean + path?: string + fullPath: string + rank?: number + parentRoute?: RouteLike + children?: Array + options?: { + caseSensitive?: boolean + } +} + +export function processRouteTree({ + routeTree, + initRoute, +}: { + routeTree: TRouteLike + initRoute?: (route: TRouteLike, index: number) => void +}) { + const routesById = {} as Record + const routesByPath = {} as Record + + const recurseRoutes = (childRoutes: Array) => { + childRoutes.forEach((childRoute, i) => { + initRoute?.(childRoute, i) + + const existingRoute = routesById[childRoute.id] + + invariant( + !existingRoute, + `Duplicate routes found with id: ${String(childRoute.id)}`, + ) + + routesById[childRoute.id] = childRoute + + if (!childRoute.isRoot && childRoute.path) { + const trimmedFullPath = trimPathRight(childRoute.fullPath) + if ( + !routesByPath[trimmedFullPath] || + childRoute.fullPath.endsWith('/') + ) { + routesByPath[trimmedFullPath] = childRoute + } + } + + const children = childRoute.children as Array + + if (children?.length) { + recurseRoutes(children) + } + }) + } + + recurseRoutes([routeTree]) + + const scoredRoutes: Array<{ + child: TRouteLike + trimmed: string + parsed: ReturnType + index: number + scores: Array + }> = [] + + const routes: Array = Object.values(routesById) + + routes.forEach((d, i) => { + if (d.isRoot || !d.path) { + return + } + + const trimmed = trimPathLeft(d.fullPath) + const parsed = parsePathname(trimmed) + + // Removes the leading slash if it is not the only remaining segment + while (parsed.length > 1 && parsed[0]?.value === '/') { + parsed.shift() + } + + const scores = parsed.map((segment) => { + if (segment.value === '/') { + return 0.75 + } + + if ( + segment.type === 'param' && + segment.prefixSegment && + segment.suffixSegment + ) { + return 0.55 + } + + if (segment.type === 'param' && segment.prefixSegment) { + return 0.52 + } + + if (segment.type === 'param' && segment.suffixSegment) { + return 0.51 + } + + if (segment.type === 'param') { + return 0.5 + } + + if ( + segment.type === 'wildcard' && + segment.prefixSegment && + segment.suffixSegment + ) { + return 0.3 + } + + if (segment.type === 'wildcard' && segment.prefixSegment) { + return 0.27 + } + + if (segment.type === 'wildcard' && segment.suffixSegment) { + return 0.26 + } + + if (segment.type === 'wildcard') { + return 0.25 + } + + return 1 + }) + + scoredRoutes.push({ child: d, trimmed, parsed, index: i, scores }) + }) + + const flatRoutes = scoredRoutes + .sort((a, b) => { + const minLength = Math.min(a.scores.length, b.scores.length) + + // Sort by min available score + for (let i = 0; i < minLength; i++) { + if (a.scores[i] !== b.scores[i]) { + return b.scores[i]! - a.scores[i]! + } + } + + // Sort by length of score + if (a.scores.length !== b.scores.length) { + return b.scores.length - a.scores.length + } + + // Sort by min available parsed value + for (let i = 0; i < minLength; i++) { + if (a.parsed[i]!.value !== b.parsed[i]!.value) { + return a.parsed[i]!.value > b.parsed[i]!.value ? 1 : -1 + } + } + + // Sort by original index + return a.index - b.index + }) + .map((d, i) => { + d.child.rank = i + return d.child + }) + + return { routesById, routesByPath, flatRoutes } +} + +export function getMatchedRoutes({ + pathname, + routePathname, + basepath, + caseSensitive, + routesByPath, + routesById, + flatRoutes, +}: { + pathname: string + routePathname?: string + basepath: string + caseSensitive?: boolean + routesByPath: Record + routesById: Record + flatRoutes: Array +}) { + let routeParams: Record = {} + const trimmedPath = trimPathRight(pathname) + const getMatchedParams = (route: TRouteLike) => { + const result = matchPathname(basepath, trimmedPath, { + to: route.fullPath, + caseSensitive: route.options?.caseSensitive ?? caseSensitive, + fuzzy: true, + }) + return result + } + + let foundRoute: TRouteLike | undefined = + routePathname !== undefined ? routesByPath[routePathname] : undefined + if (foundRoute) { + routeParams = getMatchedParams(foundRoute)! + } else { + foundRoute = flatRoutes.find((route) => { + const matchedParams = getMatchedParams(route) + + if (matchedParams) { + routeParams = matchedParams + return true + } + + return false + }) + } + + let routeCursor: TRouteLike = foundRoute || routesById[rootRouteId]! + + const matchedRoutes: Array = [routeCursor] + + while (routeCursor.parentRoute) { + routeCursor = routeCursor.parentRoute as TRouteLike + matchedRoutes.unshift(routeCursor) + } + + return { matchedRoutes, routeParams, foundRoute } +} diff --git a/packages/router-core/src/typePrimitives.ts b/packages/router-core/src/typePrimitives.ts index f0c5d2ae9f..ebc80ed732 100644 --- a/packages/router-core/src/typePrimitives.ts +++ b/packages/router-core/src/typePrimitives.ts @@ -5,7 +5,7 @@ import type { SearchParamOptions, ToPathOption, } from './link' -import type { Redirect } from './redirect' +import type { RedirectOptions } from './redirect' import type { RouteIds } from './routeInfo' import type { AnyRouter, RegisteredRouter } from './router' import type { UseParamsResult } from './useParams' @@ -104,7 +104,7 @@ export type ValidateRedirectOptions< TDefaultFrom extends string = string, > = Constrain< TOptions, - Redirect< + RedirectOptions< TRouter, InferFrom, InferTo, diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 1df674e8b9..2b522a284b 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -169,6 +169,20 @@ export type ValidateJSON = ((...args: Array) => any) extends T : 'Function is not serializable' : { [K in keyof T]: ValidateJSON } +export type LooseReturnType = T extends ( + ...args: Array +) => infer TReturn + ? TReturn + : never + +export type LooseAsyncReturnType = T extends ( + ...args: Array +) => infer TReturn + ? TReturn extends Promise + ? TReturn + : TReturn + : never + export function last(arr: Array) { return arr[arr.length - 1] } diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index 0b709d2453..8d9ff4ad7e 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -3,10 +3,13 @@ import { exactPathTest, interpolatePath, matchPathname, + parsePathname, removeBasepath, removeTrailingSlash, resolvePath, + trimPathLeft, } from '../src/path' +import type { Segment as PathSegment } from '../src/path' describe('removeBasepath', () => { it.each([ @@ -263,110 +266,261 @@ describe('resolvePath', () => { }) }) }) + + describe.each([{ base: '/' }, { base: '/nested' }])( + 'param routes w/ base=$base', + ({ base }) => { + describe('wildcard (prefix + suffix)', () => { + it.each([ + { name: 'regular top-level', to: '/$' }, + { name: 'regular nested', to: '/params/wildcard/$' }, + { name: 'with top-level prefix', to: '/prefix{$}' }, + { name: 'with nested prefix', to: '/params/wildcard/prefix{$}' }, + { name: 'with top-level suffix', to: '/{$}suffix' }, + { name: 'with nested suffix', to: '/params/wildcard/{$}suffix' }, + { + name: 'with top-level prefix + suffix', + to: '/prefix{$}suffix', + }, + { + name: 'with nested prefix + suffix', + to: '/params/wildcard/prefix{$}suffix', + }, + ])('$name', ({ to }) => { + const candidate = base + trimPathLeft(to) + expect( + resolvePath({ + basepath: '/', + base, + to: candidate, + trailingSlash: 'never', + caseSensitive: false, + }), + ).toEqual(candidate) + }) + }) + + describe('named (prefix + suffix)', () => { + it.each([ + { name: 'regular top-level', to: '/$foo' }, + { name: 'regular nested', to: '/params/named/$foo' }, + { name: 'with top-level prefix', to: '/prefix{$foo}' }, + { name: 'with nested prefix', to: '/params/named/prefix{$foo}' }, + { name: 'with top-level suffix', to: '/{$foo}suffix' }, + { name: 'with nested suffix', to: '/params/named/{$foo}suffix' }, + { + name: 'with top-level prefix + suffix', + to: '/prefix{$foo}suffix', + }, + { + name: 'with nested prefix + suffix', + to: '/params/named/prefix{$foo}suffix', + }, + ])('$name', ({ to }) => { + const candidate = base + trimPathLeft(to) + expect( + resolvePath({ + basepath: '/', + base, + to: candidate, + trailingSlash: 'never', + caseSensitive: false, + }), + ).toEqual(candidate) + }) + }) + }, + ) }) describe('interpolatePath', () => { - it.each([ - { - name: 'should interpolate the path', - path: '/users/$id', - params: { id: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with multiple params', - path: '/users/$id/$name', - params: { id: '123', name: 'tanner' }, - result: '/users/123/tanner', - }, - { - name: 'should interpolate the path with extra params', - path: '/users/$id', - params: { id: '123', name: 'tanner' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with missing params', - path: '/users/$id/$name', - params: { id: '123' }, - result: '/users/123/undefined', - }, - { - name: 'should interpolate the path with missing params and extra params', - path: '/users/$id', - params: { name: 'john' }, - result: '/users/undefined', - }, - { - name: 'should interpolate the path with the param being a number', - path: '/users/$id', - params: { id: 123 }, - result: '/users/123', - }, - { - name: 'should interpolate the path with the param being a falsey number', - path: '/users/$id', - params: { id: 0 }, - result: '/users/0', - }, - { - name: 'should interpolate the path with URI component encoding', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23%40john%2Bsmith', - }, - { - name: 'should interpolate the path without URI encoding characters in decodeCharMap', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23@john+smith', - decodeCharMap: new Map( - ['@', '+'].map((char) => [encodeURIComponent(char), char]), - ), - }, - { - name: 'should interpolate the path with the splat param at the end', - path: '/users/$', - params: { _splat: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with a single named path param and the splat param at the end', - path: '/users/$username/$', - params: { username: 'seancassiere', _splat: '123' }, - result: '/users/seancassiere/123', - }, - { - name: 'should interpolate the path with 2 named path params with the splat param at the end', - path: '/users/$username/$id/$', - params: { username: 'seancassiere', id: '123', _splat: '456' }, - result: '/users/seancassiere/123/456', - }, - { - name: 'should interpolate the path with multiple named path params with the splat param at the end', - path: '/$username/settings/$repo/$id/$', - params: { - username: 'sean-cassiere', - repo: 'my-repo', - id: '123', - _splat: '456', - }, - result: '/sean-cassiere/settings/my-repo/123/456', - }, - { - name: 'should interpolate the path with the splat param containing slashes', - path: '/users/$', - params: { _splat: 'sean/cassiere' }, - result: '/users/sean/cassiere', - }, - ])('$name', ({ path, params, decodeCharMap, result }) => { - expect( - interpolatePath({ - path, - params, - decodeCharMap, - }).interpolatedPath, - ).toBe(result) + describe('regular usage', () => { + it.each([ + { + name: 'should interpolate the path', + path: '/users/$id', + params: { id: '123' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with multiple params', + path: '/users/$id/$name', + params: { id: '123', name: 'tanner' }, + result: '/users/123/tanner', + }, + { + name: 'should interpolate the path with extra params', + path: '/users/$id', + params: { id: '123', name: 'tanner' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with missing params', + path: '/users/$id/$name', + params: { id: '123' }, + result: '/users/123/undefined', + }, + { + name: 'should interpolate the path with missing params and extra params', + path: '/users/$id', + params: { name: 'john' }, + result: '/users/undefined', + }, + { + name: 'should interpolate the path with the param being a number', + path: '/users/$id', + params: { id: 123 }, + result: '/users/123', + }, + { + name: 'should interpolate the path with the param being a falsey number', + path: '/users/$id', + params: { id: 0 }, + result: '/users/0', + }, + { + name: 'should interpolate the path with URI component encoding', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23%40john%2Bsmith', + }, + { + name: 'should interpolate the path without URI encoding characters in decodeCharMap', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23@john+smith', + decodeCharMap: new Map( + ['@', '+'].map((char) => [encodeURIComponent(char), char]), + ), + }, + { + name: 'should interpolate the path with the splat param at the end', + path: '/users/$', + params: { _splat: '123' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with a single named path param and the splat param at the end', + path: '/users/$username/$', + params: { username: 'seancassiere', _splat: '123' }, + result: '/users/seancassiere/123', + }, + { + name: 'should interpolate the path with 2 named path params with the splat param at the end', + path: '/users/$username/$id/$', + params: { username: 'seancassiere', id: '123', _splat: '456' }, + result: '/users/seancassiere/123/456', + }, + { + name: 'should interpolate the path with multiple named path params with the splat param at the end', + path: '/$username/settings/$repo/$id/$', + params: { + username: 'sean-cassiere', + repo: 'my-repo', + id: '123', + _splat: '456', + }, + result: '/sean-cassiere/settings/my-repo/123/456', + }, + { + name: 'should interpolate the path with the splat param containing slashes', + path: '/users/$', + params: { _splat: 'sean/cassiere' }, + result: '/users/sean/cassiere', + }, + ])('$name', ({ path, params, decodeCharMap, result }) => { + expect( + interpolatePath({ + path, + params, + decodeCharMap, + }).interpolatedPath, + ).toBe(result) + }) + }) + + describe('wildcard (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', + }, + { + name: 'regular curly braces', + to: '/{$}', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', + }, + { + name: 'with prefix', + to: '/prefix{$}', + params: { _splat: 'bar' }, + result: '/prefixbar', + }, + { + name: 'with suffix', + to: '/{$}-suffix', + params: { _splat: 'bar' }, + result: '/bar-suffix', + }, + { + name: 'with prefix + suffix', + to: '/prefix{$}-suffix', + params: { _splat: 'bar' }, + result: '/prefixbar-suffix', + }, + ])('$name', ({ to, params, result }) => { + expect( + interpolatePath({ + path: to, + params, + }).interpolatedPath, + ).toBe(result) + }) + }) + + describe('named params (prefix + suffix', () => { + it.each([ + { + name: 'regular', + to: '/$foo', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'regular curly braces', + to: '/{$foo}', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'with prefix', + to: '/prefix{$bar}', + params: { bar: 'baz' }, + result: '/prefixbaz', + }, + { + name: 'with suffix', + to: '/{$foo}.suffix', + params: { foo: 'bar' }, + result: '/bar.suffix', + }, + { + name: 'with prefix and suffix', + to: '/prefix{$param}.suffix', + params: { param: 'foobar' }, + result: '/prefixfoobar.suffix', + }, + ])('$name', ({ to, params, result }) => { + expect( + interpolatePath({ + path: to, + params, + }).interpolatedPath, + ).toBe(result) + }) }) }) @@ -491,10 +645,442 @@ describe('matchPathname', () => { _splat: '456', }, }, + { + name: 'should match and return the splat params when multiple subsequent segments are present', + input: '/docs/tanner/sean/manuel', + matchingOptions: { + to: '/docs/$', + }, + expectedMatchedParams: { + '*': 'tanner/sean/manuel', + _splat: 'tanner/sean/manuel', + }, + }, + ])('$name', ({ input, matchingOptions, expectedMatchedParams }) => { + expect(matchPathname('/', input, matchingOptions)).toStrictEqual( + expectedMatchedParams, + ) + }) + }) + + describe('wildcard (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + input: '/docs/foo/bar', + matchingOptions: { + to: '/docs/$', + }, + expectedMatchedParams: { + '*': 'foo/bar', + _splat: 'foo/bar', + }, + }, + { + name: 'regular curly braces', + input: '/docs/foo/bar', + matchingOptions: { + to: '/docs/{$}', + }, + expectedMatchedParams: { + '*': 'foo/bar', + _splat: 'foo/bar', + }, + }, + { + name: 'with prefix', + input: '/docs/prefixbar/baz', + matchingOptions: { + to: '/docs/prefix{$}', + }, + expectedMatchedParams: { + '*': 'bar/baz', + _splat: 'bar/baz', + }, + }, + { + name: 'with suffix', + input: '/docs/bar/baz.suffix', + matchingOptions: { + to: '/docs/{$}.suffix', + }, + expectedMatchedParams: { + '*': 'bar/baz', + _splat: 'bar/baz', + }, + }, + { + name: 'with prefix + suffix', + input: '/docs/prefixbar/baz-suffix', + matchingOptions: { + to: '/docs/prefix{$}-suffix', + }, + expectedMatchedParams: { + '*': 'bar/baz', + _splat: 'bar/baz', + }, + }, ])('$name', ({ input, matchingOptions, expectedMatchedParams }) => { expect(matchPathname('/', input, matchingOptions)).toStrictEqual( expectedMatchedParams, ) }) }) + + describe('named params (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + input: '/docs/foo', + matchingOptions: { + to: '/docs/$bar', + }, + expectedMatchedParams: { + bar: 'foo', + }, + }, + { + name: 'regular curly braces', + input: '/docs/foo', + matchingOptions: { + to: '/docs/{$bar}', + }, + expectedMatchedParams: { + bar: 'foo', + }, + }, + { + name: 'with prefix', + input: '/docs/prefixfoo', + matchingOptions: { + to: '/docs/prefix{$bar}', + }, + expectedMatchedParams: { + bar: 'foo', + }, + }, + { + name: 'with suffix', + input: '/docs/foo.suffix', + matchingOptions: { + to: '/docs/{$bar}.suffix', + }, + expectedMatchedParams: { + bar: 'foo', + }, + }, + { + name: 'with prefix + suffix', + input: '/docs/prefixfoobar-suffix', + matchingOptions: { + to: '/docs/prefix{$param}-suffix', + }, + expectedMatchedParams: { + param: 'foobar', + }, + }, + ])('$name', ({ input, matchingOptions, expectedMatchedParams }) => { + expect(matchPathname('/', input, matchingOptions)).toStrictEqual( + expectedMatchedParams, + ) + }) + }) +}) + +describe('parsePathname', () => { + type ParsePathnameTestScheme = Array<{ + name: string + to: string | undefined + expected: Array + }> + + describe('regular usage', () => { + it.each([ + { + name: 'should handle pathname being undefined', + to: undefined, + expected: [], + }, + { + name: 'should handle pathname being empty', + to: '', + expected: [], + }, + { + name: 'should handle pathname at root', + to: '/', + expected: [{ type: 'pathname', value: '/' }], + }, + { + name: 'should handle pathname with a single segment', + to: '/foo', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + ], + }, + { + name: 'should handle pathname with multiple segments', + to: '/foo/bar/baz', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'pathname', value: 'bar' }, + { type: 'pathname', value: 'baz' }, + ], + }, + { + name: 'should handle pathname with a trailing slash', + to: '/foo/', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'pathname', value: '/' }, + ], + }, + { + name: 'should handle named params', + to: '/foo/$bar', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'param', value: '$bar' }, + ], + }, + { + name: 'should handle named params at the root', + to: '/$bar', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'param', value: '$bar' }, + ], + }, + { + name: 'should handle named params followed by a segment', + to: '/foo/$bar/baz', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'param', value: '$bar' }, + { type: 'pathname', value: 'baz' }, + ], + }, + { + name: 'should handle multiple named params', + to: '/foo/$bar/$baz/qux/$quux', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'param', value: '$bar' }, + { type: 'param', value: '$baz' }, + { type: 'pathname', value: 'qux' }, + { type: 'param', value: '$quux' }, + ], + }, + { + name: 'should handle splat params', + to: '/foo/$', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'pathname', value: 'foo' }, + { type: 'wildcard', value: '$' }, + ], + }, + { + name: 'should handle splat params at the root', + to: '/$', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'wildcard', value: '$' }, + ], + }, + ] satisfies ParsePathnameTestScheme)('$name', ({ to, expected }) => { + const result = parsePathname(to) + expect(result).toEqual(expected) + }) + }) + + describe('wildcard (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'wildcard', value: '$' }, + ], + }, + { + name: 'regular curly braces', + to: '/{$}', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'wildcard', value: '$' }, + ], + }, + { + name: 'with prefix (regular text)', + to: '/foo{$}', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'wildcard', + value: '$', + prefixSegment: 'foo', + }, + ], + }, + { + name: 'with prefix + followed by special character', + to: '/foo.{$}', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'wildcard', + value: '$', + prefixSegment: 'foo.', + }, + ], + }, + { + name: 'with suffix', + to: '/{$}-foo', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'wildcard', + value: '$', + suffixSegment: '-foo', + }, + ], + }, + { + name: 'with prefix + suffix', + to: '/foo{$}-bar', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'wildcard', + value: '$', + prefixSegment: 'foo', + suffixSegment: '-bar', + }, + ], + }, + { + name: 'with prefix + followed by special character and a segment', + to: '/foo.{$}/bar', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'wildcard', + value: '$', + prefixSegment: 'foo.', + }, + { type: 'pathname', value: 'bar' }, + ], + }, + ] satisfies ParsePathnameTestScheme)('$name', ({ to, expected }) => { + const result = parsePathname(to) + expect(result).toEqual(expected) + }) + }) + + describe('named params (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$bar', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'param', value: '$bar' }, + ], + }, + { + name: 'regular curly braces', + to: '/{$bar}', + expected: [ + { type: 'pathname', value: '/' }, + { type: 'param', value: '$bar' }, + ], + }, + { + name: 'with prefix (regular text)', + to: '/foo{$bar}', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + prefixSegment: 'foo', + }, + ], + }, + { + name: 'with prefix + followed by special character', + to: '/foo.{$bar}', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + prefixSegment: 'foo.', + }, + ], + }, + { + name: 'with suffix', + to: '/{$bar}.foo', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + suffixSegment: '.foo', + }, + ], + }, + { + name: 'with suffix + started by special character', + to: '/{$bar}.foo', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + suffixSegment: '.foo', + }, + ], + }, + { + name: 'with suffix + started by special character and followed by segment', + to: '/{$bar}.foo/baz', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + suffixSegment: '.foo', + }, + { type: 'pathname', value: 'baz' }, + ], + }, + { + name: 'with suffix + prefix', + to: '/foo{$bar}.baz', + expected: [ + { type: 'pathname', value: '/' }, + { + type: 'param', + value: '$bar', + prefixSegment: 'foo', + suffixSegment: '.baz', + }, + ], + }, + ] satisfies ParsePathnameTestScheme)('$name', ({ to, expected }) => { + const result = parsePathname(to) + expect(result).toEqual(expected) + }) + }) }) diff --git a/packages/router-generator/src/config.ts b/packages/router-generator/src/config.ts index b76b1d5af3..178bb104dd 100644 --- a/packages/router-generator/src/config.ts +++ b/packages/router-generator/src/config.ts @@ -3,23 +3,16 @@ import { existsSync, readFileSync } from 'node:fs' import { z } from 'zod' import { virtualRootRouteSchema } from './filesystem/virtual/config' -export const configSchema = z.object({ +export const baseConfigSchema = z.object({ target: z.enum(['react', 'solid']).optional().default('react'), virtualRouteConfig: virtualRootRouteSchema.or(z.string()).optional(), routeFilePrefix: z.string().optional(), routeFileIgnorePrefix: z.string().optional().default('-'), routeFileIgnorePattern: z.string().optional(), routesDirectory: z.string().optional().default('./src/routes'), - generatedRouteTree: z.string().optional().default('./src/routeTree.gen.ts'), quoteStyle: z.enum(['single', 'double']).optional().default('single'), semicolons: z.boolean().optional().default(false), - disableTypes: z.boolean().optional().default(false), - addExtensions: z.boolean().optional().default(false), disableLogging: z.boolean().optional().default(false), - disableManifestGeneration: z.boolean().optional().default(false), - enableRouteTreeFormatting: z.boolean().optional().default(true), - __enableAPIRoutesGeneration: z.boolean().optional(), // Internal flag to be turned on for TanStack Start - apiBase: z.string().optional().default('/api'), routeTreeFileHeader: z .array(z.string()) .optional() @@ -28,18 +21,28 @@ export const configSchema = z.object({ '// @ts-nocheck', '// noinspection JSUnusedGlobalSymbols', ]), - routeTreeFileFooter: z.array(z.string()).optional().default([]), - autoCodeSplitting: z.boolean().optional(), indexToken: z.string().optional().default('index'), routeToken: z.string().optional().default('route'), pathParamsAllowedCharacters: z .array(z.enum([';', ':', '@', '&', '=', '+', '$', ','])) .optional(), +}) + +export type BaseConfig = z.infer + +export const configSchema = baseConfigSchema.extend({ + generatedRouteTree: z.string().optional().default('./src/routeTree.gen.ts'), + disableTypes: z.boolean().optional().default(false), + verboseFileRoutes: z.boolean().optional(), + addExtensions: z.boolean().optional().default(false), + disableManifestGeneration: z.boolean().optional().default(false), + enableRouteTreeFormatting: z.boolean().optional().default(true), + routeTreeFileFooter: z.array(z.string()).optional().default([]), + autoCodeSplitting: z.boolean().optional(), customScaffolding: z .object({ routeTemplate: z.string().optional(), lazyRouteTemplate: z.string().optional(), - apiTemplate: z.string().optional(), }) .optional(), experimental: z diff --git a/packages/router-generator/src/filesystem/physical/getRouteNodes.ts b/packages/router-generator/src/filesystem/physical/getRouteNodes.ts index 0c0df6ea5d..f72da5fac2 100644 --- a/packages/router-generator/src/filesystem/physical/getRouteNodes.ts +++ b/packages/router-generator/src/filesystem/physical/getRouteNodes.ts @@ -4,8 +4,6 @@ import { determineInitialRoutePath, logging, removeExt, - removeLeadingSlash, - removeTrailingSlash, replaceBackslash, routePathToVariable, } from '../../utils' @@ -22,7 +20,16 @@ import type { Config } from '../../config' const disallowedRouteGroupConfiguration = /\(([^)]+)\).(ts|js|tsx|jsx)/ export async function getRouteNodes( - config: Config, + config: Pick< + Config, + | 'routesDirectory' + | 'routeFilePrefix' + | 'routeFileIgnorePrefix' + | 'routeFileIgnorePattern' + | 'disableLogging' + | 'routeToken' + | 'indexToken' + >, root: string, ): Promise { const { routeFilePrefix, routeFileIgnorePrefix, routeFileIgnorePattern } = @@ -196,7 +203,7 @@ export async function getRouteNodes( */ export function getRouteMeta( routePath: string, - config: Config, + config: Pick, ): { // `__root` is can be more easily determined by filtering down to routePath === /${rootPathId} // `pathless` is needs to determined after `lazy` has been cleaned up from the routePath @@ -215,15 +222,7 @@ export function getRouteMeta( } { let fsRouteType: FsRouteType = 'static' - if ( - removeLeadingSlash(routePath).startsWith( - `${removeTrailingSlash(removeLeadingSlash(config.apiBase))}/`, - ) && - config.__enableAPIRoutesGeneration - ) { - // api routes, i.e. `/api/foo.ts` - fsRouteType = 'api' - } else if (routePath.endsWith(`/${config.routeToken}`)) { + if (routePath.endsWith(`/${config.routeToken}`)) { // layout routes, i.e `/foo/route.tsx` or `/foo/_layout/route.tsx` fsRouteType = 'layout' } else if (routePath.endsWith('/lazy')) { @@ -257,7 +256,7 @@ export function getRouteMeta( function isValidPathlessLayoutRoute( normalizedRoutePath: string, routeType: FsRouteType, - config: Config, + config: Pick, ): boolean { if (routeType === 'lazy') { return false diff --git a/packages/router-generator/src/filesystem/virtual/getRouteNodes.ts b/packages/router-generator/src/filesystem/virtual/getRouteNodes.ts index b9fa25c41a..9cca5b59bd 100644 --- a/packages/router-generator/src/filesystem/virtual/getRouteNodes.ts +++ b/packages/router-generator/src/filesystem/virtual/getRouteNodes.ts @@ -37,7 +37,15 @@ function flattenTree(node: RouteNode): Array { } export async function getRouteNodes( - tsrConfig: Config, + tsrConfig: Pick< + Config, + | 'routesDirectory' + | 'virtualRouteConfig' + | 'routeFileIgnorePrefix' + | 'disableLogging' + | 'indexToken' + | 'routeToken' + >, root: string, ): Promise { const fullDir = resolve(tsrConfig.routesDirectory) @@ -90,7 +98,7 @@ export async function getRouteNodes( * */ async function getVirtualRouteConfigFromFileExport( - tsrConfig: Config, + tsrConfig: Pick, root: string, ): Promise { if ( @@ -115,7 +123,14 @@ async function getVirtualRouteConfigFromFileExport( } export async function getRouteNodesRecursive( - tsrConfig: Config, + tsrConfig: Pick< + Config, + | 'routesDirectory' + | 'routeFileIgnorePrefix' + | 'disableLogging' + | 'indexToken' + | 'routeToken' + >, root: string, fullDir: string, nodes?: Array, diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index b7c579daec..48b1f600a4 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -2,12 +2,10 @@ import path from 'node:path' import * as fs from 'node:fs' import * as fsp from 'node:fs/promises' import { - determineInitialRoutePath, format, logging, multiSortBy, removeExt, - removeTrailingSlash, removeUnderscores, replaceBackslash, resetRegex, @@ -18,18 +16,12 @@ import { import { getRouteNodes as physicalGetRouteNodes } from './filesystem/physical/getRouteNodes' import { getRouteNodes as virtualGetRouteNodes } from './filesystem/virtual/getRouteNodes' import { rootPathId } from './filesystem/physical/rootPathId' -import { - defaultAPIRouteTemplate, - fillTemplate, - getTargetTemplate, -} from './template' +import { fillTemplate, getTargetTemplate } from './template' import type { FsRouteType, GetRouteNodesResult, RouteNode } from './types' import type { Config } from './config' -export const CONSTANTS = { - // When changing this, you'll want to update the import in `start-api-routes/src/index.ts#defaultAPIFileRouteHandler` - APIRouteExportVariable: 'APIRoute', -} +// Maybe import this from `@tanstack/router-core` in the future??? +const rootRouteId = '__root__' let latestTask = 0 const routeGroupPatternRegex = /\(.+\)/g @@ -76,10 +68,6 @@ export async function generator(config: Config, root: string) { const TYPES_DISABLED = config.disableTypes - // Controls whether API Routes are generated for TanStack Start - const ENABLED_API_ROUTES_GENERATION = - config.__enableAPIRoutesGeneration ?? false - let getRouteNodesResult: GetRouteNodesResult if (config.virtualRouteConfig) { @@ -117,30 +105,6 @@ export async function generator(config: Config, root: string) { const routeTree: Array = [] const routePiecesByPath: Record = {} - // Filtered API Route nodes - const onlyAPIRouteNodes = preRouteNodes.filter((d) => { - if (!ENABLED_API_ROUTES_GENERATION) { - return false - } - - if (d._fsRouteType !== 'api') { - return false - } - - return true - }) - - // Filtered Generator Route nodes - const onlyGeneratorRouteNodes = preRouteNodes.filter((d) => { - if (ENABLED_API_ROUTES_GENERATION) { - if (d._fsRouteType === 'api') { - return false - } - } - - return true - }) - // Loop over the flat list of routeNodes and // build up a tree based on the routeNodes' routePath const routeNodes: Array = [] @@ -243,7 +207,7 @@ export async function generator(config: Config, root: string) { tLazyRouteTemplate.template(), { tsrImports: tLazyRouteTemplate.imports.tsrImports(), - tsrPath: escapedRoutePath, + tsrPath: escapedRoutePath.replaceAll(/\{(.+)\}/gm, '$1'), tsrExportStart: tLazyRouteTemplate.imports.tsrExportStart(escapedRoutePath), tsrExportEnd: tLazyRouteTemplate.imports.tsrExportEnd(), @@ -269,20 +233,94 @@ export async function generator(config: Config, root: string) { tRouteTemplate.template(), { tsrImports: tRouteTemplate.imports.tsrImports(), - tsrPath: escapedRoutePath, + tsrPath: escapedRoutePath.replaceAll(/\{(.+)\}/gm, '$1'), tsrExportStart: tRouteTemplate.imports.tsrExportStart(escapedRoutePath), tsrExportEnd: tRouteTemplate.imports.tsrExportEnd(), }, ) } - } else { + } else if (config.verboseFileRoutes === false) { + // Check if the route file has a Route export + if ( + !routeCode + .split('\n') + .some((line) => line.trim().startsWith('export const Route')) + ) { + return + } + // Update the existing route file replaced = routeCode .replace( /(FileRoute\(\s*['"])([^\s]*)(['"],?\s*\))/g, (_, p1, __, p3) => `${p1}${escapedRoutePath}${p3}`, ) + .replace( + new RegExp( + `(import\\s*\\{)(.*)(create(Lazy)?FileRoute)(.*)(\\}\\s*from\\s*['"]@tanstack\\/${ROUTE_TEMPLATE.subPkg}['"])`, + 'gs', + ), + (_, p1, p2, ___, ____, p5, p6) => { + const beforeCreateFileRoute = () => { + if (!p2) return '' + + let trimmed = p2.trim() + + if (trimmed.endsWith(',')) { + trimmed = trimmed.slice(0, -1) + } + + return trimmed + } + + const afterCreateFileRoute = () => { + if (!p5) return '' + + let trimmed = p5.trim() + + if (trimmed.startsWith(',')) { + trimmed = trimmed.slice(1) + } + + return trimmed + } + + const newImport = () => { + const before = beforeCreateFileRoute() + const after = afterCreateFileRoute() + + if (!before) return after + + if (!after) return before + + return `${before},${after}` + } + + const middle = newImport() + + if (middle === '') return '' + + return `${p1} ${newImport()} ${p6}` + }, + ) + .replace( + /create(Lazy)?FileRoute(\(\s*['"])([^\s]*)(['"],?\s*\))/g, + (_, __, p2, ___, p4) => + `${node._fsRouteType === 'lazy' ? 'createLazyFileRoute' : 'createFileRoute'}`, + ) + } else { + replaced = routeCode + // fix wrong ids + .replace( + /(FileRoute\(\s*['"])([^\s]*)(['"],?\s*\))/g, + (_, p1, __, p3) => `${p1}${escapedRoutePath}${p3}`, + ) + // fix missing ids + .replace( + /((FileRoute)(\s*)(\({))/g, + (_, __, p2, p3, p4) => `${p2}('${escapedRoutePath}')${p3}${p4}`, + ) .replace( new RegExp( `(import\\s*\\{.*)(create(Lazy)?FileRoute)(.*\\}\\s*from\\s*['"]@tanstack\\/${ROUTE_TEMPLATE.subPkg}['"])`, @@ -296,6 +334,18 @@ export async function generator(config: Config, root: string) { (_, __, p2, ___, p4) => `${node._fsRouteType === 'lazy' ? 'createLazyFileRoute' : 'createFileRoute'}${p2}${escapedRoutePath}${p4}`, ) + + // check whether the import statement is already present + const regex = new RegExp( + `(import\\s*\\{.*)(create(Lazy)?FileRoute)(.*\\}\\s*from\\s*['"]@tanstack\\/${ROUTE_TEMPLATE.subPkg}['"])`, + 'gm', + ) + if (!replaced.match(regex)) { + replaced = [ + `import { ${node._fsRouteType === 'lazy' ? 'createLazyFileRoute' : 'createFileRoute'} } from '@tanstack/${ROUTE_TEMPLATE.subPkg}'`, + ...replaced.split('\n'), + ].join('\n') + } } await writeIfDifferent(node.fullPath, routeCode, replaced, { @@ -406,77 +456,22 @@ export async function generator(config: Config, root: string) { routeNodes.push(node) } - for (const node of onlyGeneratorRouteNodes) { + for (const node of preRouteNodes) { await handleNode(node) } + + // This is run against the `preRouteNodes` array since it + // has the flattened Route nodes and not the full tree + // Since TSR allows multiple way of defining a route, + // we need to ensure that a user hasn't defined the + // same route in multiple ways (i.e. `flat`, `nested`, `virtual`) checkRouteFullPathUniqueness( preRouteNodes.filter( - (d) => - d.children === undefined && - (['api', 'lazy'] satisfies Array).every( - (type) => type !== d._fsRouteType, - ), + (d) => d.children === undefined && 'lazy' !== d._fsRouteType, ), config, ) - const startAPIRouteNodes: Array = checkStartAPIRoutes( - onlyAPIRouteNodes, - config, - ) - - const handleAPINode = async (node: RouteNode) => { - const routeCode = fs.readFileSync(node.fullPath, 'utf-8') - - const escapedRoutePath = node.routePath?.replaceAll('$', '$$') ?? '' - - if (!routeCode) { - const replaced = await fillTemplate( - config, - config.customScaffolding?.apiTemplate ?? defaultAPIRouteTemplate, - { - tsrImports: - "import { createAPIFileRoute } from '@tanstack/react-start/api';", - tsrPath: escapedRoutePath, - tsrExportStart: `export const ${CONSTANTS.APIRouteExportVariable} = createAPIFileRoute('${escapedRoutePath}')(`, - tsrExportEnd: ');', - }, - ) - - await writeIfDifferent( - node.fullPath, - '', // Empty string because the file doesn't exist yet - replaced, - { - beforeWrite: () => { - logger.log(`🟡 Creating ${node.fullPath}`) - }, - }, - ) - } else { - await writeIfDifferent( - node.fullPath, - routeCode, - routeCode.replace( - /(createAPIFileRoute\(\s*['"])([^\s]*)(['"],?\s*\))/g, - (_, p1, __, p3) => `${p1}${escapedRoutePath}${p3}`, - ), - { - beforeWrite: () => { - logger.log(`🟡 Updating ${node.fullPath}`) - }, - }, - ) - } - } - - // Handle the API routes for TanStack Start - if (ENABLED_API_ROUTES_GENERATION) { - for (const node of startAPIRouteNodes) { - await handleAPINode(node) - } - } - function buildRouteTreeConfig(nodes: Array, depth = 1): string { const children = nodes.map((node) => { if (node._fsRouteType === '__root') { @@ -527,6 +522,30 @@ export async function generator(config: Config, root: string) { (d) => d, ]) + const typeImports = Object.entries({ + // Used for augmentation of regular routes + CreateFileRoute: + config.verboseFileRoutes === false && + sortedRouteNodes.some( + (d) => isRouteNodeValidForAugmentation(d) && d._fsRouteType !== 'lazy', + ), + // Used for augmentation of lazy (`.lazy`) routes + CreateLazyFileRoute: + config.verboseFileRoutes === false && + sortedRouteNodes.some( + (node) => + routePiecesByPath[node.routePath!]?.lazy && + isRouteNodeValidForAugmentation(node), + ), + // Used in the process of augmenting the routes + FileRoutesByPath: + config.verboseFileRoutes === false && + sortedRouteNodes.some((d) => isRouteNodeValidForAugmentation(d)), + }) + .filter((d) => d[1]) + .map((d) => d[0]) + .sort((a, b) => a.localeCompare(b)) + const imports = Object.entries({ createFileRoute: sortedRouteNodes.some((d) => d.isVirtual), lazyFn: sortedRouteNodes.some( @@ -555,14 +574,22 @@ export async function generator(config: Config, root: string) { ), ) } + const routeImports = [ ...config.routeTreeFileHeader, `// This file was automatically generated by TanStack Router. // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.`, - imports.length - ? `import { ${imports.join(', ')} } from '${ROUTE_TEMPLATE.fullPkg}'\n` - : '', + [ + imports.length + ? `import { ${imports.join(', ')} } from '${ROUTE_TEMPLATE.fullPkg}'` + : '', + !TYPES_DISABLED && typeImports.length + ? `import type { ${typeImports.join(', ')} } from '${ROUTE_TEMPLATE.fullPkg}'` + : '', + ] + .filter(Boolean) + .join('\n'), '// Import Routes', [ `import { Route as rootRoute } from './${getImportPath(rootRouteNode)}'`, @@ -571,7 +598,7 @@ export async function generator(config: Config, root: string) { .map((node) => { return `import { Route as ${ node.variableName - }Import } from './${getImportPath(node)}'` + }RouteImport } from './${getImportPath(node)}'` }), ].join('\n'), virtualRouteNodes.length ? '// Create Virtual Routes' : '', @@ -579,7 +606,7 @@ export async function generator(config: Config, root: string) { .map((node) => { return `const ${ node.variableName - }Import = createFileRoute('${node.routePath}')()` + }RouteImport = createFileRoute('${node.routePath}')()` }) .join('\n'), '// Create/Update Routes', @@ -594,7 +621,8 @@ export async function generator(config: Config, root: string) { const lazyComponentNode = routePiecesByPath[node.routePath!]?.lazy return [ - `const ${node.variableName}Route = ${node.variableName}Import.update({ + [ + `const ${node.variableName}Route = ${node.variableName}RouteImport.update({ ${[ `id: '${node.path}'`, !node.isNonPath ? `path: '${node.cleanedPath}'` : undefined, @@ -603,19 +631,19 @@ export async function generator(config: Config, root: string) { .filter(Boolean) .join(',')} }${TYPES_DISABLED ? '' : 'as any'})`, - loaderNode - ? `.updateLoader({ loader: lazyFn(() => import('./${replaceBackslash( - removeExt( - path.relative( - path.dirname(config.generatedRouteTree), - path.resolve(config.routesDirectory, loaderNode.filePath), + loaderNode + ? `.updateLoader({ loader: lazyFn(() => import('./${replaceBackslash( + removeExt( + path.relative( + path.dirname(config.generatedRouteTree), + path.resolve(config.routesDirectory, loaderNode.filePath), + ), + config.addExtensions, ), - config.addExtensions, - ), - )}'), 'loader') })` - : '', - componentNode || errorComponentNode || pendingComponentNode - ? `.update({ + )}'), 'loader') })` + : '', + componentNode || errorComponentNode || pendingComponentNode + ? `.update({ ${( [ ['component', componentNode], @@ -639,22 +667,23 @@ export async function generator(config: Config, root: string) { }) .join('\n,')} })` - : '', - lazyComponentNode - ? `.lazy(() => import('./${replaceBackslash( - removeExt( - path.relative( - path.dirname(config.generatedRouteTree), - path.resolve( - config.routesDirectory, - lazyComponentNode.filePath, + : '', + lazyComponentNode + ? `.lazy(() => import('./${replaceBackslash( + removeExt( + path.relative( + path.dirname(config.generatedRouteTree), + path.resolve( + config.routesDirectory, + lazyComponentNode.filePath, + ), ), + config.addExtensions, ), - config.addExtensions, - ), - )}').then((d) => d.Route))` - : '', - ].join('') + )}').then((d) => d.Route))` + : '', + ].join(''), + ].join('\n\n') }) .join('\n\n'), ...(TYPES_DISABLED @@ -671,12 +700,12 @@ export async function generator(config: Config, root: string) { id: '${filePathId}' path: '${inferPath(routeNode)}' fullPath: '${inferFullPath(routeNode)}' - preLoaderRoute: typeof ${routeNode.variableName}Import + preLoaderRoute: typeof ${routeNode.variableName}RouteImport parentRoute: typeof ${ routeNode.isVirtualParentRequired ? `${routeNode.parent?.variableName}Route` : routeNode.parent?.variableName - ? `${routeNode.parent.variableName}Import` + ? `${routeNode.parent.variableName}RouteImport` : 'rootRoute' } }` @@ -685,6 +714,41 @@ export async function generator(config: Config, root: string) { } }`, ]), + ...(TYPES_DISABLED + ? [] + : config.verboseFileRoutes !== false + ? [] + : [ + `// Add type-safety to the createFileRoute function across the route tree`, + routeNodes + .map((routeNode) => { + function getModuleDeclaration(routeNode?: RouteNode) { + if (!isRouteNodeValidForAugmentation(routeNode)) { + return '' + } + return `declare module './${getImportPath(routeNode)}' { + const ${routeNode._fsRouteType === 'lazy' ? 'createLazyFileRoute' : 'createFileRoute'}: ${ + routeNode._fsRouteType === 'lazy' + ? `CreateLazyFileRoute}` + : `CreateFileRoute< + '${routeNode.routePath}', + FileRoutesByPath['${routeNode.routePath}']['parentRoute'], + FileRoutesByPath['${routeNode.routePath}']['id'], + FileRoutesByPath['${routeNode.routePath}']['path'], + FileRoutesByPath['${routeNode.routePath}']['fullPath'] + > + }` + }` + } + return ( + getModuleDeclaration(routeNode) + + getModuleDeclaration( + routePiecesByPath[routeNode.routePath!]?.lazy, + ) + ) + }) + .join('\n'), + ]), '// Create and export the route tree', routeConfigChildrenText, ...(TYPES_DISABLED @@ -703,7 +767,7 @@ export async function generator(config: Config, root: string) { })} }`, `export interface FileRoutesById { - '__root__': typeof rootRoute, + '${rootRouteId}': typeof rootRoute, ${[...createRouteNodesById(routeNodes).entries()].map(([id, routeNode]) => { return `'${id}': typeof ${getResolvedRouteNodeVariableName(routeNode)}` })} @@ -713,7 +777,7 @@ export async function generator(config: Config, root: string) { fullPaths: ${routeNodes.length > 0 ? [...createRouteNodesByFullPath(routeNodes).keys()].map((fullPath) => `'${fullPath}'`).join('|') : 'never'} fileRoutesByTo: FileRoutesByTo to: ${routeNodes.length > 0 ? [...createRouteNodesByTo(routeNodes).keys()].map((to) => `'${to}'`).join('|') : 'never'} - id: ${[`'__root__'`, ...[...createRouteNodesById(routeNodes).keys()].map((id) => `'${id}'`)].join('|')} + id: ${[`'${rootRouteId}'`, ...[...createRouteNodesById(routeNodes).keys()].map((id) => `'${id}'`)].join('|')} fileRoutesById: FileRoutesById }`, `export interface RootRouteChildren { @@ -731,7 +795,7 @@ export async function generator(config: Config, root: string) { const createRouteManifest = () => { const routesManifest = { - __root__: { + [rootRouteId]: { filePath: rootRouteNode.filePath, children: routeTree.map((d) => d.routePath), }, @@ -827,6 +891,22 @@ function removeGroups(s: string) { return s.replace(possiblyNestedRouteGroupPatternRegex, '') } +/** + * Checks if a given RouteNode is valid for augmenting it with typing based on conditions. + * Also asserts that the RouteNode is defined. + * + * @param routeNode - The RouteNode to check. + * @returns A boolean indicating whether the RouteNode is defined. + */ +function isRouteNodeValidForAugmentation( + routeNode?: RouteNode, +): routeNode is RouteNode { + if (!routeNode || routeNode.isVirtual) { + return false + } + return true +} + /** * The `node.path` is used as the `id` in the route definition. * This function checks if the given node has a parent and if so, it determines the correct path for the given node. @@ -847,7 +927,7 @@ function determineNodePath(node: RouteNode) { * @example * removeLastSegmentFromPath('/workspace/_auth/foo') // '/workspace/_auth' */ -export function removeLastSegmentFromPath(routePath: string = '/'): string { +function removeLastSegmentFromPath(routePath: string = '/'): string { const segments = routePath.split('/') segments.pop() // Remove the last segment return segments.join('/') @@ -867,7 +947,7 @@ function removeLayoutSegments(routePath: string = '/'): string { return newSegments.join('/') } -export function hasParentRoute( +function hasParentRoute( routes: Array, node: RouteNode, routePathToCheck: string | undefined, @@ -902,9 +982,7 @@ export function hasParentRoute( /** * Gets the final variable name for a route */ -export const getResolvedRouteNodeVariableName = ( - routeNode: RouteNode, -): string => { +const getResolvedRouteNodeVariableName = (routeNode: RouteNode): string => { return routeNode.children?.length ? `${routeNode.variableName}RouteWithChildren` : `${routeNode.variableName}Route` @@ -913,7 +991,7 @@ export const getResolvedRouteNodeVariableName = ( /** * Creates a map from fullPath to routeNode */ -export const createRouteNodesByFullPath = ( +const createRouteNodesByFullPath = ( routeNodes: Array, ): Map => { return new Map( @@ -924,7 +1002,7 @@ export const createRouteNodesByFullPath = ( /** * Create a map from 'to' to a routeNode */ -export const createRouteNodesByTo = ( +const createRouteNodesByTo = ( routeNodes: Array, ): Map => { return new Map( @@ -938,7 +1016,7 @@ export const createRouteNodesByTo = ( /** * Create a map from 'id' to a routeNode */ -export const createRouteNodesById = ( +const createRouteNodesById = ( routeNodes: Array, ): Map => { return new Map( @@ -952,7 +1030,7 @@ export const createRouteNodesById = ( /** * Infers the full path for use by TS */ -export const inferFullPath = (routeNode: RouteNode): string => { +const inferFullPath = (routeNode: RouteNode): string => { const fullPath = removeGroups( removeUnderscores(removeLayoutSegments(routeNode.routePath)) ?? '', ) @@ -963,7 +1041,7 @@ export const inferFullPath = (routeNode: RouteNode): string => { /** * Infers the path for use by TS */ -export const inferPath = (routeNode: RouteNode): string => { +const inferPath = (routeNode: RouteNode): string => { return routeNode.cleanedPath === '/' ? routeNode.cleanedPath : (routeNode.cleanedPath?.replace(/\/$/, '') ?? '') @@ -972,7 +1050,7 @@ export const inferPath = (routeNode: RouteNode): string => { /** * Infers to path */ -export const inferTo = (routeNode: RouteNode): string => { +const inferTo = (routeNode: RouteNode): string => { const fullPath = inferFullPath(routeNode) if (fullPath === '/') return fullPath @@ -983,7 +1061,7 @@ export const inferTo = (routeNode: RouteNode): string => { /** * Dedupes branches and index routes */ -export const dedupeBranchesAndIndexRoutes = ( +const dedupeBranchesAndIndexRoutes = ( routes: Array, ): Array => { return routes.filter((route) => { @@ -1022,75 +1100,8 @@ function checkRouteFullPathUniqueness( const errorMessage = `Conflicting configuration paths were found for the following route${conflictingFiles.length > 1 ? 's' : ''}: ${conflictingFiles .map((p) => `"${p.inferredFullPath}"`) .join(', ')}. -Please ensure each route has a unique full path. +Please ensure each Route has a unique full path. Conflicting files: \n ${conflictingFiles.map((d) => path.resolve(config.routesDirectory, d.filePath)).join('\n ')}\n` throw new Error(errorMessage) } } - -function checkStartAPIRoutes(_routes: Array, config: Config) { - if (_routes.length === 0) { - return [] - } - - // Make sure these are valid URLs - // Route Groups and Layout Routes aren't being removed since - // you may want to have an API route that starts with an underscore - // or be wrapped in parentheses - const routes = _routes.map((d) => { - const routePath = removeTrailingSlash(d.routePath ?? '') - return { ...d, routePath } - }) - - const conflictingFiles = checkUnique(routes, 'routePath') - - if (conflictingFiles !== undefined) { - const errorMessage = `Conflicting configuration paths were found for the following API route${conflictingFiles.length > 1 ? 's' : ''}: ${conflictingFiles - .map((p) => `"${p}"`) - .join(', ')}. - Please ensure each API route has a unique route path. -Conflicting files: \n ${conflictingFiles.map((d) => path.resolve(config.routesDirectory, d.filePath)).join('\n ')}\n` - throw new Error(errorMessage) - } - - return routes -} - -export type StartAPIRoutePathSegment = { - value: string - type: 'path' | 'param' | 'splat' -} - -/** - * This function takes in a path in the format accepted by TanStack Router - * and returns an array of path segments that can be used to generate - * the pathname of the TanStack Start API route. - * - * @param src - * @returns - */ -export function startAPIRouteSegmentsFromTSRFilePath( - src: string, - config: Config, -): Array { - const routePath = determineInitialRoutePath(src) - - const parts = routePath - .replaceAll('.', '/') - .split('/') - .filter((p) => !!p && p !== config.indexToken) - const segments: Array = parts.map((part) => { - if (part.startsWith('$')) { - if (part === '$') { - return { value: part, type: 'splat' } - } - - part.replaceAll('$', '') - return { value: part, type: 'param' } - } - - return { value: part, type: 'path' } - }) - - return segments -} diff --git a/packages/router-generator/src/index.ts b/packages/router-generator/src/index.ts index 4f22337a3c..21e7ba58fb 100644 --- a/packages/router-generator/src/index.ts +++ b/packages/router-generator/src/index.ts @@ -1,9 +1,34 @@ -export { configSchema, getConfig, resolveConfigPath } from './config' -export type { Config } from './config' +export { + configSchema, + getConfig, + resolveConfigPath, + baseConfigSchema, +} from './config' +export type { Config, BaseConfig } from './config' + +export { generator } from './generator' export { - generator, - startAPIRouteSegmentsFromTSRFilePath, - CONSTANTS, -} from './generator' -export type { StartAPIRoutePathSegment } from './generator' + logging, + capitalize, + cleanPath, + trimPathLeft, + removeLeadingSlash, + removeTrailingSlash, + determineInitialRoutePath, + replaceBackslash, + routePathToVariable, + removeUnderscores, + resetRegex, + multiSortBy, + writeIfDifferent, + format, + removeExt, +} from './utils' + +export type { RouteNode, GetRouteNodesResult } from './types' + +export { getRouteNodes as physicalGetRouteNodes } from './filesystem/physical/getRouteNodes' +export { getRouteNodes as virtualGetRouteNodes } from './filesystem/virtual/getRouteNodes' + +export { rootPathId } from './filesystem/physical/rootPathId' diff --git a/packages/router-generator/src/template.ts b/packages/router-generator/src/template.ts index 5650844a04..1c8747a97a 100644 --- a/packages/router-generator/src/template.ts +++ b/packages/router-generator/src/template.ts @@ -77,10 +77,8 @@ export function getTargetTemplate(target: Config['target']): TargetTemplate { 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', ].join(''), imports: { - tsrImports: () => - "import { createFileRoute } from '@tanstack/react-router';", - tsrExportStart: (routePath) => - `export const Route = createFileRoute('${routePath}')(`, + tsrImports: () => '', + tsrExportStart: () => `export const Route = createFileRoute(`, tsrExportEnd: () => ');', }, }, @@ -130,10 +128,8 @@ export function getTargetTemplate(target: Config['target']): TargetTemplate { 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', ].join(''), imports: { - tsrImports: () => - "import { createFileRoute } from '@tanstack/solid-router';", - tsrExportStart: (routePath) => - `export const Route = createFileRoute('${routePath}')(`, + tsrImports: () => '', + tsrExportStart: () => `export const Route = createFileRoute(`, tsrExportEnd: () => ');', }, }, @@ -158,10 +154,3 @@ export function getTargetTemplate(target: Config['target']): TargetTemplate { throw new Error(`router-generator: Unknown target type: ${target}`) } } - -export const defaultAPIRouteTemplate = [ - 'import { json } from "@tanstack/react-start";\n', - '%%tsrImports%%', - '\n\n', - '%%tsrExportStart%%{ GET: ({ request, params }) => { return json({ message:\'Hello "%%tsrPath%%"!\' }) }}%%tsrExportEnd%%\n', -].join('') diff --git a/packages/router-generator/src/types.ts b/packages/router-generator/src/types.ts index a8ba30feee..954401bdfe 100644 --- a/packages/router-generator/src/types.ts +++ b/packages/router-generator/src/types.ts @@ -25,7 +25,6 @@ export type FsRouteType = | 'layout' | 'pathless_layout' | 'lazy' - | 'api' | 'loader' // @deprecated | 'component' // @deprecated | 'pendingComponent' // @deprecated diff --git a/packages/router-generator/src/utils.ts b/packages/router-generator/src/utils.ts index 5155bb43ef..0280e9186e 100644 --- a/packages/router-generator/src/utils.ts +++ b/packages/router-generator/src/utils.ts @@ -1,6 +1,5 @@ import * as fs from 'node:fs' import * as prettier from 'prettier' -import type { Config } from './config' export function multiSortBy( arr: Array, @@ -86,7 +85,55 @@ export function removeTrailingSlash(s: string) { } export function determineInitialRoutePath(routePath: string) { - return cleanPath(`/${routePath.split('.').join('/')}`) || '' + const DISALLOWED_ESCAPE_CHARS = new Set([ + '/', + '\\', + '?', + '#', + ':', + '*', + '<', + '>', + '|', + '!', + '$', + '%', + ]) + + const parts = routePath.split(/(? { + // Check if any disallowed characters are used in brackets + const BRACKET_CONTENT_RE = /\[(.*?)\]/g + + let match + while ((match = BRACKET_CONTENT_RE.exec(part)) !== null) { + const character = match[1] + if (character === undefined) continue + if (DISALLOWED_ESCAPE_CHARS.has(character)) { + console.error( + `Error: Disallowed character "${character}" found in square brackets in route path "${routePath}".\nYou cannot use any of the following characters in square brackets: ${Array.from( + DISALLOWED_ESCAPE_CHARS, + ).join(', ')}\nPlease remove and/or replace them.`, + ) + process.exit(1) + } + } + + // Since this split segment is safe at this point, we can + // remove the brackets and replace them with the content inside + return part.replace(/\[(.)\]/g, '$1') + }) + + // If the syntax for prefix/suffix is different, from the path + // matching internals of router-core, we'd perform those changes here + // on the `escapedParts` array before it is joined back together in + // `final` + + const final = cleanPath(`/${escapedParts.join('/')}`) || '' + + return final } export function replaceBackslash(s: string) { @@ -94,15 +141,43 @@ export function replaceBackslash(s: string) { } export function routePathToVariable(routePath: string): string { + const toVariableSafeChar = (char: string): string => { + if (/[a-zA-Z0-9_]/.test(char)) { + return char // Keep alphanumeric characters and underscores as is + } + + // Replace special characters with meaningful text equivalents + switch (char) { + case '.': + return 'Dot' + case '-': + return 'Dash' + case '@': + return 'At' + case '(': + return '' // Removed since route groups use parentheses + case ')': + return '' // Removed since route groups use parentheses + case ' ': + return '' // Remove spaces + default: + return `Char${char.charCodeAt(0)}` // For any other characters + } + } + return ( removeUnderscores(routePath) ?.replace(/\/\$\//g, '/splat/') .replace(/\$$/g, 'splat') + .replace(/\$\{\$\}/g, 'splat') .replace(/\$/g, '') .split(/[/-]/g) .map((d, i) => (i > 0 ? capitalize(d) : d)) .join('') - .replace(/([^a-zA-Z0-9]|[.])/gm, '') + .split('') + .map(toVariableSafeChar) + .join('') + // .replace(/([^a-zA-Z0-9]|[.])/gm, '') .replace(/^(\d)/g, 'R$1') ?? '' ) } @@ -151,7 +226,13 @@ export async function writeIfDifferent( * @param config The configuration object * @returns The formatted content */ -export async function format(source: string, config: Config): Promise { +export async function format( + source: string, + config: { + quoteStyle: 'single' | 'double' + semicolons: boolean + }, +): Promise { const prettierOptions: prettier.Config = { semi: config.semicolons, singleQuote: config.quoteStyle === 'single', diff --git a/packages/router-generator/tests/generator.test.ts b/packages/router-generator/tests/generator.test.ts index daf787b2ec..6badeecd05 100644 --- a/packages/router-generator/tests/generator.test.ts +++ b/packages/router-generator/tests/generator.test.ts @@ -51,6 +51,7 @@ async function setupConfig( disableLogging: true, routesDirectory: dir + '/routes', generatedRouteTree: dir + generatedRouteTree, + verboseFileRoutes: false, ...rest, }) return config @@ -116,11 +117,6 @@ function rewriteConfigByFolderName(folderName: string, config: Config) { '%%tsrExportStart%%{\n component: RouteComponent\n }%%tsrExportEnd%%\n\n', 'function RouteComponent() { return "Hello %%tsrPath%%!" };\n', ].join(''), - apiTemplate: [ - 'import { json } from "@tanstack/react-start";\n', - '%%tsrImports%%\n\n', - '%%tsrExportStart%%{ GET: ({ request, params }) => { return json({ message: "Hello /api/test" }) }}%%tsrExportEnd%%\n', - ].join(''), lazyRouteTemplate: [ 'import React, { useState } from "react";\n', '%%tsrImports%%\n\n', @@ -128,7 +124,6 @@ function rewriteConfigByFolderName(folderName: string, config: Config) { 'function RouteComponent() { return "Hello %%tsrPath%%!" };\n', ].join(''), } - config.__enableAPIRoutesGeneration = true break default: break diff --git a/packages/router-generator/tests/generator/append-and-prepend/routeTree.snapshot.ts b/packages/router-generator/tests/generator/append-and-prepend/routeTree.snapshot.ts index 7ee554ed03..fb74c36e79 100644 --- a/packages/router-generator/tests/generator/append-and-prepend/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/append-and-prepend/routeTree.snapshot.ts @@ -6,14 +6,16 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -27,12 +29,24 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/append-and-prepend/routes/index.tsx b/packages/router-generator/tests/generator/append-and-prepend/routes/index.tsx index a525ebff0c..13c752995e 100644 --- a/packages/router-generator/tests/generator/append-and-prepend/routes/index.tsx +++ b/packages/router-generator/tests/generator/append-and-prepend/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: Home, validateSearch: () => ({ indexSearch: 'indexSearch', diff --git a/packages/router-generator/tests/generator/custom-scaffolding/routeTree.snapshot.ts b/packages/router-generator/tests/generator/custom-scaffolding/routeTree.snapshot.ts index 8ba4c94c1b..f8db6d367e 100644 --- a/packages/router-generator/tests/generator/custom-scaffolding/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/custom-scaffolding/routeTree.snapshot.ts @@ -9,30 +9,38 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' +import { Route as ApiBarRouteImport } from './routes/api/bar' // Create Virtual Routes -const FooLazyImport = createFileRoute('/foo')() +const FooLazyRouteImport = createFileRoute('/foo')() // Create/Update Routes -const FooLazyRoute = FooLazyImport.update({ +const FooLazyRoute = FooLazyRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => rootRoute, } as any).lazy(() => import('./routes/foo.lazy').then((d) => d.Route)) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) +const ApiBarRoute = ApiBarRouteImport.update({ + id: '/api/bar', + path: '/api/bar', + getParentRoute: () => rootRoute, +} as any) + // Populate the FileRoutesByPath interface declare module '@tanstack/react-router' { @@ -41,54 +49,92 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/foo': { id: '/foo' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof FooLazyImport + preLoaderRoute: typeof FooLazyRouteImport + parentRoute: typeof rootRoute + } + '/api/bar': { + id: '/api/bar' + path: '/api/bar' + fullPath: '/api/bar' + preLoaderRoute: typeof ApiBarRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/foo.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/foo']['preLoaderRoute'] + > +} +declare module './routes/api/bar' { + const createFileRoute: CreateFileRoute< + '/api/bar', + FileRoutesByPath['/api/bar']['parentRoute'], + FileRoutesByPath['/api/bar']['id'], + FileRoutesByPath['/api/bar']['path'], + FileRoutesByPath['/api/bar']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { '/': typeof IndexRoute '/foo': typeof FooLazyRoute + '/api/bar': typeof ApiBarRoute } export interface FileRoutesByTo { '/': typeof IndexRoute '/foo': typeof FooLazyRoute + '/api/bar': typeof ApiBarRoute } export interface FileRoutesById { __root__: typeof rootRoute '/': typeof IndexRoute '/foo': typeof FooLazyRoute + '/api/bar': typeof ApiBarRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/foo' + fullPaths: '/' | '/foo' | '/api/bar' fileRoutesByTo: FileRoutesByTo - to: '/' | '/foo' - id: '__root__' | '/' | '/foo' + to: '/' | '/foo' | '/api/bar' + id: '__root__' | '/' | '/foo' | '/api/bar' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute FooLazyRoute: typeof FooLazyRoute + ApiBarRoute: typeof ApiBarRoute } const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, FooLazyRoute: FooLazyRoute, + ApiBarRoute: ApiBarRoute, } export const routeTree = rootRoute @@ -102,7 +148,8 @@ export const routeTree = rootRoute "filePath": "__root.tsx", "children": [ "/", - "/foo" + "/foo", + "/api/bar" ] }, "/": { @@ -110,6 +157,9 @@ export const routeTree = rootRoute }, "/foo": { "filePath": "foo.lazy.tsx" + }, + "/api/bar": { + "filePath": "api/bar.tsx" } } } diff --git a/packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx b/packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx index 090f4b945a..13867e7bd1 100644 --- a/packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx +++ b/packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx @@ -1,8 +1,9 @@ -import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' +import * as React from 'react' -export const APIRoute = createAPIFileRoute('/api/bar')({ - GET: ({ request, params }) => { - return json({ message: 'Hello /api/test' }) - }, +export const Route = createFileRoute({ + component: RouteComponent, }) + +function RouteComponent() { + return 'Hello /api/bar!' +} diff --git a/packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx b/packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx index 8b22ea6bb5..659c416bc4 100644 --- a/packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx +++ b/packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/custom-scaffolding/snapshot/api/bar.tsx b/packages/router-generator/tests/generator/custom-scaffolding/snapshot/api/bar.tsx index 090f4b945a..13867e7bd1 100644 --- a/packages/router-generator/tests/generator/custom-scaffolding/snapshot/api/bar.tsx +++ b/packages/router-generator/tests/generator/custom-scaffolding/snapshot/api/bar.tsx @@ -1,8 +1,9 @@ -import { json } from '@tanstack/react-start' -import { createAPIFileRoute } from '@tanstack/react-start/api' +import * as React from 'react' -export const APIRoute = createAPIFileRoute('/api/bar')({ - GET: ({ request, params }) => { - return json({ message: 'Hello /api/test' }) - }, +export const Route = createFileRoute({ + component: RouteComponent, }) + +function RouteComponent() { + return 'Hello /api/bar!' +} diff --git a/packages/router-generator/tests/generator/custom-scaffolding/snapshot/index.tsx b/packages/router-generator/tests/generator/custom-scaffolding/snapshot/index.tsx index 8b22ea6bb5..659c416bc4 100644 --- a/packages/router-generator/tests/generator/custom-scaffolding/snapshot/index.tsx +++ b/packages/router-generator/tests/generator/custom-scaffolding/snapshot/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routeTree.snapshot.ts b/packages/router-generator/tests/generator/custom-tokens/routeTree.snapshot.ts index a9170a93ef..0e6e125d65 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/custom-tokens/routeTree.snapshot.ts @@ -8,63 +8,65 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsR0ut3Import } from './routes/posts/_r0ut3_' -import { Route as BlogR0ut3Import } from './routes/blog/_r0ut3_' -import { Route as R1nd3xImport } from './routes/_1nd3x' -import { Route as Posts1nd3xImport } from './routes/posts/_1nd3x' -import { Route as Blog1nd3xImport } from './routes/blog/_1nd3x' -import { Route as BlogSlugImport } from './routes/blog/$slug' -import { Route as PostsPostId1nd3xImport } from './routes/posts/$postId/_1nd3x' -import { Route as PostsPostIdDeepImport } from './routes/posts/$postId/deep' +import { Route as PostsR0ut3RouteImport } from './routes/posts/_r0ut3_' +import { Route as BlogR0ut3RouteImport } from './routes/blog/_r0ut3_' +import { Route as R1nd3xRouteImport } from './routes/_1nd3x' +import { Route as Posts1nd3xRouteImport } from './routes/posts/_1nd3x' +import { Route as Blog1nd3xRouteImport } from './routes/blog/_1nd3x' +import { Route as BlogSlugRouteImport } from './routes/blog/$slug' +import { Route as PostsPostId1nd3xRouteImport } from './routes/posts/$postId/_1nd3x' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts/$postId/deep' // Create/Update Routes -const PostsR0ut3Route = PostsR0ut3Import.update({ +const PostsR0ut3Route = PostsR0ut3RouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const BlogR0ut3Route = BlogR0ut3Import.update({ +const BlogR0ut3Route = BlogR0ut3RouteImport.update({ id: '/blog', path: '/blog', getParentRoute: () => rootRoute, } as any) -const R1nd3xRoute = R1nd3xImport.update({ +const R1nd3xRoute = R1nd3xRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const Posts1nd3xRoute = Posts1nd3xImport.update({ +const Posts1nd3xRoute = Posts1nd3xRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsR0ut3Route, } as any) -const Blog1nd3xRoute = Blog1nd3xImport.update({ +const Blog1nd3xRoute = Blog1nd3xRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogR0ut3Route, } as any) -const BlogSlugRoute = BlogSlugImport.update({ +const BlogSlugRoute = BlogSlugRouteImport.update({ id: '/$slug', path: '/$slug', getParentRoute: () => BlogR0ut3Route, } as any) -const PostsPostId1nd3xRoute = PostsPostId1nd3xImport.update({ +const PostsPostId1nd3xRoute = PostsPostId1nd3xRouteImport.update({ id: '/$postId/', path: '/$postId/', getParentRoute: () => PostsR0ut3Route, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/$postId/deep', path: '/$postId/deep', getParentRoute: () => PostsR0ut3Route, @@ -78,61 +80,136 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof R1nd3xImport + preLoaderRoute: typeof R1nd3xRouteImport parentRoute: typeof rootRoute } '/blog': { id: '/blog' path: '/blog' fullPath: '/blog' - preLoaderRoute: typeof BlogR0ut3Import + preLoaderRoute: typeof BlogR0ut3RouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsR0ut3Import + preLoaderRoute: typeof PostsR0ut3RouteImport parentRoute: typeof rootRoute } '/blog/$slug': { id: '/blog/$slug' path: '/$slug' fullPath: '/blog/$slug' - preLoaderRoute: typeof BlogSlugImport - parentRoute: typeof BlogR0ut3Import + preLoaderRoute: typeof BlogSlugRouteImport + parentRoute: typeof BlogR0ut3RouteImport } '/blog/': { id: '/blog/' path: '/' fullPath: '/blog/' - preLoaderRoute: typeof Blog1nd3xImport - parentRoute: typeof BlogR0ut3Import + preLoaderRoute: typeof Blog1nd3xRouteImport + parentRoute: typeof BlogR0ut3RouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof Posts1nd3xImport - parentRoute: typeof PostsR0ut3Import + preLoaderRoute: typeof Posts1nd3xRouteImport + parentRoute: typeof PostsR0ut3RouteImport } '/posts/$postId/deep': { id: '/posts/$postId/deep' path: '/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport - parentRoute: typeof PostsR0ut3Import + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof PostsR0ut3RouteImport } '/posts/$postId/': { id: '/posts/$postId/' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostId1nd3xImport - parentRoute: typeof PostsR0ut3Import + preLoaderRoute: typeof PostsPostId1nd3xRouteImport + parentRoute: typeof PostsR0ut3RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/_1nd3x' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/blog/_r0ut3_' { + const createFileRoute: CreateFileRoute< + '/blog', + FileRoutesByPath['/blog']['parentRoute'], + FileRoutesByPath['/blog']['id'], + FileRoutesByPath['/blog']['path'], + FileRoutesByPath['/blog']['fullPath'] + > +} +declare module './routes/posts/_r0ut3_' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/blog/$slug' { + const createFileRoute: CreateFileRoute< + '/blog/$slug', + FileRoutesByPath['/blog/$slug']['parentRoute'], + FileRoutesByPath['/blog/$slug']['id'], + FileRoutesByPath['/blog/$slug']['path'], + FileRoutesByPath['/blog/$slug']['fullPath'] + > +} +declare module './routes/blog/_1nd3x' { + const createFileRoute: CreateFileRoute< + '/blog/', + FileRoutesByPath['/blog/']['parentRoute'], + FileRoutesByPath['/blog/']['id'], + FileRoutesByPath['/blog/']['path'], + FileRoutesByPath['/blog/']['fullPath'] + > +} +declare module './routes/posts/_1nd3x' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/posts/$postId/deep' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/deep', + FileRoutesByPath['/posts/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts/$postId/deep']['id'], + FileRoutesByPath['/posts/$postId/deep']['path'], + FileRoutesByPath['/posts/$postId/deep']['fullPath'] + > +} +declare module './routes/posts/$postId/_1nd3x' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/', + FileRoutesByPath['/posts/$postId/']['parentRoute'], + FileRoutesByPath['/posts/$postId/']['id'], + FileRoutesByPath['/posts/$postId/']['path'], + FileRoutesByPath['/posts/$postId/']['fullPath'] + > +} + // Create and export the route tree interface BlogR0ut3RouteChildren { diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/_1nd3x.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/_1nd3x.tsx index a680913ded..22cab82307 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/_1nd3x.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/_1nd3x.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/blog/$slug.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/blog/$slug.tsx index 0389370c39..784c2b78ae 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/blog/$slug.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/blog/$slug.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog/$slug')({ +export const Route = createFileRoute({ component: () =>
Hello /blog/$slug!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/blog/_1nd3x.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/blog/_1nd3x.tsx index 6fab51efb1..0754024ed7 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/blog/_1nd3x.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/blog/_1nd3x.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog/')({ +export const Route = createFileRoute({ component: () =>
Hello /blog/!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/blog/_r0ut3_.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/blog/_r0ut3_.tsx index 2833fcc588..ea94edad49 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/blog/_r0ut3_.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/blog/_r0ut3_.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog')({ +export const Route = createFileRoute({ component: () =>
Hello /blog!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/_1nd3x.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/_1nd3x.tsx index 3b2884f8aa..79316e21bb 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/_1nd3x.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/_1nd3x.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/$postId/')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/$postId/!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/deep.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/deep.tsx index 0e0463301d..68ba9095e1 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/deep.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/posts/$postId/deep.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/$postId/deep')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/$postId/deep!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/posts/_1nd3x.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/posts/_1nd3x.tsx index f3c995416c..2e16af1ca1 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/posts/_1nd3x.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/posts/_1nd3x.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/!
, }) diff --git a/packages/router-generator/tests/generator/custom-tokens/routes/posts/_r0ut3_.tsx b/packages/router-generator/tests/generator/custom-tokens/routes/posts/_r0ut3_.tsx index c298ab4675..3617558181 100644 --- a/packages/router-generator/tests/generator/custom-tokens/routes/posts/_r0ut3_.tsx +++ b/packages/router-generator/tests/generator/custom-tokens/routes/posts/_r0ut3_.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: () =>
Hello /posts!
, }) diff --git a/packages/router-generator/tests/generator/dot-escaped/routeTree.snapshot.ts b/packages/router-generator/tests/generator/dot-escaped/routeTree.snapshot.ts new file mode 100644 index 0000000000..52636fca80 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routeTree.snapshot.ts @@ -0,0 +1,226 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as ScriptDotjsRouteImport } from './routes/script[.]js' +import { Route as NestedDotjsRouteImport } from './routes/nested[.]js' +import { Route as NestedDotjsScriptDotjsRouteImport } from './routes/nested[.]js.script[.]js' +import { Route as NestedDotjsDoubleDotextDotjsRouteImport } from './routes/nested[.]js.double[.]ext[.]js' + +// Create/Update Routes + +const ScriptDotjsRoute = ScriptDotjsRouteImport.update({ + id: '/script.js', + path: '/script.js', + getParentRoute: () => rootRoute, +} as any) + +const NestedDotjsRoute = NestedDotjsRouteImport.update({ + id: '/nested.js', + path: '/nested.js', + getParentRoute: () => rootRoute, +} as any) + +const NestedDotjsScriptDotjsRoute = NestedDotjsScriptDotjsRouteImport.update({ + id: '/script.js', + path: '/script.js', + getParentRoute: () => NestedDotjsRoute, +} as any) + +const NestedDotjsDoubleDotextDotjsRoute = + NestedDotjsDoubleDotextDotjsRouteImport.update({ + id: '/double.ext.js', + path: '/double.ext.js', + getParentRoute: () => NestedDotjsRoute, + } as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/nested.js': { + id: '/nested.js' + path: '/nested.js' + fullPath: '/nested.js' + preLoaderRoute: typeof NestedDotjsRouteImport + parentRoute: typeof rootRoute + } + '/script.js': { + id: '/script.js' + path: '/script.js' + fullPath: '/script.js' + preLoaderRoute: typeof ScriptDotjsRouteImport + parentRoute: typeof rootRoute + } + '/nested.js/double.ext.js': { + id: '/nested.js/double.ext.js' + path: '/double.ext.js' + fullPath: '/nested.js/double.ext.js' + preLoaderRoute: typeof NestedDotjsDoubleDotextDotjsRouteImport + parentRoute: typeof NestedDotjsRouteImport + } + '/nested.js/script.js': { + id: '/nested.js/script.js' + path: '/script.js' + fullPath: '/nested.js/script.js' + preLoaderRoute: typeof NestedDotjsScriptDotjsRouteImport + parentRoute: typeof NestedDotjsRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/nested[.]js' { + const createFileRoute: CreateFileRoute< + '/nested.js', + FileRoutesByPath['/nested.js']['parentRoute'], + FileRoutesByPath['/nested.js']['id'], + FileRoutesByPath['/nested.js']['path'], + FileRoutesByPath['/nested.js']['fullPath'] + > +} +declare module './routes/script[.]js' { + const createFileRoute: CreateFileRoute< + '/script.js', + FileRoutesByPath['/script.js']['parentRoute'], + FileRoutesByPath['/script.js']['id'], + FileRoutesByPath['/script.js']['path'], + FileRoutesByPath['/script.js']['fullPath'] + > +} +declare module './routes/nested[.]js.double[.]ext[.]js' { + const createFileRoute: CreateFileRoute< + '/nested.js/double.ext.js', + FileRoutesByPath['/nested.js/double.ext.js']['parentRoute'], + FileRoutesByPath['/nested.js/double.ext.js']['id'], + FileRoutesByPath['/nested.js/double.ext.js']['path'], + FileRoutesByPath['/nested.js/double.ext.js']['fullPath'] + > +} +declare module './routes/nested[.]js.script[.]js' { + const createFileRoute: CreateFileRoute< + '/nested.js/script.js', + FileRoutesByPath['/nested.js/script.js']['parentRoute'], + FileRoutesByPath['/nested.js/script.js']['id'], + FileRoutesByPath['/nested.js/script.js']['path'], + FileRoutesByPath['/nested.js/script.js']['fullPath'] + > +} + +// Create and export the route tree + +interface NestedDotjsRouteChildren { + NestedDotjsDoubleDotextDotjsRoute: typeof NestedDotjsDoubleDotextDotjsRoute + NestedDotjsScriptDotjsRoute: typeof NestedDotjsScriptDotjsRoute +} + +const NestedDotjsRouteChildren: NestedDotjsRouteChildren = { + NestedDotjsDoubleDotextDotjsRoute: NestedDotjsDoubleDotextDotjsRoute, + NestedDotjsScriptDotjsRoute: NestedDotjsScriptDotjsRoute, +} + +const NestedDotjsRouteWithChildren = NestedDotjsRoute._addFileChildren( + NestedDotjsRouteChildren, +) + +export interface FileRoutesByFullPath { + '/nested.js': typeof NestedDotjsRouteWithChildren + '/script.js': typeof ScriptDotjsRoute + '/nested.js/double.ext.js': typeof NestedDotjsDoubleDotextDotjsRoute + '/nested.js/script.js': typeof NestedDotjsScriptDotjsRoute +} + +export interface FileRoutesByTo { + '/nested.js': typeof NestedDotjsRouteWithChildren + '/script.js': typeof ScriptDotjsRoute + '/nested.js/double.ext.js': typeof NestedDotjsDoubleDotextDotjsRoute + '/nested.js/script.js': typeof NestedDotjsScriptDotjsRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/nested.js': typeof NestedDotjsRouteWithChildren + '/script.js': typeof ScriptDotjsRoute + '/nested.js/double.ext.js': typeof NestedDotjsDoubleDotextDotjsRoute + '/nested.js/script.js': typeof NestedDotjsScriptDotjsRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/nested.js' + | '/script.js' + | '/nested.js/double.ext.js' + | '/nested.js/script.js' + fileRoutesByTo: FileRoutesByTo + to: + | '/nested.js' + | '/script.js' + | '/nested.js/double.ext.js' + | '/nested.js/script.js' + id: + | '__root__' + | '/nested.js' + | '/script.js' + | '/nested.js/double.ext.js' + | '/nested.js/script.js' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + NestedDotjsRoute: typeof NestedDotjsRouteWithChildren + ScriptDotjsRoute: typeof ScriptDotjsRoute +} + +const rootRouteChildren: RootRouteChildren = { + NestedDotjsRoute: NestedDotjsRouteWithChildren, + ScriptDotjsRoute: ScriptDotjsRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/nested.js", + "/script.js" + ] + }, + "/nested.js": { + "filePath": "nested[.]js.tsx", + "children": [ + "/nested.js/double.ext.js", + "/nested.js/script.js" + ] + }, + "/script.js": { + "filePath": "script[.]js.tsx" + }, + "/nested.js/double.ext.js": { + "filePath": "nested[.]js.double[.]ext[.]js.tsx", + "parent": "/nested.js" + }, + "/nested.js/script.js": { + "filePath": "nested[.]js.script[.]js.tsx", + "parent": "/nested.js" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/packages/router-generator/tests/generator/dot-escaped/routes/__root.tsx b/packages/router-generator/tests/generator/dot-escaped/routes/__root.tsx new file mode 100644 index 0000000000..ab504e42e9 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routes/__root.tsx @@ -0,0 +1 @@ +/** */ diff --git a/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.double[.]ext[.]js.tsx b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.double[.]ext[.]js.tsx new file mode 100644 index 0000000000..a8c4d4c893 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.double[.]ext[.]js.tsx @@ -0,0 +1,2 @@ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.script[.]js.tsx b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.script[.]js.tsx new file mode 100644 index 0000000000..a8c4d4c893 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.script[.]js.tsx @@ -0,0 +1,2 @@ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.tsx b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.tsx new file mode 100644 index 0000000000..a8c4d4c893 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routes/nested[.]js.tsx @@ -0,0 +1,2 @@ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/dot-escaped/routes/script[.]js.tsx b/packages/router-generator/tests/generator/dot-escaped/routes/script[.]js.tsx new file mode 100644 index 0000000000..a8c4d4c893 --- /dev/null +++ b/packages/router-generator/tests/generator/dot-escaped/routes/script[.]js.tsx @@ -0,0 +1,2 @@ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/duplicate-fullPath/routes/_auth/index.tsx b/packages/router-generator/tests/generator/duplicate-fullPath/routes/_auth/index.tsx index 56b2ebca76..47d07771d4 100644 --- a/packages/router-generator/tests/generator/duplicate-fullPath/routes/_auth/index.tsx +++ b/packages/router-generator/tests/generator/duplicate-fullPath/routes/_auth/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_auth/')({ +export const Route = createFileRoute({ component: () =>
Hello /_auth/!
, }) diff --git a/packages/router-generator/tests/generator/duplicate-fullPath/routes/index.tsx b/packages/router-generator/tests/generator/duplicate-fullPath/routes/index.tsx index a680913ded..22cab82307 100644 --- a/packages/router-generator/tests/generator/duplicate-fullPath/routes/index.tsx +++ b/packages/router-generator/tests/generator/duplicate-fullPath/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/file-modification/post.$postId.tsx b/packages/router-generator/tests/generator/file-modification/post.$postId.tsx index b51b2f5ad4..790146adf0 100644 --- a/packages/router-generator/tests/generator/file-modification/post.$postId.tsx +++ b/packages/router-generator/tests/generator/file-modification/post.$postId.tsx @@ -36,7 +36,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/routeTree.snapshot.ts b/packages/router-generator/tests/generator/file-modification/routeTree.snapshot.ts index f42e1f086f..6538af0694 100644 --- a/packages/router-generator/tests/generator/file-modification/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/file-modification/routeTree.snapshot.ts @@ -9,21 +9,26 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { + CreateFileRoute, + CreateLazyFileRoute, + FileRoutesByPath, +} from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as testInitiallyLazyImport } from './routes/(test)/initiallyLazy' -import { Route as testInitiallyEmptyImport } from './routes/(test)/initiallyEmpty' -import { Route as testFooImport } from './routes/(test)/foo' +import { Route as testInitiallyLazyRouteImport } from './routes/(test)/initiallyLazy' +import { Route as testInitiallyEmptyRouteImport } from './routes/(test)/initiallyEmpty' +import { Route as testFooRouteImport } from './routes/(test)/foo' // Create Virtual Routes -const testBarLazyImport = createFileRoute('/(test)/bar')() +const testBarLazyRouteImport = createFileRoute('/(test)/bar')() // Create/Update Routes -const testBarLazyRoute = testBarLazyImport +const testBarLazyRoute = testBarLazyRouteImport .update({ id: '/(test)/bar', path: '/bar', @@ -31,13 +36,13 @@ const testBarLazyRoute = testBarLazyImport } as any) .lazy(() => import('./routes/(test)/bar.lazy').then((d) => d.Route)) -const testInitiallyLazyRoute = testInitiallyLazyImport.update({ +const testInitiallyLazyRoute = testInitiallyLazyRouteImport.update({ id: '/(test)/initiallyLazy', path: '/initiallyLazy', getParentRoute: () => rootRoute, } as any) -const testInitiallyEmptyRoute = testInitiallyEmptyImport +const testInitiallyEmptyRoute = testInitiallyEmptyRouteImport .update({ id: '/(test)/initiallyEmpty', path: '/initiallyEmpty', @@ -47,7 +52,7 @@ const testInitiallyEmptyRoute = testInitiallyEmptyImport import('./routes/(test)/initiallyEmpty.lazy').then((d) => d.Route), ) -const testFooRoute = testFooImport.update({ +const testFooRoute = testFooRouteImport.update({ id: '/(test)/foo', path: '/foo', getParentRoute: () => rootRoute, @@ -61,33 +66,73 @@ declare module '@tanstack/react-router' { id: '/(test)/foo' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof testFooImport + preLoaderRoute: typeof testFooRouteImport parentRoute: typeof rootRoute } '/(test)/initiallyEmpty': { id: '/(test)/initiallyEmpty' path: '/initiallyEmpty' fullPath: '/initiallyEmpty' - preLoaderRoute: typeof testInitiallyEmptyImport + preLoaderRoute: typeof testInitiallyEmptyRouteImport parentRoute: typeof rootRoute } '/(test)/initiallyLazy': { id: '/(test)/initiallyLazy' path: '/initiallyLazy' fullPath: '/initiallyLazy' - preLoaderRoute: typeof testInitiallyLazyImport + preLoaderRoute: typeof testInitiallyLazyRouteImport parentRoute: typeof rootRoute } '/(test)/bar': { id: '/(test)/bar' path: '/bar' fullPath: '/bar' - preLoaderRoute: typeof testBarLazyImport + preLoaderRoute: typeof testBarLazyRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/(test)/foo' { + const createFileRoute: CreateFileRoute< + '/(test)/foo', + FileRoutesByPath['/(test)/foo']['parentRoute'], + FileRoutesByPath['/(test)/foo']['id'], + FileRoutesByPath['/(test)/foo']['path'], + FileRoutesByPath['/(test)/foo']['fullPath'] + > +} +declare module './routes/(test)/initiallyEmpty' { + const createFileRoute: CreateFileRoute< + '/(test)/initiallyEmpty', + FileRoutesByPath['/(test)/initiallyEmpty']['parentRoute'], + FileRoutesByPath['/(test)/initiallyEmpty']['id'], + FileRoutesByPath['/(test)/initiallyEmpty']['path'], + FileRoutesByPath['/(test)/initiallyEmpty']['fullPath'] + > +} +declare module './routes/(test)/initiallyEmpty.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(test)/initiallyEmpty']['preLoaderRoute'] + > +} +declare module './routes/(test)/initiallyLazy' { + const createFileRoute: CreateFileRoute< + '/(test)/initiallyLazy', + FileRoutesByPath['/(test)/initiallyLazy']['parentRoute'], + FileRoutesByPath['/(test)/initiallyLazy']['id'], + FileRoutesByPath['/(test)/initiallyLazy']['path'], + FileRoutesByPath['/(test)/initiallyLazy']['fullPath'] + > +} +declare module './routes/(test)/bar.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(test)/bar']['preLoaderRoute'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/file-modification/snapshot/bar.lazy.tsx b/packages/router-generator/tests/generator/file-modification/snapshot/bar.lazy.tsx index d8a6feca9b..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/snapshot/bar.lazy.tsx +++ b/packages/router-generator/tests/generator/file-modification/snapshot/bar.lazy.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/(test)/foo')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/snapshot/foo.tsx b/packages/router-generator/tests/generator/file-modification/snapshot/foo.tsx index d8a6feca9b..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/snapshot/foo.tsx +++ b/packages/router-generator/tests/generator/file-modification/snapshot/foo.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/(test)/foo')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.lazy.tsx b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.lazy.tsx index d8a6feca9b..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.lazy.tsx +++ b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.lazy.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/(test)/foo')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.tsx b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.tsx index d8a6feca9b..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.tsx +++ b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyEmpty.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/(test)/foo')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyLazy.tsx b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyLazy.tsx index d8a6feca9b..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/snapshot/initiallyLazy.tsx +++ b/packages/router-generator/tests/generator/file-modification/snapshot/initiallyLazy.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/(test)/foo')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/file-modification/template.lazy.tsx b/packages/router-generator/tests/generator/file-modification/template.lazy.tsx index 76dc2c74c3..45a3d5871f 100644 --- a/packages/router-generator/tests/generator/file-modification/template.lazy.tsx +++ b/packages/router-generator/tests/generator/file-modification/template.lazy.tsx @@ -2,7 +2,7 @@ import { createLazyFileRoute, Link } from '@tanstack/react-router' -export const Route = createLazyFileRoute('/(test)/lazy')({ +export const Route = createLazyFileRoute({ component: () => { const post = Route.useLoaderData() diff --git a/packages/router-generator/tests/generator/file-modification/template.tsx b/packages/router-generator/tests/generator/file-modification/template.tsx index 918119d3f0..cf174606e1 100644 --- a/packages/router-generator/tests/generator/file-modification/template.tsx +++ b/packages/router-generator/tests/generator/file-modification/template.tsx @@ -5,10 +5,9 @@ import { ErrorComponent, ErrorComponentProps, Link, - createFileRoute, } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ loader: async ({ params: { postId } }) => ({ postId, title: 'title', @@ -39,7 +38,7 @@ function PostComponent() { postId: post.id, }} activeProps={{ className: 'text-black font-bold' }} - className="block py-1 text-blue-800 hover:text-blue-600" + className="inline-block py-1 text-blue-800 hover:text-blue-600" > Deep View diff --git a/packages/router-generator/tests/generator/flat/routeTree.snapshot.ts b/packages/router-generator/tests/generator/flat/routeTree.snapshot.ts index 50840b912e..e4019aaade 100644 --- a/packages/router-generator/tests/generator/flat/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/flat/routeTree.snapshot.ts @@ -8,70 +8,72 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsRouteImport } from './routes/posts.route' -import { Route as BlogRouteImport } from './routes/blog.route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts.index' -import { Route as BlogIndexImport } from './routes/blog.index' -import { Route as BlogStatsImport } from './routes/blog_.stats' -import { Route as PostsPostIdIndexImport } from './routes/posts.$postId.index' -import { Route as BlogSlugIndexImport } from './routes/blog.$slug.index' -import { Route as PostsPostIdDeepImport } from './routes/posts.$postId.deep' +import { Route as PostsRouteRouteImport } from './routes/posts.route' +import { Route as BlogRouteRouteImport } from './routes/blog.route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as BlogIndexRouteImport } from './routes/blog.index' +import { Route as BlogStatsRouteImport } from './routes/blog_.stats' +import { Route as PostsPostIdIndexRouteImport } from './routes/posts.$postId.index' +import { Route as BlogSlugIndexRouteImport } from './routes/blog.$slug.index' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts.$postId.deep' // Create/Update Routes -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const BlogRouteRoute = BlogRouteImport.update({ +const BlogRouteRoute = BlogRouteRouteImport.update({ id: '/blog', path: '/blog', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const BlogIndexRoute = BlogIndexImport.update({ +const BlogIndexRoute = BlogIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogRouteRoute, } as any) -const BlogStatsRoute = BlogStatsImport.update({ +const BlogStatsRoute = BlogStatsRouteImport.update({ id: '/blog_/stats', path: '/blog/stats', getParentRoute: () => rootRoute, } as any) -const PostsPostIdIndexRoute = PostsPostIdIndexImport.update({ +const PostsPostIdIndexRoute = PostsPostIdIndexRouteImport.update({ id: '/$postId/', path: '/$postId/', getParentRoute: () => PostsRouteRoute, } as any) -const BlogSlugIndexRoute = BlogSlugIndexImport.update({ +const BlogSlugIndexRoute = BlogSlugIndexRouteImport.update({ id: '/$slug/', path: '/$slug/', getParentRoute: () => BlogRouteRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/$postId/deep', path: '/$postId/deep', getParentRoute: () => PostsRouteRoute, @@ -85,68 +87,152 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/blog': { id: '/blog' path: '/blog' fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogRouteRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/blog_/stats': { id: '/blog_/stats' path: '/blog/stats' fullPath: '/blog/stats' - preLoaderRoute: typeof BlogStatsImport + preLoaderRoute: typeof BlogStatsRouteImport parentRoute: typeof rootRoute } '/blog/': { id: '/blog/' path: '/' fullPath: '/blog/' - preLoaderRoute: typeof BlogIndexImport - parentRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogIndexRouteImport + parentRoute: typeof BlogRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/$postId/deep': { id: '/posts/$postId/deep' path: '/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof PostsRouteRouteImport } '/blog/$slug/': { id: '/blog/$slug/' path: '/$slug' fullPath: '/blog/$slug' - preLoaderRoute: typeof BlogSlugIndexImport - parentRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogSlugIndexRouteImport + parentRoute: typeof BlogRouteRouteImport } '/posts/$postId/': { id: '/posts/$postId/' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/blog.route' { + const createFileRoute: CreateFileRoute< + '/blog', + FileRoutesByPath['/blog']['parentRoute'], + FileRoutesByPath['/blog']['id'], + FileRoutesByPath['/blog']['path'], + FileRoutesByPath['/blog']['fullPath'] + > +} +declare module './routes/posts.route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/blog_.stats' { + const createFileRoute: CreateFileRoute< + '/blog_/stats', + FileRoutesByPath['/blog_/stats']['parentRoute'], + FileRoutesByPath['/blog_/stats']['id'], + FileRoutesByPath['/blog_/stats']['path'], + FileRoutesByPath['/blog_/stats']['fullPath'] + > +} +declare module './routes/blog.index' { + const createFileRoute: CreateFileRoute< + '/blog/', + FileRoutesByPath['/blog/']['parentRoute'], + FileRoutesByPath['/blog/']['id'], + FileRoutesByPath['/blog/']['path'], + FileRoutesByPath['/blog/']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/posts.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/deep', + FileRoutesByPath['/posts/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts/$postId/deep']['id'], + FileRoutesByPath['/posts/$postId/deep']['path'], + FileRoutesByPath['/posts/$postId/deep']['fullPath'] + > +} +declare module './routes/blog.$slug.index' { + const createFileRoute: CreateFileRoute< + '/blog/$slug/', + FileRoutesByPath['/blog/$slug/']['parentRoute'], + FileRoutesByPath['/blog/$slug/']['id'], + FileRoutesByPath['/blog/$slug/']['path'], + FileRoutesByPath['/blog/$slug/']['fullPath'] + > +} +declare module './routes/posts.$postId.index' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/', + FileRoutesByPath['/posts/$postId/']['parentRoute'], + FileRoutesByPath['/posts/$postId/']['id'], + FileRoutesByPath['/posts/$postId/']['path'], + FileRoutesByPath['/posts/$postId/']['fullPath'] + > +} + // Create and export the route tree interface BlogRouteRouteChildren { diff --git a/packages/router-generator/tests/generator/flat/routes/__root.tsx b/packages/router-generator/tests/generator/flat/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/__root.tsx +++ b/packages/router-generator/tests/generator/flat/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/blog.$slug.index.tsx b/packages/router-generator/tests/generator/flat/routes/blog.$slug.index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/blog.$slug.index.tsx +++ b/packages/router-generator/tests/generator/flat/routes/blog.$slug.index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/blog.index.tsx b/packages/router-generator/tests/generator/flat/routes/blog.index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/blog.index.tsx +++ b/packages/router-generator/tests/generator/flat/routes/blog.index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/blog.route.tsx b/packages/router-generator/tests/generator/flat/routes/blog.route.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/blog.route.tsx +++ b/packages/router-generator/tests/generator/flat/routes/blog.route.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/blog_.stats.tsx b/packages/router-generator/tests/generator/flat/routes/blog_.stats.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/blog_.stats.tsx +++ b/packages/router-generator/tests/generator/flat/routes/blog_.stats.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/index.tsx b/packages/router-generator/tests/generator/flat/routes/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/index.tsx +++ b/packages/router-generator/tests/generator/flat/routes/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/posts.$postId.deep.tsx b/packages/router-generator/tests/generator/flat/routes/posts.$postId.deep.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/posts.$postId.deep.tsx +++ b/packages/router-generator/tests/generator/flat/routes/posts.$postId.deep.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/posts.$postId.index.tsx b/packages/router-generator/tests/generator/flat/routes/posts.$postId.index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/posts.$postId.index.tsx +++ b/packages/router-generator/tests/generator/flat/routes/posts.$postId.index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/posts.index.tsx b/packages/router-generator/tests/generator/flat/routes/posts.index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/posts.index.tsx +++ b/packages/router-generator/tests/generator/flat/routes/posts.index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/flat/routes/posts.route.tsx b/packages/router-generator/tests/generator/flat/routes/posts.route.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/flat/routes/posts.route.tsx +++ b/packages/router-generator/tests/generator/flat/routes/posts.route.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routeTree.snapshot.ts b/packages/router-generator/tests/generator/nested-layouts/routeTree.snapshot.ts index 51095a9fea..f63b7e3a1b 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/nested-layouts/routeTree.snapshot.ts @@ -9,181 +9,184 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as LayoutA2Import } from './routes/_layout-a2' -import { Route as LayoutA1Import } from './routes/_layout-a1' -import { Route as JestedRouteImport } from './routes/jested/route' -import { Route as IndexImport } from './routes/index' -import { Route as NestedLayoutB2Import } from './routes/nested/_layout-b2' -import { Route as NestedLayoutB1Import } from './routes/nested/_layout-b1' -import { Route as JestedLayoutB4Import } from './routes/jested/_layout-b4' -import { Route as JestedLayoutB3Import } from './routes/jested/_layout-b3' -import { Route as FooBarImport } from './routes/foo/bar' -import { Route as LayoutA2BarImport } from './routes/_layout-a2/bar' -import { Route as LayoutA1FooImport } from './routes/_layout-a1/foo' -import { Route as folderInFolderImport } from './routes/(folder)/in-folder' -import { Route as FooLayoutB5RouteImport } from './routes/foo/_layout-b5/route' -import { Route as NestedLayoutB1IndexImport } from './routes/nested/_layout-b1/index' -import { Route as JestedLayoutB3IndexImport } from './routes/jested/_layout-b3/index' -import { Route as FooLayoutB5IndexImport } from './routes/foo/_layout-b5/index' -import { Route as NestedLayoutB2FooImport } from './routes/nested/_layout-b2/foo' -import { Route as NestedLayoutB1LayoutC1Import } from './routes/nested/_layout-b1/_layout-c1' -import { Route as JestedLayoutB4FooImport } from './routes/jested/_layout-b4/foo' -import { Route as JestedLayoutB3LayoutC2Import } from './routes/jested/_layout-b3/_layout-c2' -import { Route as FooLayoutB5IdImport } from './routes/foo/_layout-b5/$id' -import { Route as NestedLayoutB1LayoutC1BarImport } from './routes/nested/_layout-b1/_layout-c1/bar' -import { Route as JestedLayoutB3LayoutC2BarImport } from './routes/jested/_layout-b3/_layout-c2/bar' +import { Route as LayoutA2RouteImport } from './routes/_layout-a2' +import { Route as LayoutA1RouteImport } from './routes/_layout-a1' +import { Route as JestedRouteRouteImport } from './routes/jested/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as NestedLayoutB2RouteImport } from './routes/nested/_layout-b2' +import { Route as NestedLayoutB1RouteImport } from './routes/nested/_layout-b1' +import { Route as JestedLayoutB4RouteImport } from './routes/jested/_layout-b4' +import { Route as JestedLayoutB3RouteImport } from './routes/jested/_layout-b3' +import { Route as FooBarRouteImport } from './routes/foo/bar' +import { Route as LayoutA2BarRouteImport } from './routes/_layout-a2/bar' +import { Route as LayoutA1FooRouteImport } from './routes/_layout-a1/foo' +import { Route as folderInFolderRouteImport } from './routes/(folder)/in-folder' +import { Route as FooLayoutB5RouteRouteImport } from './routes/foo/_layout-b5/route' +import { Route as NestedLayoutB1IndexRouteImport } from './routes/nested/_layout-b1/index' +import { Route as JestedLayoutB3IndexRouteImport } from './routes/jested/_layout-b3/index' +import { Route as FooLayoutB5IndexRouteImport } from './routes/foo/_layout-b5/index' +import { Route as NestedLayoutB2FooRouteImport } from './routes/nested/_layout-b2/foo' +import { Route as NestedLayoutB1LayoutC1RouteImport } from './routes/nested/_layout-b1/_layout-c1' +import { Route as JestedLayoutB4FooRouteImport } from './routes/jested/_layout-b4/foo' +import { Route as JestedLayoutB3LayoutC2RouteImport } from './routes/jested/_layout-b3/_layout-c2' +import { Route as FooLayoutB5IdRouteImport } from './routes/foo/_layout-b5/$id' +import { Route as NestedLayoutB1LayoutC1BarRouteImport } from './routes/nested/_layout-b1/_layout-c1/bar' +import { Route as JestedLayoutB3LayoutC2BarRouteImport } from './routes/jested/_layout-b3/_layout-c2/bar' // Create Virtual Routes -const NestedImport = createFileRoute('/nested')() -const FooImport = createFileRoute('/foo')() +const NestedRouteImport = createFileRoute('/nested')() +const FooRouteImport = createFileRoute('/foo')() // Create/Update Routes -const NestedRoute = NestedImport.update({ +const NestedRoute = NestedRouteImport.update({ id: '/nested', path: '/nested', getParentRoute: () => rootRoute, } as any) -const FooRoute = FooImport.update({ +const FooRoute = FooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => rootRoute, } as any) -const LayoutA2Route = LayoutA2Import.update({ +const LayoutA2Route = LayoutA2RouteImport.update({ id: '/_layout-a2', getParentRoute: () => rootRoute, } as any) -const LayoutA1Route = LayoutA1Import.update({ +const LayoutA1Route = LayoutA1RouteImport.update({ id: '/_layout-a1', getParentRoute: () => rootRoute, } as any) -const JestedRouteRoute = JestedRouteImport.update({ +const JestedRouteRoute = JestedRouteRouteImport.update({ id: '/jested', path: '/jested', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const NestedLayoutB2Route = NestedLayoutB2Import.update({ +const NestedLayoutB2Route = NestedLayoutB2RouteImport.update({ id: '/_layout-b2', getParentRoute: () => NestedRoute, } as any) -const NestedLayoutB1Route = NestedLayoutB1Import.update({ +const NestedLayoutB1Route = NestedLayoutB1RouteImport.update({ id: '/_layout-b1', getParentRoute: () => NestedRoute, } as any) -const JestedLayoutB4Route = JestedLayoutB4Import.update({ +const JestedLayoutB4Route = JestedLayoutB4RouteImport.update({ id: '/_layout-b4', getParentRoute: () => JestedRouteRoute, } as any) -const JestedLayoutB3Route = JestedLayoutB3Import.update({ +const JestedLayoutB3Route = JestedLayoutB3RouteImport.update({ id: '/_layout-b3', getParentRoute: () => JestedRouteRoute, } as any) -const FooBarRoute = FooBarImport.update({ +const FooBarRoute = FooBarRouteImport.update({ id: '/bar', path: '/bar', getParentRoute: () => FooRoute, } as any) -const LayoutA2BarRoute = LayoutA2BarImport.update({ +const LayoutA2BarRoute = LayoutA2BarRouteImport.update({ id: '/bar', path: '/bar', getParentRoute: () => LayoutA2Route, } as any) -const LayoutA1FooRoute = LayoutA1FooImport.update({ +const LayoutA1FooRoute = LayoutA1FooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => LayoutA1Route, } as any) -const folderInFolderRoute = folderInFolderImport.update({ +const folderInFolderRoute = folderInFolderRouteImport.update({ id: '/(folder)/in-folder', path: '/in-folder', getParentRoute: () => rootRoute, } as any) -const FooLayoutB5RouteRoute = FooLayoutB5RouteImport.update({ +const FooLayoutB5RouteRoute = FooLayoutB5RouteRouteImport.update({ id: '/_layout-b5', getParentRoute: () => FooRoute, } as any) -const NestedLayoutB1IndexRoute = NestedLayoutB1IndexImport.update({ +const NestedLayoutB1IndexRoute = NestedLayoutB1IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => NestedLayoutB1Route, } as any) -const JestedLayoutB3IndexRoute = JestedLayoutB3IndexImport.update({ +const JestedLayoutB3IndexRoute = JestedLayoutB3IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => JestedLayoutB3Route, } as any) -const FooLayoutB5IndexRoute = FooLayoutB5IndexImport.update({ +const FooLayoutB5IndexRoute = FooLayoutB5IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => FooLayoutB5RouteRoute, } as any) -const NestedLayoutB2FooRoute = NestedLayoutB2FooImport.update({ +const NestedLayoutB2FooRoute = NestedLayoutB2FooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => NestedLayoutB2Route, } as any) -const NestedLayoutB1LayoutC1Route = NestedLayoutB1LayoutC1Import.update({ +const NestedLayoutB1LayoutC1Route = NestedLayoutB1LayoutC1RouteImport.update({ id: '/_layout-c1', getParentRoute: () => NestedLayoutB1Route, } as any) -const JestedLayoutB4FooRoute = JestedLayoutB4FooImport.update({ +const JestedLayoutB4FooRoute = JestedLayoutB4FooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => JestedLayoutB4Route, } as any) -const JestedLayoutB3LayoutC2Route = JestedLayoutB3LayoutC2Import.update({ +const JestedLayoutB3LayoutC2Route = JestedLayoutB3LayoutC2RouteImport.update({ id: '/_layout-c2', getParentRoute: () => JestedLayoutB3Route, } as any) -const FooLayoutB5IdRoute = FooLayoutB5IdImport.update({ +const FooLayoutB5IdRoute = FooLayoutB5IdRouteImport.update({ id: '/$id', path: '/$id', getParentRoute: () => FooLayoutB5RouteRoute, } as any) -const NestedLayoutB1LayoutC1BarRoute = NestedLayoutB1LayoutC1BarImport.update({ - id: '/bar', - path: '/bar', - getParentRoute: () => NestedLayoutB1LayoutC1Route, -} as any) +const NestedLayoutB1LayoutC1BarRoute = + NestedLayoutB1LayoutC1BarRouteImport.update({ + id: '/bar', + path: '/bar', + getParentRoute: () => NestedLayoutB1LayoutC1Route, + } as any) -const JestedLayoutB3LayoutC2BarRoute = JestedLayoutB3LayoutC2BarImport.update({ - id: '/bar', - path: '/bar', - getParentRoute: () => JestedLayoutB3LayoutC2Route, -} as any) +const JestedLayoutB3LayoutC2BarRoute = + JestedLayoutB3LayoutC2BarRouteImport.update({ + id: '/bar', + path: '/bar', + getParentRoute: () => JestedLayoutB3LayoutC2Route, + } as any) // Populate the FileRoutesByPath interface @@ -193,180 +196,392 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/jested': { id: '/jested' path: '/jested' fullPath: '/jested' - preLoaderRoute: typeof JestedRouteImport + preLoaderRoute: typeof JestedRouteRouteImport parentRoute: typeof rootRoute } '/_layout-a1': { id: '/_layout-a1' path: '' fullPath: '' - preLoaderRoute: typeof LayoutA1Import + preLoaderRoute: typeof LayoutA1RouteImport parentRoute: typeof rootRoute } '/_layout-a2': { id: '/_layout-a2' path: '' fullPath: '' - preLoaderRoute: typeof LayoutA2Import + preLoaderRoute: typeof LayoutA2RouteImport parentRoute: typeof rootRoute } '/foo': { id: '/foo' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof FooImport + preLoaderRoute: typeof FooRouteImport parentRoute: typeof rootRoute } '/foo/_layout-b5': { id: '/foo/_layout-b5' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof FooLayoutB5RouteImport + preLoaderRoute: typeof FooLayoutB5RouteRouteImport parentRoute: typeof FooRoute } '/(folder)/in-folder': { id: '/(folder)/in-folder' path: '/in-folder' fullPath: '/in-folder' - preLoaderRoute: typeof folderInFolderImport + preLoaderRoute: typeof folderInFolderRouteImport parentRoute: typeof rootRoute } '/_layout-a1/foo': { id: '/_layout-a1/foo' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof LayoutA1FooImport - parentRoute: typeof LayoutA1Import + preLoaderRoute: typeof LayoutA1FooRouteImport + parentRoute: typeof LayoutA1RouteImport } '/_layout-a2/bar': { id: '/_layout-a2/bar' path: '/bar' fullPath: '/bar' - preLoaderRoute: typeof LayoutA2BarImport - parentRoute: typeof LayoutA2Import + preLoaderRoute: typeof LayoutA2BarRouteImport + parentRoute: typeof LayoutA2RouteImport } '/foo/bar': { id: '/foo/bar' path: '/bar' fullPath: '/foo/bar' - preLoaderRoute: typeof FooBarImport - parentRoute: typeof FooImport + preLoaderRoute: typeof FooBarRouteImport + parentRoute: typeof FooRouteImport } '/jested/_layout-b3': { id: '/jested/_layout-b3' path: '' fullPath: '/jested' - preLoaderRoute: typeof JestedLayoutB3Import - parentRoute: typeof JestedRouteImport + preLoaderRoute: typeof JestedLayoutB3RouteImport + parentRoute: typeof JestedRouteRouteImport } '/jested/_layout-b4': { id: '/jested/_layout-b4' path: '' fullPath: '/jested' - preLoaderRoute: typeof JestedLayoutB4Import - parentRoute: typeof JestedRouteImport + preLoaderRoute: typeof JestedLayoutB4RouteImport + parentRoute: typeof JestedRouteRouteImport } '/nested': { id: '/nested' path: '/nested' fullPath: '/nested' - preLoaderRoute: typeof NestedImport + preLoaderRoute: typeof NestedRouteImport parentRoute: typeof rootRoute } '/nested/_layout-b1': { id: '/nested/_layout-b1' path: '/nested' fullPath: '/nested' - preLoaderRoute: typeof NestedLayoutB1Import + preLoaderRoute: typeof NestedLayoutB1RouteImport parentRoute: typeof NestedRoute } '/nested/_layout-b2': { id: '/nested/_layout-b2' path: '' fullPath: '/nested' - preLoaderRoute: typeof NestedLayoutB2Import - parentRoute: typeof NestedImport + preLoaderRoute: typeof NestedLayoutB2RouteImport + parentRoute: typeof NestedRouteImport } '/foo/_layout-b5/$id': { id: '/foo/_layout-b5/$id' path: '/$id' fullPath: '/foo/$id' - preLoaderRoute: typeof FooLayoutB5IdImport - parentRoute: typeof FooLayoutB5RouteImport + preLoaderRoute: typeof FooLayoutB5IdRouteImport + parentRoute: typeof FooLayoutB5RouteRouteImport } '/jested/_layout-b3/_layout-c2': { id: '/jested/_layout-b3/_layout-c2' path: '' fullPath: '/jested' - preLoaderRoute: typeof JestedLayoutB3LayoutC2Import - parentRoute: typeof JestedLayoutB3Import + preLoaderRoute: typeof JestedLayoutB3LayoutC2RouteImport + parentRoute: typeof JestedLayoutB3RouteImport } '/jested/_layout-b4/foo': { id: '/jested/_layout-b4/foo' path: '/foo' fullPath: '/jested/foo' - preLoaderRoute: typeof JestedLayoutB4FooImport - parentRoute: typeof JestedLayoutB4Import + preLoaderRoute: typeof JestedLayoutB4FooRouteImport + parentRoute: typeof JestedLayoutB4RouteImport } '/nested/_layout-b1/_layout-c1': { id: '/nested/_layout-b1/_layout-c1' path: '' fullPath: '/nested' - preLoaderRoute: typeof NestedLayoutB1LayoutC1Import - parentRoute: typeof NestedLayoutB1Import + preLoaderRoute: typeof NestedLayoutB1LayoutC1RouteImport + parentRoute: typeof NestedLayoutB1RouteImport } '/nested/_layout-b2/foo': { id: '/nested/_layout-b2/foo' path: '/foo' fullPath: '/nested/foo' - preLoaderRoute: typeof NestedLayoutB2FooImport - parentRoute: typeof NestedLayoutB2Import + preLoaderRoute: typeof NestedLayoutB2FooRouteImport + parentRoute: typeof NestedLayoutB2RouteImport } '/foo/_layout-b5/': { id: '/foo/_layout-b5/' path: '/' fullPath: '/foo/' - preLoaderRoute: typeof FooLayoutB5IndexImport - parentRoute: typeof FooLayoutB5RouteImport + preLoaderRoute: typeof FooLayoutB5IndexRouteImport + parentRoute: typeof FooLayoutB5RouteRouteImport } '/jested/_layout-b3/': { id: '/jested/_layout-b3/' path: '/' fullPath: '/jested/' - preLoaderRoute: typeof JestedLayoutB3IndexImport - parentRoute: typeof JestedLayoutB3Import + preLoaderRoute: typeof JestedLayoutB3IndexRouteImport + parentRoute: typeof JestedLayoutB3RouteImport } '/nested/_layout-b1/': { id: '/nested/_layout-b1/' path: '/' fullPath: '/nested/' - preLoaderRoute: typeof NestedLayoutB1IndexImport - parentRoute: typeof NestedLayoutB1Import + preLoaderRoute: typeof NestedLayoutB1IndexRouteImport + parentRoute: typeof NestedLayoutB1RouteImport } '/jested/_layout-b3/_layout-c2/bar': { id: '/jested/_layout-b3/_layout-c2/bar' path: '/bar' fullPath: '/jested/bar' - preLoaderRoute: typeof JestedLayoutB3LayoutC2BarImport - parentRoute: typeof JestedLayoutB3LayoutC2Import + preLoaderRoute: typeof JestedLayoutB3LayoutC2BarRouteImport + parentRoute: typeof JestedLayoutB3LayoutC2RouteImport } '/nested/_layout-b1/_layout-c1/bar': { id: '/nested/_layout-b1/_layout-c1/bar' path: '/bar' fullPath: '/nested/bar' - preLoaderRoute: typeof NestedLayoutB1LayoutC1BarImport - parentRoute: typeof NestedLayoutB1LayoutC1Import + preLoaderRoute: typeof NestedLayoutB1LayoutC1BarRouteImport + parentRoute: typeof NestedLayoutB1LayoutC1RouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/jested/route' { + const createFileRoute: CreateFileRoute< + '/jested', + FileRoutesByPath['/jested']['parentRoute'], + FileRoutesByPath['/jested']['id'], + FileRoutesByPath['/jested']['path'], + FileRoutesByPath['/jested']['fullPath'] + > +} +declare module './routes/_layout-a1' { + const createFileRoute: CreateFileRoute< + '/_layout-a1', + FileRoutesByPath['/_layout-a1']['parentRoute'], + FileRoutesByPath['/_layout-a1']['id'], + FileRoutesByPath['/_layout-a1']['path'], + FileRoutesByPath['/_layout-a1']['fullPath'] + > +} +declare module './routes/_layout-a2' { + const createFileRoute: CreateFileRoute< + '/_layout-a2', + FileRoutesByPath['/_layout-a2']['parentRoute'], + FileRoutesByPath['/_layout-a2']['id'], + FileRoutesByPath['/_layout-a2']['path'], + FileRoutesByPath['/_layout-a2']['fullPath'] + > +} + +declare module './routes/foo/_layout-b5/route' { + const createFileRoute: CreateFileRoute< + '/foo/_layout-b5', + FileRoutesByPath['/foo/_layout-b5']['parentRoute'], + FileRoutesByPath['/foo/_layout-b5']['id'], + FileRoutesByPath['/foo/_layout-b5']['path'], + FileRoutesByPath['/foo/_layout-b5']['fullPath'] + > +} +declare module './routes/(folder)/in-folder' { + const createFileRoute: CreateFileRoute< + '/(folder)/in-folder', + FileRoutesByPath['/(folder)/in-folder']['parentRoute'], + FileRoutesByPath['/(folder)/in-folder']['id'], + FileRoutesByPath['/(folder)/in-folder']['path'], + FileRoutesByPath['/(folder)/in-folder']['fullPath'] + > +} +declare module './routes/_layout-a1/foo' { + const createFileRoute: CreateFileRoute< + '/_layout-a1/foo', + FileRoutesByPath['/_layout-a1/foo']['parentRoute'], + FileRoutesByPath['/_layout-a1/foo']['id'], + FileRoutesByPath['/_layout-a1/foo']['path'], + FileRoutesByPath['/_layout-a1/foo']['fullPath'] + > +} +declare module './routes/_layout-a2/bar' { + const createFileRoute: CreateFileRoute< + '/_layout-a2/bar', + FileRoutesByPath['/_layout-a2/bar']['parentRoute'], + FileRoutesByPath['/_layout-a2/bar']['id'], + FileRoutesByPath['/_layout-a2/bar']['path'], + FileRoutesByPath['/_layout-a2/bar']['fullPath'] + > +} +declare module './routes/foo/bar' { + const createFileRoute: CreateFileRoute< + '/foo/bar', + FileRoutesByPath['/foo/bar']['parentRoute'], + FileRoutesByPath['/foo/bar']['id'], + FileRoutesByPath['/foo/bar']['path'], + FileRoutesByPath['/foo/bar']['fullPath'] + > +} +declare module './routes/jested/_layout-b3' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b3', + FileRoutesByPath['/jested/_layout-b3']['parentRoute'], + FileRoutesByPath['/jested/_layout-b3']['id'], + FileRoutesByPath['/jested/_layout-b3']['path'], + FileRoutesByPath['/jested/_layout-b3']['fullPath'] + > +} +declare module './routes/jested/_layout-b4' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b4', + FileRoutesByPath['/jested/_layout-b4']['parentRoute'], + FileRoutesByPath['/jested/_layout-b4']['id'], + FileRoutesByPath['/jested/_layout-b4']['path'], + FileRoutesByPath['/jested/_layout-b4']['fullPath'] + > +} + +declare module './routes/nested/_layout-b1' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b1', + FileRoutesByPath['/nested/_layout-b1']['parentRoute'], + FileRoutesByPath['/nested/_layout-b1']['id'], + FileRoutesByPath['/nested/_layout-b1']['path'], + FileRoutesByPath['/nested/_layout-b1']['fullPath'] + > +} +declare module './routes/nested/_layout-b2' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b2', + FileRoutesByPath['/nested/_layout-b2']['parentRoute'], + FileRoutesByPath['/nested/_layout-b2']['id'], + FileRoutesByPath['/nested/_layout-b2']['path'], + FileRoutesByPath['/nested/_layout-b2']['fullPath'] + > +} +declare module './routes/foo/_layout-b5/$id' { + const createFileRoute: CreateFileRoute< + '/foo/_layout-b5/$id', + FileRoutesByPath['/foo/_layout-b5/$id']['parentRoute'], + FileRoutesByPath['/foo/_layout-b5/$id']['id'], + FileRoutesByPath['/foo/_layout-b5/$id']['path'], + FileRoutesByPath['/foo/_layout-b5/$id']['fullPath'] + > +} +declare module './routes/jested/_layout-b3/_layout-c2' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b3/_layout-c2', + FileRoutesByPath['/jested/_layout-b3/_layout-c2']['parentRoute'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2']['id'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2']['path'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2']['fullPath'] + > +} +declare module './routes/jested/_layout-b4/foo' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b4/foo', + FileRoutesByPath['/jested/_layout-b4/foo']['parentRoute'], + FileRoutesByPath['/jested/_layout-b4/foo']['id'], + FileRoutesByPath['/jested/_layout-b4/foo']['path'], + FileRoutesByPath['/jested/_layout-b4/foo']['fullPath'] + > +} +declare module './routes/nested/_layout-b1/_layout-c1' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b1/_layout-c1', + FileRoutesByPath['/nested/_layout-b1/_layout-c1']['parentRoute'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1']['id'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1']['path'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1']['fullPath'] + > +} +declare module './routes/nested/_layout-b2/foo' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b2/foo', + FileRoutesByPath['/nested/_layout-b2/foo']['parentRoute'], + FileRoutesByPath['/nested/_layout-b2/foo']['id'], + FileRoutesByPath['/nested/_layout-b2/foo']['path'], + FileRoutesByPath['/nested/_layout-b2/foo']['fullPath'] + > +} +declare module './routes/foo/_layout-b5/index' { + const createFileRoute: CreateFileRoute< + '/foo/_layout-b5/', + FileRoutesByPath['/foo/_layout-b5/']['parentRoute'], + FileRoutesByPath['/foo/_layout-b5/']['id'], + FileRoutesByPath['/foo/_layout-b5/']['path'], + FileRoutesByPath['/foo/_layout-b5/']['fullPath'] + > +} +declare module './routes/jested/_layout-b3/index' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b3/', + FileRoutesByPath['/jested/_layout-b3/']['parentRoute'], + FileRoutesByPath['/jested/_layout-b3/']['id'], + FileRoutesByPath['/jested/_layout-b3/']['path'], + FileRoutesByPath['/jested/_layout-b3/']['fullPath'] + > +} +declare module './routes/nested/_layout-b1/index' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b1/', + FileRoutesByPath['/nested/_layout-b1/']['parentRoute'], + FileRoutesByPath['/nested/_layout-b1/']['id'], + FileRoutesByPath['/nested/_layout-b1/']['path'], + FileRoutesByPath['/nested/_layout-b1/']['fullPath'] + > +} +declare module './routes/jested/_layout-b3/_layout-c2/bar' { + const createFileRoute: CreateFileRoute< + '/jested/_layout-b3/_layout-c2/bar', + FileRoutesByPath['/jested/_layout-b3/_layout-c2/bar']['parentRoute'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2/bar']['id'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2/bar']['path'], + FileRoutesByPath['/jested/_layout-b3/_layout-c2/bar']['fullPath'] + > +} +declare module './routes/nested/_layout-b1/_layout-c1/bar' { + const createFileRoute: CreateFileRoute< + '/nested/_layout-b1/_layout-c1/bar', + FileRoutesByPath['/nested/_layout-b1/_layout-c1/bar']['parentRoute'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1/bar']['id'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1/bar']['path'], + FileRoutesByPath['/nested/_layout-b1/_layout-c1/bar']['fullPath'] + > +} + // Create and export the route tree interface JestedLayoutB3LayoutC2RouteChildren { diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/(folder)/in-folder.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/(folder)/in-folder.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/(folder)/in-folder.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/(folder)/in-folder.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/__root.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/__root.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1/foo.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1/foo.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1/foo.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a1/foo.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2/bar.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2/bar.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2/bar.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/_layout-a2/bar.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/$id.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/$id.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/$id.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/$id.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/index.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/index.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/route.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/route.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/route.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/foo/_layout-b5/route.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/foo/bar.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/foo/bar.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/foo/bar.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/foo/bar.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/index.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/index.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2/bar.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2/bar.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2/bar.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/_layout-c2/bar.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/index.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/index.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b3/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4/foo.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4/foo.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4/foo.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/_layout-b4/foo.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/jested/route.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/jested/route.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/jested/route.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/jested/route.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1/bar.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1/bar.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1/bar.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/_layout-c1/bar.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/index.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/index.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b1/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2/foo.tsx b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2/foo.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2/foo.tsx +++ b/packages/router-generator/tests/generator/nested-layouts/routes/nested/_layout-b2/foo.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts index 9a8c43334d..e2cae53235 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts @@ -9,75 +9,76 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as groupCLayoutCImport } from './routes/(group-c)/_layout-c' -import { Route as groupBLayoutBImport } from './routes/(group-b)/_layout-b' -import { Route as groupALayoutAImport } from './routes/(group-a)/_layout-a' -import { Route as groupCLayoutCIndexImport } from './routes/(group-c)/_layout-c/index' -import { Route as groupBLayoutBDashboardImport } from './routes/(group-b)/_layout-b/dashboard' -import { Route as groupALayoutASignupImport } from './routes/(group-a)/_layout-a/signup' -import { Route as groupALayoutALoginImport } from './routes/(group-a)/_layout-a/login' +import { Route as groupCLayoutCRouteImport } from './routes/(group-c)/_layout-c' +import { Route as groupBLayoutBRouteImport } from './routes/(group-b)/_layout-b' +import { Route as groupALayoutARouteImport } from './routes/(group-a)/_layout-a' +import { Route as groupCLayoutCIndexRouteImport } from './routes/(group-c)/_layout-c/index' +import { Route as groupBLayoutBDashboardRouteImport } from './routes/(group-b)/_layout-b/dashboard' +import { Route as groupALayoutASignupRouteImport } from './routes/(group-a)/_layout-a/signup' +import { Route as groupALayoutALoginRouteImport } from './routes/(group-a)/_layout-a/login' // Create Virtual Routes -const groupCImport = createFileRoute('/(group-c)')() -const groupBImport = createFileRoute('/(group-b)')() -const groupAImport = createFileRoute('/(group-a)')() +const groupCRouteImport = createFileRoute('/(group-c)')() +const groupBRouteImport = createFileRoute('/(group-b)')() +const groupARouteImport = createFileRoute('/(group-a)')() // Create/Update Routes -const groupCRoute = groupCImport.update({ +const groupCRoute = groupCRouteImport.update({ id: '/(group-c)', getParentRoute: () => rootRoute, } as any) -const groupBRoute = groupBImport.update({ +const groupBRoute = groupBRouteImport.update({ id: '/(group-b)', getParentRoute: () => rootRoute, } as any) -const groupARoute = groupAImport.update({ +const groupARoute = groupARouteImport.update({ id: '/(group-a)', getParentRoute: () => rootRoute, } as any) -const groupCLayoutCRoute = groupCLayoutCImport.update({ +const groupCLayoutCRoute = groupCLayoutCRouteImport.update({ id: '/_layout-c', getParentRoute: () => groupCRoute, } as any) -const groupBLayoutBRoute = groupBLayoutBImport.update({ +const groupBLayoutBRoute = groupBLayoutBRouteImport.update({ id: '/_layout-b', getParentRoute: () => groupBRoute, } as any) -const groupALayoutARoute = groupALayoutAImport.update({ +const groupALayoutARoute = groupALayoutARouteImport.update({ id: '/_layout-a', getParentRoute: () => groupARoute, } as any) -const groupCLayoutCIndexRoute = groupCLayoutCIndexImport.update({ +const groupCLayoutCIndexRoute = groupCLayoutCIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => groupCLayoutCRoute, } as any) -const groupBLayoutBDashboardRoute = groupBLayoutBDashboardImport.update({ +const groupBLayoutBDashboardRoute = groupBLayoutBDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => groupBLayoutBRoute, } as any) -const groupALayoutASignupRoute = groupALayoutASignupImport.update({ +const groupALayoutASignupRoute = groupALayoutASignupRouteImport.update({ id: '/signup', path: '/signup', getParentRoute: () => groupALayoutARoute, } as any) -const groupALayoutALoginRoute = groupALayoutALoginImport.update({ +const groupALayoutALoginRoute = groupALayoutALoginRouteImport.update({ id: '/login', path: '/login', getParentRoute: () => groupALayoutARoute, @@ -91,75 +92,143 @@ declare module '@tanstack/react-router' { id: '/(group-a)' path: '/' fullPath: '/' - preLoaderRoute: typeof groupAImport + preLoaderRoute: typeof groupARouteImport parentRoute: typeof rootRoute } '/(group-a)/_layout-a': { id: '/(group-a)/_layout-a' path: '/' fullPath: '/' - preLoaderRoute: typeof groupALayoutAImport + preLoaderRoute: typeof groupALayoutARouteImport parentRoute: typeof groupARoute } '/(group-b)': { id: '/(group-b)' path: '/' fullPath: '/' - preLoaderRoute: typeof groupBImport + preLoaderRoute: typeof groupBRouteImport parentRoute: typeof rootRoute } '/(group-b)/_layout-b': { id: '/(group-b)/_layout-b' path: '/' fullPath: '/' - preLoaderRoute: typeof groupBLayoutBImport + preLoaderRoute: typeof groupBLayoutBRouteImport parentRoute: typeof groupBRoute } '/(group-c)': { id: '/(group-c)' path: '/' fullPath: '/' - preLoaderRoute: typeof groupCImport + preLoaderRoute: typeof groupCRouteImport parentRoute: typeof rootRoute } '/(group-c)/_layout-c': { id: '/(group-c)/_layout-c' path: '/' fullPath: '/' - preLoaderRoute: typeof groupCLayoutCImport + preLoaderRoute: typeof groupCLayoutCRouteImport parentRoute: typeof groupCRoute } '/(group-a)/_layout-a/login': { id: '/(group-a)/_layout-a/login' path: '/login' fullPath: '/login' - preLoaderRoute: typeof groupALayoutALoginImport - parentRoute: typeof groupALayoutAImport + preLoaderRoute: typeof groupALayoutALoginRouteImport + parentRoute: typeof groupALayoutARouteImport } '/(group-a)/_layout-a/signup': { id: '/(group-a)/_layout-a/signup' path: '/signup' fullPath: '/signup' - preLoaderRoute: typeof groupALayoutASignupImport - parentRoute: typeof groupALayoutAImport + preLoaderRoute: typeof groupALayoutASignupRouteImport + parentRoute: typeof groupALayoutARouteImport } '/(group-b)/_layout-b/dashboard': { id: '/(group-b)/_layout-b/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof groupBLayoutBDashboardImport - parentRoute: typeof groupBLayoutBImport + preLoaderRoute: typeof groupBLayoutBDashboardRouteImport + parentRoute: typeof groupBLayoutBRouteImport } '/(group-c)/_layout-c/': { id: '/(group-c)/_layout-c/' path: '/' fullPath: '/' - preLoaderRoute: typeof groupCLayoutCIndexImport - parentRoute: typeof groupCLayoutCImport + preLoaderRoute: typeof groupCLayoutCIndexRouteImport + parentRoute: typeof groupCLayoutCRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/(group-a)/_layout-a' { + const createFileRoute: CreateFileRoute< + '/(group-a)/_layout-a', + FileRoutesByPath['/(group-a)/_layout-a']['parentRoute'], + FileRoutesByPath['/(group-a)/_layout-a']['id'], + FileRoutesByPath['/(group-a)/_layout-a']['path'], + FileRoutesByPath['/(group-a)/_layout-a']['fullPath'] + > +} + +declare module './routes/(group-b)/_layout-b' { + const createFileRoute: CreateFileRoute< + '/(group-b)/_layout-b', + FileRoutesByPath['/(group-b)/_layout-b']['parentRoute'], + FileRoutesByPath['/(group-b)/_layout-b']['id'], + FileRoutesByPath['/(group-b)/_layout-b']['path'], + FileRoutesByPath['/(group-b)/_layout-b']['fullPath'] + > +} + +declare module './routes/(group-c)/_layout-c' { + const createFileRoute: CreateFileRoute< + '/(group-c)/_layout-c', + FileRoutesByPath['/(group-c)/_layout-c']['parentRoute'], + FileRoutesByPath['/(group-c)/_layout-c']['id'], + FileRoutesByPath['/(group-c)/_layout-c']['path'], + FileRoutesByPath['/(group-c)/_layout-c']['fullPath'] + > +} +declare module './routes/(group-a)/_layout-a/login' { + const createFileRoute: CreateFileRoute< + '/(group-a)/_layout-a/login', + FileRoutesByPath['/(group-a)/_layout-a/login']['parentRoute'], + FileRoutesByPath['/(group-a)/_layout-a/login']['id'], + FileRoutesByPath['/(group-a)/_layout-a/login']['path'], + FileRoutesByPath['/(group-a)/_layout-a/login']['fullPath'] + > +} +declare module './routes/(group-a)/_layout-a/signup' { + const createFileRoute: CreateFileRoute< + '/(group-a)/_layout-a/signup', + FileRoutesByPath['/(group-a)/_layout-a/signup']['parentRoute'], + FileRoutesByPath['/(group-a)/_layout-a/signup']['id'], + FileRoutesByPath['/(group-a)/_layout-a/signup']['path'], + FileRoutesByPath['/(group-a)/_layout-a/signup']['fullPath'] + > +} +declare module './routes/(group-b)/_layout-b/dashboard' { + const createFileRoute: CreateFileRoute< + '/(group-b)/_layout-b/dashboard', + FileRoutesByPath['/(group-b)/_layout-b/dashboard']['parentRoute'], + FileRoutesByPath['/(group-b)/_layout-b/dashboard']['id'], + FileRoutesByPath['/(group-b)/_layout-b/dashboard']['path'], + FileRoutesByPath['/(group-b)/_layout-b/dashboard']['fullPath'] + > +} +declare module './routes/(group-c)/_layout-c/index' { + const createFileRoute: CreateFileRoute< + '/(group-c)/_layout-c/', + FileRoutesByPath['/(group-c)/_layout-c/']['parentRoute'], + FileRoutesByPath['/(group-c)/_layout-c/']['id'], + FileRoutesByPath['/(group-c)/_layout-c/']['path'], + FileRoutesByPath['/(group-c)/_layout-c/']['fullPath'] + > +} + // Create and export the route tree interface groupALayoutARouteChildren { diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a.tsx index e41597bd14..7716800144 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-a)/_layout-a')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/login.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/login.tsx index 100a98b815..81dfefe2c4 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/login.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/login.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-a)/_layout-a/login')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/signup.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/signup.tsx index 2214d268e7..705cfd12d6 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/signup.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-a)/_layout-a/signup.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-a)/_layout-a/signup')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b.tsx index 9dc9043617..66bad5884c 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-b)/_layout-b')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b/dashboard.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b/dashboard.tsx index c265a00158..5e70c639ea 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b/dashboard.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-b)/_layout-b/dashboard.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-b)/_layout-b/dashboard')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c.tsx index 37483d2b5d..de71033181 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-c)/_layout-c')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c/index.tsx b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c/index.tsx index 31a16f0515..cac65fa5c4 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c/index.tsx +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routes/(group-c)/_layout-c/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(group-c)/_layout-c/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/nested/routeTree.snapshot.ts b/packages/router-generator/tests/generator/nested/routeTree.snapshot.ts index 49498ae411..cb6ba3a7dc 100644 --- a/packages/router-generator/tests/generator/nested/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/nested/routeTree.snapshot.ts @@ -8,70 +8,72 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsRouteImport } from './routes/posts/route' -import { Route as BlogRouteImport } from './routes/blog/route' -import { Route as IndexImport } from './routes/index' -import { Route as PostsIndexImport } from './routes/posts/index' -import { Route as BlogIndexImport } from './routes/blog/index' -import { Route as BlogStatsImport } from './routes/blog_/stats' -import { Route as BlogSlugImport } from './routes/blog/$slug' -import { Route as PostsPostIdIndexImport } from './routes/posts/$postId/index' -import { Route as PostsPostIdDeepImport } from './routes/posts/$postId/deep' +import { Route as PostsRouteRouteImport } from './routes/posts/route' +import { Route as BlogRouteRouteImport } from './routes/blog/route' +import { Route as IndexRouteImport } from './routes/index' +import { Route as PostsIndexRouteImport } from './routes/posts/index' +import { Route as BlogIndexRouteImport } from './routes/blog/index' +import { Route as BlogStatsRouteImport } from './routes/blog_/stats' +import { Route as BlogSlugRouteImport } from './routes/blog/$slug' +import { Route as PostsPostIdIndexRouteImport } from './routes/posts/$postId/index' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts/$postId/deep' // Create/Update Routes -const PostsRouteRoute = PostsRouteImport.update({ +const PostsRouteRoute = PostsRouteRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const BlogRouteRoute = BlogRouteImport.update({ +const BlogRouteRoute = BlogRouteRouteImport.update({ id: '/blog', path: '/blog', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const PostsIndexRoute = PostsIndexImport.update({ +const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => PostsRouteRoute, } as any) -const BlogIndexRoute = BlogIndexImport.update({ +const BlogIndexRoute = BlogIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogRouteRoute, } as any) -const BlogStatsRoute = BlogStatsImport.update({ +const BlogStatsRoute = BlogStatsRouteImport.update({ id: '/blog_/stats', path: '/blog/stats', getParentRoute: () => rootRoute, } as any) -const BlogSlugRoute = BlogSlugImport.update({ +const BlogSlugRoute = BlogSlugRouteImport.update({ id: '/$slug', path: '/$slug', getParentRoute: () => BlogRouteRoute, } as any) -const PostsPostIdIndexRoute = PostsPostIdIndexImport.update({ +const PostsPostIdIndexRoute = PostsPostIdIndexRouteImport.update({ id: '/$postId/', path: '/$postId/', getParentRoute: () => PostsRouteRoute, } as any) -const PostsPostIdDeepRoute = PostsPostIdDeepImport.update({ +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ id: '/$postId/deep', path: '/$postId/deep', getParentRoute: () => PostsRouteRoute, @@ -85,68 +87,152 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/blog': { id: '/blog' path: '/blog' fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogRouteRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRoute } '/blog/$slug': { id: '/blog/$slug' path: '/$slug' fullPath: '/blog/$slug' - preLoaderRoute: typeof BlogSlugImport - parentRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogSlugRouteImport + parentRoute: typeof BlogRouteRouteImport } '/blog_/stats': { id: '/blog_/stats' path: '/blog/stats' fullPath: '/blog/stats' - preLoaderRoute: typeof BlogStatsImport + preLoaderRoute: typeof BlogStatsRouteImport parentRoute: typeof rootRoute } '/blog/': { id: '/blog/' path: '/' fullPath: '/blog/' - preLoaderRoute: typeof BlogIndexImport - parentRoute: typeof BlogRouteImport + preLoaderRoute: typeof BlogIndexRouteImport + parentRoute: typeof BlogRouteRouteImport } '/posts/': { id: '/posts/' path: '/' fullPath: '/posts/' - preLoaderRoute: typeof PostsIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/$postId/deep': { id: '/posts/$postId/deep' path: '/$postId/deep' fullPath: '/posts/$postId/deep' - preLoaderRoute: typeof PostsPostIdDeepImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof PostsRouteRouteImport } '/posts/$postId/': { id: '/posts/$postId/' path: '/$postId' fullPath: '/posts/$postId' - preLoaderRoute: typeof PostsPostIdIndexImport - parentRoute: typeof PostsRouteImport + preLoaderRoute: typeof PostsPostIdIndexRouteImport + parentRoute: typeof PostsRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/blog/route' { + const createFileRoute: CreateFileRoute< + '/blog', + FileRoutesByPath['/blog']['parentRoute'], + FileRoutesByPath['/blog']['id'], + FileRoutesByPath['/blog']['path'], + FileRoutesByPath['/blog']['fullPath'] + > +} +declare module './routes/posts/route' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/blog/$slug' { + const createFileRoute: CreateFileRoute< + '/blog/$slug', + FileRoutesByPath['/blog/$slug']['parentRoute'], + FileRoutesByPath['/blog/$slug']['id'], + FileRoutesByPath['/blog/$slug']['path'], + FileRoutesByPath['/blog/$slug']['fullPath'] + > +} +declare module './routes/blog_/stats' { + const createFileRoute: CreateFileRoute< + '/blog_/stats', + FileRoutesByPath['/blog_/stats']['parentRoute'], + FileRoutesByPath['/blog_/stats']['id'], + FileRoutesByPath['/blog_/stats']['path'], + FileRoutesByPath['/blog_/stats']['fullPath'] + > +} +declare module './routes/blog/index' { + const createFileRoute: CreateFileRoute< + '/blog/', + FileRoutesByPath['/blog/']['parentRoute'], + FileRoutesByPath['/blog/']['id'], + FileRoutesByPath['/blog/']['path'], + FileRoutesByPath['/blog/']['fullPath'] + > +} +declare module './routes/posts/index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/posts/$postId/deep' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/deep', + FileRoutesByPath['/posts/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts/$postId/deep']['id'], + FileRoutesByPath['/posts/$postId/deep']['path'], + FileRoutesByPath['/posts/$postId/deep']['fullPath'] + > +} +declare module './routes/posts/$postId/index' { + const createFileRoute: CreateFileRoute< + '/posts/$postId/', + FileRoutesByPath['/posts/$postId/']['parentRoute'], + FileRoutesByPath['/posts/$postId/']['id'], + FileRoutesByPath['/posts/$postId/']['path'], + FileRoutesByPath['/posts/$postId/']['fullPath'] + > +} + // Create and export the route tree interface BlogRouteRouteChildren { diff --git a/packages/router-generator/tests/generator/nested/routes/blog/$slug.tsx b/packages/router-generator/tests/generator/nested/routes/blog/$slug.tsx index 0389370c39..784c2b78ae 100644 --- a/packages/router-generator/tests/generator/nested/routes/blog/$slug.tsx +++ b/packages/router-generator/tests/generator/nested/routes/blog/$slug.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog/$slug')({ +export const Route = createFileRoute({ component: () =>
Hello /blog/$slug!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/blog/index.tsx b/packages/router-generator/tests/generator/nested/routes/blog/index.tsx index 6fab51efb1..0754024ed7 100644 --- a/packages/router-generator/tests/generator/nested/routes/blog/index.tsx +++ b/packages/router-generator/tests/generator/nested/routes/blog/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog/')({ +export const Route = createFileRoute({ component: () =>
Hello /blog/!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/blog/route.tsx b/packages/router-generator/tests/generator/nested/routes/blog/route.tsx index 2833fcc588..ea94edad49 100644 --- a/packages/router-generator/tests/generator/nested/routes/blog/route.tsx +++ b/packages/router-generator/tests/generator/nested/routes/blog/route.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog')({ +export const Route = createFileRoute({ component: () =>
Hello /blog!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/blog_/stats.tsx b/packages/router-generator/tests/generator/nested/routes/blog_/stats.tsx index 3c7f60dc99..16cc7268df 100644 --- a/packages/router-generator/tests/generator/nested/routes/blog_/stats.tsx +++ b/packages/router-generator/tests/generator/nested/routes/blog_/stats.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/blog_/stats')({ +export const Route = createFileRoute({ component: () =>
Hello /blog/stats!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/index.tsx b/packages/router-generator/tests/generator/nested/routes/index.tsx index a680913ded..22cab82307 100644 --- a/packages/router-generator/tests/generator/nested/routes/index.tsx +++ b/packages/router-generator/tests/generator/nested/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/posts/$postId/deep.tsx b/packages/router-generator/tests/generator/nested/routes/posts/$postId/deep.tsx index eec00feafc..6e634d9098 100644 --- a/packages/router-generator/tests/generator/nested/routes/posts/$postId/deep.tsx +++ b/packages/router-generator/tests/generator/nested/routes/posts/$postId/deep.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/$postId/deep')({ +export const Route = createFileRoute({ context: () => ({ someContext: 'context' }), loaderDeps: () => ({ dep: 1 }), loader: () => ({ data: 'data' }), diff --git a/packages/router-generator/tests/generator/nested/routes/posts/$postId/index.tsx b/packages/router-generator/tests/generator/nested/routes/posts/$postId/index.tsx index 1f0f31b0b2..6e8e65dae7 100644 --- a/packages/router-generator/tests/generator/nested/routes/posts/$postId/index.tsx +++ b/packages/router-generator/tests/generator/nested/routes/posts/$postId/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/$postId/')({ +export const Route = createFileRoute({ validateSearch: () => ({ indexSearch: 'search', }), diff --git a/packages/router-generator/tests/generator/nested/routes/posts/index.tsx b/packages/router-generator/tests/generator/nested/routes/posts/index.tsx index f3c995416c..2e16af1ca1 100644 --- a/packages/router-generator/tests/generator/nested/routes/posts/index.tsx +++ b/packages/router-generator/tests/generator/nested/routes/posts/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts/')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/!
, }) diff --git a/packages/router-generator/tests/generator/nested/routes/posts/route.tsx b/packages/router-generator/tests/generator/nested/routes/posts/route.tsx index c298ab4675..3617558181 100644 --- a/packages/router-generator/tests/generator/nested/routes/posts/route.tsx +++ b/packages/router-generator/tests/generator/nested/routes/posts/route.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: () =>
Hello /posts!
, }) diff --git a/packages/router-generator/tests/generator/no-duplicate-route-segment/routeTree.snapshot.ts b/packages/router-generator/tests/generator/no-duplicate-route-segment/routeTree.snapshot.ts index ed2a802515..f51f435e11 100644 --- a/packages/router-generator/tests/generator/no-duplicate-route-segment/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/no-duplicate-route-segment/routeTree.snapshot.ts @@ -9,31 +9,32 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as FooLayoutRouteImport } from './routes/foo/_layout/route' -import { Route as FooLayoutIndexImport } from './routes/foo/_layout/index' +import { Route as FooLayoutRouteRouteImport } from './routes/foo/_layout/route' +import { Route as FooLayoutIndexRouteImport } from './routes/foo/_layout/index' // Create Virtual Routes -const FooImport = createFileRoute('/foo')() +const FooRouteImport = createFileRoute('/foo')() // Create/Update Routes -const FooRoute = FooImport.update({ +const FooRoute = FooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => rootRoute, } as any) -const FooLayoutRouteRoute = FooLayoutRouteImport.update({ +const FooLayoutRouteRoute = FooLayoutRouteRouteImport.update({ id: '/_layout', getParentRoute: () => FooRoute, } as any) -const FooLayoutIndexRoute = FooLayoutIndexImport.update({ +const FooLayoutIndexRoute = FooLayoutIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => FooLayoutRouteRoute, @@ -47,26 +48,47 @@ declare module '@tanstack/react-router' { id: '/foo' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof FooImport + preLoaderRoute: typeof FooRouteImport parentRoute: typeof rootRoute } '/foo/_layout': { id: '/foo/_layout' path: '/foo' fullPath: '/foo' - preLoaderRoute: typeof FooLayoutRouteImport + preLoaderRoute: typeof FooLayoutRouteRouteImport parentRoute: typeof FooRoute } '/foo/_layout/': { id: '/foo/_layout/' path: '/' fullPath: '/foo/' - preLoaderRoute: typeof FooLayoutIndexImport - parentRoute: typeof FooLayoutRouteImport + preLoaderRoute: typeof FooLayoutIndexRouteImport + parentRoute: typeof FooLayoutRouteRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/foo/_layout/route' { + const createFileRoute: CreateFileRoute< + '/foo/_layout', + FileRoutesByPath['/foo/_layout']['parentRoute'], + FileRoutesByPath['/foo/_layout']['id'], + FileRoutesByPath['/foo/_layout']['path'], + FileRoutesByPath['/foo/_layout']['fullPath'] + > +} +declare module './routes/foo/_layout/index' { + const createFileRoute: CreateFileRoute< + '/foo/_layout/', + FileRoutesByPath['/foo/_layout/']['parentRoute'], + FileRoutesByPath['/foo/_layout/']['id'], + FileRoutesByPath['/foo/_layout/']['path'], + FileRoutesByPath['/foo/_layout/']['fullPath'] + > +} + // Create and export the route tree interface FooLayoutRouteRouteChildren { diff --git a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/__root.tsx b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/__root.tsx +++ b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/index.tsx b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/index.tsx +++ b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/route.tsx b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/route.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/route.tsx +++ b/packages/router-generator/tests/generator/no-duplicate-route-segment/routes/foo/_layout/route.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-formatted-route-tree/routeTree.snapshot.ts b/packages/router-generator/tests/generator/no-formatted-route-tree/routeTree.snapshot.ts index 3caaefda94..22584597bd 100644 --- a/packages/router-generator/tests/generator/no-formatted-route-tree/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/no-formatted-route-tree/routeTree.snapshot.ts @@ -8,24 +8,26 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as NestedIndexImport } from './routes/nested/index' -import { Route as NestedChildImport } from './routes/nested/child' +import { Route as IndexRouteImport } from './routes/index' +import { Route as NestedIndexRouteImport } from './routes/nested/index' +import { Route as NestedChildRouteImport } from './routes/nested/child' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/',path: '/',getParentRoute: () => rootRoute }as any) -const NestedIndexRoute = NestedIndexImport.update({ +const NestedIndexRoute = NestedIndexRouteImport.update({ id: '/nested/',path: '/nested/',getParentRoute: () => rootRoute }as any) -const NestedChildRoute = NestedChildImport.update({ +const NestedChildRoute = NestedChildRouteImport.update({ id: '/nested/child',path: '/nested/child',getParentRoute: () => rootRoute }as any) @@ -37,26 +39,56 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/nested/child': { id: '/nested/child' path: '/nested/child' fullPath: '/nested/child' - preLoaderRoute: typeof NestedChildImport + preLoaderRoute: typeof NestedChildRouteImport parentRoute: typeof rootRoute } '/nested/': { id: '/nested/' path: '/nested' fullPath: '/nested' - preLoaderRoute: typeof NestedIndexImport + preLoaderRoute: typeof NestedIndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > + } +declare module './routes/nested/child' { + const createFileRoute: CreateFileRoute< + '/nested/child', + FileRoutesByPath['/nested/child']['parentRoute'], + FileRoutesByPath['/nested/child']['id'], + FileRoutesByPath['/nested/child']['path'], + FileRoutesByPath['/nested/child']['fullPath'] + > + } +declare module './routes/nested/index' { + const createFileRoute: CreateFileRoute< + '/nested/', + FileRoutesByPath['/nested/']['parentRoute'], + FileRoutesByPath['/nested/']['id'], + FileRoutesByPath['/nested/']['path'], + FileRoutesByPath['/nested/']['fullPath'] + > + } + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/__root.tsx b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/__root.tsx +++ b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/index.tsx b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/index.tsx +++ b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/child.tsx b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/child.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/child.tsx +++ b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/child.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/index.tsx b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/index.tsx +++ b/packages/router-generator/tests/generator/no-formatted-route-tree/routes/nested/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-manifest/routeTree.snapshot.ts b/packages/router-generator/tests/generator/no-manifest/routeTree.snapshot.ts index 8f3a052d06..e19af9a375 100644 --- a/packages/router-generator/tests/generator/no-manifest/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/no-manifest/routeTree.snapshot.ts @@ -8,14 +8,16 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -29,12 +31,24 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/no-manifest/routes/__root.tsx b/packages/router-generator/tests/generator/no-manifest/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-manifest/routes/__root.tsx +++ b/packages/router-generator/tests/generator/no-manifest/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/no-manifest/routes/index.tsx b/packages/router-generator/tests/generator/no-manifest/routes/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/no-manifest/routes/index.tsx +++ b/packages/router-generator/tests/generator/no-manifest/routes/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/numbers-in-path/routeTree.snapshot.ts b/packages/router-generator/tests/generator/numbers-in-path/routeTree.snapshot.ts index b9fe213c44..fe4b1cd310 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/numbers-in-path/routeTree.snapshot.ts @@ -8,42 +8,44 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as AboutImport } from './routes/about' -import { Route as R03Import } from './routes/03' -import { Route as IndexImport } from './routes/index' -import { Route as R02IndexImport } from './routes/02.index' -import { Route as R01ExampleIndexImport } from './routes/01-example/index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as R03RouteImport } from './routes/03' +import { Route as IndexRouteImport } from './routes/index' +import { Route as R02IndexRouteImport } from './routes/02.index' +import { Route as R01ExampleIndexRouteImport } from './routes/01-example/index' // Create/Update Routes -const AboutRoute = AboutImport.update({ +const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRoute, } as any) -const R03Route = R03Import.update({ +const R03Route = R03RouteImport.update({ id: '/03', path: '/03', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const R02IndexRoute = R02IndexImport.update({ +const R02IndexRoute = R02IndexRouteImport.update({ id: '/02/', path: '/02/', getParentRoute: () => rootRoute, } as any) -const R01ExampleIndexRoute = R01ExampleIndexImport.update({ +const R01ExampleIndexRoute = R01ExampleIndexRouteImport.update({ id: '/01-example/', path: '/01-example/', getParentRoute: () => rootRoute, @@ -57,40 +59,88 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/03': { id: '/03' path: '/03' fullPath: '/03' - preLoaderRoute: typeof R03Import + preLoaderRoute: typeof R03RouteImport parentRoute: typeof rootRoute } '/about': { id: '/about' path: '/about' fullPath: '/about' - preLoaderRoute: typeof AboutImport + preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRoute } '/01-example/': { id: '/01-example/' path: '/01-example' fullPath: '/01-example' - preLoaderRoute: typeof R01ExampleIndexImport + preLoaderRoute: typeof R01ExampleIndexRouteImport parentRoute: typeof rootRoute } '/02/': { id: '/02/' path: '/02' fullPath: '/02' - preLoaderRoute: typeof R02IndexImport + preLoaderRoute: typeof R02IndexRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/03' { + const createFileRoute: CreateFileRoute< + '/03', + FileRoutesByPath['/03']['parentRoute'], + FileRoutesByPath['/03']['id'], + FileRoutesByPath['/03']['path'], + FileRoutesByPath['/03']['fullPath'] + > +} +declare module './routes/about' { + const createFileRoute: CreateFileRoute< + '/about', + FileRoutesByPath['/about']['parentRoute'], + FileRoutesByPath['/about']['id'], + FileRoutesByPath['/about']['path'], + FileRoutesByPath['/about']['fullPath'] + > +} +declare module './routes/01-example/index' { + const createFileRoute: CreateFileRoute< + '/01-example/', + FileRoutesByPath['/01-example/']['parentRoute'], + FileRoutesByPath['/01-example/']['id'], + FileRoutesByPath['/01-example/']['path'], + FileRoutesByPath['/01-example/']['fullPath'] + > +} +declare module './routes/02.index' { + const createFileRoute: CreateFileRoute< + '/02/', + FileRoutesByPath['/02/']['parentRoute'], + FileRoutesByPath['/02/']['id'], + FileRoutesByPath['/02/']['path'], + FileRoutesByPath['/02/']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/numbers-in-path/routes/01-example/index.tsx b/packages/router-generator/tests/generator/numbers-in-path/routes/01-example/index.tsx index a4d5356ffd..6943669d72 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routes/01-example/index.tsx +++ b/packages/router-generator/tests/generator/numbers-in-path/routes/01-example/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/01-example/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/numbers-in-path/routes/02.index.tsx b/packages/router-generator/tests/generator/numbers-in-path/routes/02.index.tsx index 40ec0494ad..445eec92dc 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routes/02.index.tsx +++ b/packages/router-generator/tests/generator/numbers-in-path/routes/02.index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/02/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/numbers-in-path/routes/03.tsx b/packages/router-generator/tests/generator/numbers-in-path/routes/03.tsx index 4b6349bf17..3164148a3a 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routes/03.tsx +++ b/packages/router-generator/tests/generator/numbers-in-path/routes/03.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/03')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/numbers-in-path/routes/about.tsx b/packages/router-generator/tests/generator/numbers-in-path/routes/about.tsx index 1e6c7068e0..32071e180d 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routes/about.tsx +++ b/packages/router-generator/tests/generator/numbers-in-path/routes/about.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/about')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/numbers-in-path/routes/index.tsx b/packages/router-generator/tests/generator/numbers-in-path/routes/index.tsx index d58928d9ed..7ba4d00719 100644 --- a/packages/router-generator/tests/generator/numbers-in-path/routes/index.tsx +++ b/packages/router-generator/tests/generator/numbers-in-path/routes/index.tsx @@ -1,6 +1,4 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/only-root/routeTree.snapshot.ts b/packages/router-generator/tests/generator/only-root/routeTree.snapshot.ts index 78c694471a..3abbdf6ab0 100644 --- a/packages/router-generator/tests/generator/only-root/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/only-root/routeTree.snapshot.ts @@ -20,6 +20,8 @@ declare module '@tanstack/react-router' { interface FileRoutesByPath {} } +// Add type-safety to the createFileRoute function across the route tree + // Create and export the route tree export interface FileRoutesByFullPath {} diff --git a/packages/router-generator/tests/generator/prefix-suffix/routeTree.snapshot.ts b/packages/router-generator/tests/generator/prefix-suffix/routeTree.snapshot.ts new file mode 100644 index 0000000000..2f292a8fe3 --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routeTree.snapshot.ts @@ -0,0 +1,214 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as WildcardChar123Char125suffixRouteImport } from './routes/wildcard/{$}suffix' +import { Route as WildcardChar123Char125DotsuffixRouteImport } from './routes/wildcard/{$}[.]suffix' +import { Route as WildcardPrefixChar123Char125RouteImport } from './routes/wildcard/prefix{$}' +import { Route as WildcardSplatRouteImport } from './routes/wildcard/$' + +// Create/Update Routes + +const WildcardChar123Char125suffixRoute = + WildcardChar123Char125suffixRouteImport.update({ + id: '/wildcard/{$}suffix', + path: '/wildcard/{$}suffix', + getParentRoute: () => rootRoute, + } as any) + +const WildcardChar123Char125DotsuffixRoute = + WildcardChar123Char125DotsuffixRouteImport.update({ + id: '/wildcard/{$}.suffix', + path: '/wildcard/{$}.suffix', + getParentRoute: () => rootRoute, + } as any) + +const WildcardPrefixChar123Char125Route = + WildcardPrefixChar123Char125RouteImport.update({ + id: '/wildcard/prefix{$}', + path: '/wildcard/prefix{$}', + getParentRoute: () => rootRoute, + } as any) + +const WildcardSplatRoute = WildcardSplatRouteImport.update({ + id: '/wildcard/$', + path: '/wildcard/$', + getParentRoute: () => rootRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/wildcard/$': { + id: '/wildcard/$' + path: '/wildcard/$' + fullPath: '/wildcard/$' + preLoaderRoute: typeof WildcardSplatRouteImport + parentRoute: typeof rootRoute + } + '/wildcard/prefix{$}': { + id: '/wildcard/prefix{$}' + path: '/wildcard/prefix{$}' + fullPath: '/wildcard/prefix{$}' + preLoaderRoute: typeof WildcardPrefixChar123Char125RouteImport + parentRoute: typeof rootRoute + } + '/wildcard/{$}.suffix': { + id: '/wildcard/{$}.suffix' + path: '/wildcard/{$}.suffix' + fullPath: '/wildcard/{$}.suffix' + preLoaderRoute: typeof WildcardChar123Char125DotsuffixRouteImport + parentRoute: typeof rootRoute + } + '/wildcard/{$}suffix': { + id: '/wildcard/{$}suffix' + path: '/wildcard/{$}suffix' + fullPath: '/wildcard/{$}suffix' + preLoaderRoute: typeof WildcardChar123Char125suffixRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/wildcard/$' { + const createFileRoute: CreateFileRoute< + '/wildcard/$', + FileRoutesByPath['/wildcard/$']['parentRoute'], + FileRoutesByPath['/wildcard/$']['id'], + FileRoutesByPath['/wildcard/$']['path'], + FileRoutesByPath['/wildcard/$']['fullPath'] + > +} +declare module './routes/wildcard/prefix{$}' { + const createFileRoute: CreateFileRoute< + '/wildcard/prefix{$}', + FileRoutesByPath['/wildcard/prefix{$}']['parentRoute'], + FileRoutesByPath['/wildcard/prefix{$}']['id'], + FileRoutesByPath['/wildcard/prefix{$}']['path'], + FileRoutesByPath['/wildcard/prefix{$}']['fullPath'] + > +} +declare module './routes/wildcard/{$}[.]suffix' { + const createFileRoute: CreateFileRoute< + '/wildcard/{$}.suffix', + FileRoutesByPath['/wildcard/{$}.suffix']['parentRoute'], + FileRoutesByPath['/wildcard/{$}.suffix']['id'], + FileRoutesByPath['/wildcard/{$}.suffix']['path'], + FileRoutesByPath['/wildcard/{$}.suffix']['fullPath'] + > +} +declare module './routes/wildcard/{$}suffix' { + const createFileRoute: CreateFileRoute< + '/wildcard/{$}suffix', + FileRoutesByPath['/wildcard/{$}suffix']['parentRoute'], + FileRoutesByPath['/wildcard/{$}suffix']['id'], + FileRoutesByPath['/wildcard/{$}suffix']['path'], + FileRoutesByPath['/wildcard/{$}suffix']['fullPath'] + > +} + +// Create and export the route tree + +export interface FileRoutesByFullPath { + '/wildcard/$': typeof WildcardSplatRoute + '/wildcard/prefix{$}': typeof WildcardPrefixChar123Char125Route + '/wildcard/{$}.suffix': typeof WildcardChar123Char125DotsuffixRoute + '/wildcard/{$}suffix': typeof WildcardChar123Char125suffixRoute +} + +export interface FileRoutesByTo { + '/wildcard/$': typeof WildcardSplatRoute + '/wildcard/prefix{$}': typeof WildcardPrefixChar123Char125Route + '/wildcard/{$}.suffix': typeof WildcardChar123Char125DotsuffixRoute + '/wildcard/{$}suffix': typeof WildcardChar123Char125suffixRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/wildcard/$': typeof WildcardSplatRoute + '/wildcard/prefix{$}': typeof WildcardPrefixChar123Char125Route + '/wildcard/{$}.suffix': typeof WildcardChar123Char125DotsuffixRoute + '/wildcard/{$}suffix': typeof WildcardChar123Char125suffixRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/wildcard/$' + | '/wildcard/prefix{$}' + | '/wildcard/{$}.suffix' + | '/wildcard/{$}suffix' + fileRoutesByTo: FileRoutesByTo + to: + | '/wildcard/$' + | '/wildcard/prefix{$}' + | '/wildcard/{$}.suffix' + | '/wildcard/{$}suffix' + id: + | '__root__' + | '/wildcard/$' + | '/wildcard/prefix{$}' + | '/wildcard/{$}.suffix' + | '/wildcard/{$}suffix' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + WildcardSplatRoute: typeof WildcardSplatRoute + WildcardPrefixChar123Char125Route: typeof WildcardPrefixChar123Char125Route + WildcardChar123Char125DotsuffixRoute: typeof WildcardChar123Char125DotsuffixRoute + WildcardChar123Char125suffixRoute: typeof WildcardChar123Char125suffixRoute +} + +const rootRouteChildren: RootRouteChildren = { + WildcardSplatRoute: WildcardSplatRoute, + WildcardPrefixChar123Char125Route: WildcardPrefixChar123Char125Route, + WildcardChar123Char125DotsuffixRoute: WildcardChar123Char125DotsuffixRoute, + WildcardChar123Char125suffixRoute: WildcardChar123Char125suffixRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/wildcard/$", + "/wildcard/prefix{$}", + "/wildcard/{$}.suffix", + "/wildcard/{$}suffix" + ] + }, + "/wildcard/$": { + "filePath": "wildcard/$.tsx" + }, + "/wildcard/prefix{$}": { + "filePath": "wildcard/prefix{$}.tsx" + }, + "/wildcard/{$}.suffix": { + "filePath": "wildcard/{$}[.]suffix.tsx" + }, + "/wildcard/{$}suffix": { + "filePath": "wildcard/{$}suffix.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/__root.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/__root.tsx new file mode 100644 index 0000000000..3797d7bf8c --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/__root.tsx @@ -0,0 +1,15 @@ +import * as React from 'react' +import { Outlet, createRootRoute } from '@tanstack/react-router' + +export const Route = createRootRoute({ + component: RootComponent, +}) + +function RootComponent() { + return ( + +
Hello "__root"!
+ + + ) +} diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/index.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/index.tsx new file mode 100644 index 0000000000..ab504e42e9 --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/index.tsx @@ -0,0 +1 @@ +/** */ diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/$.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/$.tsx new file mode 100644 index 0000000000..5d18ba46cb --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/$.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + return
Hello "/wildcard/$"!
+} diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/prefix{$}.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/prefix{$}.tsx new file mode 100644 index 0000000000..4d70429bed --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/prefix{$}.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + return
Hello "/wildcard/prefix"!
+} diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}[.]suffix.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}[.]suffix.tsx new file mode 100644 index 0000000000..6d1a03f2f9 --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}[.]suffix.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + return
Hello "/wildcard/.suffix"!
+} diff --git a/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}suffix.tsx b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}suffix.tsx new file mode 100644 index 0000000000..02bc57ef6e --- /dev/null +++ b/packages/router-generator/tests/generator/prefix-suffix/routes/wildcard/{$}suffix.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: RouteComponent, +}) + +function RouteComponent() { + return
Hello "/wildcard/suffix"!
+} diff --git a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts index 57a9e6aa8c..470ad28c20 100644 --- a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts @@ -9,63 +9,65 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as fooAsdfLayoutImport } from './routes/(foo)/asdf/_layout' -import { Route as fooAsdfLayoutFooImport } from './routes/(foo)/asdf/_layout.foo' -import { Route as fooAsdfbarIdImport } from './routes/(foo)/asdf/(bar)/$id' -import { Route as fooAsdfanotherGroupLayoutImport } from './routes/(foo)/asdf/(another-group)/_layout' -import { Route as fooAsdfbarLayoutAboutImport } from './routes/(foo)/asdf/(bar)/_layout.about' -import { Route as fooAsdfanotherGroupLayoutBazImport } from './routes/(foo)/asdf/(another-group)/_layout.baz' +import { Route as fooAsdfLayoutRouteImport } from './routes/(foo)/asdf/_layout' +import { Route as fooAsdfLayoutFooRouteImport } from './routes/(foo)/asdf/_layout.foo' +import { Route as fooAsdfbarIdRouteImport } from './routes/(foo)/asdf/(bar)/$id' +import { Route as fooAsdfanotherGroupLayoutRouteImport } from './routes/(foo)/asdf/(another-group)/_layout' +import { Route as fooAsdfbarLayoutAboutRouteImport } from './routes/(foo)/asdf/(bar)/_layout.about' +import { Route as fooAsdfanotherGroupLayoutBazRouteImport } from './routes/(foo)/asdf/(another-group)/_layout.baz' // Create Virtual Routes -const fooAsdfImport = createFileRoute('/(foo)/asdf')() -const fooAsdfanotherGroupImport = createFileRoute( +const fooAsdfRouteImport = createFileRoute('/(foo)/asdf')() +const fooAsdfanotherGroupRouteImport = createFileRoute( '/(foo)/asdf/(another-group)', )() -const fooAsdfbarLayoutXyzLazyImport = createFileRoute( +const fooAsdfbarLayoutXyzLazyRouteImport = createFileRoute( '/(foo)/asdf/(bar)/_layout/xyz', )() // Create/Update Routes -const fooAsdfRoute = fooAsdfImport.update({ +const fooAsdfRoute = fooAsdfRouteImport.update({ id: '/(foo)/asdf', path: '/asdf', getParentRoute: () => rootRoute, } as any) -const fooAsdfanotherGroupRoute = fooAsdfanotherGroupImport.update({ +const fooAsdfanotherGroupRoute = fooAsdfanotherGroupRouteImport.update({ id: '/(another-group)', getParentRoute: () => fooAsdfRoute, } as any) -const fooAsdfLayoutRoute = fooAsdfLayoutImport.update({ +const fooAsdfLayoutRoute = fooAsdfLayoutRouteImport.update({ id: '/_layout', getParentRoute: () => fooAsdfRoute, } as any) -const fooAsdfLayoutFooRoute = fooAsdfLayoutFooImport.update({ +const fooAsdfLayoutFooRoute = fooAsdfLayoutFooRouteImport.update({ id: '/foo', path: '/foo', getParentRoute: () => fooAsdfLayoutRoute, } as any) -const fooAsdfbarIdRoute = fooAsdfbarIdImport.update({ +const fooAsdfbarIdRoute = fooAsdfbarIdRouteImport.update({ id: '/(bar)/$id', path: '/$id', getParentRoute: () => fooAsdfRoute, } as any) -const fooAsdfanotherGroupLayoutRoute = fooAsdfanotherGroupLayoutImport.update({ - id: '/_layout', - getParentRoute: () => fooAsdfanotherGroupRoute, -} as any) +const fooAsdfanotherGroupLayoutRoute = + fooAsdfanotherGroupLayoutRouteImport.update({ + id: '/_layout', + getParentRoute: () => fooAsdfanotherGroupRoute, + } as any) -const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyImport +const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyRouteImport .update({ id: '/(bar)/_layout/xyz', path: '/xyz', @@ -75,14 +77,14 @@ const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyImport import('./routes/(foo)/asdf/(bar)/_layout.xyz.lazy').then((d) => d.Route), ) -const fooAsdfbarLayoutAboutRoute = fooAsdfbarLayoutAboutImport.update({ +const fooAsdfbarLayoutAboutRoute = fooAsdfbarLayoutAboutRouteImport.update({ id: '/(bar)/_layout/about', path: '/about', getParentRoute: () => fooAsdfRoute, } as any) const fooAsdfanotherGroupLayoutBazRoute = - fooAsdfanotherGroupLayoutBazImport.update({ + fooAsdfanotherGroupLayoutBazRouteImport.update({ id: '/baz', path: '/baz', getParentRoute: () => fooAsdfanotherGroupLayoutRoute, @@ -96,68 +98,131 @@ declare module '@tanstack/react-router' { id: '/(foo)/asdf' path: '/asdf' fullPath: '/asdf' - preLoaderRoute: typeof fooAsdfImport + preLoaderRoute: typeof fooAsdfRouteImport parentRoute: typeof rootRoute } '/(foo)/asdf/_layout': { id: '/(foo)/asdf/_layout' path: '/asdf' fullPath: '/asdf' - preLoaderRoute: typeof fooAsdfLayoutImport + preLoaderRoute: typeof fooAsdfLayoutRouteImport parentRoute: typeof fooAsdfRoute } '/(foo)/asdf/(another-group)': { id: '/(foo)/asdf/(another-group)' path: '/' fullPath: '/asdf/' - preLoaderRoute: typeof fooAsdfanotherGroupImport - parentRoute: typeof fooAsdfImport + preLoaderRoute: typeof fooAsdfanotherGroupRouteImport + parentRoute: typeof fooAsdfRouteImport } '/(foo)/asdf/(another-group)/_layout': { id: '/(foo)/asdf/(another-group)/_layout' path: '/' fullPath: '/asdf/' - preLoaderRoute: typeof fooAsdfanotherGroupLayoutImport + preLoaderRoute: typeof fooAsdfanotherGroupLayoutRouteImport parentRoute: typeof fooAsdfanotherGroupRoute } '/(foo)/asdf/(bar)/$id': { id: '/(foo)/asdf/(bar)/$id' path: '/$id' fullPath: '/asdf/$id' - preLoaderRoute: typeof fooAsdfbarIdImport - parentRoute: typeof fooAsdfImport + preLoaderRoute: typeof fooAsdfbarIdRouteImport + parentRoute: typeof fooAsdfRouteImport } '/(foo)/asdf/_layout/foo': { id: '/(foo)/asdf/_layout/foo' path: '/foo' fullPath: '/asdf/foo' - preLoaderRoute: typeof fooAsdfLayoutFooImport - parentRoute: typeof fooAsdfLayoutImport + preLoaderRoute: typeof fooAsdfLayoutFooRouteImport + parentRoute: typeof fooAsdfLayoutRouteImport } '/(foo)/asdf/(another-group)/_layout/baz': { id: '/(foo)/asdf/(another-group)/_layout/baz' path: '/baz' fullPath: '/asdf/baz' - preLoaderRoute: typeof fooAsdfanotherGroupLayoutBazImport - parentRoute: typeof fooAsdfanotherGroupLayoutImport + preLoaderRoute: typeof fooAsdfanotherGroupLayoutBazRouteImport + parentRoute: typeof fooAsdfanotherGroupLayoutRouteImport } '/(foo)/asdf/(bar)/_layout/about': { id: '/(foo)/asdf/(bar)/_layout/about' path: '/about' fullPath: '/asdf/about' - preLoaderRoute: typeof fooAsdfbarLayoutAboutImport - parentRoute: typeof fooAsdfImport + preLoaderRoute: typeof fooAsdfbarLayoutAboutRouteImport + parentRoute: typeof fooAsdfRouteImport } '/(foo)/asdf/(bar)/_layout/xyz': { id: '/(foo)/asdf/(bar)/_layout/xyz' path: '/xyz' fullPath: '/asdf/xyz' - preLoaderRoute: typeof fooAsdfbarLayoutXyzLazyImport - parentRoute: typeof fooAsdfImport + preLoaderRoute: typeof fooAsdfbarLayoutXyzLazyRouteImport + parentRoute: typeof fooAsdfRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/(foo)/asdf/_layout' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/_layout', + FileRoutesByPath['/(foo)/asdf/_layout']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/_layout']['id'], + FileRoutesByPath['/(foo)/asdf/_layout']['path'], + FileRoutesByPath['/(foo)/asdf/_layout']['fullPath'] + > +} + +declare module './routes/(foo)/asdf/(another-group)/_layout' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/(another-group)/_layout', + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout']['id'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout']['path'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout']['fullPath'] + > +} +declare module './routes/(foo)/asdf/(bar)/$id' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/(bar)/$id', + FileRoutesByPath['/(foo)/asdf/(bar)/$id']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/(bar)/$id']['id'], + FileRoutesByPath['/(foo)/asdf/(bar)/$id']['path'], + FileRoutesByPath['/(foo)/asdf/(bar)/$id']['fullPath'] + > +} +declare module './routes/(foo)/asdf/_layout.foo' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/_layout/foo', + FileRoutesByPath['/(foo)/asdf/_layout/foo']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/_layout/foo']['id'], + FileRoutesByPath['/(foo)/asdf/_layout/foo']['path'], + FileRoutesByPath['/(foo)/asdf/_layout/foo']['fullPath'] + > +} +declare module './routes/(foo)/asdf/(another-group)/_layout.baz' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/(another-group)/_layout/baz', + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout/baz']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout/baz']['id'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout/baz']['path'], + FileRoutesByPath['/(foo)/asdf/(another-group)/_layout/baz']['fullPath'] + > +} +declare module './routes/(foo)/asdf/(bar)/_layout.about' { + const createFileRoute: CreateFileRoute< + '/(foo)/asdf/(bar)/_layout/about', + FileRoutesByPath['/(foo)/asdf/(bar)/_layout/about']['parentRoute'], + FileRoutesByPath['/(foo)/asdf/(bar)/_layout/about']['id'], + FileRoutesByPath['/(foo)/asdf/(bar)/_layout/about']['path'], + FileRoutesByPath['/(foo)/asdf/(bar)/_layout/about']['fullPath'] + > +} +declare module './routes/(foo)/asdf/(bar)/_layout.xyz.lazy' { + const createLazyFileRoute: CreateLazyFileRoute< + FileRoutesByPath['/(foo)/asdf/(bar)/_layout/xyz']['preLoaderRoute'] + > +} + // Create and export the route tree interface fooAsdfLayoutRouteChildren { diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.baz.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.baz.tsx index ce8ed9a546..6db8036f00 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.baz.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.baz.tsx @@ -1,7 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/(another-group)/_layout/baz')( - { - component: () =>
Hello /(foo)/asdf/(another-group)/_layout/baz!
, - }, -) +export const Route = createFileRoute({ + component: () =>
Hello /(foo)/asdf/(another-group)/_layout/baz!
, +}) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.tsx index c2e5c502fa..f69715bf48 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(another-group)/_layout.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/(another-group)/_layout')({ +export const Route = createFileRoute({ component: () =>
Hello /(foo)/asdf/(another-group)/_layout!
, }) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/$id.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/$id.tsx index 75cbf8c35e..c46abc16f0 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/$id.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/$id.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/(bar)/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /(foo)/asdf/(bar)/$id!
, }) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.about.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.about.tsx index 06daaef4e5..8fcb6f5964 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.about.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.about.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/(bar)/_layout/about')({ +export const Route = createFileRoute({ component: () =>
Hello /(foo)/asdf/(bar)/_layout/about!
, }) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.xyz.lazy.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.xyz.lazy.tsx index 955cd7f9bd..6e5db319eb 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.xyz.lazy.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/(bar)/_layout.xyz.lazy.tsx @@ -1,5 +1,5 @@ -import { createLazyFileRoute } from '@tanstack/react-router' +// @ts-nocheck -export const Route = createLazyFileRoute('/(foo)/asdf/(bar)/_layout/xyz')({ +export const Route = createLazyFileRoute({ component: () =>
Hello /(foo)/asdf/(bar)/_layout/xyz!
, }) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.foo.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.foo.tsx index a090505278..57551c0b2e 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.foo.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.foo.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/_layout/foo')({ +export const Route = createFileRoute({ component: () =>
Hello /(foo)/asdf/_layout/foo!
, }) diff --git a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.tsx b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.tsx index 6817284676..a78ffddd1d 100644 --- a/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.tsx +++ b/packages/router-generator/tests/generator/route-groups/routes/(foo)/asdf/_layout.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/(foo)/asdf/_layout')({ +export const Route = createFileRoute({ component: () =>
Hello /(foo)/asdf/_layout!
, }) diff --git a/packages/router-generator/tests/generator/single-level/routeTree.snapshot.ts b/packages/router-generator/tests/generator/single-level/routeTree.snapshot.ts index 2f69793c10..39c796491d 100644 --- a/packages/router-generator/tests/generator/single-level/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/single-level/routeTree.snapshot.ts @@ -8,21 +8,23 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as IndexImport } from './routes/index' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as IndexRouteImport } from './routes/index' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, @@ -36,19 +38,40 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/posts': { id: '/posts' path: '/posts' fullPath: '/posts' - preLoaderRoute: typeof PostsImport + preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRoute } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} + // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/packages/router-generator/tests/generator/single-level/routes/__root.tsx b/packages/router-generator/tests/generator/single-level/routes/__root.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/single-level/routes/__root.tsx +++ b/packages/router-generator/tests/generator/single-level/routes/__root.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/single-level/routes/index.tsx b/packages/router-generator/tests/generator/single-level/routes/index.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/single-level/routes/index.tsx +++ b/packages/router-generator/tests/generator/single-level/routes/index.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/single-level/routes/posts.tsx b/packages/router-generator/tests/generator/single-level/routes/posts.tsx index ab504e42e9..a8c4d4c893 100644 --- a/packages/router-generator/tests/generator/single-level/routes/posts.tsx +++ b/packages/router-generator/tests/generator/single-level/routes/posts.tsx @@ -1 +1,2 @@ -/** */ +// @ts-nocheck +export const Route = createFileRoute() diff --git a/packages/router-generator/tests/generator/types-disabled/routeTree.snapshot.js b/packages/router-generator/tests/generator/types-disabled/routeTree.snapshot.js index e7e66c3847..10aeffda8c 100644 --- a/packages/router-generator/tests/generator/types-disabled/routeTree.snapshot.js +++ b/packages/router-generator/tests/generator/types-disabled/routeTree.snapshot.js @@ -11,32 +11,32 @@ // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PostsImport } from './routes/posts' -import { Route as IndexImport } from './routes/index' -import { Route as UsersUserIdImport } from './routes/users.$userId' -import { Route as PostsPostIdImport } from './routes/posts/$postId' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts/$postId' // Create/Update Routes -const PostsRoute = PostsImport.update({ +const PostsRoute = PostsRouteImport.update({ id: '/posts', path: '/posts', getParentRoute: () => rootRoute, }) -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, }) -const UsersUserIdRoute = UsersUserIdImport.update({ +const UsersUserIdRoute = UsersUserIdRouteImport.update({ id: '/users/$userId', path: '/users/$userId', getParentRoute: () => rootRoute, }) -const PostsPostIdRoute = PostsPostIdImport.update({ +const PostsPostIdRoute = PostsPostIdRouteImport.update({ id: '/$postId', path: '/$postId', getParentRoute: () => PostsRoute, diff --git a/packages/router-generator/tests/generator/types-disabled/routes/index.tsx b/packages/router-generator/tests/generator/types-disabled/routes/index.tsx index cebf9db135..0c6b517ac3 100644 --- a/packages/router-generator/tests/generator/types-disabled/routes/index.tsx +++ b/packages/router-generator/tests/generator/types-disabled/routes/index.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/types-disabled/routes/posts.tsx b/packages/router-generator/tests/generator/types-disabled/routes/posts.tsx index ec0b3fcee7..bbd5c622a3 100644 --- a/packages/router-generator/tests/generator/types-disabled/routes/posts.tsx +++ b/packages/router-generator/tests/generator/types-disabled/routes/posts.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts')({ +export const Route = createFileRoute({ component: () =>
Hello /posts!
, }) diff --git a/packages/router-generator/tests/generator/types-disabled/routes/posts/$postId.tsx b/packages/router-generator/tests/generator/types-disabled/routes/posts/$postId.tsx index 4528667792..0571c41009 100644 --- a/packages/router-generator/tests/generator/types-disabled/routes/posts/$postId.tsx +++ b/packages/router-generator/tests/generator/types-disabled/routes/posts/$postId.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/posts/$postId')({ +export const Route = createFileRoute({ component: () =>
Hello /posts/$postId!
, }) diff --git a/packages/router-generator/tests/generator/types-disabled/routes/users.$userId.tsx b/packages/router-generator/tests/generator/types-disabled/routes/users.$userId.tsx index b6553fe98a..32e776ec82 100644 --- a/packages/router-generator/tests/generator/types-disabled/routes/users.$userId.tsx +++ b/packages/router-generator/tests/generator/types-disabled/routes/users.$userId.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/users/$userId')({ +export const Route = createFileRoute({ component: () =>
Hello /users/$userId!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routeTree.snapshot.ts b/packages/router-generator/tests/generator/virtual-config-file-default-export/routeTree.snapshot.ts index ef967d5c21..d62466ed3b 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routeTree.snapshot.ts @@ -9,94 +9,95 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as layoutImport } from './routes/layout' -import { Route as indexImport } from './routes/index' -import { Route as dbDashboardImport } from './routes/db/dashboard' -import { Route as pagesImport } from './routes/pages' -import { Route as HelloIndexImport } from './routes/subtree/index' -import { Route as dbDashboardInvoicesImport } from './routes/db/dashboard-invoices' -import { Route as dbDashboardIndexImport } from './routes/db/dashboard-index' -import { Route as HelloFooIndexImport } from './routes/subtree/foo/index' -import { Route as HelloFooIdImport } from './routes/subtree/foo/$id' -import { Route as dbInvoiceDetailImport } from './routes/db/invoice-detail' -import { Route as dbInvoicesIndexImport } from './routes/db/invoices-index' +import { Route as layoutRouteImport } from './routes/layout' +import { Route as indexRouteImport } from './routes/index' +import { Route as dbDashboardRouteImport } from './routes/db/dashboard' +import { Route as pagesRouteImport } from './routes/pages' +import { Route as HelloIndexRouteImport } from './routes/subtree/index' +import { Route as dbDashboardInvoicesRouteImport } from './routes/db/dashboard-invoices' +import { Route as dbDashboardIndexRouteImport } from './routes/db/dashboard-index' +import { Route as HelloFooIndexRouteImport } from './routes/subtree/foo/index' +import { Route as HelloFooIdRouteImport } from './routes/subtree/foo/$id' +import { Route as dbInvoiceDetailRouteImport } from './routes/db/invoice-detail' +import { Route as dbInvoicesIndexRouteImport } from './routes/db/invoices-index' // Create Virtual Routes -const LangImport = createFileRoute('/$lang')() +const LangRouteImport = createFileRoute('/$lang')() // Create/Update Routes -const layoutRoute = layoutImport.update({ +const layoutRoute = layoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const LangRoute = LangImport.update({ +const LangRoute = LangRouteImport.update({ id: '/$lang', path: '/$lang', getParentRoute: () => rootRoute, } as any) -const indexRoute = indexImport.update({ +const indexRoute = indexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const dbDashboardRoute = dbDashboardImport.update({ +const dbDashboardRoute = dbDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => layoutRoute, } as any) -const pagesRoute = pagesImport.update({ +const pagesRoute = pagesRouteImport.update({ id: '/', path: '/', getParentRoute: () => LangRoute, } as any) -const HelloIndexRoute = HelloIndexImport.update({ +const HelloIndexRoute = HelloIndexRouteImport.update({ id: '/hello/', path: '/hello/', getParentRoute: () => layoutRoute, } as any) -const dbDashboardInvoicesRoute = dbDashboardInvoicesImport.update({ +const dbDashboardInvoicesRoute = dbDashboardInvoicesRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => dbDashboardRoute, } as any) -const dbDashboardIndexRoute = dbDashboardIndexImport.update({ +const dbDashboardIndexRoute = dbDashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardRoute, } as any) -const HelloFooIndexRoute = HelloFooIndexImport.update({ +const HelloFooIndexRoute = HelloFooIndexRouteImport.update({ id: '/hello/foo/', path: '/hello/foo/', getParentRoute: () => layoutRoute, } as any) -const HelloFooIdRoute = HelloFooIdImport.update({ +const HelloFooIdRoute = HelloFooIdRouteImport.update({ id: '/hello/foo/$id', path: '/hello/foo/$id', getParentRoute: () => layoutRoute, } as any) -const dbInvoiceDetailRoute = dbInvoiceDetailImport.update({ +const dbInvoiceDetailRoute = dbInvoiceDetailRouteImport.update({ id: '/$id', path: '/$id', getParentRoute: () => dbDashboardInvoicesRoute, } as any) -const dbInvoicesIndexRoute = dbInvoicesIndexImport.update({ +const dbInvoicesIndexRoute = dbInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardInvoicesRoute, @@ -110,89 +111,192 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof indexImport + preLoaderRoute: typeof indexRouteImport parentRoute: typeof rootRoute } '/$lang': { id: '/$lang' path: '/$lang' fullPath: '/$lang' - preLoaderRoute: typeof LangImport + preLoaderRoute: typeof LangRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof layoutImport + preLoaderRoute: typeof layoutRouteImport parentRoute: typeof rootRoute } '/$lang/': { id: '/$lang/' path: '/' fullPath: '/$lang/' - preLoaderRoute: typeof pagesImport - parentRoute: typeof LangImport + preLoaderRoute: typeof pagesRouteImport + parentRoute: typeof LangRouteImport } '/_layout/dashboard': { id: '/_layout/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof dbDashboardImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof dbDashboardRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/': { id: '/_layout/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof dbDashboardIndexImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardIndexRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/dashboard/invoices': { id: '/_layout/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof dbDashboardInvoicesImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardInvoicesRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/hello/': { id: '/_layout/hello/' path: '/hello' fullPath: '/hello' - preLoaderRoute: typeof HelloIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloIndexRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/invoices/': { id: '/_layout/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof dbInvoicesIndexImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoicesIndexRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/dashboard/invoices/$id': { id: '/_layout/dashboard/invoices/$id' path: '/$id' fullPath: '/dashboard/invoices/$id' - preLoaderRoute: typeof dbInvoiceDetailImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoiceDetailRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/hello/foo/$id': { id: '/_layout/hello/foo/$id' path: '/hello/foo/$id' fullPath: '/hello/foo/$id' - preLoaderRoute: typeof HelloFooIdImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIdRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/hello/foo/': { id: '/_layout/hello/foo/' path: '/hello/foo' fullPath: '/hello/foo' - preLoaderRoute: typeof HelloFooIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIndexRouteImport + parentRoute: typeof layoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + +declare module './routes/layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/pages' { + const createFileRoute: CreateFileRoute< + '/$lang/', + FileRoutesByPath['/$lang/']['parentRoute'], + FileRoutesByPath['/$lang/']['id'], + FileRoutesByPath['/$lang/']['path'], + FileRoutesByPath['/$lang/']['fullPath'] + > +} +declare module './routes/db/dashboard' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard', + FileRoutesByPath['/_layout/dashboard']['parentRoute'], + FileRoutesByPath['/_layout/dashboard']['id'], + FileRoutesByPath['/_layout/dashboard']['path'], + FileRoutesByPath['/_layout/dashboard']['fullPath'] + > +} +declare module './routes/db/dashboard-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/', + FileRoutesByPath['/_layout/dashboard/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/']['id'], + FileRoutesByPath['/_layout/dashboard/']['path'], + FileRoutesByPath['/_layout/dashboard/']['fullPath'] + > +} +declare module './routes/db/dashboard-invoices' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices', + FileRoutesByPath['/_layout/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices']['id'], + FileRoutesByPath['/_layout/dashboard/invoices']['path'], + FileRoutesByPath['/_layout/dashboard/invoices']['fullPath'] + > +} +declare module './routes/subtree/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/', + FileRoutesByPath['/_layout/hello/']['parentRoute'], + FileRoutesByPath['/_layout/hello/']['id'], + FileRoutesByPath['/_layout/hello/']['path'], + FileRoutesByPath['/_layout/hello/']['fullPath'] + > +} +declare module './routes/db/invoices-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/', + FileRoutesByPath['/_layout/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/db/invoice-detail' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/$id', + FileRoutesByPath['/_layout/dashboard/invoices/$id']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/$id' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/$id', + FileRoutesByPath['/_layout/hello/foo/$id']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/$id']['id'], + FileRoutesByPath['/_layout/hello/foo/$id']['path'], + FileRoutesByPath['/_layout/hello/foo/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/', + FileRoutesByPath['/_layout/hello/foo/']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/']['id'], + FileRoutesByPath['/_layout/hello/foo/']['path'], + FileRoutesByPath['/_layout/hello/foo/']['fullPath'] + > +} + // Create and export the route tree interface LangRouteChildren { diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-index.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-index.tsx index a92fc772c3..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-invoices.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-invoices.tsx index bf7e5a02b2..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-invoices.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard-invoices.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard.tsx index d5b4f49706..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/dashboard.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoice-detail.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoice-detail.tsx index e7be6c1910..a1ed3d4a28 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoice-detail.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoice-detail.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoices-index.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoices-index.tsx index f2e56721b6..960e382af9 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoices-index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/db/invoices-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/index.tsx index a294139860..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/layout.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/layout.tsx index 2e48e48410..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/layout.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/layout.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/pages.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/pages.tsx index a942c7ce75..488a59a55a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/pages.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/pages.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/$lang/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/$id.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/$id.tsx index d8cbd795a7..8418001767 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/$id.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/$id.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/index.tsx index 10233de496..84660c4d04 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/foo/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/index.tsx index 3367799b96..22cab82307 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-default-export/routes/subtree/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routeTree.snapshot.ts b/packages/router-generator/tests/generator/virtual-config-file-named-export/routeTree.snapshot.ts index ef967d5c21..d62466ed3b 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routeTree.snapshot.ts @@ -9,94 +9,95 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as layoutImport } from './routes/layout' -import { Route as indexImport } from './routes/index' -import { Route as dbDashboardImport } from './routes/db/dashboard' -import { Route as pagesImport } from './routes/pages' -import { Route as HelloIndexImport } from './routes/subtree/index' -import { Route as dbDashboardInvoicesImport } from './routes/db/dashboard-invoices' -import { Route as dbDashboardIndexImport } from './routes/db/dashboard-index' -import { Route as HelloFooIndexImport } from './routes/subtree/foo/index' -import { Route as HelloFooIdImport } from './routes/subtree/foo/$id' -import { Route as dbInvoiceDetailImport } from './routes/db/invoice-detail' -import { Route as dbInvoicesIndexImport } from './routes/db/invoices-index' +import { Route as layoutRouteImport } from './routes/layout' +import { Route as indexRouteImport } from './routes/index' +import { Route as dbDashboardRouteImport } from './routes/db/dashboard' +import { Route as pagesRouteImport } from './routes/pages' +import { Route as HelloIndexRouteImport } from './routes/subtree/index' +import { Route as dbDashboardInvoicesRouteImport } from './routes/db/dashboard-invoices' +import { Route as dbDashboardIndexRouteImport } from './routes/db/dashboard-index' +import { Route as HelloFooIndexRouteImport } from './routes/subtree/foo/index' +import { Route as HelloFooIdRouteImport } from './routes/subtree/foo/$id' +import { Route as dbInvoiceDetailRouteImport } from './routes/db/invoice-detail' +import { Route as dbInvoicesIndexRouteImport } from './routes/db/invoices-index' // Create Virtual Routes -const LangImport = createFileRoute('/$lang')() +const LangRouteImport = createFileRoute('/$lang')() // Create/Update Routes -const layoutRoute = layoutImport.update({ +const layoutRoute = layoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const LangRoute = LangImport.update({ +const LangRoute = LangRouteImport.update({ id: '/$lang', path: '/$lang', getParentRoute: () => rootRoute, } as any) -const indexRoute = indexImport.update({ +const indexRoute = indexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const dbDashboardRoute = dbDashboardImport.update({ +const dbDashboardRoute = dbDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => layoutRoute, } as any) -const pagesRoute = pagesImport.update({ +const pagesRoute = pagesRouteImport.update({ id: '/', path: '/', getParentRoute: () => LangRoute, } as any) -const HelloIndexRoute = HelloIndexImport.update({ +const HelloIndexRoute = HelloIndexRouteImport.update({ id: '/hello/', path: '/hello/', getParentRoute: () => layoutRoute, } as any) -const dbDashboardInvoicesRoute = dbDashboardInvoicesImport.update({ +const dbDashboardInvoicesRoute = dbDashboardInvoicesRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => dbDashboardRoute, } as any) -const dbDashboardIndexRoute = dbDashboardIndexImport.update({ +const dbDashboardIndexRoute = dbDashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardRoute, } as any) -const HelloFooIndexRoute = HelloFooIndexImport.update({ +const HelloFooIndexRoute = HelloFooIndexRouteImport.update({ id: '/hello/foo/', path: '/hello/foo/', getParentRoute: () => layoutRoute, } as any) -const HelloFooIdRoute = HelloFooIdImport.update({ +const HelloFooIdRoute = HelloFooIdRouteImport.update({ id: '/hello/foo/$id', path: '/hello/foo/$id', getParentRoute: () => layoutRoute, } as any) -const dbInvoiceDetailRoute = dbInvoiceDetailImport.update({ +const dbInvoiceDetailRoute = dbInvoiceDetailRouteImport.update({ id: '/$id', path: '/$id', getParentRoute: () => dbDashboardInvoicesRoute, } as any) -const dbInvoicesIndexRoute = dbInvoicesIndexImport.update({ +const dbInvoicesIndexRoute = dbInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardInvoicesRoute, @@ -110,89 +111,192 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof indexImport + preLoaderRoute: typeof indexRouteImport parentRoute: typeof rootRoute } '/$lang': { id: '/$lang' path: '/$lang' fullPath: '/$lang' - preLoaderRoute: typeof LangImport + preLoaderRoute: typeof LangRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof layoutImport + preLoaderRoute: typeof layoutRouteImport parentRoute: typeof rootRoute } '/$lang/': { id: '/$lang/' path: '/' fullPath: '/$lang/' - preLoaderRoute: typeof pagesImport - parentRoute: typeof LangImport + preLoaderRoute: typeof pagesRouteImport + parentRoute: typeof LangRouteImport } '/_layout/dashboard': { id: '/_layout/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof dbDashboardImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof dbDashboardRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/': { id: '/_layout/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof dbDashboardIndexImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardIndexRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/dashboard/invoices': { id: '/_layout/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof dbDashboardInvoicesImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardInvoicesRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/hello/': { id: '/_layout/hello/' path: '/hello' fullPath: '/hello' - preLoaderRoute: typeof HelloIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloIndexRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/invoices/': { id: '/_layout/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof dbInvoicesIndexImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoicesIndexRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/dashboard/invoices/$id': { id: '/_layout/dashboard/invoices/$id' path: '/$id' fullPath: '/dashboard/invoices/$id' - preLoaderRoute: typeof dbInvoiceDetailImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoiceDetailRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/hello/foo/$id': { id: '/_layout/hello/foo/$id' path: '/hello/foo/$id' fullPath: '/hello/foo/$id' - preLoaderRoute: typeof HelloFooIdImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIdRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/hello/foo/': { id: '/_layout/hello/foo/' path: '/hello/foo' fullPath: '/hello/foo' - preLoaderRoute: typeof HelloFooIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIndexRouteImport + parentRoute: typeof layoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + +declare module './routes/layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/pages' { + const createFileRoute: CreateFileRoute< + '/$lang/', + FileRoutesByPath['/$lang/']['parentRoute'], + FileRoutesByPath['/$lang/']['id'], + FileRoutesByPath['/$lang/']['path'], + FileRoutesByPath['/$lang/']['fullPath'] + > +} +declare module './routes/db/dashboard' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard', + FileRoutesByPath['/_layout/dashboard']['parentRoute'], + FileRoutesByPath['/_layout/dashboard']['id'], + FileRoutesByPath['/_layout/dashboard']['path'], + FileRoutesByPath['/_layout/dashboard']['fullPath'] + > +} +declare module './routes/db/dashboard-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/', + FileRoutesByPath['/_layout/dashboard/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/']['id'], + FileRoutesByPath['/_layout/dashboard/']['path'], + FileRoutesByPath['/_layout/dashboard/']['fullPath'] + > +} +declare module './routes/db/dashboard-invoices' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices', + FileRoutesByPath['/_layout/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices']['id'], + FileRoutesByPath['/_layout/dashboard/invoices']['path'], + FileRoutesByPath['/_layout/dashboard/invoices']['fullPath'] + > +} +declare module './routes/subtree/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/', + FileRoutesByPath['/_layout/hello/']['parentRoute'], + FileRoutesByPath['/_layout/hello/']['id'], + FileRoutesByPath['/_layout/hello/']['path'], + FileRoutesByPath['/_layout/hello/']['fullPath'] + > +} +declare module './routes/db/invoices-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/', + FileRoutesByPath['/_layout/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/db/invoice-detail' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/$id', + FileRoutesByPath['/_layout/dashboard/invoices/$id']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/$id' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/$id', + FileRoutesByPath['/_layout/hello/foo/$id']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/$id']['id'], + FileRoutesByPath['/_layout/hello/foo/$id']['path'], + FileRoutesByPath['/_layout/hello/foo/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/', + FileRoutesByPath['/_layout/hello/foo/']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/']['id'], + FileRoutesByPath['/_layout/hello/foo/']['path'], + FileRoutesByPath['/_layout/hello/foo/']['fullPath'] + > +} + // Create and export the route tree interface LangRouteChildren { diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-index.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-index.tsx index a92fc772c3..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-invoices.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-invoices.tsx index bf7e5a02b2..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-invoices.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard-invoices.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard.tsx index d5b4f49706..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/dashboard.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoice-detail.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoice-detail.tsx index e7be6c1910..a1ed3d4a28 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoice-detail.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoice-detail.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoices-index.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoices-index.tsx index f2e56721b6..960e382af9 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoices-index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/db/invoices-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/index.tsx index a294139860..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/layout.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/layout.tsx index 2e48e48410..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/layout.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/layout.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/pages.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/pages.tsx index a942c7ce75..488a59a55a 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/pages.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/pages.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/$lang/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/$id.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/$id.tsx index d8cbd795a7..8418001767 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/$id.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/$id.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/index.tsx index 10233de496..84660c4d04 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/foo/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/!
, }) diff --git a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/index.tsx b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/index.tsx index 3367799b96..22cab82307 100644 --- a/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/index.tsx +++ b/packages/router-generator/tests/generator/virtual-config-file-named-export/routes/subtree/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/virtual-inside-nested/routeTree.snapshot.ts b/packages/router-generator/tests/generator/virtual-inside-nested/routeTree.snapshot.ts index ca38556b08..3dda40aba6 100644 --- a/packages/router-generator/tests/generator/virtual-inside-nested/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/virtual-inside-nested/routeTree.snapshot.ts @@ -8,35 +8,37 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' -import { Route as FooBarImport } from './routes/foo/bar' -import { Route as fooBarDetailsImport } from './routes/foo/bar/details' -import { Route as fooBarHomeImport } from './routes/foo/bar/home' +import { Route as IndexRouteImport } from './routes/index' +import { Route as FooBarRouteImport } from './routes/foo/bar' +import { Route as fooBarDetailsRouteImport } from './routes/foo/bar/details' +import { Route as fooBarHomeRouteImport } from './routes/foo/bar/home' // Create/Update Routes -const IndexRoute = IndexImport.update({ +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const FooBarRoute = FooBarImport.update({ +const FooBarRoute = FooBarRouteImport.update({ id: '/foo/bar', path: '/foo/bar', getParentRoute: () => rootRoute, } as any) -const fooBarDetailsRoute = fooBarDetailsImport.update({ +const fooBarDetailsRoute = fooBarDetailsRouteImport.update({ id: '/$id', path: '/$id', getParentRoute: () => FooBarRoute, } as any) -const fooBarHomeRoute = fooBarHomeImport.update({ +const fooBarHomeRoute = fooBarHomeRouteImport.update({ id: '/', path: '/', getParentRoute: () => FooBarRoute, @@ -50,33 +52,72 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof IndexImport + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRoute } '/foo/bar': { id: '/foo/bar' path: '/foo/bar' fullPath: '/foo/bar' - preLoaderRoute: typeof FooBarImport + preLoaderRoute: typeof FooBarRouteImport parentRoute: typeof rootRoute } '/foo/bar/': { id: '/foo/bar/' path: '/' fullPath: '/foo/bar/' - preLoaderRoute: typeof fooBarHomeImport - parentRoute: typeof FooBarImport + preLoaderRoute: typeof fooBarHomeRouteImport + parentRoute: typeof FooBarRouteImport } '/foo/bar/$id': { id: '/foo/bar/$id' path: '/$id' fullPath: '/foo/bar/$id' - preLoaderRoute: typeof fooBarDetailsImport - parentRoute: typeof FooBarImport + preLoaderRoute: typeof fooBarDetailsRouteImport + parentRoute: typeof FooBarRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/foo/bar' { + const createFileRoute: CreateFileRoute< + '/foo/bar', + FileRoutesByPath['/foo/bar']['parentRoute'], + FileRoutesByPath['/foo/bar']['id'], + FileRoutesByPath['/foo/bar']['path'], + FileRoutesByPath['/foo/bar']['fullPath'] + > +} +declare module './routes/foo/bar/home' { + const createFileRoute: CreateFileRoute< + '/foo/bar/', + FileRoutesByPath['/foo/bar/']['parentRoute'], + FileRoutesByPath['/foo/bar/']['id'], + FileRoutesByPath['/foo/bar/']['path'], + FileRoutesByPath['/foo/bar/']['fullPath'] + > +} +declare module './routes/foo/bar/details' { + const createFileRoute: CreateFileRoute< + '/foo/bar/$id', + FileRoutesByPath['/foo/bar/$id']['parentRoute'], + FileRoutesByPath['/foo/bar/$id']['id'], + FileRoutesByPath['/foo/bar/$id']['path'], + FileRoutesByPath['/foo/bar/$id']['fullPath'] + > +} + // Create and export the route tree interface FooBarRouteChildren { diff --git a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar.tsx b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar.tsx index 6ef5a1ca27..dc891bb587 100644 --- a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar.tsx +++ b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/foo/bar')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/bar!
, }) diff --git a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/details.tsx b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/details.tsx index 59c29910fe..4b4c9d6de1 100644 --- a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/details.tsx +++ b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/details.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/foo/bar/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/bar/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/home.tsx b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/home.tsx index b7a0742abf..a2d2a7e838 100644 --- a/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/home.tsx +++ b/packages/router-generator/tests/generator/virtual-inside-nested/routes/foo/bar/home.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/foo/bar/')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/bar/!
, }) diff --git a/packages/router-generator/tests/generator/virtual-inside-nested/routes/index.tsx b/packages/router-generator/tests/generator/virtual-inside-nested/routes/index.tsx index a680913ded..22cab82307 100644 --- a/packages/router-generator/tests/generator/virtual-inside-nested/routes/index.tsx +++ b/packages/router-generator/tests/generator/virtual-inside-nested/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-generator/tests/generator/virtual/routeTree.snapshot.ts b/packages/router-generator/tests/generator/virtual/routeTree.snapshot.ts index ef967d5c21..d62466ed3b 100644 --- a/packages/router-generator/tests/generator/virtual/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/virtual/routeTree.snapshot.ts @@ -9,94 +9,95 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes import { Route as rootRoute } from './routes/root' -import { Route as layoutImport } from './routes/layout' -import { Route as indexImport } from './routes/index' -import { Route as dbDashboardImport } from './routes/db/dashboard' -import { Route as pagesImport } from './routes/pages' -import { Route as HelloIndexImport } from './routes/subtree/index' -import { Route as dbDashboardInvoicesImport } from './routes/db/dashboard-invoices' -import { Route as dbDashboardIndexImport } from './routes/db/dashboard-index' -import { Route as HelloFooIndexImport } from './routes/subtree/foo/index' -import { Route as HelloFooIdImport } from './routes/subtree/foo/$id' -import { Route as dbInvoiceDetailImport } from './routes/db/invoice-detail' -import { Route as dbInvoicesIndexImport } from './routes/db/invoices-index' +import { Route as layoutRouteImport } from './routes/layout' +import { Route as indexRouteImport } from './routes/index' +import { Route as dbDashboardRouteImport } from './routes/db/dashboard' +import { Route as pagesRouteImport } from './routes/pages' +import { Route as HelloIndexRouteImport } from './routes/subtree/index' +import { Route as dbDashboardInvoicesRouteImport } from './routes/db/dashboard-invoices' +import { Route as dbDashboardIndexRouteImport } from './routes/db/dashboard-index' +import { Route as HelloFooIndexRouteImport } from './routes/subtree/foo/index' +import { Route as HelloFooIdRouteImport } from './routes/subtree/foo/$id' +import { Route as dbInvoiceDetailRouteImport } from './routes/db/invoice-detail' +import { Route as dbInvoicesIndexRouteImport } from './routes/db/invoices-index' // Create Virtual Routes -const LangImport = createFileRoute('/$lang')() +const LangRouteImport = createFileRoute('/$lang')() // Create/Update Routes -const layoutRoute = layoutImport.update({ +const layoutRoute = layoutRouteImport.update({ id: '/_layout', getParentRoute: () => rootRoute, } as any) -const LangRoute = LangImport.update({ +const LangRoute = LangRouteImport.update({ id: '/$lang', path: '/$lang', getParentRoute: () => rootRoute, } as any) -const indexRoute = indexImport.update({ +const indexRoute = indexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRoute, } as any) -const dbDashboardRoute = dbDashboardImport.update({ +const dbDashboardRoute = dbDashboardRouteImport.update({ id: '/dashboard', path: '/dashboard', getParentRoute: () => layoutRoute, } as any) -const pagesRoute = pagesImport.update({ +const pagesRoute = pagesRouteImport.update({ id: '/', path: '/', getParentRoute: () => LangRoute, } as any) -const HelloIndexRoute = HelloIndexImport.update({ +const HelloIndexRoute = HelloIndexRouteImport.update({ id: '/hello/', path: '/hello/', getParentRoute: () => layoutRoute, } as any) -const dbDashboardInvoicesRoute = dbDashboardInvoicesImport.update({ +const dbDashboardInvoicesRoute = dbDashboardInvoicesRouteImport.update({ id: '/invoices', path: '/invoices', getParentRoute: () => dbDashboardRoute, } as any) -const dbDashboardIndexRoute = dbDashboardIndexImport.update({ +const dbDashboardIndexRoute = dbDashboardIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardRoute, } as any) -const HelloFooIndexRoute = HelloFooIndexImport.update({ +const HelloFooIndexRoute = HelloFooIndexRouteImport.update({ id: '/hello/foo/', path: '/hello/foo/', getParentRoute: () => layoutRoute, } as any) -const HelloFooIdRoute = HelloFooIdImport.update({ +const HelloFooIdRoute = HelloFooIdRouteImport.update({ id: '/hello/foo/$id', path: '/hello/foo/$id', getParentRoute: () => layoutRoute, } as any) -const dbInvoiceDetailRoute = dbInvoiceDetailImport.update({ +const dbInvoiceDetailRoute = dbInvoiceDetailRouteImport.update({ id: '/$id', path: '/$id', getParentRoute: () => dbDashboardInvoicesRoute, } as any) -const dbInvoicesIndexRoute = dbInvoicesIndexImport.update({ +const dbInvoicesIndexRoute = dbInvoicesIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => dbDashboardInvoicesRoute, @@ -110,89 +111,192 @@ declare module '@tanstack/react-router' { id: '/' path: '/' fullPath: '/' - preLoaderRoute: typeof indexImport + preLoaderRoute: typeof indexRouteImport parentRoute: typeof rootRoute } '/$lang': { id: '/$lang' path: '/$lang' fullPath: '/$lang' - preLoaderRoute: typeof LangImport + preLoaderRoute: typeof LangRouteImport parentRoute: typeof rootRoute } '/_layout': { id: '/_layout' path: '' fullPath: '' - preLoaderRoute: typeof layoutImport + preLoaderRoute: typeof layoutRouteImport parentRoute: typeof rootRoute } '/$lang/': { id: '/$lang/' path: '/' fullPath: '/$lang/' - preLoaderRoute: typeof pagesImport - parentRoute: typeof LangImport + preLoaderRoute: typeof pagesRouteImport + parentRoute: typeof LangRouteImport } '/_layout/dashboard': { id: '/_layout/dashboard' path: '/dashboard' fullPath: '/dashboard' - preLoaderRoute: typeof dbDashboardImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof dbDashboardRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/': { id: '/_layout/dashboard/' path: '/' fullPath: '/dashboard/' - preLoaderRoute: typeof dbDashboardIndexImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardIndexRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/dashboard/invoices': { id: '/_layout/dashboard/invoices' path: '/invoices' fullPath: '/dashboard/invoices' - preLoaderRoute: typeof dbDashboardInvoicesImport - parentRoute: typeof dbDashboardImport + preLoaderRoute: typeof dbDashboardInvoicesRouteImport + parentRoute: typeof dbDashboardRouteImport } '/_layout/hello/': { id: '/_layout/hello/' path: '/hello' fullPath: '/hello' - preLoaderRoute: typeof HelloIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloIndexRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/dashboard/invoices/': { id: '/_layout/dashboard/invoices/' path: '/' fullPath: '/dashboard/invoices/' - preLoaderRoute: typeof dbInvoicesIndexImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoicesIndexRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/dashboard/invoices/$id': { id: '/_layout/dashboard/invoices/$id' path: '/$id' fullPath: '/dashboard/invoices/$id' - preLoaderRoute: typeof dbInvoiceDetailImport - parentRoute: typeof dbDashboardInvoicesImport + preLoaderRoute: typeof dbInvoiceDetailRouteImport + parentRoute: typeof dbDashboardInvoicesRouteImport } '/_layout/hello/foo/$id': { id: '/_layout/hello/foo/$id' path: '/hello/foo/$id' fullPath: '/hello/foo/$id' - preLoaderRoute: typeof HelloFooIdImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIdRouteImport + parentRoute: typeof layoutRouteImport } '/_layout/hello/foo/': { id: '/_layout/hello/foo/' path: '/hello/foo' fullPath: '/hello/foo' - preLoaderRoute: typeof HelloFooIndexImport - parentRoute: typeof layoutImport + preLoaderRoute: typeof HelloFooIndexRouteImport + parentRoute: typeof layoutRouteImport } } } +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + +declare module './routes/layout' { + const createFileRoute: CreateFileRoute< + '/_layout', + FileRoutesByPath['/_layout']['parentRoute'], + FileRoutesByPath['/_layout']['id'], + FileRoutesByPath['/_layout']['path'], + FileRoutesByPath['/_layout']['fullPath'] + > +} +declare module './routes/pages' { + const createFileRoute: CreateFileRoute< + '/$lang/', + FileRoutesByPath['/$lang/']['parentRoute'], + FileRoutesByPath['/$lang/']['id'], + FileRoutesByPath['/$lang/']['path'], + FileRoutesByPath['/$lang/']['fullPath'] + > +} +declare module './routes/db/dashboard' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard', + FileRoutesByPath['/_layout/dashboard']['parentRoute'], + FileRoutesByPath['/_layout/dashboard']['id'], + FileRoutesByPath['/_layout/dashboard']['path'], + FileRoutesByPath['/_layout/dashboard']['fullPath'] + > +} +declare module './routes/db/dashboard-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/', + FileRoutesByPath['/_layout/dashboard/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/']['id'], + FileRoutesByPath['/_layout/dashboard/']['path'], + FileRoutesByPath['/_layout/dashboard/']['fullPath'] + > +} +declare module './routes/db/dashboard-invoices' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices', + FileRoutesByPath['/_layout/dashboard/invoices']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices']['id'], + FileRoutesByPath['/_layout/dashboard/invoices']['path'], + FileRoutesByPath['/_layout/dashboard/invoices']['fullPath'] + > +} +declare module './routes/subtree/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/', + FileRoutesByPath['/_layout/hello/']['parentRoute'], + FileRoutesByPath['/_layout/hello/']['id'], + FileRoutesByPath['/_layout/hello/']['path'], + FileRoutesByPath['/_layout/hello/']['fullPath'] + > +} +declare module './routes/db/invoices-index' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/', + FileRoutesByPath['/_layout/dashboard/invoices/']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/']['fullPath'] + > +} +declare module './routes/db/invoice-detail' { + const createFileRoute: CreateFileRoute< + '/_layout/dashboard/invoices/$id', + FileRoutesByPath['/_layout/dashboard/invoices/$id']['parentRoute'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['id'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['path'], + FileRoutesByPath['/_layout/dashboard/invoices/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/$id' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/$id', + FileRoutesByPath['/_layout/hello/foo/$id']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/$id']['id'], + FileRoutesByPath['/_layout/hello/foo/$id']['path'], + FileRoutesByPath['/_layout/hello/foo/$id']['fullPath'] + > +} +declare module './routes/subtree/foo/index' { + const createFileRoute: CreateFileRoute< + '/_layout/hello/foo/', + FileRoutesByPath['/_layout/hello/foo/']['parentRoute'], + FileRoutesByPath['/_layout/hello/foo/']['id'], + FileRoutesByPath['/_layout/hello/foo/']['path'], + FileRoutesByPath['/_layout/hello/foo/']['fullPath'] + > +} + // Create and export the route tree interface LangRouteChildren { diff --git a/packages/router-generator/tests/generator/virtual/routes/db/dashboard-index.tsx b/packages/router-generator/tests/generator/virtual/routes/db/dashboard-index.tsx index a92fc772c3..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/db/dashboard-index.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/db/dashboard-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/db/dashboard-invoices.tsx b/packages/router-generator/tests/generator/virtual/routes/db/dashboard-invoices.tsx index bf7e5a02b2..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/db/dashboard-invoices.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/db/dashboard-invoices.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/db/dashboard.tsx b/packages/router-generator/tests/generator/virtual/routes/db/dashboard.tsx index d5b4f49706..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/db/dashboard.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/db/dashboard.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/db/invoice-detail.tsx b/packages/router-generator/tests/generator/virtual/routes/db/invoice-detail.tsx index e7be6c1910..a1ed3d4a28 100644 --- a/packages/router-generator/tests/generator/virtual/routes/db/invoice-detail.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/db/invoice-detail.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/db/invoices-index.tsx b/packages/router-generator/tests/generator/virtual/routes/db/invoices-index.tsx index f2e56721b6..960e382af9 100644 --- a/packages/router-generator/tests/generator/virtual/routes/db/invoices-index.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/db/invoices-index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/dashboard/invoices/')({ +export const Route = createFileRoute({ component: () =>
Hello /_layout/dashboard/invoices/!
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/index.tsx b/packages/router-generator/tests/generator/virtual/routes/index.tsx index a294139860..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/index.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/layout.tsx b/packages/router-generator/tests/generator/virtual/routes/layout.tsx index 2e48e48410..67e477a70a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/layout.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/layout.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout')({ +export const Route = createFileRoute({ component: () =>
Hello !
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/pages.tsx b/packages/router-generator/tests/generator/virtual/routes/pages.tsx index a942c7ce75..488a59a55a 100644 --- a/packages/router-generator/tests/generator/virtual/routes/pages.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/pages.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { createFileRoute } from '@tanstack/react-router' -export const Route = createFileRoute('/$lang/')({ +export const Route = createFileRoute({ component: RouteComponent, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/subtree/foo/$id.tsx b/packages/router-generator/tests/generator/virtual/routes/subtree/foo/$id.tsx index d8cbd795a7..8418001767 100644 --- a/packages/router-generator/tests/generator/virtual/routes/subtree/foo/$id.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/subtree/foo/$id.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/$id')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/$id!
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/subtree/foo/index.tsx b/packages/router-generator/tests/generator/virtual/routes/subtree/foo/index.tsx index 10233de496..84660c4d04 100644 --- a/packages/router-generator/tests/generator/virtual/routes/subtree/foo/index.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/subtree/foo/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/foo/')({ +export const Route = createFileRoute({ component: () =>
Hello /foo/!
, }) diff --git a/packages/router-generator/tests/generator/virtual/routes/subtree/index.tsx b/packages/router-generator/tests/generator/virtual/routes/subtree/index.tsx index 3367799b96..22cab82307 100644 --- a/packages/router-generator/tests/generator/virtual/routes/subtree/index.tsx +++ b/packages/router-generator/tests/generator/virtual/routes/subtree/index.tsx @@ -1,5 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_layout/hello/')({ +export const Route = createFileRoute({ component: () =>
Hello /!
, }) diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 91ca8ccf79..7b4aeb7f38 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -7,6 +7,7 @@ import { } from 'babel-dead-code-elimination' import { generateFromAst, parseAst } from '@tanstack/router-utils' import { tsrSplit } from '../constants' +import { routeHmrStatement } from '../route-hmr-statement' import { createIdentifier } from './path-ids' import { getFrameworkOptions } from './framework-options' import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' @@ -117,6 +118,8 @@ export function compileCodeSplitReferenceRoute( runtimeEnv: 'dev' | 'prod' codeSplitGroupings: CodeSplitGroupings targetFramework: Config['target'] + filename: string + id: string }, ): GeneratorResult { const ast = parseAst(opts) @@ -166,18 +169,13 @@ export function compileCodeSplitReferenceRoute( return } - if (t.isCallExpression(path.parentPath.node)) { - const options = resolveIdentifier( - path, - path.parentPath.node.arguments[0], - ) - + function babelHandleReference(routeOptions: t.Node | undefined) { const hasImportedOrDefinedIdentifier = (name: string) => { return programPath.scope.hasBinding(name) } - if (t.isObjectExpression(options)) { - options.properties.forEach((prop) => { + if (t.isObjectExpression(routeOptions)) { + routeOptions.properties.forEach((prop) => { if (t.isObjectProperty(prop)) { if (t.isIdentifier(prop.key)) { // If the user has not specified a split grouping for this key @@ -288,18 +286,9 @@ export function compileCodeSplitReferenceRoute( )() } - // If the TSRDummyComponent is not defined, define it - if ( - opts.runtimeEnv !== 'prod' && // only in development - !hasImportedOrDefinedIdentifier( - frameworkOptions.idents.dummyHMRComponent, - ) - ) { - programPath.pushContainer('body', [ - template.statement( - frameworkOptions.dummyHMRComponent, - )(), - ]) + // add HMR handling + if (opts.runtimeEnv !== 'prod') { + programPath.pushContainer('body', routeHmrStatement) } } @@ -369,6 +358,27 @@ export function compileCodeSplitReferenceRoute( }) } } + + if (t.isCallExpression(path.parentPath.node)) { + // createFileRoute('/')({ ... }) + const options = resolveIdentifier( + path, + path.parentPath.node.arguments[0], + ) + + babelHandleReference(options) + } else if (t.isVariableDeclarator(path.parentPath.node)) { + // createFileRoute({ ... }) + const caller = resolveIdentifier( + path, + path.parentPath.node.init, + ) + + if (t.isCallExpression(caller)) { + const options = resolveIdentifier(path, caller.arguments[0]) + babelHandleReference(options) + } + } }, }, state, @@ -406,6 +416,7 @@ export function compileCodeSplitReferenceRoute( export function compileCodeSplitVirtualRoute( opts: ParseAstOptions & { splitTargets: Array + filename: string }, ): GeneratorResult { const ast = parseAst(opts) @@ -448,12 +459,7 @@ export function compileCodeSplitVirtualRoute( return } - if (t.isCallExpression(path.parentPath.node)) { - const options = resolveIdentifier( - path, - path.parentPath.node.arguments[0], - ) - + function babelHandleVirtual(options: t.Node | undefined) { if (t.isObjectExpression(options)) { options.properties.forEach((prop) => { if (t.isObjectProperty(prop)) { @@ -497,6 +503,27 @@ export function compileCodeSplitVirtualRoute( options.properties = [] } } + + if (t.isCallExpression(path.parentPath.node)) { + // createFileRoute('/')({ ... }) + const options = resolveIdentifier( + path, + path.parentPath.node.arguments[0], + ) + + babelHandleVirtual(options) + } else if (t.isVariableDeclarator(path.parentPath.node)) { + // createFileRoute({ ... }) + const caller = resolveIdentifier( + path, + path.parentPath.node.init, + ) + + if (t.isCallExpression(caller)) { + const options = resolveIdentifier(path, caller.arguments[0]) + babelHandleVirtual(options) + } + } }, }, state, @@ -841,7 +868,7 @@ function getImportSpecifierAndPathFromLocalName( } // Reusable function to get literal value or resolve variable to literal -function resolveIdentifier(path: any, node: any) { +function resolveIdentifier(path: any, node: any): t.Node | undefined { if (t.isIdentifier(node)) { const binding = path.scope.getBinding(node.name) if ( diff --git a/packages/router-plugin/src/core/code-splitter/framework-options.ts b/packages/router-plugin/src/core/code-splitter/framework-options.ts index 909f7607d6..860178b1f1 100644 --- a/packages/router-plugin/src/core/code-splitter/framework-options.ts +++ b/packages/router-plugin/src/core/code-splitter/framework-options.ts @@ -4,9 +4,7 @@ type FrameworkOptions = { createFileRoute: string lazyFn: string lazyRouteComponent: string - dummyHMRComponent: string } - dummyHMRComponent: string } export function getFrameworkOptions(framework: string): FrameworkOptions { @@ -20,9 +18,7 @@ export function getFrameworkOptions(framework: string): FrameworkOptions { createFileRoute: 'createFileRoute', lazyFn: 'lazyFn', lazyRouteComponent: 'lazyRouteComponent', - dummyHMRComponent: 'TSRDummyComponent', }, - dummyHMRComponent: `export function TSRDummyComponent() { return null }`, } break case 'solid': @@ -32,9 +28,7 @@ export function getFrameworkOptions(framework: string): FrameworkOptions { createFileRoute: 'createFileRoute', lazyFn: 'lazyFn', lazyRouteComponent: 'lazyRouteComponent', - dummyHMRComponent: 'TSRDummyComponent', }, - dummyHMRComponent: `export function TSRDummyComponent() { return null }`, } break default: diff --git a/packages/router-plugin/src/core/route-autoimport-plugin.ts b/packages/router-plugin/src/core/route-autoimport-plugin.ts new file mode 100644 index 0000000000..36e6447e6e --- /dev/null +++ b/packages/router-plugin/src/core/route-autoimport-plugin.ts @@ -0,0 +1,102 @@ +import { generateFromAst, logDiff, parseAst } from '@tanstack/router-utils' +import babel from '@babel/core' +import * as template from '@babel/template' +import { getConfig } from './config' +import { debug, fileIsInRoutesDirectory } from './utils' +import type { Config } from './config' +import type { UnpluginFactory } from 'unplugin' + +/** + * This plugin adds imports for createFileRoute and createLazyFileRoute to the file route. + */ +export const unpluginRouteAutoimportFactory: UnpluginFactory< + Partial | undefined +> = (options = {}) => { + let ROOT: string = process.cwd() + let userConfig = options as Config + + return { + name: 'router-autoimport-plugin', + enforce: 'pre', + + transform(code, id) { + let routeType: 'createFileRoute' | 'createLazyFileRoute' + if (code.includes('export const Route = createFileRoute(')) { + routeType = 'createFileRoute' + } else if (code.includes('export const Route = createLazyFileRoute(')) { + routeType = 'createLazyFileRoute' + } else { + return null + } + + const routerImportPath = `@tanstack/${userConfig.target}-router` + + const ast = parseAst({ code }) + + let isCreateRouteFunctionImported = false as boolean + + babel.traverse(ast, { + Program: { + enter(programPath) { + programPath.traverse({ + ImportDeclaration(path) { + const importedSpecifiers = path.node.specifiers.map( + (specifier) => specifier.local.name, + ) + if ( + importedSpecifiers.includes(routeType) && + path.node.source.value === routerImportPath + ) { + isCreateRouteFunctionImported = true + } + }, + }) + }, + }, + }) + + if (!isCreateRouteFunctionImported) { + if (debug) console.info('Adding autoimports to route ', id) + + const autoImportStatement = template.statement( + `import { ${routeType} } from '${routerImportPath}'`, + )() + ast.program.body.unshift(autoImportStatement) + + const result = generateFromAst(ast, { + sourceMaps: true, + filename: id, + sourceFileName: id, + }) + if (debug) { + logDiff(code, result.code) + console.log('Output:\n', result.code + '\n\n') + } + return result + } + + return null + }, + + transformInclude(id) { + return fileIsInRoutesDirectory(id, userConfig.routesDirectory) + }, + + vite: { + configResolved(config) { + ROOT = config.root + userConfig = getConfig(options, ROOT) + }, + }, + + rspack() { + ROOT = process.cwd() + userConfig = getConfig(options, ROOT) + }, + + webpack() { + ROOT = process.cwd() + userConfig = getConfig(options, ROOT) + }, + } +} diff --git a/packages/router-plugin/src/core/route-hmr-statement.ts b/packages/router-plugin/src/core/route-hmr-statement.ts new file mode 100644 index 0000000000..73e66cf4cb --- /dev/null +++ b/packages/router-plugin/src/core/route-hmr-statement.ts @@ -0,0 +1,13 @@ +import * as template from '@babel/template' + +export const routeHmrStatement = template.statement( + ` +if (import.meta.hot) { + import.meta.hot.accept((newModule) => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route) + } + }) +} +`, +)() diff --git a/packages/router-plugin/src/core/router-code-splitter-plugin.ts b/packages/router-plugin/src/core/router-code-splitter-plugin.ts index 7c1ecc17a8..0c54f367e9 100644 --- a/packages/router-plugin/src/core/router-code-splitter-plugin.ts +++ b/packages/router-plugin/src/core/router-code-splitter-plugin.ts @@ -3,7 +3,6 @@ * https://github.com/TanStack/router/pull/3355 */ -import { isAbsolute, join, normalize } from 'node:path' import { fileURLToPath, pathToFileURL } from 'node:url' import { logDiff } from '@tanstack/router-utils' import { getConfig, splitGroupingsSchema } from './config' @@ -18,6 +17,7 @@ import { tsrSplit, } from './constants' import { decodeIdentifier } from './code-splitter/path-ids' +import { debug, fileIsInRoutesDirectory } from './utils' import type { CodeSplitGroupings, SplitRouteIdentNodes } from './constants' import type { Config } from './config' @@ -27,27 +27,10 @@ import type { TransformResult as UnpluginTransformResult, } from 'unplugin' -const debug = - process.env.TSR_VITE_DEBUG && - ['true', 'router-plugin'].includes(process.env.TSR_VITE_DEBUG) - function capitalizeFirst(str: string): string { return str.charAt(0).toUpperCase() + str.slice(1) } -function fileIsInRoutesDirectory( - filePath: string, - routesDirectory: string, -): boolean { - const routesDirectoryPath = isAbsolute(routesDirectory) - ? routesDirectory - : join(process.cwd(), routesDirectory) - - const path = normalize(filePath) - - return path.startsWith(routesDirectoryPath) -} - type BannedBeforeExternalPlugin = { identifier: string pkg: string @@ -104,8 +87,6 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory< const fromCode = detectCodeSplitGroupingsFromRoute({ code, - root: ROOT, - filename: id, }) if (fromCode.groupings) { @@ -139,11 +120,11 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory< const compiledReferenceRoute = compileCodeSplitReferenceRoute({ code, - root: ROOT, - filename: id, runtimeEnv: isProduction ? 'prod' : 'dev', codeSplitGroupings: splitGroupings, targetFramework: userConfig.target, + filename: id, + id, }) if (debug) { @@ -178,7 +159,6 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory< const result = compileCodeSplitVirtualRoute({ code, - root: ROOT, filename: id, splitTargets: grouping, }) diff --git a/packages/router-plugin/src/core/router-composed-plugin.ts b/packages/router-plugin/src/core/router-composed-plugin.ts index a8256f8b4b..31d661d6a7 100644 --- a/packages/router-plugin/src/core/router-composed-plugin.ts +++ b/packages/router-plugin/src/core/router-composed-plugin.ts @@ -1,22 +1,32 @@ import { unpluginRouterGeneratorFactory } from './router-generator-plugin' import { unpluginRouterCodeSplitterFactory } from './router-code-splitter-plugin' - +import { unpluginRouterHmrFactory } from './router-hmr-plugin' +import { unpluginRouteAutoimportFactory } from './route-autoimport-plugin' import type { Config } from './config' import type { UnpluginFactory } from 'unplugin' export const unpluginRouterComposedFactory: UnpluginFactory< Partial | undefined > = (options = {}, meta) => { - const routerGenerator = unpluginRouterGeneratorFactory(options, meta) + const getPlugin = (pluginFactory: UnpluginFactory>) => { + const plugin = pluginFactory(options, meta) + if (!Array.isArray(plugin)) { + return [plugin] + } + return plugin + } + + const routerGenerator = getPlugin(unpluginRouterGeneratorFactory) + const routerCodeSplitter = getPlugin(unpluginRouterCodeSplitterFactory) + const routeAutoImport = getPlugin(unpluginRouteAutoimportFactory) - const routerGeneratorOptions = Array.isArray(routerGenerator) - ? routerGenerator - : [routerGenerator] + const result = [...routerGenerator, ...routerCodeSplitter, ...routeAutoImport] - const routerCodeSplitter = unpluginRouterCodeSplitterFactory(options, meta) - const routerCodeSplitterOptions = Array.isArray(routerCodeSplitter) - ? routerCodeSplitter - : [routerCodeSplitter] + const isProduction = process.env.NODE_ENV === 'production' - return [...routerGeneratorOptions, ...routerCodeSplitterOptions] + if (!isProduction && !options.autoCodeSplitting) { + const routerHmr = getPlugin(unpluginRouterHmrFactory) + result.push(...routerHmr) + } + return result } diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index f4cec60235..39829d60a7 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -82,12 +82,23 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< }) }, vite: { - async configResolved(config) { + configResolved(config) { ROOT = config.root userConfig = getConfig(options, ROOT) + // if (config.command === 'serve') { + // await run(generate) + // } + }, + async buildStart() { + if (this.environment.name === 'server') { + // When building in environment mode, we only need to generate routes + // for the client environment + return + } await run(generate) }, + sharedDuringBuild: true, }, rspack(compiler) { userConfig = getConfig(options, ROOT) diff --git a/packages/router-plugin/src/core/router-hmr-plugin.ts b/packages/router-plugin/src/core/router-hmr-plugin.ts new file mode 100644 index 0000000000..c909130eac --- /dev/null +++ b/packages/router-plugin/src/core/router-hmr-plugin.ts @@ -0,0 +1,65 @@ +import { generateFromAst, logDiff, parseAst } from '@tanstack/router-utils' +import { getConfig } from './config' +import { routeHmrStatement } from './route-hmr-statement' +import { debug, fileIsInRoutesDirectory } from './utils' +import type { Config } from './config' +import type { UnpluginFactory } from 'unplugin' + +/** + * This plugin adds HMR support for file routes. + * It is only added to the composed plugin in dev when autoCodeSplitting is disabled, since the code splitting plugin + * handles HMR for code-split routes itself. + */ +export const unpluginRouterHmrFactory: UnpluginFactory< + Partial | undefined +> = (options = {}) => { + let ROOT: string = process.cwd() + let userConfig = options as Config + + return { + name: 'router-hmr-plugin', + enforce: 'pre', + + transform(code, id) { + if (!code.includes('export const Route = createFileRoute(')) { + return null + } + + if (debug) console.info('Adding HMR handling to route ', id) + + const ast = parseAst({ code }) + ast.program.body.push(routeHmrStatement) + const result = generateFromAst(ast, { + sourceMaps: true, + filename: id, + sourceFileName: id, + }) + if (debug) { + logDiff(code, result.code) + console.log('Output:\n', result.code + '\n\n') + } + return result + }, + + transformInclude(id) { + return fileIsInRoutesDirectory(id, userConfig.routesDirectory) + }, + + vite: { + configResolved(config) { + ROOT = config.root + userConfig = getConfig(options, ROOT) + }, + }, + + rspack() { + ROOT = process.cwd() + userConfig = getConfig(options, ROOT) + }, + + webpack() { + ROOT = process.cwd() + userConfig = getConfig(options, ROOT) + }, + } +} diff --git a/packages/router-plugin/src/core/utils.ts b/packages/router-plugin/src/core/utils.ts new file mode 100644 index 0000000000..d866a2241f --- /dev/null +++ b/packages/router-plugin/src/core/utils.ts @@ -0,0 +1,18 @@ +import { isAbsolute, join, normalize } from 'node:path' + +export const debug = + process.env.TSR_VITE_DEBUG && + ['true', 'router-plugin'].includes(process.env.TSR_VITE_DEBUG) + +export function fileIsInRoutesDirectory( + filePath: string, + routesDirectory: string, +): boolean { + const routesDirectoryPath = isAbsolute(routesDirectory) + ? routesDirectory + : join(process.cwd(), routesDirectory) + + const path = normalize(filePath) + + return path.startsWith(routesDirectoryPath) +} diff --git a/packages/router-plugin/src/vite.ts b/packages/router-plugin/src/vite.ts index a66e942419..aad06e20cc 100644 --- a/packages/router-plugin/src/vite.ts +++ b/packages/router-plugin/src/vite.ts @@ -43,6 +43,7 @@ const TanStackRouterCodeSplitterVite = createVitePlugin( * ``` */ const TanStackRouterVite = createVitePlugin(unpluginRouterComposedFactory) +const tanstackRouter = TanStackRouterVite export default TanStackRouterVite export { @@ -50,5 +51,7 @@ export { TanStackRouterGeneratorVite, TanStackRouterCodeSplitterVite, TanStackRouterVite, + tanstackRouter, } + export type { Config } diff --git a/packages/router-plugin/tests/code-splitter.test.ts b/packages/router-plugin/tests/code-splitter.test.ts index ec1bbec5e9..c4fa076cec 100644 --- a/packages/router-plugin/tests/code-splitter.test.ts +++ b/packages/router-plugin/tests/code-splitter.test.ts @@ -67,8 +67,8 @@ describe('code-splitter works', () => { const compileResult = compileCodeSplitReferenceRoute({ code, - root: dirs.files, filename, + id: filename, runtimeEnv: NODE_ENV === 'production' ? 'prod' : 'dev', codeSplitGroupings: grouping, targetFramework: framework, @@ -91,7 +91,6 @@ describe('code-splitter works', () => { const splitResult = compileCodeSplitVirtualRoute({ code, - root: dirs.files, filename: `${filename}?${ident}`, splitTargets: targets, }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx index 0e48584a4a..d13fdc0a9a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx index dffbd70c4d..abe95e1645 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/')({ interface DemoProps { title: string; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx index 26de4ca825..45da5048e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: isEnabled ? TrueImport.loader : falseLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx index 0fbc312626..7b57f3ebd9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: importedLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx index 0c88bfe0ad..a0ab6c5ab1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/export-default-component-and-normal-notFound.tsx @@ -12,6 +12,10 @@ export default function Home() {

{one}

; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx index c395bc44ee..ae10058a91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx index 8a221122d7..1207dee6d6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx index e23a496a74..f33aef1023 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: importedLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx index 968e6633d4..19b8875997 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx index 0701029aa3..21a9069938 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx index 63787a44d6..9f608978f5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx index 13cfc22f7b..763d8ff26c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), pendingComponent: importedPendingComponent }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx index c4a5d9dbc4..7baa2e3057 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: importedLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx index 931f6bce74..c19e2898d5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ }); Route.addChildren([]); export const test = 'test'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx index b229826efb..8b00e0aa9c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx @@ -30,6 +30,10 @@ export const Route = createFileRoute('/')({ }, component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx index dc266fa611..c5f946a469 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: importedLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx index b1df7f4cf9..49922c6c9d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: importedLoader }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx index 2d40731c37..047970676d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx @@ -14,6 +14,10 @@ export const Route = createFileRoute('/_layout')({ export const SIDEBAR_WIDTH = '150px'; export const SIDEBAR_MINI_WIDTH = '80px'; const ASIDE_WIDTH = '250px'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx index 7104674b73..99fdcb621a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx index 3efbe3595d..5dc9c6c39c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/')({ interface DemoProps { title: string; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx index a126bb6807..e59fb6b170 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx index 65f2bfb918..1a97263515 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx index 762ac36b1d..fc60c1de1c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/export-default-component-and-normal-notFound.tsx @@ -12,6 +12,10 @@ export default function Home() {

{one}

; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx index d6e6fa8152..0c2b2f0f7f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx index b89aede427..c189737cc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx index 9169f0b966..1519ca0183 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx index 9b38429966..27aa2140f6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx index 108ad65fde..7111e86e76 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx index 4df3a0edc2..5622edf3e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx index 8a12860d09..b01e0aec42 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx index b8c6e8c0ff..f2947f2004 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx index a179d36c0b..12626addb0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ }); Route.addChildren([]); export const test = 'test'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx index 92f502edde..bb9a25ce5b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx @@ -26,6 +26,10 @@ export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx index bf8ae8af25..f99d37f872 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx index 5987f84c0a..6f5453d797 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx index c8da9752f0..9f37f2c2ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx @@ -14,6 +14,10 @@ export const Route = createFileRoute('/_layout')({ export const SIDEBAR_WIDTH = '150px'; export const SIDEBAR_MINI_WIDTH = '80px'; const ASIDE_WIDTH = '250px'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx index 25bae96925..26e6cb91cf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx index 9abb4a9d61..c26129ff26 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/')({ interface DemoProps { title: string; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx index 279773de15..6f59f24540 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx index 0fe0b8418d..b0e77520d1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx index 77e009583c..027607711c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/export-default-component-and-normal-notFound.tsx @@ -12,6 +12,10 @@ export default function Home() {

{one}

; } -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx index 01360ef869..41dd964317 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx @@ -8,6 +8,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx index d8355986bf..a79f652e83 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx index 4e0beddab5..abfa009cb3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx index b749bed2ea..d7af841661 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx @@ -4,6 +4,10 @@ import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx index 26951c2d0a..3fd46aa9ae 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx index 54565ca6f1..9bfc309859 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx index 02997dc053..de977998cf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx @@ -6,6 +6,17 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx index c397f9dccc..a6c20d87ad 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx index ff044594ad..b452135b17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ }); Route.addChildren([]); export const test = 'test'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx index 05f26ecf0d..769c2b9f63 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx @@ -26,6 +26,10 @@ export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx index 66da0c232a..37d9d53304 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx index 8db833f30c..a5c16d16d3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), loader: lazyFn($$splitLoaderImporter, 'loader') }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx index eb4fd485bb..fec84f0be8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx @@ -14,6 +14,10 @@ export const Route = createFileRoute('/_layout')({ export const SIDEBAR_WIDTH = '150px'; export const SIDEBAR_MINI_WIDTH = '80px'; const ASIDE_WIDTH = '250px'; -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx index 6cfb35e525..103067c81a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx @@ -116,9 +116,9 @@ export default function VersionIndex() {

Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx index f62b65b5eb..e2375ceb8b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx @@ -6,6 +6,10 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx index 5f36162818..b0356f3d87 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx index 56e28dce37..8efe2d0465 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx @@ -7,6 +7,10 @@ export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) }); -export function TSRDummyComponent() { - return null; +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); } \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/test-files/react/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/test-files/react/useStateDestructure.tsx index 6a1a086eaf..8f79e69bf0 100644 --- a/packages/router-plugin/tests/code-splitter/test-files/react/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/test-files/react/useStateDestructure.tsx @@ -159,9 +159,9 @@ export default function VersionIndex() { lg:text-xl lg:max-w-[600px]" > Full-document SSR, Streaming, Server Functions, bundling and more, - powered by TanStack Router, Vinxi,{' '} - Nitro and Vite. Ready to deploy to - your favorite hosting provider. + powered by TanStack Router, Nitro{' '} + and Vite. Ready to deploy to your favorite hosting + provider.

diff --git a/packages/router-plugin/tests/detect-route-codesplit-groupings.test.ts b/packages/router-plugin/tests/detect-route-codesplit-groupings.test.ts index 49b6b40c0a..899ace556b 100644 --- a/packages/router-plugin/tests/detect-route-codesplit-groupings.test.ts +++ b/packages/router-plugin/tests/detect-route-codesplit-groupings.test.ts @@ -76,8 +76,7 @@ describe('detectCodeSplitGroupingsFromRoute - success', () => { ({ code, expectedGrouping, expectedRouteId }) => { const result = detectCodeSplitGroupingsFromRoute({ code: code, - filename: 'test.ts', - root: '/src', + sourceFilename: 'test.ts', }) expect(result.groupings).toEqual(expectedGrouping) @@ -121,8 +120,7 @@ describe('detectCodeSplitGroupingsFromRoute - fail', () => { expect(() => detectCodeSplitGroupingsFromRoute({ code: code, - filename: 'test.ts', - root: '/src', + sourceFilename: 'test.ts', }), ).toThrowError() }) diff --git a/packages/router-utils/src/ast.ts b/packages/router-utils/src/ast.ts index fbf6d970d5..586f1efb90 100644 --- a/packages/router-utils/src/ast.ts +++ b/packages/router-utils/src/ast.ts @@ -1,27 +1,21 @@ import { parse } from '@babel/parser' import _generate from '@babel/generator' import type { GeneratorOptions, GeneratorResult } from '@babel/generator' -import type { ParseResult } from '@babel/parser' +import type { ParseResult, ParserOptions } from '@babel/parser' import type * as _babel_types from '@babel/types' -export type ParseAstOptions = { +export type ParseAstOptions = ParserOptions & { code: string - filename: string - root: string - env?: 'server' | 'client' | 'ssr' } -export function parseAst( - opts: ParseAstOptions, -): ParseResult<_babel_types.File> { - return parse(opts.code, { +export function parseAst({ + code, + ...opts +}: ParseAstOptions): ParseResult<_babel_types.File> { + return parse(code, { plugins: ['jsx', 'typescript'], sourceType: 'module', - ...{ - root: opts.root, - filename: opts.filename, - env: opts.env, - }, + ...opts, }) } diff --git a/packages/server-functions-plugin/README.md b/packages/server-functions-plugin/README.md index 9eda7c0fc3..7f4b22702f 100644 --- a/packages/server-functions-plugin/README.md +++ b/packages/server-functions-plugin/README.md @@ -10,7 +10,7 @@ Create a new instance of the plugin with the following options: const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ // This is the ID that will be available to look up and import // our server function manifest and resolve its module - manifestVirtualImportId: 'tsr:server-fn-manifest', + manifestVirtualImportId: 'tanstack:server-fn-manifest', client: { getRuntimeCode: () => `import { createClientRpc } from '@tanstack/react-start/client-runtime'`, @@ -71,7 +71,7 @@ function createClientRpc(functionId: string) { In your server handler, you can import the manifest and use it to look up and dynamically import the server function you want to call. ```ts -import serverFnManifest from 'tsr:server-fn-manifest' +import serverFnManifest from 'tanstack:server-fn-manifest' export const handler = async (req: Request) => { const functionId = req.url.split('/').pop() diff --git a/packages/server-functions-plugin/src/index.ts b/packages/server-functions-plugin/src/index.ts index dfa8993b45..cf55102643 100644 --- a/packages/server-functions-plugin/src/index.ts +++ b/packages/server-functions-plugin/src/index.ts @@ -1,6 +1,9 @@ import { mkdirSync, readFileSync, writeFileSync } from 'node:fs' import path from 'node:path' -import { TanStackDirectiveFunctionsPlugin } from '@tanstack/directive-functions-plugin' +import { + TanStackDirectiveFunctionsPlugin, + TanStackDirectiveFunctionsPluginEnv, +} from '@tanstack/directive-functions-plugin' import type { Plugin } from 'vite' import type { DirectiveFn, @@ -25,6 +28,9 @@ export type ServerFnPluginOpts = { server: ServerFnPluginEnvOpts } +const manifestFilename = + '.tanstack-start/build/server/server-functions-manifest.json' + export type ServerFnPluginEnvOpts = { getRuntimeCode: () => string replacer: ReplacerFn @@ -36,8 +42,6 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { server: Array } { const ROOT = process.cwd() - const manifestFilename = - 'node_modules/.tanstack-start/server-functions-manifest.json' globalThis.TSR_directiveFnsById = {} @@ -79,7 +83,6 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { getRuntimeCode: opts.client.getRuntimeCode, replacer: opts.client.replacer, onDirectiveFnsById, - // devSplitImporter: `(globalThis.app.getRouter('server').internals.devServer.ssrLoadModule)`, }), { // Now that we have the directiveFnsById, we need to create a new @@ -93,7 +96,9 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { // build. // Ensure the manifest directory exists - mkdirSync(path.dirname(manifestFilename), { recursive: true }) + mkdirSync(path.join(ROOT, path.dirname(manifestFilename)), { + recursive: true, + }) // Write the manifest to disk writeFileSync( @@ -124,7 +129,6 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { getRuntimeCode: opts.ssr.getRuntimeCode, replacer: opts.ssr.replacer, onDirectiveFnsById, - // devSplitImporter: `(globalThis.app.getRouter('server').internals.devServer.ssrLoadModule)`, }), ], server: [ @@ -185,3 +189,167 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { ], } } + +export function TanStackServerFnPluginEnv(opts: { + manifestVirtualImportId: string + client: { + envName?: string + getRuntimeCode: () => string + replacer: ReplacerFn + } + server: { + envName?: string + getRuntimeCode: () => string + replacer: ReplacerFn + } +}): Array { + opts = { + ...opts, + client: { + ...opts.client, + envName: opts.client.envName || 'client', + }, + server: { + ...opts.server, + envName: opts.server.envName || 'server', + }, + } + + const root = process.cwd() + + globalThis.TSR_directiveFnsById = {} + + const onDirectiveFnsById = (d: Record) => { + // When directives are compiled, save them to our global variable + // This variable will be used both during development to incrementally + // look up server functions and during build/production to produce a + // static manifest that can be read by the server build + Object.assign( + globalThis.TSR_directiveFnsById, + Object.fromEntries( + Object.entries(d).map(([id, fn]) => [ + id, + { + ...fn, + // This importer is required for the development server to + // work. It's also required in production, but cannot be serialized + // into the manifest because it's a dynamic import. Instead, as you'll + // see below, we augment the manifest output with a code-generated importer + // that looks exactly like this. + importer: () => import(fn.extractedFilename), + }, + ]), + ), + ) + } + + const directive = 'use server' + const directiveLabel = 'Server Function' + + return [ + // client: [ + // The client plugin is used to compile the client directives + // and save them so we can create a manifest + TanStackDirectiveFunctionsPluginEnv({ + directive, + directiveLabel, + onDirectiveFnsById, + environments: { + client: { + envLabel: 'Client', + getRuntimeCode: opts.client.getRuntimeCode, + replacer: opts.client.replacer, + }, + server: { + envLabel: 'Server', + getRuntimeCode: opts.server.getRuntimeCode, + replacer: opts.server.replacer, + }, + }, + }), + { + // Now that we have the directiveFnsById, we need to create a new + // virtual module that can be used to import that manifest + name: 'tanstack-start-server-fn-vite-plugin-build-client', + applyToEnvironment(environment) { + return environment.name === opts.client.envName + }, + buildEnd() { + // In production, we create a manifest so we can + // access it later in the server build, which likely does not run in the + // same vite build environment. This is essentially a + // serialized state transfer from the client build to the server + // build. + + // Ensure the manifest directory exists + mkdirSync(path.join(root, path.dirname(manifestFilename)), { + recursive: true, + }) + + // Write the manifest to disk + writeFileSync( + path.join(root, manifestFilename), + JSON.stringify( + Object.fromEntries( + Object.entries(globalThis.TSR_directiveFnsById).map( + ([id, fn]) => [ + id, + { + functionName: fn.functionName, + extractedFilename: fn.extractedFilename, + }, + ], + ), + ), + ), + ) + }, + }, + { + // On the server, we need to be able to read the server-function manifest from the client build. + // This is likely used in the handler for server functions, so we can find the server function + // by its ID, import it, and call it. We can't do this in memory here because the builds happen in isolation, + // so the manifest is like a serialized state from the client build to the server build + name: 'tanstack-start-server-fn-vite-plugin-manifest-server', + enforce: 'pre', + // applyToEnvironment(environment) { + // return environment.name === opts.server.envName + // }, + resolveId: (id) => (id === opts.manifestVirtualImportId ? id : null), + load(id) { + if (id !== opts.manifestVirtualImportId) return null + + // In development, we **can** use the in-memory manifest, and we should + // since it will be incrementally updated as we use the app and dynamic + // imports are triggered. + if (process.env.NODE_ENV === 'development') { + return `export default globalThis.TSR_directiveFnsById` + } + + // In production, we need to read the manifest from the client build. + // The manifest at that point should contain the full set of server functions + // that were found in the client build. + const manifest = JSON.parse( + readFileSync(path.join(root, manifestFilename), 'utf-8'), + ) + + // The manifest has a lot of information, but for now we only need to + // provide the function ID for lookup and the importer for loading + // This should keep the manifest small for now. + const manifestWithImports = ` + export default {${Object.entries(manifest) + .map( + ([id, fn]: any) => + `'${id}': { + functionName: '${fn.functionName}', + importer: () => import(${JSON.stringify(fn.extractedFilename)}) + }`, + ) + .join(',')}}` + + return manifestWithImports + }, + }, + // ], + ] +} diff --git a/packages/solid-router/src/HeadContent.tsx b/packages/solid-router/src/HeadContent.tsx index 512903273a..8caac5bf9f 100644 --- a/packages/solid-router/src/HeadContent.tsx +++ b/packages/solid-router/src/HeadContent.tsx @@ -59,8 +59,8 @@ export const useTags = () => { }) const links = useRouterState({ - select: (state) => - state.matches + select: (state) => { + const constructed = state.matches .map((match) => match.links!) .filter(Boolean) .flat(1) @@ -69,7 +69,27 @@ export const useTags = () => { attrs: { ...link, }, - })) as Array, + })) satisfies Array + + const manifest = router.ssr?.manifest + + // These are the assets extracted from the ViteManifest + // using the `startManifestPlugin` + const assets = state.matches + .map((match) => manifest?.routes[match.routeId]?.assets ?? []) + .filter(Boolean) + .flat(1) + .filter((asset) => asset.tag === 'link') + .map( + (asset) => + ({ + tag: 'link', + attrs: asset.attrs, + }) satisfies RouterManagedTag, + ) + + return [...constructed, ...assets] + }, }) const preloadMeta = useRouterState({ diff --git a/packages/solid-router/src/fileRoute.ts b/packages/solid-router/src/fileRoute.ts index b20789e938..427416d193 100644 --- a/packages/solid-router/src/fileRoute.ts +++ b/packages/solid-router/src/fileRoute.ts @@ -28,6 +28,7 @@ import type { RouteIds, RouteLoaderFn, UpdatableRouteOptions, + UseNavigateResult, } from '@tanstack/router-core' import type { UseLoaderDepsRoute } from './useLoaderDeps' import type { UseLoaderDataRoute } from './useLoaderData' @@ -41,8 +42,13 @@ export function createFileRoute< TFullPath extends RouteConstraints['TFullPath'] = FileRoutesByPath[TFilePath]['fullPath'], >( - path: TFilePath, + path?: TFilePath, ): FileRoute['createRoute'] { + if (typeof path === 'object') { + return new FileRoute(path, { + silent: true, + }).createRoute(path) as any + } return new FileRoute(path, { silent: true, }).createRoute @@ -63,7 +69,7 @@ export class FileRoute< silent?: boolean constructor( - public path: TFilePath, + public path?: TFilePath, _opts?: { silent: boolean }, ) { this.silent = _opts?.silent @@ -159,6 +165,18 @@ export function FileRouteLoader< return (loaderFn) => loaderFn as any } +declare module '@tanstack/router-core' { + export interface LazyRoute { + useMatch: UseMatchRoute + useRouteContext: UseRouteContextRoute + useSearch: UseSearchRoute + useParams: UseParamsRoute + useLoaderDeps: UseLoaderDepsRoute + useLoaderData: UseLoaderDataRoute + useNavigate: () => UseNavigateResult + } +} + export class LazyRoute { options: { id: string @@ -208,7 +226,7 @@ export class LazyRoute { return useLoaderData({ ...opts, from: this.options.id } as any) } - useNavigate = () => { + useNavigate = (): UseNavigateResult => { const router = useRouter() return useNavigate({ from: router.routesById[this.options.id].fullPath }) } @@ -229,6 +247,10 @@ export function createLazyRoute< export function createLazyFileRoute< TFilePath extends keyof FileRoutesByPath, TRoute extends FileRoutesByPath[TFilePath]['preLoaderRoute'], ->(id: TFilePath) { +>(id: TFilePath): (opts: LazyRouteOptions) => LazyRoute { + if (typeof id === 'object') { + return new LazyRoute(id) as any + } + return (opts: LazyRouteOptions) => new LazyRoute({ id, ...opts }) } diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index fc7c0bfd29..d25d73545a 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -207,6 +207,8 @@ export type { InjectedHtmlEntry, RouterErrorSerializer, SerializerExtensions, + CreateFileRoute, + CreateLazyFileRoute, } from '@tanstack/router-core' export { diff --git a/packages/solid-router/src/router.ts b/packages/solid-router/src/router.ts index c2bbf24e7a..bc5af4f758 100644 --- a/packages/solid-router/src/router.ts +++ b/packages/solid-router/src/router.ts @@ -1,4 +1,5 @@ import { RouterCore } from '@tanstack/router-core' +import { createFileRoute, createLazyFileRoute } from './fileRoute' import type { RouterHistory } from '@tanstack/history' import type { AnyRoute, @@ -101,3 +102,11 @@ export class Router< super(options) } } + +if (typeof globalThis !== 'undefined') { + ;(globalThis as any).createFileRoute = createFileRoute + ;(globalThis as any).createLazyFileRoute = createLazyFileRoute +} else if (typeof window !== 'undefined') { + ;(window as any).createFileRoute = createFileRoute + ;(window as any).createFileRoute = createLazyFileRoute +} diff --git a/packages/solid-router/src/useBlocker.tsx b/packages/solid-router/src/useBlocker.tsx index 5568c120f2..a769899600 100644 --- a/packages/solid-router/src/useBlocker.tsx +++ b/packages/solid-router/src/useBlocker.tsx @@ -180,7 +180,10 @@ export function useBlocker( location: HistoryLocation, ): AnyShouldBlockFnLocation { const parsedLocation = router.parseLocation(undefined, location) - const matchedRoutes = router.getMatchedRoutes(parsedLocation) + const matchedRoutes = router.getMatchedRoutes( + parsedLocation.pathname, + undefined, + ) if (matchedRoutes.foundRoute === undefined) { throw new Error(`No route found for location ${location.href}`) } diff --git a/packages/solid-router/tests/redirect.test.tsx b/packages/solid-router/tests/redirect.test.tsx index adb4b4c3c7..f774477094 100644 --- a/packages/solid-router/tests/redirect.test.tsx +++ b/packages/solid-router/tests/redirect.test.tsx @@ -1,21 +1,32 @@ import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library' -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { Link, RouterProvider, + createBrowserHistory, createMemoryHistory, createRootRoute, createRoute, createRouter, + invariant, redirect, useRouter, } from '../src' import { sleep } from './utils' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) afterEach(() => { + history.destroy() vi.clearAllMocks() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') @@ -228,7 +239,7 @@ describe('redirect', () => { indexRoute, finalRoute, ]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) @@ -273,11 +284,18 @@ describe('redirect', () => { routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), // Mock server mode isServer: true, + history: createMemoryHistory({ + initialEntries: ['/'], + }), }) await router.load() - expect(router.state.redirect).toEqual({ + expect(router.state.redirect).toBeDefined() + expect(router.state.redirect).toBeInstanceOf(Response) + invariant(router.state.redirect) + + expect(router.state.redirect.options).toEqual({ _fromLocation: expect.objectContaining({ hash: '', href: '/', @@ -286,65 +304,66 @@ describe('redirect', () => { searchStr: '', }), to: '/about', - headers: {}, - reloadDocument: false, href: '/about', - isRedirect: true, - routeId: '/', - routerCode: 'BEFORE_LOAD', statusCode: 307, }) }) + }) - test('when `redirect` is thrown in `loader`', async () => { - const rootRoute = createRootRoute() - - const indexRoute = createRoute({ - path: '/', - getParentRoute: () => rootRoute, - loader: () => { - throw redirect({ - to: '/about', - }) - }, - }) - - const aboutRoute = createRoute({ - path: '/about', - getParentRoute: () => rootRoute, - component: () => { - return 'About' - }, - }) + test('when `redirect` is thrown in `loader`', async () => { + const rootRoute = createRootRoute() + + const indexRoute = createRoute({ + path: '/', + getParentRoute: () => rootRoute, + loader: () => { + throw redirect({ + to: '/about', + }) + }, + }) - const router = createRouter({ - history: createMemoryHistory({ - initialEntries: ['/'], - }), - routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), - }) + const aboutRoute = createRoute({ + path: '/about', + getParentRoute: () => rootRoute, + component: () => { + return 'About' + }, + }) + const router = createRouter({ + history: createMemoryHistory({ + initialEntries: ['/'], + }), + routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), // Mock server mode - router.isServer = true - - await router.load() + isServer: true, + }) - expect(router.state.redirect).toEqual({ - _fromLocation: expect.objectContaining({ - hash: '', - href: '/', - pathname: '/', - search: {}, - searchStr: '', - }), - to: '/about', - headers: {}, - href: '/about', - isRedirect: true, - reloadDocument: false, - routeId: '/', - statusCode: 307, - }) + await router.load() + + const currentRedirect = router.state.redirect + + expect(currentRedirect).toBeDefined() + expect(currentRedirect).toBeInstanceOf(Response) + invariant(currentRedirect) + expect(currentRedirect.status).toEqual(307) + expect(currentRedirect.headers.get('Location')).toEqual('/about') + expect(currentRedirect.options).toEqual({ + _fromLocation: { + hash: '', + href: '/', + pathname: '/', + search: {}, + searchStr: '', + state: { + __TSR_index: 0, + key: currentRedirect.options._fromLocation!.state.key, + }, + }, + href: '/about', + to: '/about', + statusCode: 307, }) }) }) diff --git a/packages/solid-start-client/README.md b/packages/solid-start-client/README.md index fd6e98ac6d..273667a4af 100644 --- a/packages/solid-start-client/README.md +++ b/packages/solid-start-client/README.md @@ -1,33 +1,9 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! +# TanStack Solid Start - Client - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +This package is not meant to be used directly. It is a dependency of [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +TanStack Solid Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 63e7524577..6fdd87d524 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -69,8 +69,7 @@ "cookie-es": "^1.2.2", "jsesc": "^3.1.0", "tiny-invariant": "^1.3.3", - "tiny-warning": "^1.0.3", - "vinxi": "^0.5.3" + "tiny-warning": "^1.0.3" }, "devDependencies": { "@solidjs/testing-library": "^0.8.10", diff --git a/packages/solid-start-client/src/index.tsx b/packages/solid-start-client/src/index.tsx index 6b9c30ee8f..3aebc26282 100644 --- a/packages/solid-start-client/src/index.tsx +++ b/packages/solid-start-client/src/index.tsx @@ -1,6 +1,15 @@ -/// -export { mergeHeaders } from '@tanstack/start-client-core' -export { startSerializer } from '@tanstack/start-client-core' +export { + mergeHeaders, + startSerializer, + createIsomorphicFn, + createServerFn, + createMiddleware, + registerGlobalMiddleware, + globalMiddleware, + serverOnly, + clientOnly, + json, +} from '@tanstack/start-client-core' export { type DehydratedRouter, type ClientExtractedBaseEntry, @@ -10,16 +19,10 @@ export { type ClientExtractedPromise, type ClientExtractedStream, type ResolvePromiseState, -} from '@tanstack/start-client-core' -export { - createIsomorphicFn, type IsomorphicFn, type ServerOnlyFn, type ClientOnlyFn, type IsomorphicFnBase, -} from '@tanstack/start-client-core' -export { createServerFn } from '@tanstack/start-client-core' -export { type ServerFn as FetchFn, type ServerFnCtx as FetchFnCtx, type CompiledFetcherFnOptions, @@ -31,43 +34,33 @@ export { type ServerFn, type ServerFnCtx, type ServerFnResponseType, -} from '@tanstack/start-client-core' -export { type JsonResponse } from '@tanstack/start-client-core' -export { - createMiddleware, + type JsonResponse, type IntersectAllValidatorInputs, type IntersectAllValidatorOutputs, - type MiddlewareServerFn, - type AnyMiddleware, - type MiddlewareOptions, - type MiddlewareWithTypes, - type MiddlewareValidator, - type MiddlewareServer, - type MiddlewareAfterClient, - type MiddlewareAfterMiddleware, - type MiddlewareAfterServer, - type Middleware, - type MiddlewareClientFnOptions, - type MiddlewareClientFnResult, - type MiddlewareClientNextFn, - type ClientResultWithContext, + type FunctionMiddlewareServerFn, + type AnyFunctionMiddleware, + type FunctionMiddlewareOptions, + type FunctionMiddlewareWithTypes, + type FunctionMiddlewareValidator, + type FunctionMiddlewareServer, + type FunctionMiddlewareAfterClient, + type FunctionMiddlewareAfterServer, + type FunctionMiddleware, + type FunctionMiddlewareClientFnOptions, + type FunctionMiddlewareClientFnResult, + type FunctionMiddlewareClientNextFn, + type FunctionClientResultWithContext, type AssignAllClientContextBeforeNext, type AssignAllMiddleware, type AssignAllServerContext, - type MiddlewareAfterValidator, - type MiddlewareClientFn, - type MiddlewareServerFnResult, - type MiddlewareClient, - type MiddlewareServerFnOptions, - type MiddlewareServerNextFn, - type ServerResultWithContext, -} from '@tanstack/start-client-core' -export { - registerGlobalMiddleware, - globalMiddleware, + type FunctionMiddlewareAfterValidator, + type FunctionMiddlewareClientFn, + type FunctionMiddlewareServerFnResult, + type FunctionMiddlewareClient, + type FunctionMiddlewareServerFnOptions, + type FunctionMiddlewareServerNextFn, + type FunctionServerResultWithContext, } from '@tanstack/start-client-core' -export { serverOnly, clientOnly } from '@tanstack/start-client-core' -export { json } from '@tanstack/start-client-core' export { Meta } from './Meta' export { Scripts } from './Scripts' export { StartClient } from './StartClient' diff --git a/packages/solid-start-client/src/renderRSC.tsx b/packages/solid-start-client/src/renderRSC.tsx index 7c534ebf3a..83735d882a 100644 --- a/packages/solid-start-client/src/renderRSC.tsx +++ b/packages/solid-start-client/src/renderRSC.tsx @@ -1,6 +1,6 @@ // TODO: RSCs // // @ts-expect-error -// import * as reactDom from '@vinxi/react-server-dom/client' +// import * as reactDom from 'react-server-dom/client' // import { isValidElement } from 'solid-js' import invariant from 'tiny-invariant' import type * as Solid from 'solid-js' diff --git a/packages/solid-start-client/src/routesManifest.ts b/packages/solid-start-client/src/routesManifest.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/solid-start-client/src/useServerFn.ts b/packages/solid-start-client/src/useServerFn.ts index c798c871c9..c10e73021a 100644 --- a/packages/solid-start-client/src/useServerFn.ts +++ b/packages/solid-start-client/src/useServerFn.ts @@ -17,12 +17,8 @@ export function useServerFn) => Promise>( return res } catch (err) { if (isRedirect(err)) { - const resolvedRedirect = router.resolveRedirect({ - ...err, - _fromLocation: router.state.location, - }) - - return router.navigate(resolvedRedirect) + err.options._fromLocation = router.state.location + return router.navigate(router.resolveRedirect(err).options) } throw err diff --git a/packages/solid-start-config/README.md b/packages/solid-start-config/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/solid-start-config/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/solid-start-config/eslint.config.js b/packages/solid-start-config/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/solid-start-config/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/solid-start-config/package.json b/packages/solid-start-config/package.json deleted file mode 100644 index 0e730177d0..0000000000 --- a/packages/solid-start-config/package.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "name": "@tanstack/solid-start-config", - "version": "1.120.3", - "description": "Modern and scalable routing for Solid applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "solid", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "build": "tsc", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0;vitest", - "test:eslint": "eslint ./src", - "test:types": "exit 0; vitest" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/router-core": "workspace:^", - "@tanstack/router-generator": "workspace:^", - "@tanstack/router-plugin": "workspace:^", - "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/solid-start-plugin": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "vite-plugin-solid": "^2.11.2", - "import-meta-resolve": "^4.1.0", - "nitropack": "^2.10.4", - "ofetch": "^1.4.1", - "vite": "^6.1.0", - "vinxi": "0.5.3", - "zod": "^3.24.2" - }, - "peerDependencies": { - "solid-js": ">=1.0.0", - "vite": "^6.0.0" - } -} diff --git a/packages/solid-start-config/src/index.ts b/packages/solid-start-config/src/index.ts deleted file mode 100644 index 3a5c597f0d..0000000000 --- a/packages/solid-start-config/src/index.ts +++ /dev/null @@ -1,670 +0,0 @@ -import path from 'node:path' -import { existsSync, readFileSync } from 'node:fs' -import { readFile } from 'node:fs/promises' -import { fileURLToPath } from 'node:url' -import viteSolid from 'vite-plugin-solid' -import { resolve } from 'import-meta-resolve' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' -import { getConfig } from '@tanstack/router-generator' -import { createApp } from 'vinxi' -import { config } from 'vinxi/plugins/config' -// // @ts-expect-error -// import { serverComponents } from '@vinxi/server-components/plugin' -import { createTanStackServerFnPlugin } from '@tanstack/server-functions-plugin' -import { createTanStackStartPlugin } from '@tanstack/solid-start-plugin' -import { createFetch } from 'ofetch' -import { createNitro } from 'nitropack' -import { tanstackStartVinxiFileRouter } from './vinxi-file-router.js' -import { - checkDeploymentPresetInput, - getUserViteConfig, - inlineConfigSchema, - serverSchema, -} from './schema.js' -import type { configSchema } from '@tanstack/router-generator' -import type { z } from 'zod' -import type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' -import type { App as VinxiApp } from 'vinxi' -import type { Manifest } from '@tanstack/router-core' -import type * as vite from 'vite' - -export type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' - -function setTsrDefaults(config: TanStackStartOutputConfig['tsr']) { - // Normally these are `./src/___`, but we're using `./app/___` for Start stuff - const appDirectory = config?.appDirectory ?? './app' - return { - ...config, - appDirectory: config?.appDirectory ?? appDirectory, - routesDirectory: - config?.routesDirectory ?? path.join(appDirectory, 'routes'), - generatedRouteTree: - config?.generatedRouteTree ?? path.join(appDirectory, 'routeTree.gen.ts'), - } -} - -function mergeSsrOptions(options: Array) { - let ssrOptions: vite.SSROptions = {} - let noExternal: vite.SSROptions['noExternal'] = [] - for (const option of options) { - if (!option) { - continue - } - - if (option.noExternal) { - if (option.noExternal === true) { - noExternal = true - } else if (noExternal !== true) { - if (Array.isArray(option.noExternal)) { - noExternal.push(...option.noExternal) - } else { - noExternal.push(option.noExternal) - } - } - } - - ssrOptions = { - ...ssrOptions, - ...option, - noExternal, - } - } - - return ssrOptions -} - -export async function defineConfig( - inlineConfig: TanStackStartInputConfig = {}, -): Promise { - const opts = inlineConfigSchema.parse(inlineConfig) - - const { preset: configDeploymentPreset, ...serverOptions } = - serverSchema.parse(opts.server || {}) - - const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) - const tsr = setTsrDefaults(opts.tsr) - const tsrConfig = getConfig(tsr) - - const appDirectory = tsr.appDirectory - const publicDir = opts.routers?.public?.dir || './public' - - const publicBase = opts.routers?.public?.base || '/' - const clientBase = opts.routers?.client?.base || '/_build' - const apiBase = opts.tsr?.apiBase || '/api' - const serverBase = opts.routers?.server?.base || '/_server' - - const apiMiddleware = opts.routers?.api?.middleware || undefined - const serverMiddleware = opts.routers?.server?.middleware || undefined - const ssrMiddleware = opts.routers?.ssr?.middleware || undefined - - const clientEntry = - opts.routers?.client?.entry || path.join(appDirectory, 'client.tsx') - const ssrEntry = - opts.routers?.ssr?.entry || path.join(appDirectory, 'ssr.tsx') - const apiEntry = opts.routers?.api?.entry || path.join(appDirectory, 'api.ts') - - const globalMiddlewareEntry = - opts.routers?.server?.globalMiddlewareEntry || - path.join(appDirectory, 'global-middleware.ts') - - const apiEntryExists = existsSync(apiEntry) - - const viteConfig = getUserViteConfig(opts.vite) - - const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module - manifestVirtualImportId: 'tsr:server-fn-manifest', - client: { - getRuntimeCode: () => - `import { createClientRpc } from '@tanstack/solid-start/server-functions-client'`, - replacer: (opts) => - `createClientRpc('${opts.functionId}', '${serverBase}')`, - }, - ssr: { - getRuntimeCode: () => - `import { createSsrRpc } from '@tanstack/solid-start/server-functions-ssr'`, - replacer: (opts) => `createSsrRpc('${opts.functionId}', '${serverBase}')`, - }, - server: { - getRuntimeCode: () => - `import { createServerRpc } from '@tanstack/solid-start/server-functions-server'`, - replacer: (opts) => - `createServerRpc('${opts.functionId}', '${serverBase}', ${opts.fn})`, - }, - }) - - const TanStackStartPlugin = createTanStackStartPlugin({ - globalMiddlewareEntry, - }) - - // Create a dummy nitro app to get the resolved public output path - const dummyNitroApp = await createNitro({ - preset: deploymentPreset, - compatibilityDate: '2024-12-01', - }) - - const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir - await dummyNitroApp.close() - - let vinxiApp = createApp({ - server: { - ...serverOptions, - preset: deploymentPreset, - experimental: { - ...serverOptions.experimental, - asyncContext: true, - }, - }, - routers: [ - { - name: 'public', - type: 'static', - dir: publicDir, - base: publicBase, - }, - { - name: 'client', - type: 'client', - target: 'browser', - handler: clientEntry, - base: clientBase, - // @ts-expect-error - build: { - sourcemap: true, - }, - plugins: () => { - const routerType = 'client' - const clientViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-client', { - ...viteConfig.userConfig, - ...clientViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(clientViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - clientViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(clientViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - target: 'solid', - enableRouteGeneration: true, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.client, - TanStackServerFnsPlugin.client, - ...(viteConfig.plugins || []), - ...(clientViteConfig.plugins || []), - viteSolid({ ...opts.solid, ssr: true }), - // TODO: RSCS - enable this - // serverComponents.client(), - ] - }, - }, - { - name: 'ssr', - type: 'http', - target: 'server', - handler: ssrEntry, - middleware: ssrMiddleware, - // @ts-expect-error - link: { - client: 'client', - }, - plugins: () => { - const routerType = 'ssr' - const ssrViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-ssr', { - ...viteConfig.userConfig, - ...ssrViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(ssrViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - ssrViteConfig.userConfig.ssr, - { - noExternal, - external: ['@vinxi/react-server-dom/client'], - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(ssrViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - target: 'solid', - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.ssr, - TanStackServerFnsPlugin.ssr, - tsrRoutesManifest({ - tsrConfig, - clientBase, - }), - ...(getUserViteConfig(opts.vite).plugins || []), - ...(getUserViteConfig(opts.routers?.ssr?.vite).plugins || []), - viteSolid({ ...opts.solid, ssr: true }), - ] - }, - }, - { - name: 'server', - type: 'http', - target: 'server', - base: serverBase, - middleware: serverMiddleware, - // TODO: RSCS - enable this - // worker: true, - handler: importToProjectRelative( - '@tanstack/start-server-functions-handler', - ), - plugins: () => { - const routerType = 'server' - const serverViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-server', { - ...viteConfig.userConfig, - ...serverViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(serverViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - serverViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(serverViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - target: 'solid', - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.server, - TanStackServerFnsPlugin.server, - // TODO: RSCS - remove this - // resolve: { - // conditions: [], - // }, - // TODO: RSCs - add this - // serverComponents.serverActions({ - // resolve: { - // conditions: [ - // 'react-server', - // // 'node', - // 'import', - // process.env.NODE_ENV, - // ], - // }, - // runtime: '@vinxi/react-server-dom/runtime', - // transpileDeps: ['react', 'react-dom', '@vinxi/react-server-dom'], - // }), - ...(viteConfig.plugins || []), - ...(serverViteConfig.plugins || []), - viteSolid({ ...opts.solid, ssr: true }), - ] - }, - }, - ], - }) - - const noExternal = [ - '@tanstack/solid-start', - '@tanstack/solid-start/server', - '@tanstack/solid-start-client', - '@tanstack/solid-start-server', - '@tanstack/start-server-functions-fetcher', - '@tanstack/start-server-functions-handler', - '@tanstack/start-server-functions-client', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-server-functions-server', - '@tanstack/solid-start-router-manifest', - '@tanstack/solid-start-config', - '@tanstack/start-api-routes', - '@tanstack/server-functions-plugin', - 'tsr:routes-manifest', - 'tsr:server-fn-manifest', - ] - - // If API routes handler exists, add a router for it - if (apiEntryExists) { - vinxiApp = vinxiApp.addRouter({ - name: 'api', - type: 'http', - target: 'server', - base: apiBase, - handler: apiEntry, - middleware: apiMiddleware, - routes: tanstackStartVinxiFileRouter({ tsrConfig, apiBase }), - plugins: () => { - const viteConfig = getUserViteConfig(opts.vite) - const apiViteConfig = getUserViteConfig(opts.routers?.api?.vite) - - return [ - config('tsr-vite-config-api', { - ...viteConfig.userConfig, - ...apiViteConfig.userConfig, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - apiViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(apiViteConfig.userConfig.optimizeDeps || {}), - }, - define: { - ...(viteConfig.userConfig.define || {}), - ...(apiViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - target: 'solid', - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - ...(viteConfig.plugins || []), - ...(apiViteConfig.plugins || []), - viteSolid({ ...opts.solid, ssr: true }), - ] - }, - }) - } - - // Because Vinxi doesn't use the normal nitro dev server, it doesn't - // supply $fetch during dev. We need to hook into the dev server creation, - // nab the proper utils from the custom nitro instance that is used - // during dev and supply the $fetch to app. - // Hopefully and likely, this will just get removed when we move to - // Nitro directly. - vinxiApp.hooks.hook('app:dev:nitro:config', (devServer) => { - vinxiApp.hooks.hook( - 'app:dev:server:created', - ({ devApp: { localFetch } }) => { - const $fetch = createFetch({ - fetch: localFetch, - defaults: { - baseURL: devServer.nitro.options.runtimeConfig.app.baseURL, - }, - }) - - // @ts-expect-error - globalThis.$fetch = $fetch - }, - ) - }) - - return vinxiApp -} - -function importToProjectRelative(p: string) { - const resolved = fileURLToPath(resolve(p, import.meta.url)) - - const relative = path.relative(process.cwd(), resolved) - - return relative -} - -function tsrRoutesManifest(opts: { - tsrConfig: z.infer - clientBase: string -}): vite.Plugin { - let config: vite.ResolvedConfig - - return { - name: 'tsr-routes-manifest', - configResolved(resolvedConfig) { - config = resolvedConfig - }, - resolveId(id) { - if (id === 'tsr:routes-manifest') { - return id - } - return - }, - async load(id) { - if (id === 'tsr:routes-manifest') { - // If we're in development, return a dummy manifest - - if (config.command === 'serve') { - return `export default () => ({ - routes: {} - })` - } - - const clientViteManifestPath = path.resolve( - config.build.outDir, - `../client/${opts.clientBase}/.vite/manifest.json`, - ) - - type ViteManifest = Record< - string, - { - file: string - isEntry: boolean - imports: Array - } - > - - let manifest: ViteManifest - try { - manifest = JSON.parse(await readFile(clientViteManifestPath, 'utf-8')) - } catch (err) { - console.error(err) - throw new Error( - `Could not find the production client vite manifest at '${clientViteManifestPath}'!`, - ) - } - - const routeTreePath = path.resolve(opts.tsrConfig.generatedRouteTree) - - let routeTreeContent: string - try { - routeTreeContent = readFileSync(routeTreePath, 'utf-8') - } catch (err) { - console.error(err) - throw new Error( - `Could not find the generated route tree at '${routeTreePath}'!`, - ) - } - - // Extract the routesManifest JSON from the route tree file. - // It's located between the /* ROUTE_MANIFEST_START and ROUTE_MANIFEST_END */ comment block. - - const routerManifest = JSON.parse( - routeTreeContent.match( - /\/\* ROUTE_MANIFEST_START([\s\S]*?)ROUTE_MANIFEST_END \*\//, - )?.[1] || '{ routes: {} }', - ) as Manifest - - const routes = routerManifest.routes - - let entryFile: - | { - file: string - imports: Array - } - | undefined - - const filesByRouteFilePath: ViteManifest = Object.fromEntries( - Object.entries(manifest).map(([k, v]) => { - if (v.isEntry) { - entryFile = v - } - - const rPath = k.split('?')[0] - - return [rPath, v] - }, {}), - ) - - // Add preloads to the routes from the vite manifest - Object.entries(routes).forEach(([k, v]) => { - const file = - filesByRouteFilePath[ - path.join(opts.tsrConfig.routesDirectory, v.filePath as string) - ] - - if (file) { - const preloads = file.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ) - - preloads.unshift(path.join(opts.clientBase, file.file)) - - routes[k] = { - ...v, - preloads, - } - } - }) - - if (entryFile) { - routes.__root__!.preloads = [ - path.join(opts.clientBase, entryFile.file), - ...entryFile.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ), - ] - } - - const recurseRoute = ( - route: { - preloads?: Array - children?: Array - }, - seenPreloads = {} as Record, - ) => { - route.preloads = route.preloads?.filter((preload) => { - if (seenPreloads[preload]) { - return false - } - seenPreloads[preload] = true - return true - }) - - if (route.children) { - route.children.forEach((child) => { - const childRoute = routes[child]! - recurseRoute(childRoute, { ...seenPreloads }) - }) - } - } - - // @ts-expect-error - recurseRoute(routes.__root__) - - const routesManifest = { - routes, - } - - if (process.env.TSR_VITE_DEBUG) { - console.info( - 'Routes Manifest: \n' + JSON.stringify(routesManifest, null, 2), - ) - } - - return `export default () => (${JSON.stringify(routesManifest)})` - } - return - }, - } -} - -function injectDefineEnv( - key: TKey, - value: TValue, -): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { - return { - [`process.env.${key}`]: JSON.stringify(value), - [`import.meta.env.${key}`]: JSON.stringify(value), - } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } -} diff --git a/packages/solid-start-config/src/schema.ts b/packages/solid-start-config/src/schema.ts deleted file mode 100644 index 9c8a6dc810..0000000000 --- a/packages/solid-start-config/src/schema.ts +++ /dev/null @@ -1,198 +0,0 @@ -import { configSchema } from '@tanstack/router-generator' -import { z } from 'zod' -import type { PluginOption } from 'vite' -import type { AppOptions as VinxiAppOptions } from 'vinxi' -import type { NitroOptions } from 'nitropack' -import type { Options as ViteSolidOptions } from 'vite-plugin-solid' -import type { CustomizableConfig } from 'vinxi/dist/types/lib/vite-dev' - -type StartUserViteConfig = CustomizableConfig | (() => CustomizableConfig) - -export function getUserViteConfig(config?: StartUserViteConfig): { - plugins: Array | undefined - userConfig: CustomizableConfig -} { - const { plugins, ...userConfig } = - typeof config === 'function' ? config() : { ...config } - return { plugins, userConfig } -} - -/** - * Not all the deployment presets are fully functional or tested. - * @see https://github.com/TanStack/router/pull/2002 - */ -const vinxiDeploymentPresets = [ - 'alwaysdata', // untested - 'aws-amplify', // untested - 'aws-lambda', // untested - 'azure', // untested - 'azure-functions', // untested - 'base-worker', // untested - 'bun', // ✅ working - 'cleavr', // untested - 'cli', // untested - 'cloudflare', // untested - 'cloudflare-module', // untested - 'cloudflare-pages', // ✅ working - 'cloudflare-pages-static', // untested - 'deno', // untested - 'deno-deploy', // untested - 'deno-server', // untested - 'digital-ocean', // untested - 'edgio', // untested - 'firebase', // untested - 'flight-control', // untested - 'github-pages', // untested - 'heroku', // untested - 'iis', // untested - 'iis-handler', // untested - 'iis-node', // untested - 'koyeb', // untested - 'layer0', // untested - 'netlify', // ✅ working - 'netlify-builder', // untested - 'netlify-edge', // untested - 'netlify-static', // untested - 'nitro-dev', // untested - 'nitro-prerender', // untested - 'node', // partially working - 'node-cluster', // untested - 'node-server', // ✅ working - 'platform-sh', // untested - 'service-worker', // untested - 'static', // 🟧 partially working - 'stormkit', // untested - 'vercel', // ✅ working - 'vercel-edge', // untested - 'vercel-static', // untested - 'winterjs', // untested - 'zeabur', // untested - 'zeabur-static', // untested -] as const - -type DeploymentPreset = (typeof vinxiDeploymentPresets)[number] | (string & {}) - -const testedDeploymentPresets: Array = [ - 'bun', - 'netlify', - 'vercel', - 'cloudflare-pages', - 'node-server', -] - -export function checkDeploymentPresetInput( - preset?: string, -): DeploymentPreset | undefined { - if (preset) { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) - } - } - - return preset -} - -type HTTPSOptions = { - cert?: string - key?: string - pfx?: string - passphrase?: string - validityDays?: number - domains?: Array -} - -type ServerOptions_ = VinxiAppOptions['server'] & { - https?: boolean | HTTPSOptions -} - -type ServerOptions = { - [K in keyof ServerOptions_]: ServerOptions_[K] -} - -export const serverSchema = z - .object({ - routeRules: z.custom().optional(), - preset: z.custom().optional(), - static: z.boolean().optional(), - prerender: z - .object({ - routes: z.array(z.string()), - ignore: z - .array( - z.custom< - string | RegExp | ((path: string) => undefined | null | boolean) - >(), - ) - .optional(), - crawlLinks: z.boolean().optional(), - }) - .optional(), - }) - .and(z.custom()) - -const viteSchema = z.custom() - -const viteSolidSchema = z.custom() - -const routersSchema = z.object({ - ssr: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - client: z - .object({ - entry: z.string().optional(), - base: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - server: z - .object({ - base: z.string().optional(), - globalMiddlewareEntry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - api: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - public: z - .object({ - dir: z.string().optional(), - base: z.string().optional(), - }) - .optional(), -}) - -const tsrConfig = configSchema.partial().extend({ - appDirectory: z.string().optional(), -}) - -export const inlineConfigSchema = z.object({ - solid: viteSolidSchema.optional(), - vite: viteSchema.optional(), - tsr: tsrConfig.optional(), - routers: routersSchema.optional(), - server: serverSchema.optional(), -}) - -export type TanStackStartInputConfig = z.input -export type TanStackStartOutputConfig = z.infer diff --git a/packages/solid-start-config/src/vinxi-file-router.ts b/packages/solid-start-config/src/vinxi-file-router.ts deleted file mode 100644 index 9e6d829d1b..0000000000 --- a/packages/solid-start-config/src/vinxi-file-router.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { - BaseFileSystemRouter as VinxiBaseFileSystemRouter, - analyzeModule as vinxiFsRouterAnalyzeModule, - cleanPath as vinxiFsRouterCleanPath, -} from 'vinxi/fs-router' -import { - CONSTANTS as GENERATOR_CONSTANTS, - startAPIRouteSegmentsFromTSRFilePath, -} from '@tanstack/router-generator' -import type { configSchema } from '@tanstack/router-generator' -import type { - AppOptions as VinxiAppOptions, - RouterSchemaInput as VinxiRouterSchemaInput, -} from 'vinxi' -import type { z } from 'zod' - -export function tanstackStartVinxiFileRouter(opts: { - tsrConfig: z.infer - apiBase: string -}) { - const apiBaseSegment = opts.apiBase.split('/').filter(Boolean).join('/') - const isAPIPath = new RegExp(`/${apiBaseSegment}/`) - - return function (router: VinxiRouterSchemaInput, app: VinxiAppOptions) { - // Our own custom File Router that extends the VinxiBaseFileSystemRouter - // for splitting the API routes into its own "bundle" - // and adding the $APIRoute metadata to the route object - // This could be customized in future to support more complex splits - class TanStackStartFsRouter extends VinxiBaseFileSystemRouter { - toPath(src: string): string { - const inputPath = vinxiFsRouterCleanPath(src, this.config) - - const segments = startAPIRouteSegmentsFromTSRFilePath( - inputPath, - opts.tsrConfig, - ) - - const pathname = segments - .map((part) => { - if (part.type === 'splat') { - return `*splat` - } - - if (part.type === 'param') { - return `:${part.value}?` - } - - return part.value - }) - .join('/') - - return pathname.length > 0 ? `/${pathname}` : '/' - } - - toRoute(src: string) { - const webPath = this.toPath(src) - - const [_, exports] = vinxiFsRouterAnalyzeModule(src) - - const hasAPIRoute = exports.find( - (exp) => exp.n === GENERATOR_CONSTANTS.APIRouteExportVariable, - ) - - return { - path: webPath, - filePath: src, - $APIRoute: - isAPIPath.test(webPath) && hasAPIRoute - ? { - src, - pick: [GENERATOR_CONSTANTS.APIRouteExportVariable], - } - : undefined, - } - } - } - - return new TanStackStartFsRouter( - { - dir: opts.tsrConfig.routesDirectory, - extensions: ['js', 'jsx', 'ts', 'tsx'], - }, - router, - app, - ) - } -} diff --git a/packages/solid-start-config/tsconfig.json b/packages/solid-start-config/tsconfig.json deleted file mode 100644 index 940a9cce0a..0000000000 --- a/packages/solid-start-config/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src/index.ts"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist/esm", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/solid-start-plugin/README.md b/packages/solid-start-plugin/README.md index 798fa094a3..f1f10693be 100644 --- a/packages/solid-start-plugin/README.md +++ b/packages/solid-start-plugin/README.md @@ -1,5 +1,9 @@ -# TanStack Start Vite Plugin +# TanStack Solid Start - Plugin -See https://tanstack.com/router/latest/docs/framework/react/guide/file-based-routing +This package is not meant to be used directly. It is a dependency of [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). + +TanStack Solid Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). + +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 1fb0325218..b8f98a114b 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -27,7 +27,7 @@ "clean": "rimraf ./dist && rimraf ./coverage", "clean:snapshots": "rimraf **/*snapshot* --glob", "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "vitest", + "test:unit": "exit 0; vitest", "test:eslint": "eslint ./src", "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", @@ -65,22 +65,12 @@ "node": ">=12" }, "dependencies": { - "@babel/code-frame": "7.26.2", - "@babel/core": "^7.26.8", - "@babel/plugin-syntax-jsx": "^7.25.9", - "@babel/plugin-syntax-typescript": "^7.25.9", - "@babel/template": "^7.26.8", - "@babel/traverse": "^7.26.8", - "@babel/types": "^7.26.8", + "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", - "babel-dead-code-elimination": "^1.0.9", - "tiny-invariant": "^1.3.3", - "vite": "6.1.4" - }, - "devDependencies": { - "@types/babel__code-frame": "^7.0.6", - "@types/babel__core": "^7.20.5", - "@types/babel__template": "^7.4.4", - "@types/babel__traverse": "^7.20.6" + "@tanstack/server-functions-plugin": "workspace:^", + "@tanstack/start-plugin-core": "workspace:^", + "vite": "6.1.4", + "vite-plugin-solid": "^2.11.6", + "zod": "^3.24.2" } } diff --git a/packages/solid-start-plugin/src/compilers.ts b/packages/solid-start-plugin/src/compilers.ts deleted file mode 100644 index 0fd65af65c..0000000000 --- a/packages/solid-start-plugin/src/compilers.ts +++ /dev/null @@ -1,584 +0,0 @@ -import * as babel from '@babel/core' -import * as t from '@babel/types' -import { codeFrameColumns } from '@babel/code-frame' -import { - deadCodeElimination, - findReferencedIdentifiers, -} from 'babel-dead-code-elimination' -import { generateFromAst, parseAst } from '@tanstack/router-utils' -import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' - -// build these once and reuse them -const handleServerOnlyCallExpression = - buildEnvOnlyCallExpressionHandler('server') -const handleClientOnlyCallExpression = - buildEnvOnlyCallExpressionHandler('client') - -type CompileOptions = ParseAstOptions & { - env: 'server' | 'client' | 'ssr' - dce?: boolean -} - -type IdentifierConfig = { - name: string - type: 'ImportSpecifier' | 'ImportNamespaceSpecifier' - namespaceId: string - handleCallExpression: ( - path: babel.NodePath, - opts: CompileOptions, - ) => void - paths: Array -} - -export function compileStartOutput(opts: CompileOptions): GeneratorResult { - const ast = parseAst(opts) - - const doDce = opts.dce ?? true - // find referenced identifiers *before* we transform anything - const refIdents = doDce ? findReferencedIdentifiers(ast) : undefined - - babel.traverse(ast, { - Program: { - enter(programPath) { - const identifiers: { - createServerFn: IdentifierConfig - createMiddleware: IdentifierConfig - serverOnly: IdentifierConfig - clientOnly: IdentifierConfig - createIsomorphicFn: IdentifierConfig - } = { - createServerFn: { - name: 'createServerFn', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateServerFnCallExpression, - paths: [], - }, - createMiddleware: { - name: 'createMiddleware', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateMiddlewareCallExpression, - paths: [], - }, - serverOnly: { - name: 'serverOnly', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleServerOnlyCallExpression, - paths: [], - }, - clientOnly: { - name: 'clientOnly', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleClientOnlyCallExpression, - paths: [], - }, - createIsomorphicFn: { - name: 'createIsomorphicFn', - type: 'ImportSpecifier', - namespaceId: '', - handleCallExpression: handleCreateIsomorphicFnCallExpression, - paths: [], - }, - } - - const identifierKeys = Object.keys(identifiers) as Array< - keyof typeof identifiers - > - - programPath.traverse({ - ImportDeclaration: (path) => { - if (path.node.source.value !== '@tanstack/solid-start') { - return - } - - // handle a destructured imports being renamed like "import { createServerFn as myCreateServerFn } from '@tanstack/solid-start';" - path.node.specifiers.forEach((specifier) => { - identifierKeys.forEach((identifierKey) => { - const identifier = identifiers[identifierKey] - - if ( - specifier.type === 'ImportSpecifier' && - specifier.imported.type === 'Identifier' - ) { - if (specifier.imported.name === identifierKey) { - identifier.name = specifier.local.name - identifier.type = 'ImportSpecifier' - } - } - - // handle namespace imports like "import * as TanStackStart from '@tanstack/solid-start';" - if (specifier.type === 'ImportNamespaceSpecifier') { - identifier.type = 'ImportNamespaceSpecifier' - identifier.namespaceId = specifier.local.name - identifier.name = `${identifier.namespaceId}.${identifierKey}` - } - }) - }) - }, - CallExpression: (path) => { - identifierKeys.forEach((identifierKey) => { - // Check to see if the call expression is a call to the - // identifiers[identifierKey].name - if ( - t.isIdentifier(path.node.callee) && - path.node.callee.name === identifiers[identifierKey].name - ) { - // The identifier could be a call to the original function - // in the source code. If this is case, we need to ignore it. - // Check the scope to see if the identifier is a function declaration. - // if it is, then we can ignore it. - - if ( - path.scope.getBinding(identifiers[identifierKey].name)?.path - .node.type === 'FunctionDeclaration' - ) { - return - } - - return identifiers[identifierKey].paths.push(path) - } - - if (t.isMemberExpression(path.node.callee)) { - if ( - t.isIdentifier(path.node.callee.object) && - t.isIdentifier(path.node.callee.property) - ) { - const callname = [ - path.node.callee.object.name, - path.node.callee.property.name, - ].join('.') - - if (callname === identifiers[identifierKey].name) { - identifiers[identifierKey].paths.push(path) - } - } - } - - return - }) - }, - }) - - identifierKeys.forEach((identifierKey) => { - identifiers[identifierKey].paths.forEach((path) => { - identifiers[identifierKey].handleCallExpression( - path as babel.NodePath, - opts, - ) - }) - }) - }, - }, - }) - - if (doDce) { - deadCodeElimination(ast, refIdents) - } - - return generateFromAst(ast, { - sourceMaps: true, - sourceFileName: opts.filename, - filename: opts.filename, - }) -} - -function handleCreateServerFnCallExpression( - path: babel.NodePath, - opts: ParseAstOptions, -) { - // The function is the 'fn' property of the object passed to createServerFn - - // const firstArg = path.node.arguments[0] - // if (t.isObjectExpression(firstArg)) { - // // Was called with some options - // } - - // Traverse the member expression and find the call expressions for - // the validator, handler, and middleware methods. Check to make sure they - // are children of the createServerFn call expression. - - const calledOptions = path.node.arguments[0] - ? (path.get('arguments.0') as babel.NodePath) - : null - - const shouldValidateClient = !!calledOptions?.node.properties.find((prop) => { - return ( - t.isObjectProperty(prop) && - t.isIdentifier(prop.key) && - prop.key.name === 'validateClient' && - t.isBooleanLiteral(prop.value) && - prop.value.value === true - ) - }) - - const callExpressionPaths = { - middleware: null as babel.NodePath | null, - validator: null as babel.NodePath | null, - handler: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createServerFn call expression:', - // rootCallExpression.toString(), - // ) - - // Check if the call is assigned to a variable - if (!rootCallExpression.parentPath.isVariableDeclarator()) { - throw new Error('createServerFn must be assigned to a variable!') - } - - // Get the identifier name of the variable - const variableDeclarator = rootCallExpression.parentPath.node - const existingVariableName = (variableDeclarator.id as t.Identifier).name - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if (callExpressionPaths.validator) { - const innerInputExpression = callExpressionPaths.validator.node.arguments[0] - - if (!innerInputExpression) { - throw new Error( - 'createServerFn().validator() must be called with a validator!', - ) - } - - // If we're on the client, and we're not validating the client, remove the validator call expression - if ( - opts.env === 'client' && - !shouldValidateClient && - t.isMemberExpression(callExpressionPaths.validator.node.callee) - ) { - callExpressionPaths.validator.replaceWith( - callExpressionPaths.validator.node.callee.object, - ) - } - } - - // First, we need to move the handler function to a nested function call - // that is applied to the arguments passed to the server function. - - const handlerFnPath = callExpressionPaths.handler?.get( - 'arguments.0', - ) as babel.NodePath - - if (!callExpressionPaths.handler || !handlerFnPath.node) { - throw codeFrameError( - opts.code, - path.node.callee.loc!, - `createServerFn must be called with a "handler" property!`, - ) - } - - const handlerFn = handlerFnPath.node - - // So, the way we do this is we give the handler function a way - // to access the serverFn ctx on the server via function scope. - // The 'use server' extracted function will be called with the - // payload from the client, then use the scoped serverFn ctx - // to execute the handler function. - // This way, we can do things like data and middleware validation - // in the __execute function without having to AST transform the - // handler function too much itself. - - // .handler((optsOut, ctx) => { - // return ((optsIn) => { - // 'use server' - // ctx.__execute(handlerFn, optsIn) - // })(optsOut) - // }) - - // If the handler function is an identifier and we're on the client, we need to - // remove the bound function from the file. - // If we're on the server, you can leave it, since it will get referenced - // as a second argument. - - if (t.isIdentifier(handlerFn)) { - if (opts.env === 'client' || opts.env === 'ssr') { - // Find the binding for the handler function - const binding = handlerFnPath.scope.getBinding(handlerFn.name) - // Remove it - if (binding) { - binding.path.remove() - } - } - // If the env is server, just leave it alone - } - - handlerFnPath.replaceWith( - t.arrowFunctionExpression( - [t.identifier('opts'), t.identifier('signal')], - t.blockStatement( - // Everything in here is server-only, since the client - // will strip out anything in the 'use server' directive. - [ - t.returnStatement( - t.callExpression( - t.identifier(`${existingVariableName}.__executeServer`), - [t.identifier('opts'), t.identifier('signal')], - ), - ), - ], - [t.directive(t.directiveLiteral('use server'))], - ), - ), - ) - - if (opts.env === 'server') { - callExpressionPaths.handler.node.arguments.push(handlerFn) - } -} - -function handleCreateMiddlewareCallExpression( - path: babel.NodePath, - opts: ParseAstOptions, -) { - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createMiddleware call expression:', - // rootCallExpression.toString(), - // ) - - const callExpressionPaths = { - middleware: null as babel.NodePath | null, - validator: null as babel.NodePath | null, - client: null as babel.NodePath | null, - server: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if (callExpressionPaths.validator) { - const innerInputExpression = callExpressionPaths.validator.node.arguments[0] - - if (!innerInputExpression) { - throw new Error( - 'createMiddleware().validator() must be called with a validator!', - ) - } - - // If we're on the client or ssr, remove the validator call expression - if (opts.env === 'client' || opts.env === 'ssr') { - if (t.isMemberExpression(callExpressionPaths.validator.node.callee)) { - callExpressionPaths.validator.replaceWith( - callExpressionPaths.validator.node.callee.object, - ) - } - } - } - - const serverFnPath = callExpressionPaths.server?.get( - 'arguments.0', - ) as babel.NodePath - - if ( - callExpressionPaths.server && - serverFnPath.node && - (opts.env === 'client' || opts.env === 'ssr') - ) { - // If we're on the client, remove the server call expression - if (t.isMemberExpression(callExpressionPaths.server.node.callee)) { - callExpressionPaths.server.replaceWith( - callExpressionPaths.server.node.callee.object, - ) - } - } -} - -function buildEnvOnlyCallExpressionHandler(env: 'client' | 'server') { - return function envOnlyCallExpressionHandler( - path: babel.NodePath, - opts: ParseAstOptions, - ) { - // if (debug) - // console.info(`Handling ${env}Only call expression:`, path.toString()) - - const isEnvMatch = - env === 'client' - ? opts.env === 'client' - : opts.env === 'server' || opts.env === 'ssr' - - if (isEnvMatch) { - // extract the inner function from the call expression - const innerInputExpression = path.node.arguments[0] - - if (!t.isExpression(innerInputExpression)) { - throw new Error( - `${env}Only() functions must be called with a function!`, - ) - } - - path.replaceWith(innerInputExpression) - return - } - - // If we're on the wrong environment, replace the call expression - // with a function that always throws an error. - path.replaceWith( - t.arrowFunctionExpression( - [], - t.blockStatement([ - t.throwStatement( - t.newExpression(t.identifier('Error'), [ - t.stringLiteral( - `${env}Only() functions can only be called on the ${env}!`, - ), - ]), - ), - ]), - ), - ) - } -} - -function handleCreateIsomorphicFnCallExpression( - path: babel.NodePath, - opts: CompileOptions, -) { - const rootCallExpression = getRootCallExpression(path) - - // if (debug) - // console.info( - // 'Handling createIsomorphicFn call expression:', - // rootCallExpression.toString(), - // ) - - const callExpressionPaths = { - client: null as babel.NodePath | null, - server: null as babel.NodePath | null, - } - - const validMethods = Object.keys(callExpressionPaths) - - rootCallExpression.traverse({ - MemberExpression(memberExpressionPath) { - if (t.isIdentifier(memberExpressionPath.node.property)) { - const name = memberExpressionPath.node.property - .name as keyof typeof callExpressionPaths - - if ( - validMethods.includes(name) && - memberExpressionPath.parentPath.isCallExpression() - ) { - callExpressionPaths[name] = memberExpressionPath.parentPath - } - } - }, - }) - - if ( - validMethods.every( - (method) => - !callExpressionPaths[method as keyof typeof callExpressionPaths], - ) - ) { - const variableId = rootCallExpression.parentPath.isVariableDeclarator() - ? rootCallExpression.parentPath.node.id - : null - console.warn( - 'createIsomorphicFn called without a client or server implementation!', - 'This will result in a no-op function.', - 'Variable name:', - t.isIdentifier(variableId) ? variableId.name : 'unknown', - ) - } - - const resolvedEnv = opts.env === 'ssr' ? 'server' : opts.env - - const envCallExpression = callExpressionPaths[resolvedEnv] - - if (!envCallExpression) { - // if we don't have an implementation for this environment, default to a no-op - rootCallExpression.replaceWith( - t.arrowFunctionExpression([], t.blockStatement([])), - ) - return - } - - const innerInputExpression = envCallExpression.node.arguments[0] - - if (!t.isExpression(innerInputExpression)) { - throw new Error( - `createIsomorphicFn().${resolvedEnv}(func) must be called with a function!`, - ) - } - - rootCallExpression.replaceWith(innerInputExpression) -} - -function getRootCallExpression(path: babel.NodePath) { - // Find the highest callExpression parent - let rootCallExpression: babel.NodePath = path - - // Traverse up the chain of CallExpressions - while (rootCallExpression.parentPath.isMemberExpression()) { - const parent = rootCallExpression.parentPath - if (parent.parentPath.isCallExpression()) { - rootCallExpression = parent.parentPath - } - } - - return rootCallExpression -} - -function codeFrameError( - code: string, - loc: { - start: { line: number; column: number } - end: { line: number; column: number } - }, - message: string, -) { - const frame = codeFrameColumns( - code, - { - start: loc.start, - end: loc.end, - }, - { - highlightCode: true, - message, - }, - ) - - return new Error(frame) -} diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index f24f09d18a..c7903ae0f3 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -1,130 +1,119 @@ -import { fileURLToPath, pathToFileURL } from 'node:url' import path from 'node:path' -import { existsSync } from 'node:fs' -import { logDiff } from '@tanstack/router-utils' -import { compileStartOutput } from './compilers' -import type { Plugin } from 'vite' +import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' +import { tanstackRouter } from '@tanstack/router-plugin/vite' +import viteSolid from 'vite-plugin-solid' +import { + TanStackStartServerRoutesVite, + TanStackStartVitePluginCore, +} from '@tanstack/start-plugin-core' +import { getTanStackStartOptions } from './schema' +import type { PluginOption } from 'vite' +import type { TanStackStartInputConfig, WithSolidPlugin } from './schema' -const debug = - process.env.TSR_VITE_DEBUG && - ['true', 'solid-start-plugin'].includes(process.env.TSR_VITE_DEBUG) +export type { + TanStackStartInputConfig, + TanStackStartOutputConfig, + WithSolidPlugin, +} from './schema' -export type TanStackStartViteOptions = { - globalMiddlewareEntry: string -} - -const transformFuncs = [ - 'createServerFn', - 'createMiddleware', - 'serverOnly', - 'clientOnly', - 'createIsomorphicFn', -] -const tokenRegex = new RegExp(transformFuncs.join('|')) -// const eitherFuncRegex = new RegExp( -// `(function ${transformFuncs.join('|function ')})`, -// ) - -export function createTanStackStartPlugin(opts: TanStackStartViteOptions): { - client: Array - ssr: Array - server: Array -} { - const globalMiddlewarePlugin = (): Plugin => { - let entry: string | null = null - let resolvedGlobalMiddlewareEntry: string | null = null - let globalMiddlewareEntryExists = false - let ROOT: string = process.cwd() - return { - name: 'vite-plugin-tanstack-start-ensure-global-middleware', - enforce: 'pre', - configResolved: (config) => { - ROOT = config.root - entry = path.resolve(ROOT, (config as any).router.handler) - resolvedGlobalMiddlewareEntry = path.resolve( - ROOT, - opts.globalMiddlewareEntry, - ) - globalMiddlewareEntryExists = existsSync(resolvedGlobalMiddlewareEntry) +export function TanStackStartVitePlugin( + opts?: TanStackStartInputConfig & WithSolidPlugin, +): Array { + type OptionsWithSolid = ReturnType & + WithSolidPlugin + const options: OptionsWithSolid = getTanStackStartOptions(opts) - if (!entry) { - throw new Error( - '@tanstack/solid-start-plugin: No server entry found!', - ) - } - }, - transform(code, id) { - if (entry && id.includes(entry)) { - if (globalMiddlewareEntryExists) { - return { - code: `${code}\n\nimport '${path.resolve(ROOT, opts.globalMiddlewareEntry)}'`, - map: null, - } - } + return [ + tanstackRouter({ + verboseFileRoutes: false, + ...options.tsr, + target: 'solid', + enableRouteGeneration: true, + autoCodeSplitting: true, + }), + TanStackStartVitePluginCore('solid', options), + { + name: 'tanstack-solid-start:resolve-entries', + resolveId(id) { + if ( + [ + '/~start/server-entry', + '/~start/default-server-entry', + '/~start/default-client-entry', + ].includes(id) + ) { + return `${id}.tsx` } - return code - }, - } - } - return { - client: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'client' }), - ], - ssr: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'ssr' }), - ], - server: [ - globalMiddlewarePlugin(), - TanStackStartServerFnsAndMiddleware({ ...opts, env: 'server' }), - ], - } -} + return null + }, + load(id) { + const routerImportPath = JSON.stringify( + path.resolve(options.root, options.tsr.srcDirectory, 'router'), + ) -export function TanStackStartServerFnsAndMiddleware(opts: { - env: 'server' | 'ssr' | 'client' -}): Plugin { - let ROOT: string = process.cwd() + if (id === '/~start/server-entry.tsx') { + return ` +import { toWebRequest, defineEventHandler, __setGlobalOrigin, __getAbsoluteUrl } from '@tanstack/solid-start/server'; +import serverEntry from '${options.serverEntryPath}'; - return { - name: 'vite-plugin-tanstack-start-create-server-fn', - enforce: 'pre', - configResolved: (config) => { - ROOT = config.root - }, - transform(code, id) { - const url = pathToFileURL(id) - url.searchParams.delete('v') - id = fileURLToPath(url).replace(/\\/g, '/') +export default defineEventHandler(function(event) { + const request = toWebRequest(event); + __setGlobalOrigin(__getAbsoluteUrl(request)); + return serverEntry({ request }); +}) +` + } - const includesToken = tokenRegex.test(code) - // const includesEitherFunc = eitherFuncRegex.test(code) + if (id === '/~start/default-client-entry.tsx') { + return ` +import { hydrate } from 'solid-js/web' +import { StartClient } from '@tanstack/solid-start' +import { createRouter } from ${routerImportPath} - if ( - !includesToken - // includesEitherFunc - // /node_modules/.test(id) - ) { - return null - } +const router = createRouter() - if (debug) console.info(`${opts.env} Compiling Start: `, id) +hydrate(() => , document.body) +` + } - const compiled = compileStartOutput({ - code, - root: ROOT, - filename: id, - env: opts.env, - }) + if (id === '/~start/default-server-entry.tsx') { + return ` +import { createStartHandler, defaultStreamHandler } from '@tanstack/solid-start/server' +import { createRouter } from ${routerImportPath} - if (debug) { - logDiff(code, compiled.code) - console.log('Output:\n', compiled.code + '\n\n') - } +export default createStartHandler({ + createRouter, +})(defaultStreamHandler) +` + } - return compiled + return null + }, }, - } + TanStackServerFnPluginEnv({ + // This is the ID that will be available to look up and import + // our server function manifest and resolve its module + manifestVirtualImportId: 'tanstack:server-fn-manifest', + client: { + getRuntimeCode: () => + `import { createClientRpc } from '@tanstack/solid-start/server-functions-client'`, + replacer: (d) => + `createClientRpc('${d.functionId}', '${options.serverFns.base}')`, + }, + server: { + getRuntimeCode: () => + `import { createServerRpc } from '@tanstack/solid-start/server-functions-server'`, + replacer: (d) => + `createServerRpc('${d.functionId}', '${options.serverFns.base}', ${d.fn})`, + }, + }), + TanStackStartServerRoutesVite({ + ...options.tsr, + target: 'solid', + }), + viteSolid({ ...options.solid, ssr: true }), + ] } + +export { TanStackStartVitePlugin as tanstackStart } diff --git a/packages/solid-start-plugin/src/schema.ts b/packages/solid-start-plugin/src/schema.ts new file mode 100644 index 0000000000..c9d836957c --- /dev/null +++ b/packages/solid-start-plugin/src/schema.ts @@ -0,0 +1,31 @@ +import { z } from 'zod' +import { + createTanStackConfig, + createTanStackStartOptionsSchema, +} from '@tanstack/start-plugin-core' +import type { Options as ViteSolidOptions } from 'vite-plugin-solid' + +export type WithSolidPlugin = { + solid?: ViteSolidOptions +} + +const frameworkPlugin = { + solid: z.custom().optional(), +} + +// eslint-disable-next-line unused-imports/no-unused-vars +const TanStackStartOptionsSchema = + createTanStackStartOptionsSchema(frameworkPlugin) + +const defaultConfig = createTanStackConfig(frameworkPlugin) + +export function getTanStackStartOptions(opts?: TanStackStartInputConfig) { + return defaultConfig.parse(opts) +} + +export type TanStackStartInputConfig = z.input< + typeof TanStackStartOptionsSchema +> +export type TanStackStartOutputConfig = ReturnType< + typeof getTanStackStartOptions +> diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts b/packages/solid-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts deleted file mode 100644 index 9d1e78228e..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { readFile, readdir } from 'node:fs/promises' -import path from 'node:path' -import { afterAll, describe, expect, test, vi } from 'vitest' - -import { compileStartOutput } from '../../src/compilers' - -async function getFilenames() { - return await readdir(path.resolve(import.meta.dirname, './test-files')) -} - -describe('createIsomorphicFn compiles correctly', async () => { - const noImplWarning = - 'createIsomorphicFn called without a client or server implementation!' - - const originalConsoleWarn = console.warn - const consoleSpy = vi.spyOn(console, 'warn').mockImplementation((...args) => { - // we want to avoid sending this warning to the console, we know about it - if (args[0] === noImplWarning) { - return - } - originalConsoleWarn(...args) - }) - - afterAll(() => { - consoleSpy.mockRestore() - }) - - const filenames = await getFilenames() - - describe.each(filenames)('should handle "%s"', async (filename) => { - const file = await readFile( - path.resolve(import.meta.dirname, `./test-files/${filename}`), - ) - const code = file.toString() - - test.each(['client', 'server'] as const)( - `should compile for ${filename} %s`, - async (env) => { - const compiledResult = compileStartOutput({ - env, - code, - root: './test-files', - filename, - dce: false, - }) - - await expect(compiledResult.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) - }, - ) - }) - test('should error if implementation not provided', () => { - expect(() => { - compileStartOutput({ - env: 'client', - code: ` - import { createIsomorphicFn } from '@tanstack/solid-start' - const clientOnly = createIsomorphicFn().client()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - expect(() => { - compileStartOutput({ - env: 'server', - code: ` - import { createIsomorphicFn } from '@tanstack/solid-start' - const serverOnly = createIsomorphicFn().server()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - }) - test('should warn to console if no implementations provided', () => { - compileStartOutput({ - env: 'client', - code: ` - import { createIsomorphicFn } from '@tanstack/solid-start' - const noImpl = createIsomorphicFn()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - expect(consoleSpy).toHaveBeenCalledWith( - noImplWarning, - 'This will result in a no-op function.', - 'Variable name:', - 'noImpl', - ) - }) -}) diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx deleted file mode 100644 index 269cab1607..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { createIsomorphicFn } from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = () => {}; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx deleted file mode 100644 index 3c5c041e90..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = () => {}; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx deleted file mode 100644 index 5b90ddeaf1..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = () => {}; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx deleted file mode 100644 index 126e2404c5..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { createIsomorphicFn } from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = abstractedServerFn; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx deleted file mode 100644 index 442156f4e3..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = abstractedServerFn; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx deleted file mode 100644 index 318745b993..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -const noImpl = () => {}; -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; -function abstractedServerFn() { - return 'server'; -} -const serverOnlyFnAbstracted = abstractedServerFn; -function abstractedClientFn() { - return 'client'; -} -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx deleted file mode 100644 index 51263bea85..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { createIsomorphicFn } from '@tanstack/solid-start' - -const noImpl = createIsomorphicFn() - -const serverOnlyFn = createIsomorphicFn().server(() => 'server') - -const clientOnlyFn = createIsomorphicFn().client(() => 'client') - -const serverThenClientFn = createIsomorphicFn() - .server(() => 'server') - .client(() => 'client') - -const clientThenServerFn = createIsomorphicFn() - .client(() => 'client') - .server(() => 'server') - -function abstractedServerFn() { - return 'server' -} - -const serverOnlyFnAbstracted = createIsomorphicFn().server(abstractedServerFn) - -function abstractedClientFn() { - return 'client' -} - -const clientOnlyFnAbstracted = createIsomorphicFn().client(abstractedClientFn) - -const serverThenClientFnAbstracted = createIsomorphicFn() - .server(abstractedServerFn) - .client(abstractedClientFn) - -const clientThenServerFnAbstracted = createIsomorphicFn() - .client(abstractedClientFn) - .server(abstractedServerFn) diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx deleted file mode 100644 index 6606a86c50..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/solid-start' - -const noImpl = isomorphicFn() - -const serverOnlyFn = isomorphicFn().server(() => 'server') - -const clientOnlyFn = isomorphicFn().client(() => 'client') - -const serverThenClientFn = isomorphicFn() - .server(() => 'server') - .client(() => 'client') - -const clientThenServerFn = isomorphicFn() - .client(() => 'client') - .server(() => 'server') - -function abstractedServerFn() { - return 'server' -} - -const serverOnlyFnAbstracted = isomorphicFn().server(abstractedServerFn) - -function abstractedClientFn() { - return 'client' -} - -const clientOnlyFnAbstracted = isomorphicFn().client(abstractedClientFn) - -const serverThenClientFnAbstracted = isomorphicFn() - .server(abstractedServerFn) - .client(abstractedClientFn) - -const clientThenServerFnAbstracted = isomorphicFn() - .client(abstractedClientFn) - .server(abstractedServerFn) diff --git a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx b/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx deleted file mode 100644 index 9ca4b15b94..0000000000 --- a/packages/solid-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start' - -const noImpl = TanStackStart.createIsomorphicFn() - -const serverOnlyFn = TanStackStart.createIsomorphicFn().server(() => 'server') - -const clientOnlyFn = TanStackStart.createIsomorphicFn().client(() => 'client') - -const serverThenClientFn = TanStackStart.createIsomorphicFn() - .server(() => 'server') - .client(() => 'client') - -const clientThenServerFn = TanStackStart.createIsomorphicFn() - .client(() => 'client') - .server(() => 'server') - -function abstractedServerFn() { - return 'server' -} - -const serverOnlyFnAbstracted = - TanStackStart.createIsomorphicFn().server(abstractedServerFn) - -function abstractedClientFn() { - return 'client' -} - -const clientOnlyFnAbstracted = - TanStackStart.createIsomorphicFn().client(abstractedClientFn) - -const serverThenClientFnAbstracted = TanStackStart.createIsomorphicFn() - .server(abstractedServerFn) - .client(abstractedClientFn) - -const clientThenServerFnAbstracted = TanStackStart.createIsomorphicFn() - .client(abstractedClientFn) - .server(abstractedServerFn) diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx deleted file mode 100644 index ac0d1d2a9a..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createMiddleware({ - id: 'test' -}); -export const withoutUseServer = createMiddleware({ - id: 'test' -}); -export const withVariable = createMiddleware({ - id: 'test' -}); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = createMiddleware({ - id: 'test' -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx deleted file mode 100644 index 3e917e901f..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { createMiddleware as middlewareFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = middlewareFn({ - id: 'test' -}); -export const withoutUseServer = middlewareFn({ - id: 'test' -}); -export const withVariable = middlewareFn({ - id: 'test' -}); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = middlewareFn({ - id: 'test' -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx deleted file mode 100644 index 00d22094e8..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withoutUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withVariable = TanStackStart.createMiddleware({ - id: 'test' -}); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = TanStackStart.createMiddleware({ - id: 'test' -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx deleted file mode 100644 index 40a49dca05..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createMiddleware({ - id: 'test' -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx deleted file mode 100644 index dda24f7c4e..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createMiddleware({ - id: 'test' -}).server(async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withoutUseServer = createMiddleware({ - id: 'test' -}).server(async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = createMiddleware({ - id: 'test' -}).server(abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = createMiddleware({ - id: 'test' -}).server(zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx deleted file mode 100644 index 7fcc6b7b5a..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { createMiddleware as middlewareFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = middlewareFn({ - id: 'test' -}).server(async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withoutUseServer = middlewareFn({ - id: 'test' -}).server(async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = middlewareFn({ - id: 'test' -}).server(abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = middlewareFn({ - id: 'test' -}).server(zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx deleted file mode 100644 index 92047bfa0a..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = TanStackStart.createMiddleware({ - id: 'test' -}).server(async function () { - 'use server'; - - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withoutUseServer = TanStackStart.createMiddleware({ - id: 'test' -}).server(async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = TanStackStart.createMiddleware({ - id: 'test' -}).server(abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = TanStackStart.createMiddleware({ - id: 'test' -}).server(zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx b/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx deleted file mode 100644 index eb3d933b77..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createMiddleware({ - id: 'test' -}).validator(z.number()).server(({ - input -}) => input + 1); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx b/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx deleted file mode 100644 index 595099cdbe..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = createMiddleware({ - id: 'test', -}).server(async function () { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withoutUseServer = createMiddleware({ - id: 'test', -}).server(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = createMiddleware({ - id: 'test', -}).server(abstractedFunction) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = createMiddleware({ - id: 'test', -}).server( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) diff --git a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx b/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx deleted file mode 100644 index 700da4fe63..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { createMiddleware as middlewareFn } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = middlewareFn({ - id: 'test', -}).server(async function () { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withoutUseServer = middlewareFn({ - id: 'test', -}).server(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = middlewareFn({ - id: 'test', -}).server(abstractedFunction) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = middlewareFn({ - id: 'test', -}).server( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) diff --git a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx b/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx deleted file mode 100644 index 315d29e1c7..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = TanStackStart.createMiddleware({ - id: 'test', -}).server(async function () { - 'use server' - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withoutUseServer = TanStackStart.createMiddleware({ - id: 'test', -}).server(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = TanStackStart.createMiddleware({ - id: 'test', -}).server(abstractedFunction) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = TanStackStart.createMiddleware({ - id: 'test', -}).server( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) diff --git a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx b/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx deleted file mode 100644 index 62ea02b36a..0000000000 --- a/packages/solid-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { createMiddleware } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = createMiddleware({ - id: 'test', -}) - .validator(z.number()) - .server(({ input }) => input + 1) diff --git a/packages/solid-start-plugin/tests/createServerFn/createServerFn.test.ts b/packages/solid-start-plugin/tests/createServerFn/createServerFn.test.ts deleted file mode 100644 index 8d30fee5ad..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/createServerFn.test.ts +++ /dev/null @@ -1,176 +0,0 @@ -import { readFile, readdir } from 'node:fs/promises' -import path from 'node:path' -import { describe, expect, test } from 'vitest' - -import { compileStartOutput } from '../../src/compilers' - -async function getFilenames() { - return await readdir(path.resolve(import.meta.dirname, './test-files')) -} - -describe('createServerFn compiles correctly', async () => { - const filenames = await getFilenames() - - describe.each(filenames)('should handle "%s"', async (filename) => { - const file = await readFile( - path.resolve(import.meta.dirname, `./test-files/${filename}`), - ) - const code = file.toString() - - test.each(['client', 'server'] as const)( - `should compile for ${filename} %s`, - async (env) => { - const compiledResult = compileStartOutput({ - env, - code, - root: './test-files', - filename, - dce: false, - }) - - await expect(compiledResult.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) - }, - ) - }) - - test('should error if created without a handler', () => { - expect(() => { - compileStartOutput({ - env: 'client', - code: ` - import { createServerFn } from '@tanstack/solid-start' - createServerFn()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - }) - - test('should be assigned to a variable', () => { - expect(() => { - compileStartOutput({ - env: 'client', - code: ` - import { createServerFn } from '@tanstack/solid-start' - createServerFn().handler(async () => {})`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - }) - - test('should work with identifiers of functions', () => { - const code = ` - import { createServerFn } from '@tanstack/solid-start' - const myFunc = () => { - return 'hello from the server' - } - const myServerFn = createServerFn().handler(myFunc)` - - const compiledResultClient = compileStartOutput({ - root: '/test', - filename: 'test.ts', - code, - env: 'client', - dce: false, - }) - - const compiledResultServer = compileStartOutput({ - root: '/test', - filename: 'test.ts', - code, - env: 'server', - dce: false, - }) - - expect(compiledResultClient.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/solid-start'; - const myServerFn = createServerFn().handler((opts, signal) => { - "use server"; - - return myServerFn.__executeServer(opts, signal); - });" - `) - - expect(compiledResultServer.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/solid-start'; - const myFunc = () => { - return 'hello from the server'; - }; - const myServerFn = createServerFn().handler((opts, signal) => { - "use server"; - - return myServerFn.__executeServer(opts, signal); - }, myFunc);" - `) - }) - - test('should use dce by default', () => { - const code = ` - import { createServerFn } from '@tanstack/solid-start' - const exportedVar = 'exported' - export const exportedFn = createServerFn().handler(async () => { - return exportedVar - }) - const nonExportedVar = 'non-exported' - const nonExportedFn = createServerFn().handler(async () => { - return nonExportedVar - })` - - // Client - const compiledResult = compileStartOutput({ - root: '/test', - filename: 'test.ts', - code, - env: 'client', - dce: true, - }) - - expect(compiledResult.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/solid-start'; - export const exportedFn = createServerFn().handler((opts, signal) => { - "use server"; - - return exportedFn.__executeServer(opts, signal); - }); - const nonExportedFn = createServerFn().handler((opts, signal) => { - "use server"; - - return nonExportedFn.__executeServer(opts, signal); - });" - `) - - // Server - const compiledResultServer = compileStartOutput({ - root: '/test', - filename: 'test.ts', - code, - env: 'server', - dce: true, - }) - - expect(compiledResultServer.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/solid-start'; - const exportedVar = 'exported'; - export const exportedFn = createServerFn().handler((opts, signal) => { - "use server"; - - return exportedFn.__executeServer(opts, signal); - }, async () => { - return exportedVar; - }); - const nonExportedVar = 'non-exported'; - const nonExportedFn = createServerFn().handler((opts, signal) => { - "use server"; - - return nonExportedFn.__executeServer(opts, signal); - }, async () => { - return nonExportedVar; - });" - `) - }) -}) diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx deleted file mode 100644 index d8105165f0..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withArrowFunction.__executeServer(opts, signal); -}); -export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withArrowFunctionAndFunction.__executeServer(opts, signal); -}); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}); -export const withVariable = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}); -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withValidatorFn.__executeServer(opts, signal); -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx deleted file mode 100644 index e7d1010563..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { createServerFn as serverFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}); -export const withVariable = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}); -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx deleted file mode 100644 index e2735ea5d1..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}); -export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}); -export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}); -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx deleted file mode 100644 index f43f06ee88..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx deleted file mode 100644 index 673c4e90fe..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withArrowFunction.__executeServer(opts, signal); -}, async () => null); -export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withArrowFunctionAndFunction.__executeServer(opts, signal); -}, async () => test()); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}, abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).validator(z.number()).handler((opts, signal) => { - "use server"; - - return withValidatorFn.__executeServer(opts, signal); -}, async ({ - input -}) => { - return null; -}); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx deleted file mode 100644 index d9902417f5..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { createServerFn as serverFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}, abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = serverFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx deleted file mode 100644 index 83964ecc5c..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}, async function () { - 'use server'; - - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withoutUseServer.__executeServer(opts, signal); -}, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withVariable.__executeServer(opts, signal); -}, abstractedFunction); -async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -} -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { - return async (input: unknown) => { - return fn(schema.parse(input)); - }; -} -export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler((opts, signal) => { - "use server"; - - return withZodValidator.__executeServer(opts, signal); -}, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx b/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx deleted file mode 100644 index 364f8354fa..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).validator(z.number()).handler((opts, signal) => { - "use server"; - - return withUseServer.__executeServer(opts, signal); -}, ({ - input -}) => input + 1); \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx b/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx deleted file mode 100644 index fd7f48510d..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = createServerFn({ - method: 'GET', -}).handler(async function () { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withArrowFunction = createServerFn({ - method: 'GET', -}).handler(async () => null) - -export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET', -}).handler(async () => test()) - -export const withoutUseServer = createServerFn({ - method: 'GET', -}).handler(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = createServerFn({ - method: 'GET', -}).handler(abstractedFunction) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = createServerFn({ - method: 'GET', -}).handler( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) - -export const withValidatorFn = createServerFn({ - method: 'GET', -}) - .validator(z.number()) - .handler(async ({ input }) => { - return null - }) diff --git a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx b/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx deleted file mode 100644 index 823339b3ac..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { createServerFn as serverFn } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = serverFn({ - method: 'GET', -}).handler(async function () { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withoutUseServer = serverFn({ - method: 'GET', -}).handler(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = serverFn({ method: 'GET' }).handler( - abstractedFunction, -) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = serverFn({ - method: 'GET', -}).handler( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) diff --git a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx b/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx deleted file mode 100644 index d4ecddb304..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import * as TanStackStart from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = TanStackStart.createServerFn({ - method: 'GET', -}).handler(async function () { - 'use server' - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET', -}).handler(async () => { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -}) - -export const withVariable = TanStackStart.createServerFn({ - method: 'GET', -}).handler(abstractedFunction) - -async function abstractedFunction() { - console.info('Fetching posts...') - await new Promise((r) => setTimeout(r, 500)) - return axios - .get>('https://jsonplaceholder.typicode.com/posts') - .then((r) => r.data.slice(0, 10)) -} - -function zodValidator( - schema: TSchema, - fn: (input: z.output) => TResult, -) { - return async (input: unknown) => { - return fn(schema.parse(input)) - } -} - -export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET', -}).handler( - zodValidator(z.number(), (input) => { - return { 'you gave': input } - }), -) diff --git a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx b/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx deleted file mode 100644 index 0d535eb369..0000000000 --- a/packages/solid-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { createServerFn } from '@tanstack/solid-start' -import { z } from 'zod' - -export const withUseServer = createServerFn({ - method: 'GET', -}) - .validator(z.number()) - .handler(({ input }) => input + 1) diff --git a/packages/solid-start-plugin/tests/envOnly/envOnly.test.ts b/packages/solid-start-plugin/tests/envOnly/envOnly.test.ts deleted file mode 100644 index 00c9786170..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/envOnly.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { readFile, readdir } from 'node:fs/promises' -import path from 'node:path' -import { describe, expect, test } from 'vitest' - -import { compileStartOutput } from '../../src/compilers' - -async function getFilenames() { - return await readdir(path.resolve(import.meta.dirname, './test-files')) -} - -describe('envOnly functions compile correctly', async () => { - const filenames = await getFilenames() - - describe.each(filenames)('should handle "%s"', async (filename) => { - const file = await readFile( - path.resolve(import.meta.dirname, `./test-files/${filename}`), - ) - const code = file.toString() - - test.each(['client', 'server'] as const)( - `should compile for ${filename} %s`, - async (env) => { - const compiledResult = compileStartOutput({ - env, - code, - root: './test-files', - filename, - dce: false, - }) - - await expect(compiledResult.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) - }, - ) - }) - test('should error if implementation not provided', () => { - expect(() => { - compileStartOutput({ - env: 'client', - code: ` - import { clientOnly } from '@tanstack/solid-start' - const fn = clientOnly()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - expect(() => { - compileStartOutput({ - env: 'server', - code: ` - import { serverOnly } from '@tanstack/solid-start' - const fn = serverOnly()`, - root: './test-files', - filename: 'no-fn.ts', - dce: false, - }) - }).toThrowError() - }) -}) diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx deleted file mode 100644 index 8080d677e6..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly, clientOnly } from '@tanstack/solid-start'; -const serverFunc = () => { - throw new Error("serverOnly() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx deleted file mode 100644 index c3e67e045b..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/solid-start'; -const serverFunc = () => { - throw new Error("serverOnly() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx deleted file mode 100644 index d860ab6d21..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as TanstackStart from '@tanstack/solid-start'; -const serverFunc = () => { - throw new Error("serverOnly() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx deleted file mode 100644 index 35bf2907cc..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly, clientOnly } from '@tanstack/solid-start'; -const serverFunc = () => 'server'; -const clientFunc = () => { - throw new Error("clientOnly() functions can only be called on the client!"); -}; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx deleted file mode 100644 index 31c1c2a23b..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/solid-start'; -const serverFunc = () => 'server'; -const clientFunc = () => { - throw new Error("clientOnly() functions can only be called on the client!"); -}; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx b/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx deleted file mode 100644 index 318b47dd64..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as TanstackStart from '@tanstack/solid-start'; -const serverFunc = () => 'server'; -const clientFunc = () => { - throw new Error("clientOnly() functions can only be called on the client!"); -}; \ No newline at end of file diff --git a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx b/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx deleted file mode 100644 index c4513f737d..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly, clientOnly } from '@tanstack/solid-start' - -const serverFunc = serverOnly(() => 'server') - -const clientFunc = clientOnly(() => 'client') diff --git a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx b/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx deleted file mode 100644 index 4b48ba3b58..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { - serverOnly as serverFn, - clientOnly as clientFn, -} from '@tanstack/solid-start' - -const serverFunc = serverFn(() => 'server') - -const clientFunc = clientFn(() => 'client') diff --git a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx b/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx deleted file mode 100644 index adeab52616..0000000000 --- a/packages/solid-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as TanstackStart from '@tanstack/solid-start' - -const serverFunc = TanstackStart.serverOnly(() => 'server') - -const clientFunc = TanstackStart.clientOnly(() => 'client') diff --git a/packages/solid-start-plugin/tsconfig.json b/packages/solid-start-plugin/tsconfig.json index 37d21ef6ca..090ec3917d 100644 --- a/packages/solid-start-plugin/tsconfig.json +++ b/packages/solid-start-plugin/tsconfig.json @@ -3,6 +3,8 @@ "include": ["src", "vite.config.ts", "tests"], "exclude": ["tests/**/test-files/**", "tests/**/snapshots/**"], "compilerOptions": { - "jsx": "react-jsx" + "outDir": "dist/esm", + "target": "esnext", + "noEmit": true } } diff --git a/packages/solid-start-plugin/vite.config.ts b/packages/solid-start-plugin/vite.config.ts index 5389f0f739..2c711fd181 100644 --- a/packages/solid-start-plugin/vite.config.ts +++ b/packages/solid-start-plugin/vite.config.ts @@ -16,5 +16,6 @@ export default mergeConfig( tanstackViteConfig({ entry: './src/index.ts', srcDir: './src', + outDir: './dist', }), ) diff --git a/packages/solid-start-router-manifest/README.md b/packages/solid-start-router-manifest/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/solid-start-router-manifest/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/solid-start-router-manifest/eslint.config.js b/packages/solid-start-router-manifest/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/solid-start-router-manifest/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/solid-start-router-manifest/package.json b/packages/solid-start-router-manifest/package.json deleted file mode 100644 index 3ee031b8e0..0000000000 --- a/packages/solid-start-router-manifest/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "@tanstack/solid-start-router-manifest", - "version": "1.120.3", - "description": "Modern and scalable routing for Solid applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "solid", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0; vitest", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "tsc" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/router-core": "workspace:^", - "tiny-invariant": "^1.3.3", - "vinxi": "0.5.3" - }, - "devDependencies": { - "typescript": "^5.7.2" - } -} diff --git a/packages/solid-start-router-manifest/src/index.ts b/packages/solid-start-router-manifest/src/index.ts deleted file mode 100644 index 9a41e3f788..0000000000 --- a/packages/solid-start-router-manifest/src/index.ts +++ /dev/null @@ -1,83 +0,0 @@ -// @ts-expect-error -import tsrGetManifest from 'tsr:routes-manifest' -import { getManifest } from 'vinxi/manifest' -import { default as invariant } from 'tiny-invariant' -import type { Manifest } from '@tanstack/router-core' - -function sanitizeBase(base: string) { - return base.replace(/^\/|\/$/g, '') -} - -/** - * @description Returns the full, unfiltered router manifest. This includes relationships - * between routes, assets, and preloads and is NOT what you want to serialize and - * send to the client. - */ -export function getFullRouterManifest() { - const routerManifest = tsrGetManifest() as Manifest - - const rootRoute = (routerManifest.routes.__root__ = - routerManifest.routes.__root__ || {}) - - rootRoute.assets = rootRoute.assets || [] - - const script = '' - // Always fake that HMR is ready - if (process.env.NODE_ENV === 'development') { - const CLIENT_BASE = sanitizeBase(process.env.TSS_CLIENT_BASE || '') - - if (!CLIENT_BASE) { - throw new Error( - 'tanstack/solid-start-router-manifest: TSS_CLIENT_BASE must be defined in your environment for getFullRouterManifest()', - ) - } - } - - // Get the entry for the client from vinxi - const vinxiClientManifest = getManifest('client') - - const importPath = - vinxiClientManifest.inputs[vinxiClientManifest.handler]?.output.path - if (!importPath) { - invariant(importPath, 'Could not find client entry in vinxi manifest') - } - - rootRoute.assets.push({ - tag: 'script', - attrs: { - type: 'module', - suppressHydrationWarning: true, - async: true, - }, - children: `${script}import("${importPath}")`, - }) - - return routerManifest -} - -/** - * @description Returns the router manifest that should be sent to the client. - * This includes only the assets and preloads for the current route and any - * special assets that are needed for the client. It does not include relationships - * between routes or any other data that is not needed for the client. - */ -export function getRouterManifest() { - const routerManifest = getFullRouterManifest() - - // Strip out anything that isn't needed for the client - return { - ...routerManifest, - routes: Object.fromEntries( - Object.entries(routerManifest.routes).map(([k, v]: any) => { - const { preloads, assets } = v - return [ - k, - { - preloads, - assets, - }, - ] - }), - ), - } -} diff --git a/packages/solid-start-router-manifest/tsconfig.json b/packages/solid-start-router-manifest/tsconfig.json deleted file mode 100644 index 940a9cce0a..0000000000 --- a/packages/solid-start-router-manifest/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src/index.ts"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist/esm", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/solid-start-router-manifest/vite.config.ts b/packages/solid-start-router-manifest/vite.config.ts deleted file mode 100644 index d6472068fb..0000000000 --- a/packages/solid-start-router-manifest/vite.config.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import packageJson from './package.json' -import type { ViteUserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [] as ViteUserConfig['plugins'], - test: { - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - externalDeps: ['tsr:routes-manifest'], - }), -) diff --git a/packages/solid-start-server/README.md b/packages/solid-start-server/README.md index fd6e98ac6d..46a245ec2d 100644 --- a/packages/solid-start-server/README.md +++ b/packages/solid-start-server/README.md @@ -1,33 +1,9 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! +# TanStack Solid Start - Server - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +This package is not meant to be used directly. It is a dependency of [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +TanStack Solid Start is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/solid-start-server/src/index.tsx b/packages/solid-start-server/src/index.tsx index f4573955c8..b0dda10b7a 100644 --- a/packages/solid-start-server/src/index.tsx +++ b/packages/solid-start-server/src/index.tsx @@ -1,4 +1,5 @@ export { StartServer } from './StartServer' export { defaultStreamHandler } from './defaultStreamHandler' export { defaultRenderHandler } from './defaultRenderHandler' + export * from '@tanstack/start-server-core' diff --git a/packages/solid-start-server/vite.config.ts b/packages/solid-start-server/vite.config.ts index c0a7454291..d973bb3b08 100644 --- a/packages/solid-start-server/vite.config.ts +++ b/packages/solid-start-server/vite.config.ts @@ -22,5 +22,6 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', + externalDeps: ['tanstack:server-fn-manifest', 'tanstack:start-manifest'], }), ) diff --git a/packages/solid-start/README.md b/packages/solid-start/README.md index 5745ba8bf0..c44c19422c 100644 --- a/packages/solid-start/README.md +++ b/packages/solid-start/README.md @@ -1,33 +1,42 @@ -> 🤫 we're cooking up something special! - -# TanStack Start +# TanStack Solid Start -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +![TanStack Solid Start Header](https://github.com/tanstack/router/raw/main/media/header.png) -🤖 Type-safe router w/ built-in caching & URL state management for Solid! (Experimental) +SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router) and Vite. Ready to deploy to your favorite hosting provider. #TanStack - + + - - - - - - semantic-release - + + + + + + + + + semantic-release + + Join the discussion on Github -Best of JS + + + Best of JS + + - + + - + + Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Visit [tanstack.com/start](https://tanstack.com/start) for docs, guides, API and more! diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 228c931c61..23422af30c 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/solid-start" }, "homepage": "https://tanstack.com/start", "funding": { @@ -62,34 +62,14 @@ "default": "./dist/cjs/server.cjs" } }, - "./config": { + "./plugin/vite": { "import": { - "types": "./dist/esm/config.d.ts", - "default": "./dist/esm/config.js" + "types": "./dist/esm/plugin-vite.d.ts", + "default": "./dist/esm/plugin-vite.js" }, "require": { - "types": "./dist/cjs/config.d.cts", - "default": "./dist/cjs/config.cjs" - } - }, - "./api": { - "import": { - "types": "./dist/esm/api.d.ts", - "default": "./dist/esm/api.js" - }, - "require": { - "types": "./dist/cjs/api.d.cts", - "default": "./dist/cjs/api.cjs" - } - }, - "./router-manifest": { - "import": { - "types": "./dist/esm/router-manifest.d.ts", - "default": "./dist/esm/router-manifest.js" - }, - "require": { - "types": "./dist/cjs/router-manifest.d.cts", - "default": "./dist/cjs/router-manifest.cjs" + "types": "./dist/cjs/plugin-vite.d.cts", + "default": "./dist/cjs/plugin-vite.cjs" } }, "./server-functions-client": { @@ -112,26 +92,6 @@ "default": "./dist/cjs/server-functions-server.cjs" } }, - "./server-functions-handler": { - "import": { - "types": "./dist/esm/server-functions-handler.d.ts", - "default": "./dist/esm/server-functions-handler.js" - }, - "require": { - "types": "./dist/cjs/server-functions-handler.d.cts", - "default": "./dist/cjs/server-functions-handler.cjs" - } - }, - "./server-functions-ssr": { - "import": { - "types": "./dist/esm/server-functions-ssr.d.ts", - "default": "./dist/esm/server-functions-ssr.js" - }, - "require": { - "types": "./dist/cjs/server-functions-ssr.d.cts", - "default": "./dist/cjs/server-functions-ssr.cjs" - } - }, "./package.json": "./package.json" }, "sideEffects": false, @@ -145,13 +105,9 @@ "dependencies": { "@tanstack/solid-start-client": "workspace:^", "@tanstack/solid-start-server": "workspace:^", - "@tanstack/solid-start-config": "workspace:^", - "@tanstack/solid-start-router-manifest": "workspace:^", + "@tanstack/solid-start-plugin": "workspace:^", "@tanstack/start-server-functions-client": "workspace:^", - "@tanstack/start-server-functions-server": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@tanstack/start-server-functions-ssr": "workspace:^", - "@tanstack/start-api-routes": "workspace:^" + "@tanstack/start-server-functions-server": "workspace:^" }, "peerDependencies": { "solid-js": ">=1.0.0", diff --git a/packages/solid-start/src/api.tsx b/packages/solid-start/src/api.tsx deleted file mode 100644 index fff3bec5ea..0000000000 --- a/packages/solid-start/src/api.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-api-routes' diff --git a/packages/solid-start/src/config.tsx b/packages/solid-start/src/config.tsx deleted file mode 100644 index 5a71360c3a..0000000000 --- a/packages/solid-start/src/config.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/solid-start-config' diff --git a/packages/solid-start/src/plugin-vite.ts b/packages/solid-start/src/plugin-vite.ts new file mode 100644 index 0000000000..24c76d5516 --- /dev/null +++ b/packages/solid-start/src/plugin-vite.ts @@ -0,0 +1 @@ +export * from '@tanstack/solid-start-plugin' diff --git a/packages/solid-start/src/router-manifest.tsx b/packages/solid-start/src/router-manifest.tsx deleted file mode 100644 index 4e939be275..0000000000 --- a/packages/solid-start/src/router-manifest.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/solid-start-router-manifest' diff --git a/packages/solid-start/src/server-functions-handler.tsx b/packages/solid-start/src/server-functions-handler.tsx deleted file mode 100644 index c3cc9770d2..0000000000 --- a/packages/solid-start/src/server-functions-handler.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-server-functions-handler' diff --git a/packages/solid-start/src/server-functions-ssr.tsx b/packages/solid-start/src/server-functions-ssr.tsx deleted file mode 100644 index 7359e26f45..0000000000 --- a/packages/solid-start/src/server-functions-ssr.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from '@tanstack/start-server-functions-ssr' diff --git a/packages/solid-start/vite.config.ts b/packages/solid-start/vite.config.ts index dfcd5b4b41..8557385ded 100644 --- a/packages/solid-start/vite.config.ts +++ b/packages/solid-start/vite.config.ts @@ -17,22 +17,16 @@ export default mergeConfig( entry: [ './src/client.tsx', './src/server.tsx', - './src/config.tsx', - './src/router-manifest.tsx', + './src/plugin-vite.ts', './src/server-functions-client.tsx', './src/server-functions-server.tsx', - './src/server-functions-ssr.tsx', - './src/api.tsx', ], externalDeps: [ '@tanstack/solid-start-client', '@tanstack/solid-start-server', - '@tanstack/solid-start-config', - '@tanstack/solid-start-router-manifest', + '@tanstack/solid-start-plugin', '@tanstack/start-server-functions-client', '@tanstack/start-server-functions-server', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-api-routes', ], }), ) diff --git a/packages/start-api-routes/README.md b/packages/start-api-routes/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/start-api-routes/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/start-api-routes/eslint.config.js b/packages/start-api-routes/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/start-api-routes/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/start-api-routes/src/index.ts b/packages/start-api-routes/src/index.ts deleted file mode 100644 index dbfba63cce..0000000000 --- a/packages/start-api-routes/src/index.ts +++ /dev/null @@ -1,369 +0,0 @@ -import { eventHandler, toWebRequest } from '@tanstack/start-server-core' -import vinxiFileRoutes from 'vinxi/routes' -import type { ResolveParams } from '@tanstack/router-core' - -export type StartAPIHandlerCallback = (ctx: { - request: Request -}) => Response | Promise - -export type StartAPIMethodCallback = (ctx: { - request: Request - params: ResolveParams -}) => Response | Promise - -const HTTP_API_METHODS = [ - 'GET', - 'POST', - 'PUT', - 'PATCH', - 'DELETE', - 'OPTIONS', - 'HEAD', -] as const -export type HTTP_API_METHOD = (typeof HTTP_API_METHODS)[number] - -/** - * - * @param cb The callback function that will be called when the API handler is invoked - * @returns The response from the callback function - */ -export function createStartAPIHandler(cb: StartAPIHandlerCallback) { - return eventHandler(async (event) => { - const request = toWebRequest(event)! - const res = await cb({ request }) - return res - }) -} - -type APIRoute = { - path: TPath - methods: Partial>> -} - -type CreateAPIRouteFn = ( - methods: Partial>>, -) => APIRoute - -type CreateAPIRoute = ( - path: TPath, -) => CreateAPIRouteFn - -type APIRouteReturnType = ReturnType> - -/** - * This function is used to create an API route that will be listening on a specific path when you are not using the file-based routes. - * - * @param path The path that the API route will be listening on. You need to make sure that this is a valid TanStack Router path in order for the route to be matched. This means that you can use the following syntax: - * /api/foo/$bar/name/$ - * - The `$bar` is a parameter that will be extracted from the URL and passed to the handler - * - The `$` is a wildcard that will match any number of segments in the URL - * @returns A function that takes the methods that the route will be listening on and returns the API route object - */ -export const createAPIRoute: CreateAPIRoute = (path) => (methods) => ({ - path, - methods, -}) - -/** - * This function is used to create an API route that will be listening on a specific path when you are using the file-based routes. - * - * @param filePath The path that the API file route will be listening on. This filePath should automatically be generated by the TSR plugin and should be a valid TanStack Router path - * @returns A function that takes the methods that the route will be listening on and returns the API route object - */ -export const createAPIFileRoute: CreateAPIRoute = (filePath) => (methods) => ({ - path: filePath, - methods, -}) - -/** - * This function takes a URL object and a list of routes and finds the route that matches the URL. - * - * @param url URL object - * @param entryRoutes List of routes entries in the TSR format to find the current match by the URL - * @returns Returns the route that matches the URL or undefined if no route matches - */ -function findRoute( - url: URL, - entryRoutes: Array<{ routePath: string; payload: TPayload }>, -): - | { - routePath: string - params: Record - payload: TPayload - } - | undefined { - const urlSegments = url.pathname.split('/').filter(Boolean) - - const routes = entryRoutes - .sort((a, b) => { - const aParts = a.routePath.split('/').filter(Boolean) - const bParts = b.routePath.split('/').filter(Boolean) - - return bParts.length - aParts.length - }) - .filter((r) => { - const routeSegments = r.routePath.split('/').filter(Boolean) - return urlSegments.length >= routeSegments.length - }) - - for (const route of routes) { - const routeSegments = route.routePath.split('/').filter(Boolean) - const params: Record = {} - let matches = true - for (let i = 0; i < routeSegments.length; i++) { - const routeSegment = routeSegments[i] as string - const urlSegment = urlSegments[i] as string - if (routeSegment.startsWith('$')) { - if (routeSegment === '$') { - const wildcardValue = urlSegments.slice(i).join('/') - if (wildcardValue !== '') { - params['*'] = wildcardValue - params['_splat'] = wildcardValue - } else { - matches = false - break - } - } else { - const paramName = routeSegment.slice(1) - params[paramName] = urlSegment - } - } else if (routeSegment !== urlSegment) { - matches = false - break - } - } - if (matches) { - return { routePath: route.routePath, params, payload: route.payload } - } - } - - return undefined -} - -/** - * You should only be using this function if you are not using the file-based routes. - * - * - * @param opts - A map of TSR routes with the values being the route handlers - * @returns The handler for the incoming request - * - * @example - * ```ts - * // app/foo.ts - * import { createAPIRoute } from '@tanstack/start-api-routes' - * const fooBarRoute = createAPIRoute('/api/foo/$bar')({ - * GET: ({ params }) => { - * return new Response(JSON.stringify({ params })) - * } - * }) - * - * // app/api.ts - * import { - * createStartAPIHandler, - * defaultAPIRoutesHandler - * } from '@tanstack/start-api-routes' - * - * export default createStartAPIHandler( - * defaultAPIRoutesHandler({ - * '/api/foo/$bar': fooBarRoute - * }) - * ) - * ``` - */ -export const defaultAPIRoutesHandler: (opts: { - routes: { [TPath in string]: APIRoute } -}) => StartAPIHandlerCallback = (opts) => { - return async ({ request }) => { - if (!HTTP_API_METHODS.includes(request.method as HTTP_API_METHOD)) { - return new Response('Method not allowed', { status: 405 }) - } - - const url = new URL(request.url, 'http://localhost:3000') - - const routes = Object.entries(opts.routes).map(([routePath, route]) => ({ - routePath, - payload: route, - })) - - // Find the route that matches the request by the request URL - const match = findRoute(url, routes) - - // If we don't have a route that could possibly handle the request, return a 404 - if (!match) { - return new Response('Not found', { status: 404 }) - } - - // If the route path doesn't match the payload path, return a 404 - if (match.routePath !== match.payload.path) { - console.error( - `Route path mismatch: ${match.routePath} !== ${match.payload.path}. Please make sure that the route path in \`createAPIRoute\` matches the path in the handler map in \`defaultAPIRoutesHandler\``, - ) - return new Response('Not found', { status: 404 }) - } - - const method = request.method as HTTP_API_METHOD - - // Get the handler for the request method based on the Request Method - const handler = match.payload.methods[method] - - // If the handler is not defined, return a 405 - if (!handler) { - return new Response('Method not allowed', { status: 405 }) - } - - return await handler({ request, params: match.params }) - } -} - -interface CustomizedVinxiFileRoute { - path: string // this path adheres to the h3 router path format - filePath: string // this is the file path on the system - $APIRoute?: { - src: string // this is the path to the source file - import: () => Promise<{ - APIRoute: APIRouteReturnType - }> - } -} - -/** - * This is populated by the work done in the config file using the tsrFileRouter - */ -const vinxiRoutes = ( - vinxiFileRoutes as unknown as Array -).filter((route) => route['$APIRoute']) - -/** - * This function takes the vinxi routes and interpolates them into a format that can be worked with in the API handler - * - * @param routes The vinxi routes that have been filtered to only include those with a $APIRoute property - * @returns An array of objects where the path `key` is interpolated to a valid TanStack Router path, with the `payload` being the original route object - * - * @example - * ``` - * const input = [ - * { - * path: '/api/boo/:$id?/name/*splat', - * filePath: '..../code/tanstack/router/examples/react/start-basic/app/routes/api.boo.$id.name.$.tsx', - * '$APIRoute': [Object] - * } - * ] - * - * toTSRFileBasedRoutes(input) - * [ - * { - * path: '/api/boo/$id/name/$', - * route: { - * path: '/api/boo/:$id?/name/*splat', - * filePath: '..../code/tanstack/router/examples/react/start-basic/app/routes/api.boo.$id.name.$.tsx', - * '$APIRoute': [Object] - * } - * } - * ] - * ``` - */ -function toTSRFileBasedRoutes( - routes: Array, -): Array<{ routePath: string; payload: CustomizedVinxiFileRoute }> { - const pairs: Array<{ - routePath: string - payload: CustomizedVinxiFileRoute - }> = [] - - routes.forEach((route) => { - const parts = route.path.split('/').filter(Boolean) - - const path = parts - .map((part) => { - if (part === '*splat') { - return '$' - } - - if (part.startsWith(':$') && part.endsWith('?')) { - return part.slice(1, -1) - } - - return part - }) - .join('/') - - pairs.push({ routePath: `/${path}`, payload: route }) - }) - - return pairs -} - -/** - * This function is the default handler for the API routes when using file-based routes. - * - * @param StartAPIHandlerCallbackContext - * @returns The handler for the incoming request - * - * @example - * ```ts - * // app/api.ts - * import { - * createStartAPIHandler, - * defaultAPIFileRouteHandler - * } from '@tanstack/start-api-routes' - * - * export default createStartAPIHandler(defaultAPIFileRouteHandler) - * ``` - */ -export const defaultAPIFileRouteHandler: StartAPIHandlerCallback = async ({ - request, -}) => { - // Simple early abort if there are no routes - if (!vinxiRoutes.length) { - return new Response('No routes found', { status: 404 }) - } - - if (!HTTP_API_METHODS.includes(request.method as HTTP_API_METHOD)) { - return new Response('Method not allowed', { status: 405 }) - } - - const routes = toTSRFileBasedRoutes(vinxiRoutes) - - const url = new URL(request.url, 'http://localhost:3000') - - // Find the route that file that matches the request by the request URL - const match = findRoute(url, routes) - - // If we don't have a route that could possibly handle the request, return a 404 - if (!match) { - return new Response('Not found', { status: 404 }) - } - - // The action is the route file that we need to import - // which contains the possible handlers for the incoming request - let action: APIRouteReturnType | undefined = undefined - - try { - // We can guarantee that action is defined since we filtered for it earlier - action = await match.payload.$APIRoute!.import().then((m) => m.APIRoute) - } catch (err) { - // If we can't import the route file, return a 500 - console.error('Error importing route file:', err) - return new Response('Internal server error', { status: 500 }) - } - - // If we don't have an action, return a 500 - if (!action) { - return new Response('Internal server error', { status: 500 }) - } - - const method = request.method as HTTP_API_METHOD - - // Get the handler for the request method based on the Request Method - const handler = action.methods[method] - - // If the handler is not defined, return a 405 - // What this means is that we have a route that matches the request - // but we don't have a handler for the request method - // i.e we have a route that matches /api/foo/$ but we don't have a POST handler - if (!handler) { - return new Response('Method not allowed', { status: 405 }) - } - - return await handler({ request, params: match.params }) -} diff --git a/packages/start-api-routes/tsconfig.json b/packages/start-api-routes/tsconfig.json deleted file mode 100644 index 51dda9abf2..0000000000 --- a/packages/start-api-routes/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx", - "module": "esnext" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/start-api-routes/vite.config.ts b/packages/start-api-routes/vite.config.ts deleted file mode 100644 index 976bb5c87f..0000000000 --- a/packages/start-api-routes/vite.config.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import packageJson from './package.json' -import type { ViteUserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [] as ViteUserConfig['plugins'], - test: { - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - }), -) diff --git a/packages/start-client-core/README.md b/packages/start-client-core/README.md index fd6e98ac6d..6c9085433a 100644 --- a/packages/start-client-core/README.md +++ b/packages/start-client-core/README.md @@ -1,33 +1,12 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +# TanStack Start - Client Core -🤖 Type-safe router w/ built-in caching & URL state management for React! +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index 654fe78271..357adea2f2 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -14,21 +14,225 @@ import type { SerializerStringify, } from '@tanstack/router-core' -export type AssignAllMiddleware< +export function createMiddleware( + options: { + type: TType + validateClient?: boolean + }, + __opts?: FunctionMiddlewareOptions< + unknown, + undefined, + undefined, + undefined, + ServerFnResponseType + >, +): CreateMiddlewareResult { + // const resolvedOptions = (__opts || options) as MiddlewareOptions< + const resolvedOptions = { + type: 'function', + ...(__opts || + (options as FunctionMiddlewareOptions< + unknown, + undefined, + undefined, + undefined, + ServerFnResponseType + >)), + } + + return { + options: resolvedOptions, + middleware: (middleware: any) => { + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { middleware }), + ) as any + }, + validator: (validator: any) => { + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { validator }), + ) as any + }, + client: (client: any) => { + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { client }), + ) as any + }, + server: (server: any) => { + return createMiddleware( + {} as any, + Object.assign(resolvedOptions, { server }), + ) as any + }, + } as unknown as CreateMiddlewareResult +} + +export type MiddlewareType = 'request' | 'function' + +export type CreateMiddlewareResult = + 'function' extends TType + ? FunctionMiddleware + : RequestMiddleware + +export interface FunctionMiddleware< + TServerFnResponseType extends ServerFnResponseType, +> extends FunctionMiddlewareAfterMiddleware { + middleware: ( + middlewares: Constrain< + TNewMiddlewares, + ReadonlyArray + >, + ) => FunctionMiddlewareAfterMiddleware +} + +export interface FunctionMiddlewareAfterMiddleware< + TMiddlewares, + TServerFnResponseType extends ServerFnResponseType, +> extends FunctionMiddlewareWithTypes< + TMiddlewares, + undefined, + undefined, + undefined, + undefined, + undefined, + TServerFnResponseType + >, + FunctionMiddlewareServer< + TMiddlewares, + undefined, + undefined, + undefined, + TServerFnResponseType + >, + FunctionMiddlewareClient, + FunctionMiddlewareValidator {} + +export interface FunctionMiddlewareWithTypes< + TMiddlewares, + TValidator, + TServerContext, + TServerSendContext, + TClientContext, + TClientSendContext, + TServerFnResponseType extends ServerFnResponseType, +> { + _types: FunctionMiddlewareTypes< + TMiddlewares, + TValidator, + TServerContext, + TServerSendContext, + TClientContext, + TClientSendContext + > + options: FunctionMiddlewareOptions< + TMiddlewares, + TValidator, + TServerContext, + TClientContext, + TServerFnResponseType + > +} + +export interface FunctionMiddlewareTypes< + in out TMiddlewares, + in out TValidator, + in out TServerContext, + in out TServerSendContext, + in out TClientContext, + in out TClientSendContext, +> { + type: 'function' + middlewares: TMiddlewares + input: ResolveValidatorInput + allInput: IntersectAllValidatorInputs + output: ResolveValidatorOutput + allOutput: IntersectAllValidatorOutputs + clientContext: TClientContext + allClientContextBeforeNext: AssignAllClientContextBeforeNext< + TMiddlewares, + TClientContext + > + allClientContextAfterNext: AssignAllClientContextAfterNext< + TMiddlewares, + TClientContext, + TClientSendContext + > + serverContext: TServerContext + serverSendContext: TServerSendContext + allServerSendContext: AssignAllServerSendContext< + TMiddlewares, + TServerSendContext + > + allServerContext: AssignAllServerContext< + TMiddlewares, + TServerSendContext, + TServerContext + > + clientSendContext: TClientSendContext + allClientSendContext: AssignAllClientSendContext< + TMiddlewares, + TClientSendContext + > + validator: TValidator +} + +/** + * Recursively resolve the input type produced by a sequence of middleware + */ +export type IntersectAllValidatorInputs = + unknown extends TValidator + ? TValidator + : TValidator extends undefined + ? IntersectAllMiddleware + : IntersectAssign< + IntersectAllMiddleware, + ResolveValidatorInput + > + +export type IntersectAllMiddleware< TMiddlewares, - TType extends keyof AnyMiddleware['_types'], + TType extends + | keyof AnyFunctionMiddleware['_types'] + | keyof AnyRequestMiddleware['_types'], TAcc = undefined, -> = TMiddlewares extends readonly [ - infer TMiddleware extends AnyMiddleware, - ...infer TRest, -] - ? AssignAllMiddleware< - TRest, - TType, - Assign - > +> = TMiddlewares extends readonly [infer TMiddleware, ...infer TRest] + ? TMiddleware extends AnyFunctionMiddleware | AnyRequestMiddleware + ? IntersectAllMiddleware< + TRest, + TType, + IntersectAssign< + TAcc, + TMiddleware['_types'][TType & keyof TMiddleware['_types']] + > + > + : TAcc : TAcc +export type AnyFunctionMiddleware = FunctionMiddlewareWithTypes< + any, + any, + any, + any, + any, + any, + any +> + +/** + * Recursively merge the output type produced by a sequence of middleware + */ +export type IntersectAllValidatorOutputs = + unknown extends TValidator + ? TValidator + : TValidator extends undefined + ? IntersectAllMiddleware + : IntersectAssign< + IntersectAllMiddleware, + ResolveValidatorOutput + > + /** * Recursively resolve the client context type produced by a sequence of middleware */ @@ -42,15 +246,21 @@ export type AssignAllClientContextBeforeNext< TClientContext > -export type AssignAllClientSendContext< +export type AssignAllMiddleware< TMiddlewares, - TSendContext = undefined, -> = unknown extends TSendContext - ? TSendContext - : Assign< - AssignAllMiddleware, - TSendContext - > + TType extends + | keyof AnyFunctionMiddleware['_types'] + | keyof AnyRequestMiddleware['_types'], + TAcc = undefined, +> = TMiddlewares extends readonly [infer TMiddleware, ...infer TRest] + ? TMiddleware extends AnyFunctionMiddleware | AnyRequestMiddleware + ? AssignAllMiddleware< + TRest, + TType, + Assign + > + : TAcc + : TAcc export type AssignAllClientContextAfterNext< TMiddlewares, @@ -63,6 +273,16 @@ export type AssignAllClientContextAfterNext< Assign > +export type AssignAllServerSendContext< + TMiddlewares, + TSendContext = undefined, +> = unknown extends TSendContext + ? TSendContext + : Assign< + AssignAllMiddleware, + TSendContext + > + /** * Recursively resolve the server context type produced by a sequence of middleware */ @@ -77,57 +297,17 @@ export type AssignAllServerContext< Assign > -export type AssignAllServerSendContext< +export type AssignAllClientSendContext< TMiddlewares, TSendContext = undefined, > = unknown extends TSendContext ? TSendContext : Assign< - AssignAllMiddleware, + AssignAllMiddleware, TSendContext > -export type IntersectAllMiddleware< - TMiddlewares, - TType extends keyof AnyMiddleware['_types'], - TAcc = undefined, -> = TMiddlewares extends readonly [ - infer TMiddleware extends AnyMiddleware, - ...infer TRest, -] - ? IntersectAllMiddleware< - TRest, - TType, - IntersectAssign - > - : TAcc - -/** - * Recursively resolve the input type produced by a sequence of middleware - */ -export type IntersectAllValidatorInputs = - unknown extends TValidator - ? TValidator - : IntersectAssign< - IntersectAllMiddleware, - TValidator extends undefined - ? undefined - : ResolveValidatorInput - > -/** - * Recursively merge the output type produced by a sequence of middleware - */ -export type IntersectAllValidatorOutputs = - unknown extends TValidator - ? TValidator - : IntersectAssign< - IntersectAllMiddleware, - TValidator extends undefined - ? undefined - : ResolveValidatorOutput - > - -export interface MiddlewareOptions< +export interface FunctionMiddlewareOptions< in out TMiddlewares, in out TValidator, in out TServerContext, @@ -137,14 +317,14 @@ export interface MiddlewareOptions< validateClient?: boolean middleware?: TMiddlewares validator?: ConstrainValidator - client?: MiddlewareClientFn< + client?: FunctionMiddlewareClientFn< TMiddlewares, TValidator, TServerContext, TClientContext, TServerFnResponseType > - server?: MiddlewareServerFn< + server?: FunctionMiddlewareServerFn< TMiddlewares, TValidator, TServerContext, @@ -154,38 +334,44 @@ export interface MiddlewareOptions< > } -export type MiddlewareServerNextFn = < - TNewServerContext = undefined, +export type FunctionMiddlewareClientNextFn = < TSendContext = undefined, + TNewClientContext = undefined, >(ctx?: { - context?: TNewServerContext + context?: TNewClientContext sendContext?: SerializerStringify + headers?: HeadersInit }) => Promise< - ServerResultWithContext< - TMiddlewares, - TServerSendContext, - TNewServerContext, - TSendContext - > + FunctionClientResultWithContext > -export interface MiddlewareServerFnOptions< - in out TMiddlewares, - in out TValidator, - in out TServerSendContext, - in out TServerFnResponseType, +export interface FunctionMiddlewareServer< + TMiddlewares, + TValidator, + TServerSendContext, + TClientContext, + TServerFnResponseType extends ServerFnResponseType, > { - data: Expand> - context: Expand> - next: MiddlewareServerNextFn - response: TServerFnResponseType - method: Method - filename: string - functionId: string - signal: AbortSignal + server: ( + server: FunctionMiddlewareServerFn< + TMiddlewares, + TValidator, + TServerSendContext, + TNewServerContext, + TSendContext, + TServerFnResponseType + >, + ) => FunctionMiddlewareAfterServer< + TMiddlewares, + TValidator, + TNewServerContext, + TServerSendContext, + TClientContext, + TSendContext, + ServerFnResponseType + > } - -export type MiddlewareServerFn< +export type FunctionMiddlewareServerFn< TMiddlewares, TValidator, TServerSendContext, @@ -193,96 +379,47 @@ export type MiddlewareServerFn< TSendContext, TServerFnResponseType extends ServerFnResponseType, > = ( - options: MiddlewareServerFnOptions< + options: FunctionMiddlewareServerFnOptions< TMiddlewares, TValidator, TServerSendContext, TServerFnResponseType >, -) => MiddlewareServerFnResult< +) => FunctionMiddlewareServerFnResult< TMiddlewares, TServerSendContext, TNewServerContext, TSendContext > -export type MiddlewareServerFnResult< - TMiddlewares, - TServerSendContext, - TServerContext, - TSendContext, -> = - | Promise< - ServerResultWithContext< - TMiddlewares, - TServerSendContext, - TServerContext, - TSendContext - > - > - | ServerResultWithContext< - TMiddlewares, - TServerSendContext, - TServerContext, - TSendContext - > - -export type MiddlewareClientNextFn = < - TSendContext = undefined, - TNewClientContext = undefined, ->(ctx?: { - context?: TNewClientContext - sendContext?: SerializerStringify - headers?: HeadersInit -}) => Promise< - ClientResultWithContext -> - -export interface MiddlewareClientFnOptions< +export interface RequestMiddlewareServerFnOptions< in out TMiddlewares, - in out TValidator, - in out TServerFnResponseType extends ServerFnResponseType, + in out TServerSendContext, > { - data: Expand> - context: Expand> - sendContext: Expand> + request: Request + context: Expand> + next: FunctionMiddlewareServerNextFn + response: Response method: Method - response: TServerFnResponseType signal: AbortSignal - next: MiddlewareClientNextFn - filename: string - functionId: string - type: ServerFnTypeOrTypeFn< - Method, - TServerFnResponseType, - TMiddlewares, - TValidator - > } -export type MiddlewareClientFn< - TMiddlewares, - TValidator, - TSendContext, - TClientContext, - TServerFnResponseType extends ServerFnResponseType, -> = ( - options: MiddlewareClientFnOptions< +export type FunctionMiddlewareServerNextFn = < + TNewServerContext = undefined, + TSendContext = undefined, +>(ctx?: { + context?: TNewServerContext + sendContext?: SerializerStringify +}) => Promise< + FunctionServerResultWithContext< TMiddlewares, - TValidator, - TServerFnResponseType - >, -) => MiddlewareClientFnResult - -export type MiddlewareClientFnResult< - TMiddlewares, - TSendContext, - TClientContext, -> = - | Promise> - | ClientResultWithContext + TServerSendContext, + TNewServerContext, + TSendContext + > +> -export type ServerResultWithContext< +export type FunctionServerResultWithContext< in out TMiddlewares, in out TServerSendContext, in out TServerContext, @@ -299,70 +436,44 @@ export type ServerResultWithContext< sendContext: Expand> } -export type ClientResultWithContext< - in out TMiddlewares, - in out TSendContext, - in out TClientContext, -> = { - 'use functions must return the result of next()': true - context: Expand> - sendContext: Expand> - headers: HeadersInit -} - -export type AnyMiddleware = MiddlewareWithTypes< - any, - any, - any, - any, - any, - any, - any -> - -export interface MiddlewareTypes< +export interface FunctionMiddlewareServerFnOptions< in out TMiddlewares, in out TValidator, - in out TServerContext, in out TServerSendContext, - in out TClientContext, - in out TClientSendContext, + in out TServerFnResponseType, > { - middlewares: TMiddlewares - input: ResolveValidatorInput - allInput: IntersectAllValidatorInputs - output: ResolveValidatorOutput - allOutput: IntersectAllValidatorOutputs - clientContext: TClientContext - allClientContextBeforeNext: AssignAllClientContextBeforeNext< - TMiddlewares, - TClientContext - > - allClientContextAfterNext: AssignAllClientContextAfterNext< - TMiddlewares, - TClientContext, - TClientSendContext - > - serverContext: TServerContext - serverSendContext: TServerSendContext - allServerSendContext: AssignAllServerSendContext< - TMiddlewares, - TServerSendContext - > - allServerContext: AssignAllServerContext< - TMiddlewares, - TServerSendContext, - TServerContext - > - clientSendContext: TClientSendContext - allClientSendContext: AssignAllClientSendContext< - TMiddlewares, - TClientSendContext - > - validator: TValidator + data: Expand> + context: Expand> + next: FunctionMiddlewareServerNextFn + response: TServerFnResponseType + method: Method + filename: string + functionId: string + signal: AbortSignal } -export interface MiddlewareWithTypes< +export type FunctionMiddlewareServerFnResult< + TMiddlewares, + TServerSendContext, + TServerContext, + TSendContext, +> = + | Promise< + FunctionServerResultWithContext< + TMiddlewares, + TServerSendContext, + TServerContext, + TSendContext + > + > + | FunctionServerResultWithContext< + TMiddlewares, + TServerSendContext, + TServerContext, + TSendContext + > + +export interface FunctionMiddlewareAfterServer< TMiddlewares, TValidator, TServerContext, @@ -370,111 +481,110 @@ export interface MiddlewareWithTypes< TClientContext, TClientSendContext, TServerFnResponseType extends ServerFnResponseType, -> { - _types: MiddlewareTypes< +> extends FunctionMiddlewareWithTypes< TMiddlewares, TValidator, TServerContext, TServerSendContext, TClientContext, - TClientSendContext - > - options: MiddlewareOptions< - TMiddlewares, - TValidator, - TServerContext, - TClientContext, + TClientSendContext, TServerFnResponseType - > -} + > {} -export interface MiddlewareAfterValidator< +export interface FunctionMiddlewareClient< TMiddlewares, TValidator, TServerFnResponseType extends ServerFnResponseType, -> extends MiddlewareWithTypes< - TMiddlewares, - TValidator, - undefined, - undefined, - undefined, - undefined, - ServerFnResponseType - >, - MiddlewareServer< +> { + client: ( + client: FunctionMiddlewareClientFn< TMiddlewares, TValidator, - undefined, - undefined, + TSendServerContext, + TNewClientContext, TServerFnResponseType >, - MiddlewareClient {} - -export interface MiddlewareValidator< - TMiddlewares, - TServerFnResponseType extends ServerFnResponseType, -> { - validator: ( - input: ConstrainValidator, - ) => MiddlewareAfterValidator< + ) => FunctionMiddlewareAfterClient< TMiddlewares, - TNewValidator, - TServerFnResponseType + TValidator, + TSendServerContext, + TNewClientContext, + ServerFnResponseType > } -export interface MiddlewareAfterServer< +export type FunctionMiddlewareClientFn< TMiddlewares, TValidator, - TServerContext, - TServerSendContext, + TSendContext, TClientContext, - TClientSendContext, TServerFnResponseType extends ServerFnResponseType, -> extends MiddlewareWithTypes< +> = ( + options: FunctionMiddlewareClientFnOptions< TMiddlewares, TValidator, - TServerContext, - TServerSendContext, - TClientContext, - TClientSendContext, TServerFnResponseType - > {} - -export interface MiddlewareServer< + >, +) => FunctionMiddlewareClientFnResult< TMiddlewares, - TValidator, - TServerSendContext, - TClientContext, - TServerFnResponseType extends ServerFnResponseType, + TSendContext, + TClientContext +> + +export interface FunctionMiddlewareClientFnOptions< + in out TMiddlewares, + in out TValidator, + in out TServerFnResponseType extends ServerFnResponseType, > { - server: ( - server: MiddlewareServerFn< - TMiddlewares, - TValidator, - TServerSendContext, - TNewServerContext, - TSendContext, - TServerFnResponseType - >, - ) => MiddlewareAfterServer< + data: Expand> + context: Expand> + sendContext: Expand> + method: Method + response: TServerFnResponseType + signal: AbortSignal + next: FunctionMiddlewareClientNextFn + filename: string + functionId: string + type: ServerFnTypeOrTypeFn< + Method, + TServerFnResponseType, TMiddlewares, - TValidator, - TNewServerContext, - TServerSendContext, - TClientContext, - TSendContext, - ServerFnResponseType + TValidator > } -export interface MiddlewareAfterClient< +export type FunctionMiddlewareClientFnResult< + TMiddlewares, + TSendContext, + TClientContext, +> = + | Promise< + FunctionClientResultWithContext< + TMiddlewares, + TSendContext, + TClientContext + > + > + | FunctionClientResultWithContext + +export type FunctionClientResultWithContext< + in out TMiddlewares, + in out TSendContext, + in out TClientContext, +> = { + 'use functions must return the result of next()': true + context: Expand> + sendContext: Expand> + headers: HeadersInit +} + +export interface FunctionMiddlewareAfterClient< TMiddlewares, TValidator, TServerSendContext, TClientContext, TServerFnResponseType extends ServerFnResponseType, -> extends MiddlewareWithTypes< +> extends FunctionMiddlewareWithTypes< TMiddlewares, TValidator, undefined, @@ -483,7 +593,7 @@ export interface MiddlewareAfterClient< undefined, TServerFnResponseType >, - MiddlewareServer< + FunctionMiddlewareServer< TMiddlewares, TValidator, TServerSendContext, @@ -491,105 +601,106 @@ export interface MiddlewareAfterClient< TServerFnResponseType > {} -export interface MiddlewareClient< +export interface FunctionMiddlewareValidator< TMiddlewares, - TValidator, TServerFnResponseType extends ServerFnResponseType, > { - client: ( - client: MiddlewareClientFn< - TMiddlewares, - TValidator, - TSendServerContext, - TNewClientContext, - TServerFnResponseType - >, - ) => MiddlewareAfterClient< + validator: ( + input: ConstrainValidator, + ) => FunctionMiddlewareAfterValidator< TMiddlewares, - TValidator, - TSendServerContext, - TNewClientContext, - ServerFnResponseType + TNewValidator, + TServerFnResponseType > } -export interface MiddlewareAfterMiddleware< +export interface FunctionMiddlewareAfterValidator< TMiddlewares, + TValidator, TServerFnResponseType extends ServerFnResponseType, -> extends MiddlewareWithTypes< +> extends FunctionMiddlewareWithTypes< TMiddlewares, + TValidator, undefined, undefined, undefined, undefined, - undefined, - TServerFnResponseType + ServerFnResponseType >, - MiddlewareServer< + FunctionMiddlewareServer< TMiddlewares, - undefined, + TValidator, undefined, undefined, TServerFnResponseType >, - MiddlewareClient, - MiddlewareValidator {} + FunctionMiddlewareClient {} -export interface Middleware - extends MiddlewareAfterMiddleware { - middleware: ( - middlewares: Constrain>, - ) => MiddlewareAfterMiddleware +export interface RequestMiddleware + extends RequestMiddlewareAfterMiddleware { + middleware: ( + middlewares: Constrain>, + ) => RequestMiddlewareAfterMiddleware } -export function createMiddleware( - options?: { - validateClient?: boolean - }, - __opts?: MiddlewareOptions< - unknown, - undefined, - undefined, +export type AnyRequestMiddleware = RequestMiddlewareWithTypes + +export interface RequestMiddlewareWithTypes { + _types: RequestMiddlewareTypes +} + +export interface RequestMiddlewareTypes { + type: 'request' + middlewares: TMiddlewares + serverContext: TServerContext + allServerContext: AssignAllServerContext< + TMiddlewares, undefined, - ServerFnResponseType - >, -): Middleware { - // const resolvedOptions = (__opts || options) as MiddlewareOptions< - const resolvedOptions = - __opts || - ((options || {}) as MiddlewareOptions< - unknown, - undefined, - undefined, - undefined, - ServerFnResponseType - >) + TServerContext + > +} - return { - options: resolvedOptions as any, - middleware: (middleware: any) => { - return createMiddleware( - undefined, - Object.assign(resolvedOptions, { middleware }), - ) as any - }, - validator: (validator: any) => { - return createMiddleware( - undefined, - Object.assign(resolvedOptions, { validator }), - ) as any - }, - client: (client: any) => { - return createMiddleware( - undefined, - Object.assign(resolvedOptions, { client }), - ) as any - }, - server: (server: any) => { - return createMiddleware( - undefined, - Object.assign(resolvedOptions, { server }), - ) as any - }, - } as unknown as Middleware +export interface RequestMiddlewareAfterMiddleware + extends RequestMiddlewareWithTypes, + RequestMiddlewareServer {} + +export interface RequestMiddlewareServer { + server: ( + fn: RequestServerFn, + ) => RequestMiddlewareAfterServer +} + +export type RequestServerFn = ( + options: RequestServerOptions, +) => RequestMiddlewareServerFnResult + +export interface RequestServerOptions { + request: Request + pathname: string + context: AssignAllServerContext + next: RequestServerNextFn +} + +export type RequestServerNextFn = ( + options?: RequestServerNextFnOptions, +) => RequestMiddlewareServerFnResult + +export interface RequestServerNextFnOptions { + context?: TServerContext +} + +export type RequestMiddlewareServerFnResult = + | Promise> + | RequestServerResult + +export interface RequestServerResult { + request: Request + pathname: string + context: Expand< + AssignAllServerContext + > + response: Response } + +export interface RequestMiddlewareAfterServer + extends RequestMiddlewareWithTypes {} diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index a84995097e..14c1b26001 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -16,15 +16,17 @@ import type { } from '@tanstack/router-core' import type { Readable } from 'node:stream' import type { - AnyMiddleware, + AnyFunctionMiddleware, AssignAllClientSendContext, AssignAllServerContext, + FunctionMiddlewareClientFnResult, + FunctionMiddlewareServerFnResult, IntersectAllValidatorInputs, IntersectAllValidatorOutputs, - MiddlewareClientFnResult, - MiddlewareServerFnResult, } from './createMiddleware' +type TODO = any + export function createServerFn< TMethod extends Method, TServerFnResponseType extends ServerFnResponseType = 'data', @@ -215,8 +217,8 @@ export function createServerFn< } } -async function executeMiddleware( - middlewares: Array, +export async function executeMiddleware( + middlewares: Array, env: 'client' | 'server', opts: ServerFnMiddlewareOptions, ): Promise { @@ -398,6 +400,7 @@ export type ServerFnReturnType< > = TServerFnResponseType extends 'raw' ? RawResponse | Promise : Promise> | SerializerStringify + export type ServerFn< TMethod, TServerFnResponseType extends ServerFnResponseType, @@ -442,7 +445,7 @@ export type ServerFnBaseOptions< method: TMethod response?: TServerFnResponseType validateClient?: boolean - middleware?: Constrain> + middleware?: Constrain> validator?: ConstrainValidator extractedFn?: CompiledFetcherFn serverFn?: ServerFn< @@ -485,7 +488,10 @@ export interface ServerFnMiddleware< TValidator, > { middleware: ( - middlewares: Constrain>, + middlewares: Constrain< + TNewMiddlewares, + ReadonlyArray + >, ) => ServerFnAfterMiddleware< TMethod, TServerFnResponseType, @@ -812,12 +818,12 @@ export function extractFormDataContext(formData: FormData) { } export function flattenMiddlewares( - middlewares: Array, -): Array { - const seen = new Set() - const flattened: Array = [] + middlewares: Array, +): Array { + const seen = new Set() + const flattened: Array = [] - const recurse = (middleware: Array) => { + const recurse = (middleware: Array) => { middleware.forEach((m) => { if (m.options.middleware) { recurse(m.options.middleware) @@ -929,7 +935,7 @@ export function execValidator( export function serverFnBaseToMiddleware( options: ServerFnBaseOptions, -): AnyMiddleware { +): AnyFunctionMiddleware { return { _types: undefined!, options: { @@ -973,16 +979,25 @@ export function serverFnBaseToMiddleware( // but not before serializing the context const res = await options.extractedFn?.(payload) - return next(res) as unknown as MiddlewareClientFnResult + return next(res) as unknown as FunctionMiddlewareClientFnResult< + any, + any, + any + > }, server: async ({ next, ...ctx }) => { // Execute the server function - const result = await options.serverFn?.(ctx) + const result = await options.serverFn?.(ctx as TODO) return next({ ...ctx, result, - } as any) as unknown as MiddlewareServerFnResult + } as any) as unknown as FunctionMiddlewareServerFnResult< + any, + any, + any, + any + > }, }, } diff --git a/packages/start-client-core/src/index.tsx b/packages/start-client-core/src/index.tsx index fb50145dee..5c409dab00 100644 --- a/packages/start-client-core/src/index.tsx +++ b/packages/start-client-core/src/index.tsx @@ -25,30 +25,30 @@ export { createMiddleware, type IntersectAllValidatorInputs, type IntersectAllValidatorOutputs, - type MiddlewareServerFn, - type AnyMiddleware, - type MiddlewareOptions, - type MiddlewareWithTypes, - type MiddlewareValidator, - type MiddlewareServer, - type MiddlewareAfterClient, - type MiddlewareAfterMiddleware, - type MiddlewareAfterServer, - type Middleware, - type MiddlewareClientFnOptions, - type MiddlewareClientFnResult, - type MiddlewareClientNextFn, - type ClientResultWithContext, + type FunctionMiddlewareServerFn, + type AnyFunctionMiddleware, + type FunctionMiddlewareOptions, + type FunctionMiddlewareWithTypes, + type FunctionMiddlewareValidator, + type FunctionMiddlewareServer, + type FunctionMiddlewareAfterClient, + type FunctionMiddlewareAfterServer, + type FunctionMiddleware, + type FunctionMiddlewareClientFnOptions, + type FunctionMiddlewareClientFnResult, + type FunctionMiddlewareClientNextFn, + type FunctionClientResultWithContext, type AssignAllClientContextBeforeNext, type AssignAllMiddleware, type AssignAllServerContext, - type MiddlewareAfterValidator, - type MiddlewareClientFn, - type MiddlewareServerFnResult, - type MiddlewareClient, - type MiddlewareServerFnOptions, - type MiddlewareServerNextFn, - type ServerResultWithContext, + type FunctionMiddlewareAfterValidator, + type FunctionMiddlewareClientFn, + type FunctionMiddlewareServerFnResult, + type FunctionMiddlewareClient, + type FunctionMiddlewareServerFnOptions, + type FunctionMiddlewareServerNextFn, + type FunctionServerResultWithContext, + type AnyRequestMiddleware, } from './createMiddleware' export { registerGlobalMiddleware, @@ -84,4 +84,5 @@ export { extractFormDataContext, flattenMiddlewares, serverFnStaticCache, + executeMiddleware, } from './createServerFn' diff --git a/packages/start-client-core/src/registerGlobalMiddleware.ts b/packages/start-client-core/src/registerGlobalMiddleware.ts index 3d7effc85b..ab13d981ad 100644 --- a/packages/start-client-core/src/registerGlobalMiddleware.ts +++ b/packages/start-client-core/src/registerGlobalMiddleware.ts @@ -1,9 +1,9 @@ -import type { AnyMiddleware } from './createMiddleware' +import type { AnyFunctionMiddleware } from './createMiddleware' -export const globalMiddleware: Array = [] +export const globalMiddleware: Array = [] export function registerGlobalMiddleware(options: { - middleware: Array + middleware: Array }) { globalMiddleware.push(...options.middleware) } diff --git a/packages/start-client-core/src/tests/createServerFn.test-d.ts b/packages/start-client-core/src/tests/createServerFn.test-d.ts index 5cb1305ebe..2abc7a409b 100644 --- a/packages/start-client-core/src/tests/createServerFn.test-d.ts +++ b/packages/start-client-core/src/tests/createServerFn.test-d.ts @@ -60,21 +60,25 @@ test('createServerFn with validator', () => { }) test('createServerFn with middleware and context', () => { - const middleware1 = createMiddleware().server(({ next }) => { - return next({ context: { a: 'a' } as const }) - }) + const middleware1 = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { a: 'a' } as const }) + }, + ) - const middleware2 = createMiddleware().server(({ next }) => { - return next({ context: { b: 'b' } as const }) - }) + const middleware2 = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { b: 'b' } as const }) + }, + ) - const middleware3 = createMiddleware() + const middleware3 = createMiddleware({ type: 'function' }) .middleware([middleware1, middleware2]) .client(({ next }) => { return next({ context: { c: 'c' } as const }) }) - const middleware4 = createMiddleware() + const middleware4 = createMiddleware({ type: 'function' }) .middleware([middleware3]) .client(({ context, next }) => { return next({ sendContext: context }) @@ -113,21 +117,24 @@ test('createServerFn with middleware and context', () => { }) describe('createServerFn with middleware and validator', () => { - const middleware1 = createMiddleware().validator( + const middleware1 = createMiddleware({ type: 'function' }).validator( (input: { readonly inputA: 'inputA' }) => ({ outputA: 'outputA', }) as const, ) - const middleware2 = createMiddleware().validator( + const middleware2 = createMiddleware({ type: 'function' }).validator( (input: { readonly inputB: 'inputB' }) => ({ outputB: 'outputB', }) as const, ) - const middleware3 = createMiddleware().middleware([middleware1, middleware2]) + const middleware3 = createMiddleware({ type: 'function' }).middleware([ + middleware1, + middleware2, + ]) test(`response: 'data'`, () => { const fn = createServerFn({ method: 'GET', response: 'data' }) @@ -222,7 +229,7 @@ describe('createServerFn with middleware and validator', () => { }) test('createServerFn overrides properties', () => { - const middleware1 = createMiddleware() + const middleware1 = createMiddleware({ type: 'function' }) .validator( () => ({ @@ -246,7 +253,7 @@ test('createServerFn overrides properties', () => { return next({ sendContext: newContext, context: newContext }) }) - const middleware2 = createMiddleware() + const middleware2 = createMiddleware({ type: 'function' }) .middleware([middleware1]) .validator( () => diff --git a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts index 8ca1eaca36..5e61c970c8 100644 --- a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts +++ b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts @@ -1,10 +1,11 @@ import { expectTypeOf, test } from 'vitest' import { createMiddleware } from '../createMiddleware' +import type { RequestServerNextFn } from '../createMiddleware' import type { Constrain, Validator } from '@tanstack/router-core' import type { ConstrainValidator } from '../createServerFn' test('createServeMiddleware removes middleware after middleware,', () => { - const middleware = createMiddleware() + const middleware = createMiddleware({ type: 'function' }) expectTypeOf(middleware).toHaveProperty('middleware') expectTypeOf(middleware).toHaveProperty('server') @@ -45,51 +46,55 @@ test('createServeMiddleware removes middleware after middleware,', () => { }) test('createMiddleware merges server context', () => { - const middleware1 = createMiddleware().server(async (options) => { - expectTypeOf(options.context).toEqualTypeOf() - expectTypeOf(options.data).toEqualTypeOf() - expectTypeOf(options.method).toEqualTypeOf<'GET' | 'POST'>() + const middleware1 = createMiddleware({ type: 'function' }).server( + async (options) => { + expectTypeOf(options.context).toEqualTypeOf() + expectTypeOf(options.data).toEqualTypeOf() + expectTypeOf(options.method).toEqualTypeOf<'GET' | 'POST'>() - const result = await options.next({ context: { a: true } }) + const result = await options.next({ context: { a: true } }) - expectTypeOf(result).toEqualTypeOf<{ - 'use functions must return the result of next()': true - _types: { - context: { - a: boolean + expectTypeOf(result).toEqualTypeOf<{ + 'use functions must return the result of next()': true + _types: { + context: { + a: boolean + } + sendContext: undefined } + context: { a: boolean } sendContext: undefined - } - context: { a: boolean } - sendContext: undefined - }>() + }>() - return result - }) + return result + }, + ) - const middleware2 = createMiddleware().server(async (options) => { - expectTypeOf(options.context).toEqualTypeOf() - expectTypeOf(options.data).toEqualTypeOf() - expectTypeOf(options.method).toEqualTypeOf<'GET' | 'POST'>() + const middleware2 = createMiddleware({ type: 'function' }).server( + async (options) => { + expectTypeOf(options.context).toEqualTypeOf() + expectTypeOf(options.data).toEqualTypeOf() + expectTypeOf(options.method).toEqualTypeOf<'GET' | 'POST'>() - const result = await options.next({ context: { b: 'test' } }) + const result = await options.next({ context: { b: 'test' } }) - expectTypeOf(result).toEqualTypeOf<{ - 'use functions must return the result of next()': true - _types: { - context: { - b: string + expectTypeOf(result).toEqualTypeOf<{ + 'use functions must return the result of next()': true + _types: { + context: { + b: string + } + sendContext: undefined } + context: { b: string } sendContext: undefined - } - context: { b: string } - sendContext: undefined - }>() + }>() - return result - }) + return result + }, + ) - const middleware3 = createMiddleware() + const middleware3 = createMiddleware({ type: 'function' }) .middleware([middleware1, middleware2]) .server(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ a: boolean; b: string }>() @@ -111,7 +116,7 @@ test('createMiddleware merges server context', () => { return result }) - createMiddleware() + createMiddleware({ type: 'function' }) .middleware([middleware3]) .server(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -139,37 +144,41 @@ test('createMiddleware merges server context', () => { }) test('createMiddleware merges client context and sends to the server', () => { - const middleware1 = createMiddleware().client(async (options) => { - expectTypeOf(options.context).toEqualTypeOf() + const middleware1 = createMiddleware({ type: 'function' }).client( + async (options) => { + expectTypeOf(options.context).toEqualTypeOf() - const result = await options.next({ context: { a: true } }) + const result = await options.next({ context: { a: true } }) - expectTypeOf(result).toEqualTypeOf<{ - 'use functions must return the result of next()': true - context: { a: boolean } - sendContext: undefined - headers: HeadersInit - }>() + expectTypeOf(result).toEqualTypeOf<{ + 'use functions must return the result of next()': true + context: { a: boolean } + sendContext: undefined + headers: HeadersInit + }>() - return result - }) + return result + }, + ) - const middleware2 = createMiddleware().client(async (options) => { - expectTypeOf(options.context).toEqualTypeOf() + const middleware2 = createMiddleware({ type: 'function' }).client( + async (options) => { + expectTypeOf(options.context).toEqualTypeOf() - const result = await options.next({ context: { b: 'test' } }) + const result = await options.next({ context: { b: 'test' } }) - expectTypeOf(result).toEqualTypeOf<{ - 'use functions must return the result of next()': true - context: { b: string } - sendContext: undefined - headers: HeadersInit - }>() + expectTypeOf(result).toEqualTypeOf<{ + 'use functions must return the result of next()': true + context: { b: string } + sendContext: undefined + headers: HeadersInit + }>() - return result - }) + return result + }, + ) - const middleware3 = createMiddleware() + const middleware3 = createMiddleware({ type: 'function' }) .middleware([middleware1, middleware2]) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ a: boolean; b: string }>() @@ -186,7 +195,7 @@ test('createMiddleware merges client context and sends to the server', () => { return result }) - const middleware4 = createMiddleware() + const middleware4 = createMiddleware({ type: 'function' }) .middleware([middleware3]) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -209,7 +218,7 @@ test('createMiddleware merges client context and sends to the server', () => { return result }) - createMiddleware() + createMiddleware({ type: 'function' }) .middleware([middleware4]) .server(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -242,7 +251,7 @@ test('createMiddleware merges client context and sends to the server', () => { }) test('createMiddleware merges input', () => { - const middleware1 = createMiddleware() + const middleware1 = createMiddleware({ type: 'function' }) .validator(() => { return { a: 'a', @@ -253,7 +262,7 @@ test('createMiddleware merges input', () => { return next() }) - const middleware2 = createMiddleware() + const middleware2 = createMiddleware({ type: 'function' }) .middleware([middleware1]) .validator(() => { return { @@ -265,7 +274,7 @@ test('createMiddleware merges input', () => { return next() }) - createMiddleware() + createMiddleware({ type: 'function' }) .middleware([middleware2]) .validator(() => ({ c: 'c' }) as const) .server(({ next, data }) => { @@ -279,7 +288,7 @@ test('createMiddleware merges input', () => { }) test('createMiddleware merges server context and client context, sends server context to the client and merges ', () => { - const middleware1 = createMiddleware() + const middleware1 = createMiddleware({ type: 'function' }) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf() @@ -318,7 +327,7 @@ test('createMiddleware merges server context and client context, sends server co return result }) - const middleware2 = createMiddleware() + const middleware2 = createMiddleware({ type: 'function' }) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf() @@ -357,7 +366,7 @@ test('createMiddleware merges server context and client context, sends server co return result }) - const middleware3 = createMiddleware() + const middleware3 = createMiddleware({ type: 'function' }) .middleware([middleware1, middleware2]) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -411,7 +420,7 @@ test('createMiddleware merges server context and client context, sends server co return result }) - const middleware4 = createMiddleware() + const middleware4 = createMiddleware({ type: 'function' }) .middleware([middleware3]) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -475,7 +484,7 @@ test('createMiddleware merges server context and client context, sends server co return result }) - createMiddleware() + createMiddleware({ type: 'function' }) .middleware([middleware4]) .client(async (options) => { expectTypeOf(options.context).toEqualTypeOf<{ @@ -548,7 +557,7 @@ test('createMiddleware merges server context and client context, sends server co }) test('createMiddleware sendContext cannot send a function', () => { - createMiddleware() + createMiddleware({ type: 'function' }) .client(({ next }) => { expectTypeOf(next<{ func: () => 'func' }>) .parameter(0) @@ -570,7 +579,7 @@ test('createMiddleware sendContext cannot send a function', () => { }) test('createMiddleware cannot validate function', () => { - const validator = createMiddleware().validator< + const validator = createMiddleware({ type: 'function' }).validator< (input: { func: () => 'string' }) => { output: 'string' } > @@ -585,7 +594,7 @@ test('createMiddleware cannot validate function', () => { }) test('createMiddleware can validate Date', () => { - const validator = createMiddleware().validator< + const validator = createMiddleware({ type: 'function' }).validator< (input: Date) => { output: 'string' } > @@ -595,7 +604,7 @@ test('createMiddleware can validate Date', () => { }) test('createMiddleware can validate FormData', () => { - const validator = createMiddleware().validator< + const validator = createMiddleware({ type: 'function' }).validator< (input: FormData) => { output: 'string' } > @@ -606,8 +615,22 @@ test('createMiddleware can validate FormData', () => { >() }) +test('createMiddleware merging from parent with undefined validator', () => { + const middleware1 = createMiddleware({ type: 'function' }).validator( + (input: { test: string }) => input.test, + ) + + createMiddleware({ type: 'function' }) + .middleware([middleware1]) + .server((ctx) => { + expectTypeOf(ctx.data).toEqualTypeOf() + + return ctx.next() + }) +}) + test('createMiddleware validator infers unknown for default input type', () => { - createMiddleware() + createMiddleware({ type: 'function' }) .validator((input) => { expectTypeOf(input).toEqualTypeOf() @@ -621,3 +644,93 @@ test('createMiddleware validator infers unknown for default input type', () => { return next() }) }) + +test('createMiddleware with type request, no middleware or context', () => { + createMiddleware({ type: 'request' }).server(async (options) => { + expectTypeOf(options).toEqualTypeOf<{ + request: Request + next: RequestServerNextFn + pathname: string + context: undefined + }>() + + const result = await options.next() + + expectTypeOf(result).toEqualTypeOf<{ + context: undefined + pathname: string + request: Request + response: Response + }>() + + return result + }) +}) + +test('createMiddleware with type request, no middleware with context', () => { + createMiddleware({ type: 'request' }).server(async (options) => { + expectTypeOf(options).toEqualTypeOf<{ + request: Request + next: RequestServerNextFn + pathname: string + context: undefined + }>() + + const result = await options.next({ context: { a: 'a' } }) + + expectTypeOf(result).toEqualTypeOf<{ + context: { a: string } + pathname: string + request: Request + response: Response + }>() + + return result + }) +}) + +test('createMiddleware with type request, middleware and context', () => { + const middleware1 = createMiddleware({ type: 'request' }).server( + async (options) => { + expectTypeOf(options).toEqualTypeOf<{ + request: Request + next: RequestServerNextFn + pathname: string + context: undefined + }>() + + const result = await options.next({ context: { a: 'a' } }) + + expectTypeOf(result).toEqualTypeOf<{ + context: { a: string } + pathname: string + request: Request + response: Response + }>() + + return result + }, + ) + + createMiddleware({ type: 'request' }) + .middleware([middleware1]) + .server(async (options) => { + expectTypeOf(options).toEqualTypeOf<{ + request: Request + next: RequestServerNextFn + pathname: string + context: { a: string } + }>() + + const result = await options.next({ context: { b: 'b' } }) + + expectTypeOf(result).toEqualTypeOf<{ + context: { a: string; b: string } + pathname: string + request: Request + response: Response + }>() + + return result + }) +}) diff --git a/packages/start-client-core/vite.config.ts b/packages/start-client-core/vite.config.ts index ac2026fbb7..fb0b2664aa 100644 --- a/packages/start-client-core/vite.config.ts +++ b/packages/start-client-core/vite.config.ts @@ -16,5 +16,6 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', + // externalDeps: ['node:fs', 'node:path', 'node:os', 'node:crypto'], }), ) diff --git a/packages/start-config/README.md b/packages/start-config/README.md deleted file mode 100644 index e3131543bd..0000000000 --- a/packages/start-config/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React applications! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/start-config/eslint.config.js b/packages/start-config/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/start-config/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/start-config/package.json b/packages/start-config/package.json deleted file mode 100644 index 8c5bb24691..0000000000 --- a/packages/start-config/package.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "name": "@tanstack/start-config", - "version": "1.120.3", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start-config" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "build": "tsc", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0;vitest", - "test:eslint": "eslint ./src", - "test:types": "exit 0; vitest" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/react-router": "workspace:^", - "@tanstack/router-generator": "workspace:^", - "@tanstack/router-plugin": "workspace:^", - "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/react-start-plugin": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@vitejs/plugin-react": "^4.3.4", - "import-meta-resolve": "^4.1.0", - "nitropack": "^2.10.4", - "ofetch": "^1.4.1", - "vite": "^6.1.0", - "vinxi": "0.5.3", - "zod": "^3.24.2" - }, - "peerDependencies": { - "react": ">=18.0.0 || >=19.0.0", - "react-dom": ">=18.0.0 || >=19.0.0", - "vite": "^6.0.0" - } -} diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts deleted file mode 100644 index 4f67610504..0000000000 --- a/packages/start-config/src/index.ts +++ /dev/null @@ -1,663 +0,0 @@ -import path from 'node:path' -import { existsSync, readFileSync } from 'node:fs' -import { readFile } from 'node:fs/promises' -import { fileURLToPath } from 'node:url' -import viteReact from '@vitejs/plugin-react' -import { resolve } from 'import-meta-resolve' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' -import { getConfig } from '@tanstack/router-generator' -import { createApp } from 'vinxi' -import { config } from 'vinxi/plugins/config' -// // @ts-expect-error -// import { serverComponents } from '@vinxi/server-components/plugin' -import { createTanStackServerFnPlugin } from '@tanstack/server-functions-plugin' -import { createTanStackStartPlugin } from '@tanstack/react-start-plugin' -import { createFetch } from 'ofetch' -import { createNitro } from 'nitropack' -import { tanstackStartVinxiFileRouter } from './vinxi-file-router.js' -import { - checkDeploymentPresetInput, - getUserViteConfig, - inlineConfigSchema, - serverSchema, -} from './schema.js' -import type { configSchema } from '@tanstack/router-generator' -import type { z } from 'zod' -import type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' -import type { App as VinxiApp } from 'vinxi' -import type { Manifest } from '@tanstack/react-router' -import type * as vite from 'vite' - -export type { - TanStackStartInputConfig, - TanStackStartOutputConfig, -} from './schema.js' - -function setTsrDefaults(config: TanStackStartOutputConfig['tsr']) { - // Normally these are `./src/___`, but we're using `./app/___` for Start stuff - const appDirectory = config?.appDirectory ?? './app' - return { - ...config, - appDirectory: config?.appDirectory ?? appDirectory, - routesDirectory: - config?.routesDirectory ?? path.join(appDirectory, 'routes'), - generatedRouteTree: - config?.generatedRouteTree ?? path.join(appDirectory, 'routeTree.gen.ts'), - } -} - -function mergeSsrOptions(options: Array) { - let ssrOptions: vite.SSROptions = {} - let noExternal: vite.SSROptions['noExternal'] = [] - for (const option of options) { - if (!option) { - continue - } - - if (option.noExternal) { - if (option.noExternal === true) { - noExternal = true - } else if (noExternal !== true) { - if (Array.isArray(option.noExternal)) { - noExternal.push(...option.noExternal) - } else { - noExternal.push(option.noExternal) - } - } - } - - ssrOptions = { - ...ssrOptions, - ...option, - noExternal, - } - } - - return ssrOptions -} - -export async function defineConfig( - inlineConfig: TanStackStartInputConfig = {}, -): Promise { - const opts = inlineConfigSchema.parse(inlineConfig) - - const { preset: configDeploymentPreset, ...serverOptions } = - serverSchema.parse(opts.server || {}) - - const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) - const tsr = setTsrDefaults(opts.tsr) - const tsrConfig = getConfig(tsr) - - const appDirectory = tsr.appDirectory - const publicDir = opts.routers?.public?.dir || './public' - - const publicBase = opts.routers?.public?.base || '/' - const clientBase = opts.routers?.client?.base || '/_build' - const apiBase = opts.tsr?.apiBase || '/api' - const serverBase = opts.routers?.server?.base || '/_server' - - const apiMiddleware = opts.routers?.api?.middleware || undefined - const serverMiddleware = opts.routers?.server?.middleware || undefined - const ssrMiddleware = opts.routers?.ssr?.middleware || undefined - - const clientEntry = - opts.routers?.client?.entry || path.join(appDirectory, 'client.tsx') - const ssrEntry = - opts.routers?.ssr?.entry || path.join(appDirectory, 'ssr.tsx') - const apiEntry = opts.routers?.api?.entry || path.join(appDirectory, 'api.ts') - const globalMiddlewareEntry = - opts.routers?.server?.globalMiddlewareEntry || - path.join(appDirectory, 'global-middleware.ts') - const apiEntryExists = existsSync(apiEntry) - - const viteConfig = getUserViteConfig(opts.vite) - - const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module - manifestVirtualImportId: 'tsr:server-fn-manifest', - client: { - getRuntimeCode: () => - `import { createClientRpc } from '@tanstack/start/server-functions-client'`, - replacer: (opts) => - `createClientRpc('${opts.functionId}', '${serverBase}')`, - }, - ssr: { - getRuntimeCode: () => - `import { createSsrRpc } from '@tanstack/start/server-functions-ssr'`, - replacer: (opts) => `createSsrRpc('${opts.functionId}', '${serverBase}')`, - }, - server: { - getRuntimeCode: () => - `import { createServerRpc } from '@tanstack/start/server-functions-server'`, - replacer: (opts) => - `createServerRpc('${opts.functionId}', '${serverBase}', ${opts.fn})`, - }, - }) - - const TanStackStartPlugin = createTanStackStartPlugin({ - globalMiddlewareEntry, - }) - - // Create a dummy nitro app to get the resolved public output path - const dummyNitroApp = await createNitro({ - preset: deploymentPreset, - compatibilityDate: '2024-12-01', - }) - - const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir - await dummyNitroApp.close() - - let vinxiApp = createApp({ - server: { - ...serverOptions, - preset: deploymentPreset, - experimental: { - ...serverOptions.experimental, - asyncContext: true, - }, - }, - routers: [ - { - name: 'public', - type: 'static', - dir: publicDir, - base: publicBase, - }, - { - name: 'client', - type: 'client', - target: 'browser', - handler: clientEntry, - base: clientBase, - // @ts-expect-error - build: { - sourcemap: true, - }, - plugins: () => { - const routerType = 'client' - const clientViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-client', { - ...viteConfig.userConfig, - ...clientViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(clientViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - clientViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(clientViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: true, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.client, - TanStackServerFnsPlugin.client, - ...(viteConfig.plugins || []), - ...(clientViteConfig.plugins || []), - viteReact(opts.react), - // TODO: RSCS - enable this - // serverComponents.client(), - ] - }, - }, - { - name: 'ssr', - type: 'http', - target: 'server', - handler: ssrEntry, - middleware: ssrMiddleware, - // @ts-expect-error - link: { - client: 'client', - }, - plugins: () => { - const routerType = 'ssr' - const ssrViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-ssr', { - ...viteConfig.userConfig, - ...ssrViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(ssrViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - ssrViteConfig.userConfig.ssr, - { - noExternal, - external: ['@vinxi/react-server-dom/client'], - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(ssrViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.ssr, - TanStackServerFnsPlugin.ssr, - tsrRoutesManifest({ - tsrConfig, - clientBase, - }), - ...(getUserViteConfig(opts.vite).plugins || []), - ...(getUserViteConfig(opts.routers?.ssr?.vite).plugins || []), - viteReact(opts.react), - ] - }, - }, - { - name: 'server', - type: 'http', - target: 'server', - base: serverBase, - middleware: serverMiddleware, - // TODO: RSCS - enable this - // worker: true, - handler: importToProjectRelative( - '@tanstack/start-server-functions-handler', - ), - plugins: () => { - const routerType = 'server' - const serverViteConfig = getUserViteConfig( - opts.routers?.[routerType]?.vite, - ) - - return [ - config('tss-vite-config-server', { - ...viteConfig.userConfig, - ...serverViteConfig.userConfig, - define: { - ...(viteConfig.userConfig.define || {}), - ...(serverViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase), - ...injectDefineEnv( - 'TSS_OUTPUT_PUBLIC_DIR', - nitroOutputPublicDir, - ), - }, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - serverViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(serverViteConfig.userConfig.optimizeDeps || {}), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - TanStackStartPlugin.server, - TanStackServerFnsPlugin.server, - // TODO: RSCS - remove this - // resolve: { - // conditions: [], - // }, - // TODO: RSCs - add this - // serverComponents.serverActions({ - // resolve: { - // conditions: [ - // 'react-server', - // // 'node', - // 'import', - // process.env.NODE_ENV, - // ], - // }, - // runtime: '@vinxi/react-server-dom/runtime', - // transpileDeps: ['react', 'react-dom', '@vinxi/react-server-dom'], - // }), - ...(viteConfig.plugins || []), - ...(serverViteConfig.plugins || []), - ] - }, - }, - ], - }) - - const noExternal = [ - '@tanstack/start', - '@tanstack/react-start', - '@tanstack/react-start/server', - '@tanstack/react-start-client', - '@tanstack/react-start-server', - '@tanstack/start-server-functions-fetcher', - '@tanstack/start-server-functions-handler', - '@tanstack/start-server-functions-client', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-server-functions-server', - '@tanstack/react-start-router-manifest', - '@tanstack/start-config', - '@tanstack/start-api-routes', - '@tanstack/server-functions-plugin', - 'tsr:routes-manifest', - 'tsr:server-fn-manifest', - ] - - // If API routes handler exists, add a router for it - if (apiEntryExists) { - vinxiApp = vinxiApp.addRouter({ - name: 'api', - type: 'http', - target: 'server', - base: apiBase, - handler: apiEntry, - middleware: apiMiddleware, - routes: tanstackStartVinxiFileRouter({ tsrConfig, apiBase }), - plugins: () => { - const viteConfig = getUserViteConfig(opts.vite) - const apiViteConfig = getUserViteConfig(opts.routers?.api?.vite) - - return [ - config('tsr-vite-config-api', { - ...viteConfig.userConfig, - ...apiViteConfig.userConfig, - ssr: mergeSsrOptions([ - viteConfig.userConfig.ssr, - apiViteConfig.userConfig.ssr, - { - noExternal, - }, - ]), - optimizeDeps: { - entries: [], - ...(viteConfig.userConfig.optimizeDeps || {}), - ...(apiViteConfig.userConfig.optimizeDeps || {}), - }, - define: { - ...(viteConfig.userConfig.define || {}), - ...(apiViteConfig.userConfig.define || {}), - ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), - ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), - ...injectDefineEnv('TSS_API_BASE', apiBase), - ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), - }, - }), - TanStackRouterVite({ - ...tsrConfig, - enableRouteGeneration: false, - autoCodeSplitting: true, - __enableAPIRoutesGeneration: true, - experimental: { - ...tsrConfig.experimental, - }, - }), - ...(viteConfig.plugins || []), - ...(apiViteConfig.plugins || []), - ] - }, - }) - } - - // Because Vinxi doesn't use the normal nitro dev server, it doesn't - // supply $fetch during dev. We need to hook into the dev server creation, - // nab the proper utils from the custom nitro instance that is used - // during dev and supply the $fetch to app. - // Hopefully and likely, this will just get removed when we move to - // Nitro directly. - vinxiApp.hooks.hook('app:dev:nitro:config', (devServer) => { - vinxiApp.hooks.hook( - 'app:dev:server:created', - ({ devApp: { localFetch } }) => { - const $fetch = createFetch({ - fetch: localFetch, - defaults: { - baseURL: devServer.nitro.options.runtimeConfig.app.baseURL, - }, - }) - - // @ts-expect-error - globalThis.$fetch = $fetch - }, - ) - }) - - return vinxiApp -} - -function importToProjectRelative(p: string) { - const resolved = fileURLToPath(resolve(p, import.meta.url)) - - const relative = path.relative(process.cwd(), resolved) - - return relative -} - -function tsrRoutesManifest(opts: { - tsrConfig: z.infer - clientBase: string -}): vite.Plugin { - let config: vite.ResolvedConfig - - return { - name: 'tsr-routes-manifest', - configResolved(resolvedConfig) { - config = resolvedConfig - }, - resolveId(id) { - if (id === 'tsr:routes-manifest') { - return id - } - return - }, - async load(id) { - if (id === 'tsr:routes-manifest') { - // If we're in development, return a dummy manifest - - if (config.command === 'serve') { - return `export default () => ({ - routes: {} - })` - } - - const clientViteManifestPath = path.resolve( - config.build.outDir, - `../client/${opts.clientBase}/.vite/manifest.json`, - ) - - type ViteManifest = Record< - string, - { - file: string - isEntry: boolean - imports: Array - } - > - - let manifest: ViteManifest - try { - manifest = JSON.parse(await readFile(clientViteManifestPath, 'utf-8')) - } catch (err) { - console.error(err) - throw new Error( - `Could not find the production client vite manifest at '${clientViteManifestPath}'!`, - ) - } - - const routeTreePath = path.resolve(opts.tsrConfig.generatedRouteTree) - - let routeTreeContent: string - try { - routeTreeContent = readFileSync(routeTreePath, 'utf-8') - } catch (err) { - console.error(err) - throw new Error( - `Could not find the generated route tree at '${routeTreePath}'!`, - ) - } - - // Extract the routesManifest JSON from the route tree file. - // It's located between the /* ROUTE_MANIFEST_START and ROUTE_MANIFEST_END */ comment block. - - const routerManifest = JSON.parse( - routeTreeContent.match( - /\/\* ROUTE_MANIFEST_START([\s\S]*?)ROUTE_MANIFEST_END \*\//, - )?.[1] || '{ routes: {} }', - ) as Manifest - - const routes = routerManifest.routes - - let entryFile: - | { - file: string - imports: Array - } - | undefined - - const filesByRouteFilePath: ViteManifest = Object.fromEntries( - Object.entries(manifest).map(([k, v]) => { - if (v.isEntry) { - entryFile = v - } - - const rPath = k.split('?')[0] - - return [rPath, v] - }, {}), - ) - - // Add preloads to the routes from the vite manifest - Object.entries(routes).forEach(([k, v]) => { - const file = - filesByRouteFilePath[ - path.join(opts.tsrConfig.routesDirectory, v.filePath as string) - ] - - if (file) { - const preloads = file.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ) - - preloads.unshift(path.join(opts.clientBase, file.file)) - - routes[k] = { - ...v, - preloads, - } - } - }) - - if (entryFile) { - routes.__root__!.preloads = [ - path.join(opts.clientBase, entryFile.file), - ...entryFile.imports.map((d) => - path.join(opts.clientBase, manifest[d]!.file), - ), - ] - } - - const recurseRoute = ( - route: { - preloads?: Array - children?: Array - }, - seenPreloads = {} as Record, - ) => { - route.preloads = route.preloads?.filter((preload) => { - if (seenPreloads[preload]) { - return false - } - seenPreloads[preload] = true - return true - }) - - if (route.children) { - route.children.forEach((child) => { - const childRoute = routes[child]! - recurseRoute(childRoute, { ...seenPreloads }) - }) - } - } - - // @ts-expect-error - recurseRoute(routes.__root__) - - const routesManifest = { - routes, - } - - if (process.env.TSR_VITE_DEBUG) { - console.info( - 'Routes Manifest: \n' + JSON.stringify(routesManifest, null, 2), - ) - } - - return `export default () => (${JSON.stringify(routesManifest)})` - } - return - }, - } -} - -function injectDefineEnv( - key: TKey, - value: TValue, -): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { - return { - [`process.env.${key}`]: JSON.stringify(value), - [`import.meta.env.${key}`]: JSON.stringify(value), - } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } -} diff --git a/packages/start-config/src/schema.ts b/packages/start-config/src/schema.ts deleted file mode 100644 index 4529483793..0000000000 --- a/packages/start-config/src/schema.ts +++ /dev/null @@ -1,198 +0,0 @@ -import { configSchema } from '@tanstack/router-generator' -import { z } from 'zod' -import type { PluginOption } from 'vite' -import type { AppOptions as VinxiAppOptions } from 'vinxi' -import type { NitroOptions } from 'nitropack' -import type { Options as ViteReactOptions } from '@vitejs/plugin-react' -import type { CustomizableConfig } from 'vinxi/dist/types/lib/vite-dev' - -type StartUserViteConfig = CustomizableConfig | (() => CustomizableConfig) - -export function getUserViteConfig(config?: StartUserViteConfig): { - plugins: Array | undefined - userConfig: CustomizableConfig -} { - const { plugins, ...userConfig } = - typeof config === 'function' ? config() : { ...config } - return { plugins, userConfig } -} - -/** - * Not all the deployment presets are fully functional or tested. - * @see https://github.com/TanStack/router/pull/2002 - */ -const vinxiDeploymentPresets = [ - 'alwaysdata', // untested - 'aws-amplify', // untested - 'aws-lambda', // untested - 'azure', // untested - 'azure-functions', // untested - 'base-worker', // untested - 'bun', // ✅ working - 'cleavr', // untested - 'cli', // untested - 'cloudflare', // untested - 'cloudflare-module', // untested - 'cloudflare-pages', // ✅ working - 'cloudflare-pages-static', // untested - 'deno', // untested - 'deno-deploy', // untested - 'deno-server', // untested - 'digital-ocean', // untested - 'edgio', // untested - 'firebase', // untested - 'flight-control', // untested - 'github-pages', // untested - 'heroku', // untested - 'iis', // untested - 'iis-handler', // untested - 'iis-node', // untested - 'koyeb', // untested - 'layer0', // untested - 'netlify', // ✅ working - 'netlify-builder', // untested - 'netlify-edge', // untested - 'netlify-static', // untested - 'nitro-dev', // untested - 'nitro-prerender', // untested - 'node', // partially working - 'node-cluster', // untested - 'node-server', // ✅ working - 'platform-sh', // untested - 'service-worker', // untested - 'static', // 🟧 partially working - 'stormkit', // untested - 'vercel', // ✅ working - 'vercel-edge', // untested - 'vercel-static', // untested - 'winterjs', // untested - 'zeabur', // untested - 'zeabur-static', // untested -] as const - -type DeploymentPreset = (typeof vinxiDeploymentPresets)[number] | (string & {}) - -const testedDeploymentPresets: Array = [ - 'bun', - 'netlify', - 'vercel', - 'cloudflare-pages', - 'node-server', -] - -export function checkDeploymentPresetInput( - preset?: string, -): DeploymentPreset | undefined { - if (preset) { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) - } - } - - return preset -} - -type HTTPSOptions = { - cert?: string - key?: string - pfx?: string - passphrase?: string - validityDays?: number - domains?: Array -} - -type ServerOptions_ = VinxiAppOptions['server'] & { - https?: boolean | HTTPSOptions -} - -type ServerOptions = { - [K in keyof ServerOptions_]: ServerOptions_[K] -} - -export const serverSchema = z - .object({ - routeRules: z.custom().optional(), - preset: z.custom().optional(), - static: z.boolean().optional(), - prerender: z - .object({ - routes: z.array(z.string()), - ignore: z - .array( - z.custom< - string | RegExp | ((path: string) => undefined | null | boolean) - >(), - ) - .optional(), - crawlLinks: z.boolean().optional(), - }) - .optional(), - }) - .and(z.custom()) - -const viteSchema = z.custom() - -const viteReactSchema = z.custom() - -const routersSchema = z.object({ - ssr: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - client: z - .object({ - entry: z.string().optional(), - base: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - server: z - .object({ - base: z.string().optional(), - globalMiddlewareEntry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - api: z - .object({ - entry: z.string().optional(), - middleware: z.string().optional(), - vite: viteSchema.optional(), - }) - .optional(), - public: z - .object({ - dir: z.string().optional(), - base: z.string().optional(), - }) - .optional(), -}) - -const tsrConfig = configSchema.partial().extend({ - appDirectory: z.string().optional(), -}) - -export const inlineConfigSchema = z.object({ - react: viteReactSchema.optional(), - vite: viteSchema.optional(), - tsr: tsrConfig.optional(), - routers: routersSchema.optional(), - server: serverSchema.optional(), -}) - -export type TanStackStartInputConfig = z.input -export type TanStackStartOutputConfig = z.infer diff --git a/packages/start-config/src/vinxi-file-router.ts b/packages/start-config/src/vinxi-file-router.ts deleted file mode 100644 index 9e6d829d1b..0000000000 --- a/packages/start-config/src/vinxi-file-router.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { - BaseFileSystemRouter as VinxiBaseFileSystemRouter, - analyzeModule as vinxiFsRouterAnalyzeModule, - cleanPath as vinxiFsRouterCleanPath, -} from 'vinxi/fs-router' -import { - CONSTANTS as GENERATOR_CONSTANTS, - startAPIRouteSegmentsFromTSRFilePath, -} from '@tanstack/router-generator' -import type { configSchema } from '@tanstack/router-generator' -import type { - AppOptions as VinxiAppOptions, - RouterSchemaInput as VinxiRouterSchemaInput, -} from 'vinxi' -import type { z } from 'zod' - -export function tanstackStartVinxiFileRouter(opts: { - tsrConfig: z.infer - apiBase: string -}) { - const apiBaseSegment = opts.apiBase.split('/').filter(Boolean).join('/') - const isAPIPath = new RegExp(`/${apiBaseSegment}/`) - - return function (router: VinxiRouterSchemaInput, app: VinxiAppOptions) { - // Our own custom File Router that extends the VinxiBaseFileSystemRouter - // for splitting the API routes into its own "bundle" - // and adding the $APIRoute metadata to the route object - // This could be customized in future to support more complex splits - class TanStackStartFsRouter extends VinxiBaseFileSystemRouter { - toPath(src: string): string { - const inputPath = vinxiFsRouterCleanPath(src, this.config) - - const segments = startAPIRouteSegmentsFromTSRFilePath( - inputPath, - opts.tsrConfig, - ) - - const pathname = segments - .map((part) => { - if (part.type === 'splat') { - return `*splat` - } - - if (part.type === 'param') { - return `:${part.value}?` - } - - return part.value - }) - .join('/') - - return pathname.length > 0 ? `/${pathname}` : '/' - } - - toRoute(src: string) { - const webPath = this.toPath(src) - - const [_, exports] = vinxiFsRouterAnalyzeModule(src) - - const hasAPIRoute = exports.find( - (exp) => exp.n === GENERATOR_CONSTANTS.APIRouteExportVariable, - ) - - return { - path: webPath, - filePath: src, - $APIRoute: - isAPIPath.test(webPath) && hasAPIRoute - ? { - src, - pick: [GENERATOR_CONSTANTS.APIRouteExportVariable], - } - : undefined, - } - } - } - - return new TanStackStartFsRouter( - { - dir: opts.tsrConfig.routesDirectory, - extensions: ['js', 'jsx', 'ts', 'tsx'], - }, - router, - app, - ) - } -} diff --git a/packages/start-config/tsconfig.json b/packages/start-config/tsconfig.json deleted file mode 100644 index 940a9cce0a..0000000000 --- a/packages/start-config/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src/index.ts"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist/esm", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/start-plugin-core/README.md b/packages/start-plugin-core/README.md new file mode 100644 index 0000000000..fd4ca0fd33 --- /dev/null +++ b/packages/start-plugin-core/README.md @@ -0,0 +1,12 @@ + + +# TanStack Start - Plugin Core + +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: + +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). + +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). + +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-plugin-core/eslint.config.js b/packages/start-plugin-core/eslint.config.js new file mode 100644 index 0000000000..8ce6ad05fc --- /dev/null +++ b/packages/start-plugin-core/eslint.config.js @@ -0,0 +1,5 @@ +// @ts-check + +import rootConfig from '../../eslint.config.js' + +export default [...rootConfig] diff --git a/packages/start-api-routes/package.json b/packages/start-plugin-core/package.json similarity index 66% rename from packages/start-api-routes/package.json rename to packages/start-plugin-core/package.json index 3c2acd77ee..74d4f84b75 100644 --- a/packages/start-api-routes/package.json +++ b/packages/start-plugin-core/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-api-routes", - "version": "1.120.3", - "description": "Modern and scalable routing for applications", + "name": "@tanstack/start-plugin-core", + "version": "1.114.12", + "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start-api-routes" + "directory": "packages/start-plugin-core" }, "homepage": "https://tanstack.com/start", "funding": { @@ -15,6 +15,7 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "keywords": [ + "solid", "react", "location", "router", @@ -25,8 +26,9 @@ ], "scripts": { "clean": "rimraf ./dist && rimraf ./coverage", + "clean:snapshots": "rimraf **/*snapshot* --glob", "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0; vitest", + "test:unit": "vitest", "test:eslint": "eslint ./src", "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", @@ -40,6 +42,8 @@ }, "type": "module", "types": "dist/esm/index.d.ts", + "main": "dist/cjs/index.cjs", + "module": "dist/esm/index.js", "exports": { ".": { "import": { @@ -62,11 +66,22 @@ "node": ">=12" }, "dependencies": { + "@babel/code-frame": "7.26.2", + "@babel/core": "^7.26.8", + "@babel/types": "^7.26.8", "@tanstack/router-core": "workspace:^", - "@tanstack/start-server-core": "workspace:^", - "vinxi": "0.5.3" - }, - "devDependencies": { - "typescript": "^5.7.2" + "@tanstack/router-generator": "workspace:^", + "@tanstack/router-utils": "workspace:^", + "@types/babel__code-frame": "^7.0.6", + "@types/babel__core": "^7.20.5", + "babel-dead-code-elimination": "^1.0.9", + "cheerio": "^1.0.0", + "h3": "1.13.0", + "nitropack": "^2.11.8", + "pathe": "^2.0.3", + "ufo": "^1.5.4", + "vite": "6.1.0", + "xmlbuilder2": "^3.1.1", + "zod": "^3.24.2" } } diff --git a/packages/start-plugin-core/src/compilers.ts b/packages/start-plugin-core/src/compilers.ts new file mode 100644 index 0000000000..c589fe4b13 --- /dev/null +++ b/packages/start-plugin-core/src/compilers.ts @@ -0,0 +1,759 @@ +import * as babel from '@babel/core' +import * as t from '@babel/types' +import { codeFrameColumns } from '@babel/code-frame' + +import { + deadCodeElimination, + findReferencedIdentifiers, +} from 'babel-dead-code-elimination' +import { generateFromAst, parseAst } from '@tanstack/router-utils' +import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' + +export type CompileStartFrameworkOptions = 'react' | 'solid' + +export function compileStartOutputFactory( + framework: CompileStartFrameworkOptions, +) { + return function compileStartOutput(opts: CompileOptions): GeneratorResult { + const ast = parseAst(opts) + + const doDce = opts.dce ?? true + // find referenced identifiers *before* we transform anything + const refIdents = doDce ? findReferencedIdentifiers(ast) : undefined + + babel.traverse(ast, { + Program: { + enter(programPath) { + const identifiers: { + createServerFileRoute: IdentifierConfig + createServerFn: IdentifierConfig + createMiddleware: IdentifierConfig + serverOnly: IdentifierConfig + clientOnly: IdentifierConfig + createIsomorphicFn: IdentifierConfig + } = { + createServerFileRoute: { + name: 'createServerFileRoute', + handleCallExpression: + handleCreateServerFileRouteCallExpressionFactory(framework), + paths: [], + }, + createServerFn: { + name: 'createServerFn', + handleCallExpression: handleCreateServerFnCallExpression, + paths: [], + }, + createMiddleware: { + name: 'createMiddleware', + handleCallExpression: handleCreateMiddlewareCallExpression, + paths: [], + }, + serverOnly: { + name: 'serverOnly', + handleCallExpression: handleServerOnlyCallExpression, + paths: [], + }, + clientOnly: { + name: 'clientOnly', + handleCallExpression: handleClientOnlyCallExpression, + paths: [], + }, + createIsomorphicFn: { + name: 'createIsomorphicFn', + handleCallExpression: handleCreateIsomorphicFnCallExpression, + paths: [], + }, + } + + const identifierKeys = Object.keys(identifiers) as Array< + keyof typeof identifiers + > + + programPath.traverse({ + ImportDeclaration: (path) => { + if ( + path.node.source.value !== '@tanstack/react-start' && + path.node.source.value !== '@tanstack/solid-start' + ) { + return + } + + // handle a destructured imports being renamed like "import { createServerFn as myCreateServerFn } from '@tanstack/react-start';" + path.node.specifiers.forEach((specifier) => { + identifierKeys.forEach((identifierKey) => { + const identifier = identifiers[identifierKey] + + if ( + specifier.type === 'ImportSpecifier' && + specifier.imported.type === 'Identifier' + ) { + if (specifier.imported.name === identifierKey) { + identifier.name = specifier.local.name + } + } + + // handle namespace imports like "import * as TanStackStart from '@tanstack/react-start';" + if (specifier.type === 'ImportNamespaceSpecifier') { + identifier.name = `${specifier.local.name}.${identifierKey}` + } + }) + }) + }, + CallExpression: (path) => { + identifierKeys.forEach((identifierKey) => { + // Check to see if the call expression is a call to the + // identifiers[identifierKey].name + if ( + t.isIdentifier(path.node.callee) && + path.node.callee.name === identifiers[identifierKey].name + ) { + // The identifier could be a call to the original function + // in the source code. If this is case, we need to ignore it. + // Check the scope to see if the identifier is a function declaration. + // if it is, then we can ignore it. + + if ( + path.scope.getBinding(identifiers[identifierKey].name)?.path + .node.type === 'FunctionDeclaration' + ) { + return + } + + return identifiers[identifierKey].paths.push(path) + } + + if (t.isMemberExpression(path.node.callee)) { + if ( + t.isIdentifier(path.node.callee.object) && + t.isIdentifier(path.node.callee.property) + ) { + const callname = [ + path.node.callee.object.name, + path.node.callee.property.name, + ].join('.') + + if (callname === identifiers[identifierKey].name) { + identifiers[identifierKey].paths.push(path) + } + } + } + + return + }) + }, + }) + + identifierKeys.forEach((identifierKey) => { + identifiers[identifierKey].paths.forEach((path) => { + identifiers[identifierKey].handleCallExpression( + path as babel.NodePath, + opts, + ) + }) + }) + }, + }, + }) + + if (doDce) { + deadCodeElimination(ast, refIdents) + } + + return generateFromAst(ast, { + sourceMaps: true, + sourceFileName: opts.filename, + filename: opts.filename, + }) + } +} + +function handleCreateServerFileRouteCallExpressionFactory( + factory: CompileStartFrameworkOptions, +) { + return function handleCreateServerFileRouteCallExpression( + path: babel.NodePath, + opts: CompileOptions, + ) { + const PACKAGES = { start: `@tanstack/${factory}-start/server` } + + let highestParent: babel.NodePath = path + + while (highestParent.parentPath && !highestParent.parentPath.isProgram()) { + highestParent = highestParent.parentPath + } + + const programPath = highestParent.parentPath as babel.NodePath + + // // Find the root call expression and all of the methods that are called on it + // const rootCallExpression = getRootCallExpression(path) + + // const callExpressionPaths = { + // validator: null as babel.NodePath | null, + // middleware: null as babel.NodePath | null, + // methods: null as babel.NodePath | null, + // } + + // const validMethods = Object.keys(callExpressionPaths) + + // rootCallExpression.traverse({ + // MemberExpression(memberExpressionPath) { + // if (t.isIdentifier(memberExpressionPath.node.property)) { + // const name = memberExpressionPath.node.property + // .name as keyof typeof callExpressionPaths + + // if ( + // validMethods.includes(name) && + // memberExpressionPath.parentPath.isCallExpression() + // ) { + // callExpressionPaths[name] = memberExpressionPath.parentPath + // } + // } + // }, + // }) + + // const manifest = { middleware: false, methods: {} as any } + + // Object.entries(callExpressionPaths).forEach(([key, callPath]) => { + // if (callPath && t.isMemberExpression(callPath.node.callee)) { + // if (key === 'middleware') { + // manifest.middleware = true + // } else if (key === 'methods') { + // // Get the methods object from the methods call + // const methodsArg = callPath.node.arguments[0] + + // // Handle the case where methods is a function that returns an object + // if ( + // t.isArrowFunctionExpression(methodsArg) && + // t.isObjectExpression(methodsArg.body) + // ) { + // methodsArg.body.properties.forEach((prop) => { + // if (t.isObjectProperty(prop) && t.isIdentifier(prop.key)) { + // const methodName = prop.key.name + // manifest.methods[methodName] = { + // middleware: false, + // } + + // // Check if this method has a middleware + // if (t.isCallExpression(prop.value)) { + // const method = prop.value + // method.arguments.forEach((arg) => { + // if (t.isObjectExpression(arg)) { + // arg.properties.forEach((methodProp) => { + // if ( + // t.isObjectProperty(methodProp) && + // t.isIdentifier(methodProp.key) + // ) { + // if (methodProp.key.name === 'middleware') { + // manifest.methods[methodName].middleware = true + // } + // } + // }) + // } + // }) + // } + // } + // }) + // } + // // Handle the case where methods is a direct object + // else if (t.isObjectExpression(methodsArg)) { + // methodsArg.properties.forEach((prop) => { + // if (t.isObjectProperty(prop) && t.isIdentifier(prop.key)) { + // const methodName = prop.key.name + // manifest.methods[methodName] = { + // middleware: false, + // } + // } + // }) + // } + // } + + // if (opts.env === 'client') { + // callPath.replaceWith(callPath.node.callee.object) + // } + // } + // }) + + // If we're on the client, remove the entire variable + if (opts.env === 'client') { + // console.debug('createServerFileRoute -> manifest:\n', manifest) + highestParent.remove() + return + } + + // path.replaceWith( + // t.callExpression(t.identifier('createServerFileRoute'), [ + // t.identifier('undefined'), + // t.callExpression( + // t.memberExpression(t.identifier('Object'), t.identifier('assign')), + // [ + // t.objectExpression( + // path.node.arguments + // .map((arg) => { + // if (t.isIdentifier(arg)) { + // return t.objectProperty(t.identifier(arg.name), arg) + // } + // // Handle other cases or return a default value if necessary + // return null // or throw an error, or handle accordingly + // }) + // .filter( + // (property): property is t.ObjectProperty => property !== null, + // ), + // ), + // t.objectExpression([ + // t.objectProperty( + // t.identifier('manifest'), + // t.valueToNode(manifest), + // ), + // ]), + // ], + // ), + // ]), + // ) + + let isCreateServerFileRouteImported = false as boolean + + programPath.traverse({ + ImportDeclaration(importPath) { + const importSource = importPath.node.source.value + if (importSource === PACKAGES.start) { + const specifiers = importPath.node.specifiers + isCreateServerFileRouteImported = specifiers.some((specifier) => { + return ( + t.isImportSpecifier(specifier) && + t.isIdentifier(specifier.imported) && + specifier.imported.name === 'createServerFileRoute' + ) + }) + } + }, + }) + + if (!isCreateServerFileRouteImported) { + const importDeclaration = t.importDeclaration( + [ + t.importSpecifier( + t.identifier('createServerFileRoute'), + t.identifier('createServerFileRoute'), + ), + ], + t.stringLiteral(PACKAGES.start), + ) + programPath.node.body.unshift(importDeclaration) + } + } +} + +// build these once and reuse them +export const handleServerOnlyCallExpression = + buildEnvOnlyCallExpressionHandler('server') +export const handleClientOnlyCallExpression = + buildEnvOnlyCallExpressionHandler('client') + +export type CompileOptions = ParseAstOptions & { + env: 'server' | 'client' + dce?: boolean + filename: string +} + +export type IdentifierConfig = { + name: string + handleCallExpression: ( + path: babel.NodePath, + opts: CompileOptions, + ) => void + paths: Array +} + +export function handleCreateServerFnCallExpression( + path: babel.NodePath, + opts: CompileOptions, +) { + // The function is the 'fn' property of the object passed to createServerFn + + // const firstArg = path.node.arguments[0] + // if (t.isObjectExpression(firstArg)) { + // // Was called with some options + // } + + // Traverse the member expression and find the call expressions for + // the validator, handler, and middleware methods. Check to make sure they + // are children of the createServerFn call expression. + + const calledOptions = path.node.arguments[0] + ? (path.get('arguments.0') as babel.NodePath) + : null + + const shouldValidateClient = !!calledOptions?.node.properties.find((prop) => { + return ( + t.isObjectProperty(prop) && + t.isIdentifier(prop.key) && + prop.key.name === 'validateClient' && + t.isBooleanLiteral(prop.value) && + prop.value.value === true + ) + }) + + const callExpressionPaths = { + middleware: null as babel.NodePath | null, + validator: null as babel.NodePath | null, + handler: null as babel.NodePath | null, + } + + const validMethods = Object.keys(callExpressionPaths) + + const rootCallExpression = getRootCallExpression(path) + + // if (debug) + // console.info( + // 'Handling createServerFn call expression:', + // rootCallExpression.toString(), + // ) + + // Check if the call is assigned to a variable + if (!rootCallExpression.parentPath.isVariableDeclarator()) { + throw new Error('createServerFn must be assigned to a variable!') + } + + // Get the identifier name of the variable + const variableDeclarator = rootCallExpression.parentPath.node + const existingVariableName = (variableDeclarator.id as t.Identifier).name + + rootCallExpression.traverse({ + MemberExpression(memberExpressionPath) { + if (t.isIdentifier(memberExpressionPath.node.property)) { + const name = memberExpressionPath.node.property + .name as keyof typeof callExpressionPaths + + if ( + validMethods.includes(name) && + memberExpressionPath.parentPath.isCallExpression() + ) { + callExpressionPaths[name] = memberExpressionPath.parentPath + } + } + }, + }) + + if (callExpressionPaths.validator) { + const innerInputExpression = callExpressionPaths.validator.node.arguments[0] + + if (!innerInputExpression) { + throw new Error( + 'createServerFn().validator() must be called with a validator!', + ) + } + + // If we're on the client, and we're not validating the client, remove the validator call expression + if ( + opts.env === 'client' && + !shouldValidateClient && + t.isMemberExpression(callExpressionPaths.validator.node.callee) + ) { + callExpressionPaths.validator.replaceWith( + callExpressionPaths.validator.node.callee.object, + ) + } + } + + // First, we need to move the handler function to a nested function call + // that is applied to the arguments passed to the server function. + + const handlerFnPath = callExpressionPaths.handler?.get( + 'arguments.0', + ) as babel.NodePath + + if (!callExpressionPaths.handler || !handlerFnPath.node) { + throw codeFrameError( + opts.code, + path.node.callee.loc!, + `createServerFn must be called with a "handler" property!`, + ) + } + + const handlerFn = handlerFnPath.node + + // So, the way we do this is we give the handler function a way + // to access the serverFn ctx on the server via function scope. + // The 'use server' extracted function will be called with the + // payload from the client, then use the scoped serverFn ctx + // to execute the handler function. + // This way, we can do things like data and middleware validation + // in the __execute function without having to AST transform the + // handler function too much itself. + + // .handler((optsOut, ctx) => { + // return ((optsIn) => { + // 'use server' + // ctx.__execute(handlerFn, optsIn) + // })(optsOut) + // }) + + // If the handler function is an identifier and we're on the client, we need to + // remove the bound function from the file. + // If we're on the server, you can leave it, since it will get referenced + // as a second argument. + + if (t.isIdentifier(handlerFn)) { + if (opts.env === 'client') { + // Find the binding for the handler function + const binding = handlerFnPath.scope.getBinding(handlerFn.name) + // Remove it + if (binding) { + binding.path.remove() + } + } + // If the env is server, just leave it alone + } + + handlerFnPath.replaceWith( + t.arrowFunctionExpression( + [t.identifier('opts'), t.identifier('signal')], + t.blockStatement( + // Everything in here is server-only, since the client + // will strip out anything in the 'use server' directive. + [ + t.returnStatement( + t.callExpression( + t.identifier(`${existingVariableName}.__executeServer`), + [t.identifier('opts'), t.identifier('signal')], + ), + ), + ], + [t.directive(t.directiveLiteral('use server'))], + ), + ), + ) + + if (opts.env === 'server') { + callExpressionPaths.handler.node.arguments.push(handlerFn) + } +} + +export function handleCreateMiddlewareCallExpression( + path: babel.NodePath, + opts: CompileOptions, +) { + const rootCallExpression = getRootCallExpression(path) + + // if (debug) + // console.info( + // 'Handling createMiddleware call expression:', + // rootCallExpression.toString(), + // ) + + const callExpressionPaths = { + middleware: null as babel.NodePath | null, + validator: null as babel.NodePath | null, + client: null as babel.NodePath | null, + server: null as babel.NodePath | null, + } + + const validMethods = Object.keys(callExpressionPaths) + + rootCallExpression.traverse({ + MemberExpression(memberExpressionPath) { + if (t.isIdentifier(memberExpressionPath.node.property)) { + const name = memberExpressionPath.node.property + .name as keyof typeof callExpressionPaths + + if ( + validMethods.includes(name) && + memberExpressionPath.parentPath.isCallExpression() + ) { + callExpressionPaths[name] = memberExpressionPath.parentPath + } + } + }, + }) + + if (callExpressionPaths.validator) { + const innerInputExpression = callExpressionPaths.validator.node.arguments[0] + + if (!innerInputExpression) { + throw new Error( + 'createMiddleware().validator() must be called with a validator!', + ) + } + + // If we're on the client, remove the validator call expression + if (opts.env === 'client') { + if (t.isMemberExpression(callExpressionPaths.validator.node.callee)) { + callExpressionPaths.validator.replaceWith( + callExpressionPaths.validator.node.callee.object, + ) + } + } + } + + const serverFnPath = callExpressionPaths.server?.get( + 'arguments.0', + ) as babel.NodePath + + if ( + callExpressionPaths.server && + serverFnPath.node && + opts.env === 'client' + ) { + // If we're on the client, remove the server call expression + if (t.isMemberExpression(callExpressionPaths.server.node.callee)) { + callExpressionPaths.server.replaceWith( + callExpressionPaths.server.node.callee.object, + ) + } + } +} + +function buildEnvOnlyCallExpressionHandler(env: 'client' | 'server') { + return function envOnlyCallExpressionHandler( + path: babel.NodePath, + opts: CompileOptions, + ) { + // if (debug) + // console.info(`Handling ${env}Only call expression:`, path.toString()) + + const isEnvMatch = + env === 'client' ? opts.env === 'client' : opts.env === 'server' + + if (isEnvMatch) { + // extract the inner function from the call expression + const innerInputExpression = path.node.arguments[0] + + if (!t.isExpression(innerInputExpression)) { + throw new Error( + `${env}Only() functions must be called with a function!`, + ) + } + + path.replaceWith(innerInputExpression) + return + } + + // If we're on the wrong environment, replace the call expression + // with a function that always throws an error. + path.replaceWith( + t.arrowFunctionExpression( + [], + t.blockStatement([ + t.throwStatement( + t.newExpression(t.identifier('Error'), [ + t.stringLiteral( + `${env}Only() functions can only be called on the ${env}!`, + ), + ]), + ), + ]), + ), + ) + } +} + +export function handleCreateIsomorphicFnCallExpression( + path: babel.NodePath, + opts: CompileOptions, +) { + const rootCallExpression = getRootCallExpression(path) + + // if (debug) + // console.info( + // 'Handling createIsomorphicFn call expression:', + // rootCallExpression.toString(), + // ) + + const callExpressionPaths = { + client: null as babel.NodePath | null, + server: null as babel.NodePath | null, + } + + const validMethods = Object.keys(callExpressionPaths) + + rootCallExpression.traverse({ + MemberExpression(memberExpressionPath) { + if (t.isIdentifier(memberExpressionPath.node.property)) { + const name = memberExpressionPath.node.property + .name as keyof typeof callExpressionPaths + + if ( + validMethods.includes(name) && + memberExpressionPath.parentPath.isCallExpression() + ) { + callExpressionPaths[name] = memberExpressionPath.parentPath + } + } + }, + }) + + if ( + validMethods.every( + (method) => + !callExpressionPaths[method as keyof typeof callExpressionPaths], + ) + ) { + const variableId = rootCallExpression.parentPath.isVariableDeclarator() + ? rootCallExpression.parentPath.node.id + : null + console.warn( + 'createIsomorphicFn called without a client or server implementation!', + 'This will result in a no-op function.', + 'Variable name:', + t.isIdentifier(variableId) ? variableId.name : 'unknown', + ) + } + + const envCallExpression = callExpressionPaths[opts.env] + + if (!envCallExpression) { + // if we don't have an implementation for this environment, default to a no-op + rootCallExpression.replaceWith( + t.arrowFunctionExpression([], t.blockStatement([])), + ) + return + } + + const innerInputExpression = envCallExpression.node.arguments[0] + + if (!t.isExpression(innerInputExpression)) { + throw new Error( + `createIsomorphicFn().${opts.env}(func) must be called with a function!`, + ) + } + + rootCallExpression.replaceWith(innerInputExpression) +} + +export function getRootCallExpression(path: babel.NodePath) { + // Find the highest callExpression parent + let rootCallExpression: babel.NodePath = path + + // Traverse up the chain of CallExpressions + while (rootCallExpression.parentPath.isMemberExpression()) { + const parent = rootCallExpression.parentPath + if (parent.parentPath.isCallExpression()) { + rootCallExpression = parent.parentPath + } + } + + return rootCallExpression +} + +function codeFrameError( + code: string, + loc: { + start: { line: number; column: number } + end: { line: number; column: number } + }, + message: string, +) { + const frame = codeFrameColumns( + code, + { + start: loc.start, + end: loc.end, + }, + { + highlightCode: true, + message, + }, + ) + + return new Error(frame) +} diff --git a/packages/start-plugin-core/src/extractHtmlScripts.ts b/packages/start-plugin-core/src/extractHtmlScripts.ts new file mode 100644 index 0000000000..41e3ac44a9 --- /dev/null +++ b/packages/start-plugin-core/src/extractHtmlScripts.ts @@ -0,0 +1,19 @@ +import * as cheerio from 'cheerio' + +export function extractHtmlScripts( + html: string, +): Array<{ content?: string; src?: string }> { + const $ = cheerio.load(html) + const scripts: Array<{ content?: string; src?: string }> = [] + + $('script').each((_, element) => { + const src = $(element).attr('src') + const content = $(element).html() ?? undefined + scripts.push({ + src, + content, + }) + }) + + return scripts +} diff --git a/packages/start-plugin-core/src/index.ts b/packages/start-plugin-core/src/index.ts new file mode 100644 index 0000000000..28b8cbdab0 --- /dev/null +++ b/packages/start-plugin-core/src/index.ts @@ -0,0 +1,15 @@ +export type { CompileOptions, IdentifierConfig } from './compilers' + +export { compileStartOutputFactory } from './compilers' + +export type { PagesJson } from './nitro/build-sitemap' +export { buildSitemap } from './nitro/build-sitemap' + +export { + createTanStackConfig, + createTanStackStartOptionsSchema, + pageSchema, +} from './schema' + +export { TanStackStartVitePluginCore } from './plugin' +export { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin' diff --git a/packages/start-plugin-core/src/nitro/build-nitro.ts b/packages/start-plugin-core/src/nitro/build-nitro.ts new file mode 100644 index 0000000000..918248c3a9 --- /dev/null +++ b/packages/start-plugin-core/src/nitro/build-nitro.ts @@ -0,0 +1,27 @@ +import { promises as fsp } from 'node:fs' +import path from 'node:path' +import { copyPublicAssets, prepare } from 'nitropack' +import type { Nitro } from 'nitropack' + +export async function buildNitroEnvironment( + nitro: Nitro, + build: () => Promise, +) { + await prepare(nitro) + await copyPublicAssets(nitro) + await build() + + const publicDir = nitro.options.output.publicDir + + // As a part of the build process, the `.vite/` directory + // is copied over from `.tanstack-start/build/client-dist/` + // to the `publicDir` (e.g. `.output/public/`). + // This directory (containing the vite manifest) should not be + // included in the final build, so we remove it here. + const viteDir = path.resolve(publicDir, '.vite') + if (await fsp.stat(viteDir).catch(() => false)) { + await fsp.rm(viteDir, { recursive: true, force: true }) + } + + await nitro.close() +} diff --git a/packages/start-plugin-core/src/nitro/build-sitemap.ts b/packages/start-plugin-core/src/nitro/build-sitemap.ts new file mode 100644 index 0000000000..c06ed77d0e --- /dev/null +++ b/packages/start-plugin-core/src/nitro/build-sitemap.ts @@ -0,0 +1,79 @@ +import { writeFileSync } from 'node:fs' +import { resolve } from 'node:path' +import { create } from 'xmlbuilder2' +import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' + +export type PagesJson = { + page: string + lastMod: string +} + +export async function buildSitemap({ + host, + routes, + outputDir, +}: { + host: string + routes: Array | (() => Promise>) + outputDir: string +}) { + const routeList: Array = await optionHasRoutes(routes) + + if (routeList.length) { + const slash = checkSlash(host) + const sitemapData: Array = routeList.map((page: string) => ({ + page: `${host}${slash}${page.replace(/^\/+/g, '')}`, + lastMod: new Date().toISOString().split('T')[0]!, + })) + + const sitemap = createXml('urlset') + + for (const item of sitemapData) { + const page = sitemap.ele('url') + page.ele('loc').txt(item.page) + page.ele('lastmod').txt(item.lastMod) + } + + const mapPath = `${resolve(outputDir)}/sitemap.xml` + try { + console.log(`Writing sitemap at ${mapPath}`) + writeFileSync(mapPath, sitemap.end({ prettyPrint: true })) + } catch (e) { + console.error(`Unable to write file at ${mapPath}`, e) + } + } +} + +function createXml(elementName: 'urlset' | 'sitemapindex'): XMLBuilder { + return create({ version: '1.0', encoding: 'UTF-8' }) + .ele(elementName, { + xmlns: 'https://www.sitemaps.org/schemas/sitemap/0.9', + }) + .com(`This file was automatically generated by Analog.`) +} + +function checkSlash(host: string): string { + const finalChar = host.slice(-1) + return finalChar === '/' ? '' : '/' +} + +async function optionHasRoutes( + routes: + | Array + | (() => Promise>), +): Promise> { + let routeList: Array + + if (typeof routes === 'function') { + // returns an array or undefined + routeList = await routes() + } else if (Array.isArray(routes)) { + // returns an array of strings + routeList = routes + } else { + // default it to an empty of array + routeList = [] + } + + return routeList.filter(Boolean) as Array +} diff --git a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts new file mode 100644 index 0000000000..1f868d4440 --- /dev/null +++ b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts @@ -0,0 +1,159 @@ +import { createEvent, getHeader, sendWebResponse } from 'h3' +import { isRunnableDevEnvironment } from 'vite' +import { extractHtmlScripts } from '../extractHtmlScripts' +import type { Connect, Plugin, ViteDevServer } from 'vite' + +declare global { + // eslint-disable-next-line no-var + var TSS_INJECTED_HEAD_SCRIPTS: string | undefined +} + +export function devServerPlugin(): Plugin { + // let config: UserConfig + let isTest = false + + return { + name: 'start-dev-ssr-plugin', + config(userConfig, { mode }) { + // config = userConfig + isTest = isTest ? isTest : mode === 'test' + }, + configureServer(viteDevServer) { + if (isTest) { + return + } + + ;(globalThis as any).viteDevServer = viteDevServer + + return () => { + remove_html_middlewares(viteDevServer.middlewares) + let cachedScripts: string | undefined + viteDevServer.middlewares.use(async (req, res) => { + const event = createEvent(req, res) + const serverEnv = viteDevServer.environments['server'] + + try { + if (!serverEnv || !isRunnableDevEnvironment(serverEnv)) { + throw new Error('Server environment not found') + } + if (cachedScripts === undefined) { + const templateHtml = `` + const transformedHtml = await viteDevServer.transformIndexHtml( + req.url || '/', + templateHtml, + ) + const scripts = extractHtmlScripts(transformedHtml) + globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts + .map((script) => script.content ?? '') + .join(';') + } + const serverEntry = await serverEnv.runner.import( + '/~start/server-entry', + ) + const response = await serverEntry['default'](event) + + return sendWebResponse(event, response) + } catch (e) { + console.error(e) + viteDevServer.ssrFixStacktrace(e as Error) + + if ( + getHeader(event, 'content-type')?.includes('application/json') + ) { + return sendWebResponse( + event, + new Response( + JSON.stringify( + { + status: 500, + error: 'Internal Server Error', + message: + 'An unexpected error occurred. Please try again later.', + timestamp: new Date().toISOString(), + }, + null, + 2, + ), + { + status: 500, + headers: { + 'Content-Type': 'application/json', + }, + }, + ), + ) + } + + return sendWebResponse( + event, + new Response( + ` + + + + + Error + + + + + + `, + { + status: 500, + headers: { + 'Content-Type': 'text/html', + }, + }, + ), + ) + } + }) + } + }, + } +} + +/** + * Removes Vite internal middleware + * + * @param server + */ +function remove_html_middlewares(server: ViteDevServer['middlewares']) { + const html_middlewares = [ + 'viteIndexHtmlMiddleware', + 'vite404Middleware', + 'viteSpaFallbackMiddleware', + ] + for (let i = server.stack.length - 1; i > 0; i--) { + if ( + html_middlewares.includes( + // @ts-expect-error + server.stack[i].handle.name, + ) + ) { + server.stack.splice(i, 1) + } + } +} + +/** + * Formats error for SSR message in error overlay + * @param req + * @param error + * @returns + */ +function prepareError(req: Connect.IncomingMessage, error: unknown) { + const e = error as Error + return { + message: `An error occured while server rendering ${req.url}:\n\n\t${ + typeof e === 'string' ? e : e.message + } `, + stack: typeof e === 'string' ? '' : e.stack, + } +} diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts new file mode 100644 index 0000000000..c61be21144 --- /dev/null +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -0,0 +1,161 @@ +import path from 'node:path' +import { rmSync } from 'node:fs' +import { build, createNitro } from 'nitropack' +import { dirname, resolve } from 'pathe' +import { clientDistDir, ssrEntryFile } from '../plugin' +import { prerender } from '../prerender' +import { devServerPlugin } from './dev-server-plugin' +import { buildNitroEnvironment } from './build-nitro' +import type { EnvironmentOptions, PluginOption, Rollup } from 'vite' +import type { NitroConfig } from 'nitropack' +import type { TanStackStartOutputConfig } from '../plugin' + +export function nitroPlugin( + options: TanStackStartOutputConfig, + getSsrBundle: () => Rollup.OutputBundle, +): Array { + const buildPreset = + process.env['START_TARGET'] ?? (options.target as string | undefined) + + return [ + devServerPlugin(), + { + name: 'tanstack-vite-plugin-nitro', + configEnvironment(name) { + if (name === 'server') { + return { + build: { + commonjsOptions: { + include: [], + }, + ssr: true, + sourcemap: true, + rollupOptions: { + input: '/~start/server-entry', + }, + }, + } satisfies EnvironmentOptions + } + + return null + }, + config() { + return { + builder: { + sharedPlugins: true, + async buildApp(builder) { + const clientEnv = builder.environments['client'] + const serverEnv = builder.environments['server'] + + if (!clientEnv) { + throw new Error('Client environment not found') + } + + if (!serverEnv) { + throw new Error('SSR environment not found') + } + + const clientOutputDir = resolve(options.root, clientDistDir) + rmSync(clientOutputDir, { recursive: true, force: true }) + await builder.build(clientEnv) + + await builder.build(serverEnv) + + const nitroConfig: NitroConfig = { + dev: false, + // TODO do we need this? should this be made configurable? + compatibilityDate: '2024-11-19', + logLevel: 3, + preset: buildPreset, + publicAssets: [ + { + dir: path.resolve(options.root, clientDistDir), + }, + ], + typescript: { + generateTsConfig: false, + }, + prerender: undefined, + renderer: ssrEntryFile, + rollupConfig: { + plugins: [virtualBundlePlugin(getSsrBundle())], + }, + } + + const nitro = await createNitro(nitroConfig) + + await buildNitroEnvironment(nitro, () => build(nitro)) + + if (options.prerender?.enabled) { + await prerender({ + options, + nitro, + builder, + }) + } + + // if (nitroConfig.prerender?.routes?.length && options.sitemap) { + // console.log('Building Sitemap...') + // // sitemap needs to be built after all directories are built + // await buildSitemap({ + // host: options.sitemap.host, + // routes: nitroConfig.prerender.routes, + // outputDir: resolve(options.root, 'dist/public'), + // }) + // } + + // console.log( + // `\n\n✅ Client and server bundles successfully built.`, + // ) + }, + }, + } + }, + }, + ] +} + +function virtualBundlePlugin(ssrBundle: Rollup.OutputBundle): Rollup.Plugin { + type VirtualModule = { code: string; map: string | null } + const _modules = new Map() + + // group chunks and source maps + for (const [fileName, content] of Object.entries(ssrBundle)) { + if (content.type === 'chunk') { + const virtualModule: VirtualModule = { + code: content.code, + map: null, + } + const maybeMap = ssrBundle[`${fileName}.map`] + if (maybeMap && maybeMap.type === 'asset') { + virtualModule.map = maybeMap.source as string + } + _modules.set(fileName, virtualModule) + _modules.set(resolve(fileName), virtualModule) + } + } + + return { + name: 'virtual-bundle', + resolveId(id, importer) { + if (_modules.has(id)) { + return resolve(id) + } + + if (importer) { + const resolved = resolve(dirname(importer), id) + if (_modules.has(resolved)) { + return resolved + } + } + return null + }, + load(id) { + const m = _modules.get(id) + if (!m) { + return null + } + return m + }, + } +} diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts new file mode 100644 index 0000000000..fde7ea057f --- /dev/null +++ b/packages/start-plugin-core/src/plugin.ts @@ -0,0 +1,145 @@ +import path from 'node:path' +import { createNitro } from 'nitropack' +import { + createTanStackConfig, + createTanStackStartOptionsSchema, +} from './schema' +import { nitroPlugin } from './nitro/nitro-plugin' +import { startManifestPlugin } from './routesManifestPlugin' +import { TanStackStartCompilerPlugin } from './start-compiler-plugin' +import type { PluginOption, Rollup } from 'vite' +import type { z } from 'zod' +import type { CompileStartFrameworkOptions } from './compilers' + +const TanStackStartOptionsSchema = createTanStackStartOptionsSchema() +export type TanStackStartInputConfig = z.input< + typeof TanStackStartOptionsSchema +> + +const defaultConfig = createTanStackConfig() +export function getTanStackStartOptions(opts?: TanStackStartInputConfig) { + return defaultConfig.parse(opts) +} + +export type TanStackStartOutputConfig = ReturnType< + typeof getTanStackStartOptions +> + +export const clientDistDir = '.tanstack-start/build/client-dist' +export const ssrEntryFile = 'ssr.mjs' + +// this needs to live outside of the TanStackStartVitePluginCore since it will be invoked multiple times by vite +let ssrBundle: Rollup.OutputBundle + +export function TanStackStartVitePluginCore( + framework: CompileStartFrameworkOptions, + opts: TanStackStartOutputConfig, +): Array { + return [ + { + name: 'tanstack-start-core:config-client', + async config() { + const nitroOutputPublicDir = await (async () => { + // Create a dummy nitro app to get the resolved public output path + const dummyNitroApp = await createNitro({ + preset: opts.target, + compatibilityDate: '2024-12-01', + }) + + const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir + await dummyNitroApp.close() + + return nitroOutputPublicDir + })() + + return { + environments: { + client: { + consumer: 'client', + build: { + manifest: true, + rollupOptions: { + input: { + main: opts.clientEntryPath, + }, + output: { + dir: path.resolve(opts.root, clientDistDir), + }, + // TODO this should be removed + external: ['node:fs', 'node:path', 'node:os', 'node:crypto'], + }, + }, + }, + server: { + consumer: 'server', + build: { + ssr: true, + // we don't write to the file system as the below 'capture-output' plugin will + // capture the output and write it to the virtual file system + write: false, + copyPublicDir: false, + rollupOptions: { + output: { + entryFileNames: ssrEntryFile, + }, + plugins: [ + { + name: 'capture-output', + generateBundle(options, bundle) { + // TODO can this hook be called more than once? + ssrBundle = bundle + }, + }, + ], + }, + commonjsOptions: { + include: [/node_modules/], + }, + }, + }, + }, + resolve: { + noExternal: [ + '@tanstack/start-client', + '@tanstack/start-client-core', + '@tanstack/start-server', + '@tanstack/start-server-core', + '@tanstack/start-server-functions-fetcher', + '@tanstack/start-server-functions-client', + '@tanstack/start-server-functions-server', + '@tanstack/start-router-manifest', + '@tanstack/start-config', + '@tanstack/server-functions-plugin', + 'tanstack:start-manifest', + 'tanstack:server-fn-manifest', + 'nitropack', + '@tanstack/**', + ], + external: ['undici'], + }, + /* prettier-ignore */ + define: { + ...injectDefineEnv('TSS_PUBLIC_BASE', opts.public.base), + ...injectDefineEnv('TSS_CLIENT_BASE', opts.client.base), + ...injectDefineEnv('TSS_CLIENT_ENTRY', opts.clientEntryPath), + ...injectDefineEnv('TSS_SERVER_FN_BASE', opts.serverFns.base), + ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), + }, + } + }, + }, + TanStackStartCompilerPlugin(framework), + startManifestPlugin(opts), + nitroPlugin(opts, () => ssrBundle), + ] +} + +function injectDefineEnv( + key: TKey, + value: TValue, +): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { + return { + [`process.env.${key}`]: JSON.stringify(value), + [`import.meta.env.${key}`]: JSON.stringify(value), + } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } +} diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts new file mode 100644 index 0000000000..afb252431a --- /dev/null +++ b/packages/start-plugin-core/src/prerender.ts @@ -0,0 +1,245 @@ +import { promises as fsp } from 'node:fs' +import os from 'node:os' +import path from 'node:path' +import { getRollupConfig } from 'nitropack/rollup' +import { build as buildNitro, createNitro } from 'nitropack' +import { joinURL, withBase, withoutBase } from 'ufo' +import { Queue } from './queue' +import { buildNitroEnvironment } from './nitro/build-nitro' +import type { ViteBuilder } from 'vite' +import type { $Fetch, Nitro } from 'nitropack' +import type { TanStackStartOutputConfig } from './plugin' +import type { Page } from './schema' + +export async function prerender({ + options, + nitro, + builder, +}: { + options: TanStackStartOutputConfig + nitro: Nitro + builder: ViteBuilder +}) { + nitro.logger.info('Prendering pages...') + + // If prerender is enabled but no pages are provided, default to prerendering the root page + if (options.prerender?.enabled && !options.pages.length) { + options.pages = [ + { + path: '/', + }, + ] + } + + const serverEnv = builder.environments['server'] + + if (!serverEnv) { + throw new Error(`Vite's "server" environment not found`) + } + + const prerenderOutputDir = path.resolve( + options.root, + '.tanstack-start/build/prerenderer', + ) + + const nodeNitro = await createNitro({ + ...nitro.options._config, + preset: 'nitro-prerender', + logLevel: 0, + output: { + dir: prerenderOutputDir, + serverDir: path.resolve(prerenderOutputDir, 'server'), + publicDir: path.resolve(prerenderOutputDir, 'public'), + }, + }) + + const nodeNitroRollupOptions = getRollupConfig(nodeNitro) + + const build = serverEnv.config.build + + build.outDir = prerenderOutputDir + + build.rollupOptions = { + ...build.rollupOptions, + ...nodeNitroRollupOptions, + output: { + ...build.rollupOptions.output, + ...nodeNitroRollupOptions.output, + sourcemap: undefined, + }, + } + + await buildNitroEnvironment(nodeNitro, () => buildNitro(nodeNitro)) + + // Import renderer entry + const serverFilename = + typeof nodeNitroRollupOptions.output.entryFileNames === 'string' + ? nodeNitroRollupOptions.output.entryFileNames + : 'index.mjs' + + const serverEntrypoint = path.resolve( + path.join(nodeNitro.options.output.serverDir, serverFilename), + ) + + const { closePrerenderer, localFetch } = (await import(serverEntrypoint)) as { + closePrerenderer: () => void + localFetch: $Fetch + } + + try { + // Crawl all pages + const pages = await prerenderPages() + + nitro.logger.info(`Prerendered ${pages.length} pages:`) + pages.forEach((page) => { + nitro.logger.info(`- ${page}`) + }) + + // TODO: Write the prerendered pages to the output directory + } catch (error) { + nitro.logger.error(error) + } finally { + // Ensure server is always closed + // server.process.kill() + closePrerenderer() + } + + function extractLinks(html: string): Array { + const linkRegex = /]+href=["']([^"']+)["'][^>]*>/g + const links: Array = [] + let match + + while ((match = linkRegex.exec(html)) !== null) { + const href = match[1] + if (href && (href.startsWith('/') || href.startsWith('./'))) { + links.push(href) + } + } + + return links + } + + async function prerenderPages() { + const seen = new Set() + const retriesByPath = new Map() + const concurrency = options.prerender?.concurrency ?? os.cpus().length + nitro.logger.info(`Concurrency: ${concurrency}`) + const queue = new Queue({ concurrency }) + + options.pages.forEach((_page) => { + let page = _page as Page + + if (typeof _page === 'string') { + page = { path: _page } + } + + addCrawlPageTask(page) + }) + + await queue.start() + + return Array.from(seen) + + function addCrawlPageTask(page: Page) { + // Was the page already seen? + if (seen.has(page.path)) return + + // Add the page to the seen set + seen.add(page.path) + + if (page.fromCrawl) { + options.pages.push(page) + } + + // If not enabled, skip + if (!(page.prerender?.enabled ?? true)) return + + // If there is a filter link, check if the page should be prerendered + if (options.prerender?.filter && !options.prerender.filter(page)) return + + // Resolve the merged default and page-specific prerender options + const prerenderOptions = { + ...options.prerender, + ...page.prerender, + } + + // Add the task + queue.add(async () => { + nitro.logger.info(`Crawling: ${page.path}`) + const retries = retriesByPath.get(page.path) || 0 + try { + // Fetch the route + const encodedRoute = encodeURI(page.path) + + const res = await localFetch( + withBase(encodedRoute, nodeNitro.options.baseURL), + { + headers: { 'x-nitro-prerender': encodedRoute }, + }, + ) + + if (!res.ok) { + throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`) + } + + // Guess route type and populate fileName + const contentType = res.headers.get('content-type') || '' + const isImplicitHTML = + !page.path.endsWith('.html') && contentType.includes('html') + // && + // !JsonSigRx.test(dataBuff.subarray(0, 32).toString('utf8')) + const routeWithIndex = page.path.endsWith('/') + ? page.path + 'index' + : page.path + + const htmlPath = + page.path.endsWith('/') || prerenderOptions.autoSubfolderIndex + ? joinURL(page.path, 'index.html') + : page.path + '.html' + + const filename = withoutBase( + isImplicitHTML ? htmlPath : routeWithIndex, + nitro.options.baseURL, + ) + + const html = await res.text() + + const filepath = path.join(nitro.options.output.publicDir, filename) + + await fsp.mkdir(path.dirname(filepath), { + recursive: true, + }) + + await fsp.writeFile(filepath, html) + + const newPage = await prerenderOptions.onSuccess?.({ page, html }) + + if (newPage) { + Object.assign(page, newPage) + } + + // Find new links + if (prerenderOptions.crawlLinks ?? true) { + const links = extractLinks(html) + for (const link of links) { + addCrawlPageTask({ path: link, fromCrawl: true }) + } + } + } catch (error) { + if (retries < (prerenderOptions.retryCount ?? 0)) { + nitro.logger.warn( + `Encountered error, retrying: ${page.path} in 500ms`, + ) + await new Promise((resolve) => + setTimeout(resolve, prerenderOptions.retryDelay), + ) + retriesByPath.set(page.path, retries + 1) + addCrawlPageTask(page) + } else { + throw error + } + } + }) + } + } +} diff --git a/packages/start-plugin-core/src/queue.ts b/packages/start-plugin-core/src/queue.ts new file mode 100644 index 0000000000..279146fdb2 --- /dev/null +++ b/packages/start-plugin-core/src/queue.ts @@ -0,0 +1,153 @@ +interface PoolConfig { + concurrency?: number + started?: boolean + tasks?: Array<() => Promise> +} + +const defaultConfig: PoolConfig = { + concurrency: 5, + started: false, + tasks: [], +} + +export class Queue { + private onSettles: Array<(res: any, error: any) => void> = [] + private onErrors: Array<(error: any, task: () => Promise) => void> = [] + private onSuccesses: Array<(result: any, task: () => Promise) => void> = + [] + private running: boolean + private active: Array<() => Promise> = [] + private pending: Array<() => Promise> + private currentConcurrency: number + + constructor(config: PoolConfig = defaultConfig) { + const { concurrency, started, tasks } = { + ...defaultConfig, + ...config, + } + this.running = started! + this.pending = tasks as Array<() => Promise> + this.currentConcurrency = concurrency! + } + + private tick() { + if (!this.running) { + return + } + while ( + this.active.length < this.currentConcurrency && + this.pending.length + ) { + const nextFn = this.pending.shift() + if (!nextFn) { + throw new Error('Found task that is not a function') + } + this.active.push(nextFn) + ;(async () => { + let success = false + let res!: T + let error: any + try { + res = await nextFn() + success = true + } catch (e) { + error = e + } + this.active = this.active.filter((d) => d !== nextFn) + if (success) { + this.onSuccesses.forEach((d) => d(res, nextFn)) + } else { + this.onErrors.forEach((d) => d(error, nextFn)) + } + this.onSettles.forEach((d) => d(res, error)) + this.tick() + })() + } + } + + add(fn: () => Promise | T, { priority }: { priority?: boolean } = {}) { + return new Promise((resolve, reject) => { + const task = () => + Promise.resolve(fn()) + .then((res) => { + resolve(res) + return res + }) + .catch((err) => { + reject(err) + throw err + }) + if (priority) { + this.pending.unshift(task) + } else { + this.pending.push(task) + } + this.tick() + }) + } + + throttle(n: number) { + this.currentConcurrency = n + } + + onSettled(cb: () => void) { + this.onSettles.push(cb) + return () => { + this.onSettles = this.onSettles.filter((d) => d !== cb) + } + } + + onError(cb: (error: any, task: () => Promise) => void) { + this.onErrors.push(cb) + return () => { + this.onErrors = this.onErrors.filter((d) => d !== cb) + } + } + + onSuccess(cb: (result: any, task: () => Promise) => void) { + this.onSuccesses.push(cb) + return () => { + this.onSuccesses = this.onSuccesses.filter((d) => d !== cb) + } + } + + stop() { + this.running = false + } + + start() { + this.running = true + this.tick() + return new Promise((resolve) => { + this.onSettled(() => { + if (this.isSettled()) { + resolve() + } + }) + }) + } + + clear() { + this.pending = [] + } + + getActive() { + return this.active + } + + getPending() { + return this.pending + } + + getAll() { + return [...this.active, ...this.pending] + } + + isRunning() { + return this.running + } + + isSettled() { + return !this.active.length && !this.pending.length + } +} diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/routesManifestPlugin.ts new file mode 100644 index 0000000000..e323dc792d --- /dev/null +++ b/packages/start-plugin-core/src/routesManifestPlugin.ts @@ -0,0 +1,216 @@ +import { readFileSync } from 'node:fs' +import path from 'node:path' +import { joinURL } from 'ufo' +import { rootRouteId } from '@tanstack/router-core' +import type { + PluginOption, + ResolvedConfig, + Manifest as ViteManifest, + ManifestChunk as ViteManifestChunk, +} from 'vite' +import type { Manifest, RouterManagedTag } from '@tanstack/router-core' +import type { TanStackStartOutputConfig } from './plugin' + +export function startManifestPlugin( + opts: TanStackStartOutputConfig, +): PluginOption { + let config: ResolvedConfig + + return { + name: 'tsr-routes-manifest', + enforce: 'pre', + + configResolved(resolvedConfig) { + config = resolvedConfig + }, + // configEnvironment(env, envConfig) { + // config = envConfig. + // }, + resolveId(id) { + if (id === 'tanstack:start-manifest') { + return id + } + return + }, + load(id) { + if (id === 'tanstack:start-manifest') { + if (this.environment.config.consumer !== 'server') { + // this will ultimately fail the build if the plugin is used outside the server environment + // TODO: do we need special handling for `serve`? + return `export default {}` + } + // If we're in development, return a dummy manifest + + if (config.command === 'serve') { + return `export const tsrStartManifest = () => ({ + entry: "$${process.env.TSS_CLIENT_BASE}/", + routes: {} + })` + } + + const clientViteManifestPath = path.resolve( + opts.root, + '.tanstack-start/build/client-dist/.vite/manifest.json', + ) + + let viteManifest: ViteManifest + try { + viteManifest = JSON.parse( + readFileSync(clientViteManifestPath, 'utf-8'), + ) + } catch (err) { + console.error(err) + throw new Error( + `Could not find the production client vite manifest at '${clientViteManifestPath}'!`, + ) + } + + const routeTreePath = path.resolve(opts.tsr.generatedRouteTree) + + let routeTreeContent: string + try { + routeTreeContent = readFileSync(routeTreePath, 'utf-8') + } catch (err) { + console.error(err) + throw new Error( + `Could not find the generated route tree at '${routeTreePath}'!`, + ) + } + + // Extract the routesManifest JSON from the route tree file. + // It's located between the /* ROUTE_MANIFEST_START and ROUTE_MANIFEST_END */ comment block. + + const routerManifest = JSON.parse( + routeTreeContent.match( + /\/\* ROUTE_MANIFEST_START([\s\S]*?)ROUTE_MANIFEST_END \*\//, + )?.[1] || '{ routes: {} }', + ) as Manifest + + const routes = routerManifest.routes + + let entryFile: ViteManifestChunk | undefined + + const filesByRouteFilePath: ViteManifest = Object.fromEntries( + Object.entries(viteManifest).map(([k, v]) => { + if (v.isEntry) { + entryFile = v + } + + const rPath = k.split('?')[0] + + return [rPath, v] + }, {}), + ) + + const routesDirectoryFromRoot = path.relative( + opts.root, + opts.tsr.routesDirectory, + ) + + // Add preloads to the routes from the vite manifest + Object.entries(routes).forEach(([k, v]) => { + const file = + filesByRouteFilePath[ + path.join(routesDirectoryFromRoot, v.filePath as string) + ] + + if (file) { + const preloads = (file.imports ?? []).map((d) => + path.join('/', viteManifest[d]!.file), + ) + + if (file.file) { + preloads.unshift(path.join('/', file.file)) + } + + const cssFiles = file.css ?? [] + const cssAssetsList: Array = cssFiles.map( + (cssFile) => ({ + tag: 'link', + attrs: { + rel: 'stylesheet', + href: joinURL('/', cssFile), + type: 'text/css', + }, + }), + ) + + routes[k] = { + ...v, + assets: [...(v.assets || []), ...cssAssetsList], + preloads, + } + } + }) + + if (entryFile) { + routes[rootRouteId]!.preloads = [ + path.join('/', entryFile.file), + ...(entryFile.imports?.map((d) => + path.join('/', viteManifest[d]!.file), + ) || []), + ] + + // Gather all the CSS files from the entry file in + // the `css` key and add them to the root route + const entryCssFiles = entryFile.css ?? [] + const entryCssAssetsList: Array = entryCssFiles.map( + (cssFile) => ({ + tag: 'link', + attrs: { + rel: 'stylesheet', + href: joinURL('/', cssFile), + type: 'text/css', + }, + }), + ) + + routes[rootRouteId]!.assets = [ + ...(routes[rootRouteId]!.assets || []), + ...entryCssAssetsList, + { + tag: 'script', + attrs: { + src: joinURL('/', entryFile.file), + type: 'module', + }, + }, + ] + } + + const recurseRoute = ( + route: { + preloads?: Array + children?: Array + }, + seenPreloads = {} as Record, + ) => { + route.preloads = route.preloads?.filter((preload) => { + if (seenPreloads[preload]) { + return false + } + seenPreloads[preload] = true + return true + }) + + if (route.children) { + route.children.forEach((child) => { + const childRoute = routes[child]! + recurseRoute(childRoute, { ...seenPreloads }) + }) + } + } + + // @ts-expect-error + recurseRoute(routes[rootRouteId]) + + const routesManifest = { + routes, + } + + return `export const tsrStartManifest = () => (${JSON.stringify(routesManifest)})` + } + return + }, + } +} diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts new file mode 100644 index 0000000000..b2f135d0c7 --- /dev/null +++ b/packages/start-plugin-core/src/schema.ts @@ -0,0 +1,193 @@ +import path from 'node:path' +import { existsSync } from 'node:fs' +import { z } from 'zod' +import { configSchema, getConfig } from '@tanstack/router-generator' +import type { NitroConfig } from 'nitropack' + +const tsrConfig = configSchema.partial().extend({ + srcDirectory: z.string().optional().default('src'), +}) + +export function createTanStackConfig< + TFrameworkPlugin extends Record, +>(frameworkPlugin?: TFrameworkPlugin) { + const schema = createTanStackStartOptionsSchema(frameworkPlugin) + + return { + schema, + parse: (opts?: z.input) => { + const options = schema.parse(opts) + + const srcDirectory = options.tsr.srcDirectory + + const routesDirectory = + options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes') + + const generatedRouteTree = + options.tsr.generatedRouteTree ?? + path.join(srcDirectory, 'routeTree.gen.ts') + + const clientEntryPath = (() => { + if (options.client.entry) { + return path.join(srcDirectory, options.client.entry) + } + + if (existsSync(path.join(srcDirectory, 'client.tsx'))) { + return path.join(srcDirectory, 'client.tsx') + } + + return '/~start/default-client-entry' + })() + + const serverEntryPath = (() => { + if (options.server.entry) { + return path.join(srcDirectory, options.server.entry) + } + + if (existsSync(path.join(srcDirectory, 'server.tsx'))) { + return path.join(srcDirectory, 'server.tsx') + } + + return '/~start/default-server-entry' + })() + + return { + ...options, + tsr: { + ...options.tsr, + ...getConfig({ + ...options.tsr, + routesDirectory, + generatedRouteTree, + }), + }, + clientEntryPath, + serverEntryPath, + } + }, + } +} + +export function createTanStackStartOptionsSchema( + frameworkPlugin: Record = {}, +) { + return z + .object({ + root: z.string().optional().default(process.cwd()), + target: z.custom().optional(), + ...frameworkPlugin, + tsr: tsrConfig.optional().default({}), + client: z + .object({ + entry: z.string().optional(), + base: z.string().optional().default('/_build'), + }) + .optional() + .default({}), + server: z + .object({ + entry: z.string().optional(), + }) + .optional() + .default({}), + serverFns: z + .object({ + base: z.string().optional().default('/_server'), + }) + .optional() + .default({}), + public: z + .object({ + dir: z.string().optional().default('public'), + base: z.string().optional().default('/'), + }) + .optional() + .default({}), + pages: z + .array(z.union([z.string(), pageSchema])) + .optional() + .default([]), + sitemap: pagePrerenderOptionsSchema + .extend({ + host: z.string().optional(), + }) + .optional(), + prerender: z + .object({ + enabled: z.boolean().optional(), + concurrency: z.number().optional(), + filter: z.function().args(pageSchema).returns(z.any()).optional(), + failOnError: z.boolean().optional(), + }) + .and(pagePrerenderOptionsSchema.optional()) + .optional(), + }) + .optional() + .default({}) +} + +const pageSitemapOptionsSchema = z.object({ + exclude: z.boolean().optional(), + priority: z.number().min(0).max(1).optional(), + changefreq: z + .enum(['always', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'never']) + .optional(), + lastmod: z.union([z.string(), z.date()]).optional(), + alternateRefs: z + .array( + z.object({ + href: z.string(), + hreflang: z.string(), + }), + ) + .optional(), + images: z + .array( + z.object({ + loc: z.string(), + caption: z.string().optional(), + title: z.string().optional(), + }), + ) + .optional(), + news: z + .object({ + publication: z.object({ + name: z.string(), + language: z.string(), + }), + publicationDate: z.union([z.string(), z.date()]), + title: z.string(), + }) + .optional(), +}) + +const pageBaseSchema = z.object({ + path: z.string(), + sitemap: pageSitemapOptionsSchema.optional(), + fromCrawl: z.boolean().optional(), +}) + +const pagePrerenderOptionsSchema = z.object({ + enabled: z.boolean().optional(), + autoSubfolderIndex: z.boolean().optional(), + crawlLinks: z.boolean().optional(), + retryCount: z.number().optional(), + retryDelay: z.number().optional(), + onSuccess: z + .function() + .args( + z.object({ + page: pageBaseSchema, + html: z.string(), + }), + ) + .returns(z.any()) + .optional(), +}) + +export const pageSchema = pageBaseSchema.extend({ + prerender: pagePrerenderOptionsSchema.optional(), +}) + +export type Page = z.infer diff --git a/packages/start-plugin-core/src/start-compiler-plugin.ts b/packages/start-plugin-core/src/start-compiler-plugin.ts new file mode 100644 index 0000000000..e381536c4b --- /dev/null +++ b/packages/start-plugin-core/src/start-compiler-plugin.ts @@ -0,0 +1,111 @@ +import { fileURLToPath, pathToFileURL } from 'node:url' +import { logDiff } from '@tanstack/router-utils' + +import { compileStartOutputFactory } from './compilers' +import type { Plugin } from 'vite' +import type { CompileStartFrameworkOptions } from './compilers' + +const debug = + process.env.TSR_VITE_DEBUG && + ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG) + +export type TanStackStartViteOptions = { + globalMiddlewareEntry: string +} + +const transformFuncs = [ + 'createServerFn', + 'createMiddleware', + 'serverOnly', + 'clientOnly', + 'createIsomorphicFn', + 'createServerFileRoute', +] + +const tokenRegex = new RegExp(transformFuncs.join('|')) + +export function TanStackStartCompilerPlugin( + framework: CompileStartFrameworkOptions, + inputOpts?: { + client?: { + envName?: string + } + server?: { + envName?: string + } + }, +): Plugin { + const opts = { + client: { + envName: 'client', + ...inputOpts?.client, + }, + server: { + envName: 'server', + ...inputOpts?.server, + }, + } + + return { + name: 'vite-plugin-tanstack-start-create-server-fn', + enforce: 'pre', + applyToEnvironment(env) { + return [opts.client.envName, opts.server.envName].includes(env.name) + }, + transform(code, id) { + const env = + this.environment.name === opts.client.envName + ? 'client' + : this.environment.name === opts.server.envName + ? 'server' + : (() => { + throw new Error( + `Environment ${this.environment.name} not configured`, + ) + })() + + return transformCode({ + code, + id, + env, + framework, + }) + }, + } +} + +function transformCode(opts: { + code: string + id: string + env: 'server' | 'client' + framework: CompileStartFrameworkOptions +}) { + const { code, env, framework } = opts + let { id } = opts + + const url = pathToFileURL(id) + url.searchParams.delete('v') + id = fileURLToPath(url).replace(/\\/g, '/') + + const includesToken = tokenRegex.test(code) + + if (!includesToken) { + return null + } + + if (debug) console.info(`${env} Compiling Start: `, id) + + const compileStartOutput = compileStartOutputFactory(framework) + const compiled = compileStartOutput({ + code, + filename: id, + env, + }) + + if (debug) { + logDiff(code, compiled.code) + console.log('Output:\n', compiled.code + '\n\n') + } + + return compiled +} diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/config.ts b/packages/start-plugin-core/src/start-server-routes-plugin/config.ts new file mode 100644 index 0000000000..d9fc413975 --- /dev/null +++ b/packages/start-plugin-core/src/start-server-routes-plugin/config.ts @@ -0,0 +1,8 @@ +import { baseConfigSchema } from '@tanstack/router-generator' +import { z } from 'zod' + +export const configSchema = baseConfigSchema.extend({ + srcDirectory: z.string().optional().default('src'), +}) + +export type Config = z.infer diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts new file mode 100644 index 0000000000..92b19e9523 --- /dev/null +++ b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts @@ -0,0 +1,890 @@ +import path, { isAbsolute, join, normalize } from 'node:path' +import fs from 'node:fs' +import fsp from 'node:fs/promises' +import { + format, + logging, + multiSortBy, + physicalGetRouteNodes, + removeExt, + removeUnderscores, + replaceBackslash, + resetRegex, + rootPathId, + routePathToVariable, + trimPathLeft, + virtualGetRouteNodes, + writeIfDifferent, +} from '@tanstack/router-generator' +import { rootRouteId } from '@tanstack/router-core' +import { fillTemplate, getTargetTemplate } from './template' +import type { GetRouteNodesResult, RouteNode } from '@tanstack/router-generator' +import type { Config } from './config' +import type { Plugin } from 'vite' + +let lock = false +const checkLock = () => lock +const setLock = (bool: boolean) => { + lock = bool +} + +export function TanStackStartServerRoutesVite(config: Config): Plugin { + let ROOT: string = process.cwd() + + const getRoutesDirectoryPath = () => { + return isAbsolute(config.routesDirectory) + ? config.routesDirectory + : join(ROOT, config.routesDirectory) + } + + const generate = async () => { + if (checkLock()) { + return + } + + setLock(true) + + try { + await generator(config, ROOT) + } catch (err) { + console.error(err) + console.info() + } finally { + setLock(false) + } + } + + const handleFile = async (file: string) => { + const filePath = normalize(file) + + const routesDirectoryPath = getRoutesDirectoryPath() + if (filePath.startsWith(routesDirectoryPath)) { + await generate() + } + } + + return { + name: 'tanstack-start-server-routes-plugin', + configureServer(server) { + server.watcher.on('all', (event, path) => { + handleFile(path) + }) + }, + configResolved(config) { + ROOT = config.root + }, + async buildStart() { + await generate() + // if (this.environment.name === 'server') { + // } + }, + sharedDuringBuild: true, + resolveId(id) { + if (id === 'tanstack:server-routes') { + const generatedRouteTreePath = getGeneratedRouteTreePath(ROOT) + return generatedRouteTreePath + } + return null + }, + } +} + +// Maybe import this from `@tanstack/router-core` in the future??? +let latestTask = 0 +const routeGroupPatternRegex = /\(.+\)/g +const possiblyNestedRouteGroupPatternRegex = /\([^/]+\)\/?/g + +let isFirst = false +let skipMessage = false + +function getGeneratedRouteTreePath(root: string) { + return path.resolve(root, '.tanstack-start/server-routes/routeTree.gen.ts') +} + +async function generator(config: Config, root: string) { + const generatedServerRouteTreePath = getGeneratedRouteTreePath(root) + const ROUTE_TEMPLATE = getTargetTemplate(config.target) + const logger = logging({ disabled: config.disableLogging }) + + if (!isFirst) { + // logger.log('♻️ Generating server routes...') + isFirst = true + } else if (skipMessage) { + skipMessage = false + } else { + // logger.log('♻️ Regenerating server routes...') + } + + const taskId = latestTask + 1 + latestTask = taskId + + const checkLatest = () => { + if (latestTask !== taskId) { + skipMessage = true + return false + } + + return true + } + + const start = Date.now() + + let getRouteNodesResult: GetRouteNodesResult + + if (config.virtualRouteConfig) { + getRouteNodesResult = await virtualGetRouteNodes(config, root) + } else { + getRouteNodesResult = await physicalGetRouteNodes(config, root) + } + + const { rootRouteNode, routeNodes: beforeRouteNodes } = getRouteNodesResult + if (rootRouteNode === undefined) { + let errorMessage = `rootRouteNode must not be undefined. Make sure you've added your root route into the route-tree.` + if (!config.virtualRouteConfig) { + errorMessage += `\nMake sure that you add a "${rootPathId}.tsx" file to your routes directory.\nAdd the file in: "${config.routesDirectory}/${rootPathId}.tsx"` + } + throw new Error(errorMessage) + } + + const preRouteNodes = multiSortBy(beforeRouteNodes, [ + (d) => (d.routePath === '/' ? -1 : 1), + (d) => d.routePath?.split('/').length, + (d) => + d.filePath.match(new RegExp(`[./]${config.indexToken}[.]`)) ? 1 : -1, + (d) => + d.filePath.match( + /[./](component|errorComponent|pendingComponent|loader|lazy)[.]/, + ) + ? 1 + : -1, + (d) => + d.filePath.match(new RegExp(`[./]${config.routeToken}[.]`)) ? -1 : 1, + (d) => (d.routePath?.endsWith('/') ? -1 : 1), + (d) => d.routePath, + ]).filter((d) => ![`/${rootPathId}`].includes(d.routePath || '')) + + const routeTree: Array = [] + + // Loop over the flat list of routeNodes and + // build up a tree based on the routeNodes' routePath + const routeNodes: Array = [] + + // the handleRootNode function is not being collapsed into the handleNode function + // because it requires only a subset of the logic that the handleNode function requires + // and it's easier to read and maintain this way + const handleRootNode = async (node?: RouteNode) => { + if (!node) { + // currently this is not being handled, but it could be in the future + // for example to handle a virtual root route + return + } + + // from here on, we are only handling the root node that's present in the file system + const routeCode = fs.readFileSync(node.fullPath, 'utf-8') + + if (!routeCode) { + const _rootTemplate = ROUTE_TEMPLATE.rootRoute + const replaced = await fillTemplate(config, _rootTemplate.template(), { + tsrImports: _rootTemplate.imports.tsrImports(), + tsrPath: rootPathId, + tsrExportStart: _rootTemplate.imports.tsrExportStart(), + tsrExportEnd: _rootTemplate.imports.tsrExportEnd(), + }) + + await writeIfDifferent( + node.fullPath, + '', // Empty string because the file doesn't exist yet + replaced, + { + beforeWrite: () => { + // logger.log(`🟡 Creating ${node.fullPath}`) + }, + }, + ) + } + } + + await handleRootNode(rootRouteNode) + + const handleNode = async (node: RouteNode) => { + // Do not remove this as we need to set the lastIndex to 0 as it + // is necessary to reset the regex's index when using the global flag + // otherwise it might not match the next time it's used + resetRegex(routeGroupPatternRegex) + + let parentRoute = hasParentRoute(routeNodes, node, node.routePath) + + // if the parent route is a virtual parent route, we need to find the real parent route + if (parentRoute?.isVirtualParentRoute && parentRoute.children?.length) { + // only if this sub-parent route returns a valid parent route, we use it, if not leave it as it + const possibleParentRoute = hasParentRoute( + parentRoute.children, + node, + node.routePath, + ) + if (possibleParentRoute) { + parentRoute = possibleParentRoute + } + } + + if (parentRoute) node.parent = parentRoute + + node.path = determineNodePath(node) + + const trimmedPath = trimPathLeft(node.path ?? '') + + const split = trimmedPath.split('/') + const lastRouteSegment = split[split.length - 1] ?? trimmedPath + + node.isNonPath = + lastRouteSegment.startsWith('_') || + routeGroupPatternRegex.test(lastRouteSegment) + + node.cleanedPath = removeGroups( + removeUnderscores(removeLayoutSegments(node.path)) ?? '', + ) + + const routeCode = fs.readFileSync(node.fullPath, 'utf-8') + + // Ensure the boilerplate for the route exists, which can be skipped for virtual parent routes and virtual routes + if (!node.isVirtualParentRoute && !node.isVirtual) { + // const escapedRoutePath = node.routePath?.replaceAll('$', '$$') ?? '' + // let replaced = routeCode + // await writeIfDifferent(node.fullPath, routeCode, replaced, { + // beforeWrite: () => { + // // logger.log(`🟡 Updating ${node.fullPath}`) + // }, + // }) + } + + const cleanedPathIsEmpty = (node.cleanedPath || '').length === 0 + const nonPathRoute = + node._fsRouteType === 'pathless_layout' && node.isNonPath + + node.isVirtualParentRequired = + node._fsRouteType === 'pathless_layout' || nonPathRoute + ? !cleanedPathIsEmpty + : false + + if (!node.isVirtual && node.isVirtualParentRequired) { + const parentRoutePath = removeLastSegmentFromPath(node.routePath) || '/' + const parentVariableName = routePathToVariable(parentRoutePath) + + const anchorRoute = routeNodes.find( + (d) => d.routePath === parentRoutePath, + ) + + if (!anchorRoute) { + const parentNode: RouteNode = { + ...node, + path: removeLastSegmentFromPath(node.path) || '/', + filePath: removeLastSegmentFromPath(node.filePath) || '/', + fullPath: removeLastSegmentFromPath(node.fullPath) || '/', + routePath: parentRoutePath, + variableName: parentVariableName, + isVirtual: true, + _fsRouteType: 'layout', // layout since this route will wrap other routes + isVirtualParentRoute: true, + isVirtualParentRequired: false, + } + + parentNode.children = parentNode.children ?? [] + parentNode.children.push(node) + + node.parent = parentNode + + if (node._fsRouteType === 'pathless_layout') { + // since `node.path` is used as the `id` on the route definition, we need to update it + node.path = determineNodePath(node) + } + + await handleNode(parentNode) + } else { + anchorRoute.children = anchorRoute.children ?? [] + anchorRoute.children.push(node) + + node.parent = anchorRoute + } + } + + if ( + !routeCode + .split('\n') + .some((line) => line.trim().startsWith('export const ServerRoute')) + ) { + return + } + + if (node.parent) { + if (!node.isVirtualParentRequired) { + node.parent.children = node.parent.children ?? [] + node.parent.children.push(node) + } + } else { + routeTree.push(node) + } + + routeNodes.push(node) + } + + for (const node of preRouteNodes) { + await handleNode(node) + } + + // This is run against the `routeNodes` array since it + // has the accumulated (intended) Server Route nodes + // Since TSR allows multiple way of defining a route, + // we need to ensure that a user hasn't defined the + // same route in multiple ways (i.e. `flat`, `nested`, `virtual`) + checkRouteFullPathUniqueness(routeNodes, config) + + function buildRouteTreeConfig(nodes: Array, depth = 1): string { + const children = nodes.map((node) => { + if (node._fsRouteType === '__root') { + return + } + + if (node._fsRouteType === 'pathless_layout' && !node.children?.length) { + return + } + + const route = `${node.variableName}Route` + + if (node.children?.length) { + const childConfigs = buildRouteTreeConfig(node.children, depth + 1) + + const childrenDeclaration = `interface ${route}Children { + ${node.children.map((child) => `${child.variableName}Route: typeof ${getResolvedRouteNodeVariableName(child)}`).join(',')} +}` + + const children = `const ${route}Children: ${route}Children = { + ${node.children.map((child) => `${child.variableName}Route: ${getResolvedRouteNodeVariableName(child)}`).join(',')} +}` + + const routeWithChildren = `const ${route}WithChildren = ${route}._addFileChildren(${route}Children)` + + return [ + childConfigs, + childrenDeclaration, + children, + routeWithChildren, + ].join('\n\n') + } + + return undefined + }) + + return children.filter(Boolean).join('\n\n') + } + + const routeConfigChildrenText = buildRouteTreeConfig(routeTree) + + const sortedRouteNodes = multiSortBy(routeNodes, [ + (d) => (d.routePath?.includes(`/${rootPathId}`) ? -1 : 1), + (d) => d.routePath?.split('/').length, + (d) => (d.routePath?.endsWith(config.indexToken) ? -1 : 1), + (d) => d, + ]) + + const imports = Object.entries({ + createFileRoute: sortedRouteNodes.some((d) => d.isVirtual), + }) + .filter((d) => d[1]) + .map((d) => d[0]) + + const virtualRouteNodes = sortedRouteNodes.filter((d) => d.isVirtual) + + function getImportPath(node: RouteNode) { + return replaceBackslash( + removeExt( + path.relative( + path.dirname(generatedServerRouteTreePath), + path.resolve(config.routesDirectory, node.filePath), + ), + ), + ) + } + + const rootRouteExists = fs.existsSync(rootRouteNode.fullPath) + const rootRouteCode = rootRouteExists + ? fs.readFileSync(rootRouteNode.fullPath, 'utf-8') + : '' + const hasServerRootRoute = + rootRouteExists && rootRouteCode.includes('export const ServerRoute') + + const routeImports = [ + ...config.routeTreeFileHeader, + `// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.`, + imports.length + ? `import { ${imports.join(', ')} } from '${ROUTE_TEMPLATE.fullPkg}'\n` + : '', + '// Import Routes', + [ + `import type { FileRoutesByPath, CreateServerFileRoute } from '${ROUTE_TEMPLATE.fullPkg}'`, + `import { createServerRoute, createServerFileRoute } from '${ROUTE_TEMPLATE.fullPkg}'`, + hasServerRootRoute + ? `import { ServerRoute as rootRouteImport } from './${getImportPath(rootRouteNode)}'` + : '', + ...sortedRouteNodes + .filter((d) => !d.isVirtual) + .map((node) => { + return `import { ServerRoute as ${ + node.variableName + }RouteImport } from './${getImportPath(node)}'` + }), + ].join('\n'), + virtualRouteNodes.length ? '// Create Virtual Routes' : '', + virtualRouteNodes + .map((node) => { + return `const ${ + node.variableName + }RouteImport = createFileRoute('${node.routePath}')()` + }) + .join('\n'), + '// Create/Update Routes', + !hasServerRootRoute + ? ` + const rootRoute = createServerRoute() + ` + : '', + sortedRouteNodes + .map((node) => { + return [ + [ + `const ${node.variableName}Route = ${node.variableName}RouteImport.update({ + ${[ + `id: '${node.path}'`, + !node.isNonPath ? `path: '${node.cleanedPath}'` : undefined, + `getParentRoute: () => ${node.parent?.variableName ?? 'root'}Route`, + ] + .filter(Boolean) + .join(',')} + } as any)`, + ].join(''), + ].join('\n\n') + }) + .join('\n\n'), + '', + + '// Populate the FileRoutesByPath interface', + `declare module '${ROUTE_TEMPLATE.fullPkg}' { + interface FileRoutesByPath { + ${routeNodes + .map((routeNode) => { + const filePathId = routeNode.routePath + + return `'${filePathId}': { + id: '${filePathId}' + path: '${inferPath(routeNode)}' + fullPath: '${inferFullPath(routeNode)}' + preLoaderRoute: typeof ${routeNode.variableName}RouteImport + parentRoute: typeof ${ + routeNode.isVirtualParentRequired + ? `${routeNode.parent?.variableName}Route` + : routeNode.parent?.variableName + ? `${routeNode.parent.variableName}RouteImport` + : 'rootRoute' + } + }` + }) + .join('\n')} + } +}`, + `// Add type-safety to the createFileRoute function across the route tree`, + routeNodes + .map((routeNode) => { + return `declare module './${getImportPath(routeNode)}' { +const createServerFileRoute: CreateServerFileRoute< +FileRoutesByPath['${routeNode.routePath}']['parentRoute'], +FileRoutesByPath['${routeNode.routePath}']['id'], +FileRoutesByPath['${routeNode.routePath}']['path'], +FileRoutesByPath['${routeNode.routePath}']['fullPath'], +${routeNode.children?.length ? `${routeNode.variableName}RouteChildren` : 'unknown'} +> +}` + }) + .join('\n'), + '// Create and export the route tree', + routeConfigChildrenText, + `export interface FileRoutesByFullPath { + ${[...createRouteNodesByFullPath(routeNodes).entries()].map( + ([fullPath, routeNode]) => { + return `'${fullPath}': typeof ${getResolvedRouteNodeVariableName(routeNode)}` + }, + )} +}`, + `export interface FileRoutesByTo { + ${[...createRouteNodesByTo(routeNodes).entries()].map(([to, routeNode]) => { + return `'${to}': typeof ${getResolvedRouteNodeVariableName(routeNode)}` + })} +}`, + `export interface FileRoutesById { + '${rootRouteId}': typeof rootRoute, + ${[...createRouteNodesById(routeNodes).entries()].map(([id, routeNode]) => { + return `'${id}': typeof ${getResolvedRouteNodeVariableName(routeNode)}` + })} +}`, + `export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: ${routeNodes.length > 0 ? [...createRouteNodesByFullPath(routeNodes).keys()].map((fullPath) => `'${fullPath}'`).join('|') : 'never'} + fileRoutesByTo: FileRoutesByTo + to: ${routeNodes.length > 0 ? [...createRouteNodesByTo(routeNodes).keys()].map((to) => `'${to}'`).join('|') : 'never'} + id: ${[`'${rootRouteId}'`, ...[...createRouteNodesById(routeNodes).keys()].map((id) => `'${id}'`)].join('|')} + fileRoutesById: FileRoutesById +}`, + `export interface RootRouteChildren { + ${routeTree.map((child) => `${child.variableName}Route: typeof ${getResolvedRouteNodeVariableName(child)}`).join(',')} +}`, + `const rootRouteChildren: RootRouteChildren = { + ${routeTree.map((child) => `${child.variableName}Route: ${getResolvedRouteNodeVariableName(child)}`).join(',')} +}`, + `export const routeTree = rootRoute._addFileChildren(rootRouteChildren)._addFileTypes()`, + ] + .filter(Boolean) + .join('\n\n') + + const createRouteManifest = () => { + const routesManifest = { + [rootRouteId]: { + filePath: rootRouteNode.filePath, + children: routeTree.map((d) => d.routePath), + }, + ...Object.fromEntries( + routeNodes.map((d) => { + const filePathId = d.routePath + + return [ + filePathId, + { + filePath: d.filePath, + parent: d.parent?.routePath ? d.parent.routePath : undefined, + children: d.children?.map((childRoute) => childRoute.routePath), + }, + ] + }), + ), + } + + return JSON.stringify( + { + routes: routesManifest, + }, + null, + 2, + ) + } + + const includeManifest = ['react', 'solid'] + const routeConfigFileContent = !includeManifest.includes(config.target) + ? routeImports + : [ + routeImports, + '\n', + '/* ROUTE_MANIFEST_START', + createRouteManifest(), + 'ROUTE_MANIFEST_END */', + ].join('\n') + + if (!checkLatest()) return + + const existingRouteTreeContent = await fsp + .readFile(path.resolve(generatedServerRouteTreePath), 'utf-8') + .catch((err) => { + if (err.code === 'ENOENT') { + return '' + } + + throw err + }) + + if (!checkLatest()) return + + // Ensure the directory exists + await fsp.mkdir(path.dirname(path.resolve(generatedServerRouteTreePath)), { + recursive: true, + }) + + if (!checkLatest()) return + + // Write the route tree file, if it has changed + const routeTreeWriteResult = await writeIfDifferent( + path.resolve(generatedServerRouteTreePath), + await format(existingRouteTreeContent, config), + await format(routeConfigFileContent, config), + { + beforeWrite: () => { + // logger.log(`🟡 Updating ${generatedRouteTreePath}`) + }, + }, + ) + + // Write declaration file + const startDeclarationFilePath = path.join( + path.resolve(root, config.srcDirectory), + 'tanstack-start.d.ts', + ) + const serverRoutesRelativePath = removeExt( + path.relative( + path.dirname(startDeclarationFilePath), + generatedServerRouteTreePath, + ), + ) + const startDeclarationFileContent = buildStartDeclarationFile({ + serverRoutesRelativePath, + }) + if (!fs.existsSync(startDeclarationFilePath)) { + await writeIfDifferent( + startDeclarationFilePath, + '', + startDeclarationFileContent, + { + beforeWrite: () => { + logger.log(`🟡 Creating tanstack-start.d.ts`) + }, + }, + ) + } else { + const existingDeclarationFileContent = await fsp + .readFile(startDeclarationFilePath, 'utf-8') + .catch((err) => { + if (err.code === 'ENOENT') { + return '' + } + throw err + }) + await writeIfDifferent( + startDeclarationFilePath, + existingDeclarationFileContent, + startDeclarationFileContent, + { + beforeWrite: () => { + logger.log(`🟡 Updating tanstack-start.d.ts`) + }, + }, + ) + } + + if (routeTreeWriteResult && !checkLatest()) { + return + } + + // logger.log( + // `✅ Processed ${routeNodes.length === 1 ? 'server route' : 'server routes'} in ${ + // Date.now() - start + // }ms`, + // ) +} + +function buildStartDeclarationFile({ + serverRoutesRelativePath, +}: { + serverRoutesRelativePath: string +}) { + return [`import '${serverRoutesRelativePath}'`].join('\n') + '\n' +} + +function removeGroups(s: string) { + return s.replace(possiblyNestedRouteGroupPatternRegex, '') +} + +/** + * The `node.path` is used as the `id` in the route definition. + * This function checks if the given node has a parent and if so, it determines the correct path for the given node. + * @param node - The node to determine the path for. + * @returns The correct path for the given node. + */ +function determineNodePath(node: RouteNode) { + return (node.path = node.parent + ? node.routePath?.replace(node.parent.routePath ?? '', '') || '/' + : node.routePath) +} + +/** + * Removes the last segment from a given path. Segments are considered to be separated by a '/'. + * + * @param {string} routePath - The path from which to remove the last segment. Defaults to '/'. + * @returns {string} The path with the last segment removed. + * @example + * removeLastSegmentFromPath('/workspace/_auth/foo') // '/workspace/_auth' + */ +function removeLastSegmentFromPath(routePath: string = '/'): string { + const segments = routePath.split('/') + segments.pop() // Remove the last segment + return segments.join('/') +} + +/** + * Removes all segments from a given path that start with an underscore ('_'). + * + * @param {string} routePath - The path from which to remove segments. Defaults to '/'. + * @returns {string} The path with all underscore-prefixed segments removed. + * @example + * removeLayoutSegments('/workspace/_auth/foo') // '/workspace/foo' + */ +function removeLayoutSegments(routePath: string = '/'): string { + const segments = routePath.split('/') + const newSegments = segments.filter((segment) => !segment.startsWith('_')) + return newSegments.join('/') +} + +function hasParentRoute( + routes: Array, + node: RouteNode, + routePathToCheck: string | undefined, +): RouteNode | null { + if (!routePathToCheck || routePathToCheck === '/') { + return null + } + + const sortedNodes = multiSortBy(routes, [ + (d) => d.routePath!.length * -1, + (d) => d.variableName, + ]).filter((d) => d.routePath !== `/${rootPathId}`) + + for (const route of sortedNodes) { + if (route.routePath === '/') continue + + if ( + routePathToCheck.startsWith(`${route.routePath}/`) && + route.routePath !== routePathToCheck + ) { + return route + } + } + + const segments = routePathToCheck.split('/') + segments.pop() // Remove the last segment + const parentRoutePath = segments.join('/') + + return hasParentRoute(routes, node, parentRoutePath) +} + +/** + * Gets the final variable name for a route + */ +const getResolvedRouteNodeVariableName = (routeNode: RouteNode): string => { + return routeNode.children?.length + ? `${routeNode.variableName}RouteWithChildren` + : `${routeNode.variableName}Route` +} + +/** + * Creates a map from fullPath to routeNode + */ +const createRouteNodesByFullPath = ( + routeNodes: Array, +): Map => { + return new Map( + routeNodes.map((routeNode) => [inferFullPath(routeNode), routeNode]), + ) +} + +/** + * Create a map from 'to' to a routeNode + */ +const createRouteNodesByTo = ( + routeNodes: Array, +): Map => { + return new Map( + dedupeBranchesAndIndexRoutes(routeNodes).map((routeNode) => [ + inferTo(routeNode), + routeNode, + ]), + ) +} + +/** + * Create a map from 'id' to a routeNode + */ +const createRouteNodesById = ( + routeNodes: Array, +): Map => { + return new Map( + routeNodes.map((routeNode) => { + const id = routeNode.routePath ?? '' + return [id, routeNode] + }), + ) +} + +/** + * Infers the full path for use by TS + */ +const inferFullPath = (routeNode: RouteNode): string => { + const fullPath = removeGroups( + removeUnderscores(removeLayoutSegments(routeNode.routePath)) ?? '', + ) + + return routeNode.cleanedPath === '/' ? fullPath : fullPath.replace(/\/$/, '') +} + +/** + * Infers the path for use by TS + */ +const inferPath = (routeNode: RouteNode): string => { + return routeNode.cleanedPath === '/' + ? routeNode.cleanedPath + : (routeNode.cleanedPath?.replace(/\/$/, '') ?? '') +} + +/** + * Infers to path + */ +const inferTo = (routeNode: RouteNode): string => { + const fullPath = inferFullPath(routeNode) + + if (fullPath === '/') return fullPath + + return fullPath.replace(/\/$/, '') +} + +/** + * Dedupes branches and index routes + */ +const dedupeBranchesAndIndexRoutes = ( + routes: Array, +): Array => { + return routes.filter((route) => { + if (route.children?.find((child) => child.cleanedPath === '/')) return false + return true + }) +} + +function checkUnique(routes: Array, key: keyof TElement) { + // Check no two routes have the same `key` + // if they do, throw an error with the conflicting filePaths + const keys = routes.map((d) => d[key]) + const uniqueKeys = new Set(keys) + if (keys.length !== uniqueKeys.size) { + const duplicateKeys = keys.filter((d, i) => keys.indexOf(d) !== i) + const conflictingFiles = routes.filter((d) => + duplicateKeys.includes(d[key]), + ) + return conflictingFiles + } + return undefined +} + +function checkRouteFullPathUniqueness( + _routes: Array, + config: Config, +) { + const routes = _routes.map((d) => { + const inferredFullPath = inferFullPath(d) + return { ...d, inferredFullPath } + }) + + const conflictingFiles = checkUnique(routes, 'inferredFullPath') + + if (conflictingFiles !== undefined) { + const errorMessage = `Conflicting configuration paths were found for the following route${conflictingFiles.length > 1 ? 's' : ''}: ${conflictingFiles + .map((p) => `"${p.inferredFullPath}"`) + .join(', ')}. +Please ensure each Server Route has a unique full path. +Conflicting files: \n ${conflictingFiles.map((d) => path.resolve(config.routesDirectory, d.filePath)).join('\n ')}\n` + console.error(errorMessage) + process.exit(1) + } +} diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/template.ts b/packages/start-plugin-core/src/start-server-routes-plugin/template.ts new file mode 100644 index 0000000000..9599efeb2a --- /dev/null +++ b/packages/start-plugin-core/src/start-server-routes-plugin/template.ts @@ -0,0 +1,164 @@ +import { format } from '@tanstack/router-generator' +import type { Config } from './config' + +type TemplateTag = 'tsrImports' | 'tsrPath' | 'tsrExportStart' | 'tsrExportEnd' + +export function fillTemplate( + config: Config, + template: string, + values: Record, +) { + const replaced = template.replace( + /%%(\w+)%%/g, + (_, key) => values[key as TemplateTag] || '', + ) + return format(replaced, config) +} + +type TargetTemplate = { + fullPkg: string + subPkg: string + rootRoute: { + template: () => string + imports: { + tsrImports: () => string + tsrExportStart: () => string + tsrExportEnd: () => string + } + } + route: { + template: () => string + imports: { + tsrImports: () => string + tsrExportStart: (routePath: string) => string + tsrExportEnd: () => string + } + } + lazyRoute: { + template: () => string + imports: { + tsrImports: () => string + tsrExportStart: (routePath: string) => string + tsrExportEnd: () => string + } + } +} + +export function getTargetTemplate(target: Config['target']): TargetTemplate { + switch (target) { + // TODO: Remove this disabled eslint rule when more target types are added. + + case 'react': + return { + fullPkg: '@tanstack/react-start/server', + subPkg: 'react-start/server', + // TODO: Clean this up if it's not used + rootRoute: { + template: () => + [ + 'import * as React from "react"\n', + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RootComponent\n }%%tsrExportEnd%%\n\n', + 'function RootComponent() { return (
Hello "%%tsrPath%%"!
) };\n', + ].join(''), + imports: { + tsrImports: () => + "import { Outlet, createRootRoute } from '@tanstack/react-router';", + tsrExportStart: () => 'export const Route = createRootRoute(', + tsrExportEnd: () => ');', + }, + }, + route: { + template: () => + [ + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RouteComponent\n }%%tsrExportEnd%%\n\n', + 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', + ].join(''), + imports: { + tsrImports: () => '', + tsrExportStart: () => `export const Route = createFileRoute(`, + tsrExportEnd: () => ');', + }, + }, + lazyRoute: { + template: () => + [ + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RouteComponent\n }%%tsrExportEnd%%\n\n', + 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', + ].join(''), + imports: { + tsrImports: () => + "import { createLazyFileRoute } from '@tanstack/react-router';", + tsrExportStart: (routePath) => + `export const Route = createLazyFileRoute('${routePath}')(`, + tsrExportEnd: () => ');', + }, + }, + } + case 'solid': + return { + fullPkg: '@tanstack/solid-start/server', + subPkg: 'solid-start/server', + rootRoute: { + template: () => + [ + 'import * as Solid from "solid-js"\n', + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RootComponent\n }%%tsrExportEnd%%\n\n', + 'function RootComponent() { return (<>
Hello "%%tsrPath%%"!
) };\n', + ].join(''), + imports: { + tsrImports: () => + "import { Outlet, createRootRoute } from '@tanstack/solid-router';", + tsrExportStart: () => 'export const Route = createRootRoute(', + tsrExportEnd: () => ');', + }, + }, + route: { + template: () => + [ + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RouteComponent\n }%%tsrExportEnd%%\n\n', + 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', + ].join(''), + imports: { + tsrImports: () => '', + tsrExportStart: () => `export const Route = createFileRoute(`, + tsrExportEnd: () => ');', + }, + }, + lazyRoute: { + template: () => + [ + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{\n component: RouteComponent\n }%%tsrExportEnd%%\n\n', + 'function RouteComponent() { return
Hello "%%tsrPath%%"!
};\n', + ].join(''), + imports: { + tsrImports: () => + "import { createLazyFileRoute } from '@tanstack/solid-router';", + tsrExportStart: (routePath) => + `export const Route = createLazyFileRoute('${routePath}')(`, + tsrExportEnd: () => ');', + }, + }, + } + default: + throw new Error(`router-generator: Unknown target type: ${target}`) + } +} + +export const defaultServerRouteTemplate = [ + 'import { json } from "@tanstack/react-start";\n', + '%%tsrImports%%', + '\n\n', + '%%tsrExportStart%%{ GET: ({ request, params }) => { return json({ message:\'Hello "%%tsrPath%%"!\' }) }}%%tsrExportEnd%%\n', +].join('') diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts similarity index 93% rename from packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts rename to packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts index 32a31d401c..249a3851fc 100644 --- a/packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts @@ -2,7 +2,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { afterAll, describe, expect, test, vi } from 'vitest' -import { compileStartOutput } from '../../src/compilers' +import { compileStartOutputFactory } from '../../src/compilers' + +const compileStartOutput = compileStartOutputFactory('react') async function getFilenames() { return await readdir(path.resolve(import.meta.dirname, './test-files')) @@ -39,7 +41,6 @@ describe('createIsomorphicFn compiles correctly', async () => { const compiledResult = compileStartOutput({ env, code, - root: './test-files', filename, dce: false, }) @@ -57,7 +58,6 @@ describe('createIsomorphicFn compiles correctly', async () => { code: ` import { createIsomorphicFn } from '@tanstack/react-start' const clientOnly = createIsomorphicFn().client()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) @@ -68,7 +68,6 @@ describe('createIsomorphicFn compiles correctly', async () => { code: ` import { createIsomorphicFn } from '@tanstack/react-start' const serverOnly = createIsomorphicFn().server()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) @@ -80,7 +79,6 @@ describe('createIsomorphicFn compiles correctly', async () => { code: ` import { createIsomorphicFn } from '@tanstack/react-start' const noImpl = createIsomorphicFn()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx rename to packages/start-plugin-core/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/createMiddleware.test.ts b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts similarity index 88% rename from packages/react-start-plugin/tests/createMiddleware/createMiddleware.test.ts rename to packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts index 05d57dd32d..92af2feb31 100644 --- a/packages/react-start-plugin/tests/createMiddleware/createMiddleware.test.ts +++ b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts @@ -2,7 +2,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test } from 'vitest' -import { compileStartOutput } from '../../src/compilers' +import { compileStartOutputFactory } from '../../src/compilers' + +const compileStartOutput = compileStartOutputFactory('react') async function getFilenames() { return await readdir(path.resolve(import.meta.dirname, './test-files')) @@ -23,7 +25,6 @@ describe('createMiddleware compiles correctly', async () => { const compiledResult = compileStartOutput({ env, code, - root: './test-files', filename, dce: false, }) diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx rename to packages/start-plugin-core/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx b/packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx rename to packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx b/packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx rename to packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx b/packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx rename to packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx diff --git a/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx b/packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx rename to packages/start-plugin-core/tests/createMiddleware/test-files/createMiddlewareValidator.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts similarity index 95% rename from packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts rename to packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts index 5c93ae90bc..c8c013dc99 100644 --- a/packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts +++ b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts @@ -2,7 +2,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test } from 'vitest' -import { compileStartOutput } from '../../src/compilers' +import { compileStartOutputFactory } from '../../src/compilers' + +const compileStartOutput = compileStartOutputFactory('react') async function getFilenames() { return await readdir(path.resolve(import.meta.dirname, './test-files')) @@ -23,7 +25,6 @@ describe('createServerFn compiles correctly', async () => { const compiledResult = compileStartOutput({ env, code, - root: './test-files', filename, dce: false, }) @@ -42,7 +43,6 @@ describe('createServerFn compiles correctly', async () => { code: ` import { createServerFn } from '@tanstack/react-start' createServerFn()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) @@ -56,7 +56,6 @@ describe('createServerFn compiles correctly', async () => { code: ` import { createServerFn } from '@tanstack/react-start' createServerFn().handler(async () => {})`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) @@ -72,7 +71,6 @@ describe('createServerFn compiles correctly', async () => { const myServerFn = createServerFn().handler(myFunc)` const compiledResultClient = compileStartOutput({ - root: '/test', filename: 'test.ts', code, env: 'client', @@ -80,7 +78,6 @@ describe('createServerFn compiles correctly', async () => { }) const compiledResultServer = compileStartOutput({ - root: '/test', filename: 'test.ts', code, env: 'server', @@ -123,7 +120,6 @@ describe('createServerFn compiles correctly', async () => { // Client const compiledResult = compileStartOutput({ - root: '/test', filename: 'test.ts', code, env: 'client', @@ -146,7 +142,6 @@ describe('createServerFn compiles correctly', async () => { // Server const compiledResultServer = compileStartOutput({ - root: '/test', filename: 'test.ts', code, env: 'server', diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx rename to packages/start-plugin-core/tests/createServerFn/snapshots/server/createServerFnValidator.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/test-files/createServerFnDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx rename to packages/start-plugin-core/tests/createServerFn/test-files/createServerFnDestructured.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx rename to packages/start-plugin-core/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/test-files/createServerFnStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx rename to packages/start-plugin-core/tests/createServerFn/test-files/createServerFnStarImport.tsx diff --git a/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/test-files/createServerFnValidator.tsx similarity index 100% rename from packages/react-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx rename to packages/start-plugin-core/tests/createServerFn/test-files/createServerFnValidator.tsx diff --git a/packages/solid-start-plugin/tests/createMiddleware/createMiddleware.test.ts b/packages/start-plugin-core/tests/createServerRoute/createServerRoute.test.ts similarity index 86% rename from packages/solid-start-plugin/tests/createMiddleware/createMiddleware.test.ts rename to packages/start-plugin-core/tests/createServerRoute/createServerRoute.test.ts index 05d57dd32d..6ab449670d 100644 --- a/packages/solid-start-plugin/tests/createMiddleware/createMiddleware.test.ts +++ b/packages/start-plugin-core/tests/createServerRoute/createServerRoute.test.ts @@ -2,7 +2,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test } from 'vitest' -import { compileStartOutput } from '../../src/compilers' +import { compileStartOutputFactory } from '../../src/compilers' + +const compileStartOutput = compileStartOutputFactory('react') async function getFilenames() { return await readdir(path.resolve(import.meta.dirname, './test-files')) @@ -23,9 +25,8 @@ describe('createMiddleware compiles correctly', async () => { const compiledResult = compileStartOutput({ env, code, - root: './test-files', filename, - dce: false, + dce: true, }) await expect(compiledResult.code).toMatchFileSnapshot( diff --git a/packages/react-start-client/src/routesManifest.ts b/packages/start-plugin-core/tests/createServerRoute/snapshots/client/nonImported.tsx similarity index 100% rename from packages/react-start-client/src/routesManifest.ts rename to packages/start-plugin-core/tests/createServerRoute/snapshots/client/nonImported.tsx diff --git a/packages/start-plugin-core/tests/createServerRoute/snapshots/server/nonImported.tsx b/packages/start-plugin-core/tests/createServerRoute/snapshots/server/nonImported.tsx new file mode 100644 index 0000000000..265eba8dbc --- /dev/null +++ b/packages/start-plugin-core/tests/createServerRoute/snapshots/server/nonImported.tsx @@ -0,0 +1,11 @@ +import { createServerFileRoute } from "@tanstack/react-start/server"; +import { z } from 'zod'; +export const ServerRoute = createServerFileRoute().validator(z.number()).middleware(({ + input +}) => input + 1).methods({ + GET: async ({ + input + }) => { + return input + 1; + } +}); \ No newline at end of file diff --git a/packages/start-plugin-core/tests/createServerRoute/test-files/nonImported.tsx b/packages/start-plugin-core/tests/createServerRoute/test-files/nonImported.tsx new file mode 100644 index 0000000000..d782a05448 --- /dev/null +++ b/packages/start-plugin-core/tests/createServerRoute/test-files/nonImported.tsx @@ -0,0 +1,10 @@ +import { z } from 'zod' + +export const ServerRoute = createServerFileRoute() + .validator(z.number()) + .middleware(({ input }) => input + 1) + .methods({ + GET: async ({ input }) => { + return input + 1 + }, + }) diff --git a/packages/react-start-plugin/tests/envOnly/envOnly.test.ts b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts similarity index 91% rename from packages/react-start-plugin/tests/envOnly/envOnly.test.ts rename to packages/start-plugin-core/tests/envOnly/envOnly.test.ts index 0fae21d3af..4ce873cc23 100644 --- a/packages/react-start-plugin/tests/envOnly/envOnly.test.ts +++ b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts @@ -2,7 +2,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test } from 'vitest' -import { compileStartOutput } from '../../src/compilers' +import { compileStartOutputFactory } from '../../src/compilers' + +const compileStartOutput = compileStartOutputFactory('react') async function getFilenames() { return await readdir(path.resolve(import.meta.dirname, './test-files')) @@ -23,7 +25,6 @@ describe('envOnly functions compile correctly', async () => { const compiledResult = compileStartOutput({ env, code, - root: './test-files', filename, dce: false, }) @@ -41,7 +42,6 @@ describe('envOnly functions compile correctly', async () => { code: ` import { clientOnly } from '@tanstack/react-start' const fn = clientOnly()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) @@ -52,7 +52,6 @@ describe('envOnly functions compile correctly', async () => { code: ` import { serverOnly } from '@tanstack/react-start' const fn = serverOnly()`, - root: './test-files', filename: 'no-fn.ts', dce: false, }) diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx rename to packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx diff --git a/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/test-files/envOnlyDestructured.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx rename to packages/start-plugin-core/tests/envOnly/test-files/envOnlyDestructured.tsx diff --git a/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/test-files/envOnlyDestructuredRename.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx rename to packages/start-plugin-core/tests/envOnly/test-files/envOnlyDestructuredRename.tsx diff --git a/packages/react-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/test-files/envOnlyStarImport.tsx similarity index 100% rename from packages/react-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx rename to packages/start-plugin-core/tests/envOnly/test-files/envOnlyStarImport.tsx diff --git a/packages/start-plugin-core/tsconfig.json b/packages/start-plugin-core/tsconfig.json new file mode 100644 index 0000000000..3ed8e1dc0f --- /dev/null +++ b/packages/start-plugin-core/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "include": ["src", "vite.config.ts", "tests"], + "exclude": ["tests/**/test-files/**", "tests/**/snapshots/**"], + "compilerOptions": { + "target": "esnext", + "noEmit": true + } +} diff --git a/packages/start-server-functions-ssr/vite.config.ts b/packages/start-plugin-core/vite.config.ts similarity index 75% rename from packages/start-server-functions-ssr/vite.config.ts rename to packages/start-plugin-core/vite.config.ts index 976bb5c87f..2c711fd181 100644 --- a/packages/start-server-functions-ssr/vite.config.ts +++ b/packages/start-plugin-core/vite.config.ts @@ -1,14 +1,13 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/config/vite' import packageJson from './package.json' -import type { ViteUserConfig } from 'vitest/config' const config = defineConfig({ - plugins: [] as ViteUserConfig['plugins'], test: { name: packageJson.name, + dir: './tests', watch: false, - environment: 'jsdom', + typecheck: { enabled: true }, }, }) @@ -17,5 +16,6 @@ export default mergeConfig( tanstackViteConfig({ entry: './src/index.ts', srcDir: './src', + outDir: './dist', }), ) diff --git a/packages/start-server-core/README.md b/packages/start-server-core/README.md index bb009b0c87..0c0d4cc215 100644 --- a/packages/start-server-core/README.md +++ b/packages/start-server-core/README.md @@ -1,33 +1,12 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +# TanStack Start - Server Core -🤖 Type-safe router w/ built-in caching & URL state management for React! +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 95f7e6799a..09f7b9a02b 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -65,15 +65,18 @@ "@tanstack/history": "workspace:^", "@tanstack/router-core": "workspace:^", "@tanstack/start-client-core": "workspace:^", - "tiny-warning": "^1.0.3", "h3": "1.13.0", "isbot": "^5.1.22", "jsesc": "^3.1.0", - "unctx": "^2.4.1" + "tiny-invariant": "^1.3.3", + "tiny-warning": "^1.0.3", + "unctx": "^2.4.1", + "undici": "^7.8.0" }, "devDependencies": { "@types/jsesc": "^3.0.3", "esbuild": "^0.25.0", - "typescript": "^5.7.2" + "typescript": "^5.7.2", + "vite": "6.1.4" } } diff --git a/packages/start-server-core/src/createRequestHandler.ts b/packages/start-server-core/src/createRequestHandler.ts index 0e7b975d13..061e458468 100644 --- a/packages/start-server-core/src/createRequestHandler.ts +++ b/packages/start-server-core/src/createRequestHandler.ts @@ -66,9 +66,7 @@ function getRequestHeaders(opts: { router: AnyRouter }): Headers { const { redirect } = opts.router.state if (redirect) { - headers = mergeHeaders(headers, redirect.headers, { - Location: redirect.href, - }) + headers = mergeHeaders(headers, redirect.headers) } return headers diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 7604efbdef..1ce6c4b73d 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -1,82 +1,348 @@ +import path from 'node:path' import { createMemoryHistory } from '@tanstack/history' -import { mergeHeaders } from '@tanstack/start-client-core' -import { eventHandler, getResponseHeaders, toWebRequest } from 'h3' +import { + flattenMiddlewares, + json, + mergeHeaders, +} from '@tanstack/start-client-core' +import { + getMatchedRoutes, + isRedirect, + processRouteTree, + rootRouteId, + tsrRedirectHeaderKey, +} from '@tanstack/router-core' +import { getResponseHeaders, requestHandler } from './h3' import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server' +import { getStartManifest } from './router-manifest' +import { handleServerAction } from './server-functions-handler' +import type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute' +import type { RequestHandler } from './h3' +import type { AnyRouter } from '@tanstack/router-core' import type { HandlerCallback } from './handlerCallback' -import type { EventHandlerResponse, H3Event } from 'h3' -import type { AnyRouter, Manifest } from '@tanstack/router-core' - -export type CustomizeStartHandler< - TRouter extends AnyRouter, - TResponse extends EventHandlerResponse = EventHandlerResponse, -> = (cb: HandlerCallback) => ReturnType - -export function createStartHandler< - TRouter extends AnyRouter, - TResponse extends EventHandlerResponse = EventHandlerResponse, ->({ + +type TODO = any + +export type CustomizeStartHandler = ( + cb: HandlerCallback, +) => RequestHandler + +export function getStartResponseHeaders(opts: { router: AnyRouter }) { + let headers = mergeHeaders( + getResponseHeaders(), + { + 'Content-Type': 'text/html; charset=UTF-8', + }, + ...opts.router.state.matches.map((match) => { + return match.headers + }), + ) + // Handle Redirects + const { redirect } = opts.router.state + + if (redirect) { + headers = mergeHeaders(headers, redirect.headers) + } + return headers +} + +export function createStartHandler({ createRouter, - getRouterManifest, }: { createRouter: () => TRouter - getRouterManifest?: () => Manifest | Promise -}): CustomizeStartHandler { +}): CustomizeStartHandler { return (cb) => { - return eventHandler(async (event) => { - const request = toWebRequest(event) - + return requestHandler(async ({ request }) => { const url = new URL(request.url) const href = url.href.replace(url.origin, '') - // Create a history for the router + // Create a history for the client-side router const history = createMemoryHistory({ initialEntries: [href], }) + // Create the client-side router const router = createRouter() - attachRouterServerSsrUtils(router, await getRouterManifest?.()) + // Attach the server-side SSR utils to the client-side router + attachRouterServerSsrUtils(router, getStartManifest()) - // Update the router with the history and context + // Update the client-side router with the history and context router.update({ history, }) - await router.load() + const response = await (async () => { + try { + if (!process.env.TSS_SERVER_FN_BASE) { + throw new Error( + 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()', + ) + } - dehydrateRouter(router) + // First, let's attempt to handle server functions + if ( + href.startsWith(path.join('/', process.env.TSS_SERVER_FN_BASE, '/')) + ) { + return await handleServerAction({ request }) + } - const responseHeaders = getStartResponseHeaders({ event, router }) - const response = await cb({ - request, - router, - responseHeaders, - }) + // Then move on to attempting to load server routes + const serverRouteTreeModule = await (async () => { + try { + // @ts-expect-error + return (await import('tanstack:server-routes')) as { + routeTree: AnyServerRoute + } + } catch (e) { + console.log(e) + return undefined + } + })() + + // If we have a server route tree, then we try matching to see if we have a + // server route that matches the request. + if (serverRouteTreeModule) { + const [matchedRoutes, response] = await handleServerRoutes({ + routeTree: serverRouteTreeModule.routeTree, + request, + }) + + if (response) return response + } + + const requestAcceptHeader = request.headers.get('Accept') || '*/*' + const splitRequestAcceptHeader = requestAcceptHeader.split(',') + + const supportedMimeTypes = ['*/*', 'text/html'] + const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) => + splitRequestAcceptHeader.some((acceptedMimeType) => + acceptedMimeType.trim().startsWith(mimeType), + ), + ) + + if (!isRouterAcceptSupported) { + return json( + { + error: 'Only HTML requests are supported here', + }, + { + status: 500, + }, + ) + } + + // If no Server Routes were found, so fallback to normal SSR matching using + // the router + + await router.load() + + // If there was a redirect, skip rendering the page at all + if (router.state.redirect) return router.state.redirect + + dehydrateRouter(router) + + const responseHeaders = getStartResponseHeaders({ router }) + const response = await cb({ + request, + router, + responseHeaders, + }) + + return response + } catch (err) { + if (err instanceof Response) { + return err + } + + throw err + } + })() + + if (isRedirect(response)) { + if ( + response.options.to && + typeof response.options.to === 'string' && + !response.options.to.startsWith('/') + ) { + throw new Error( + `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`, + ) + } + + if ( + ['params', 'search', 'hash'].some( + (d) => typeof (response.options as any)[d] === 'function', + ) + ) { + throw new Error( + `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys( + response.options, + ) + .filter((d) => typeof (response.options as any)[d] === 'function') + .map((d) => `"${d}"`) + .join(', ')}`, + ) + } + + const redirect = router.resolveRedirect(response) + + if (request.headers.get('x-tsr-redirect') === 'manual') { + return json( + { + ...response.options, + isSerializedRedirect: true, + }, + { + headers: redirect.headers, + }, + ) + } + + return redirect + } + + response.headers.append( + 'Access-Control-Expose-Headers', + tsrRedirectHeaderKey, + ) return response }) } } -function getStartResponseHeaders(opts: { event: H3Event; router: AnyRouter }) { - let headers = mergeHeaders( - getResponseHeaders(opts.event), - (opts.event as any).___ssrRpcResponseHeaders, - { - 'Content-Type': 'text/html; charset=UTF-8', +async function handleServerRoutes({ + routeTree, + request, +}: { + routeTree: AnyServerRouteWithTypes + request: Request +}) { + const { flatRoutes, routesById, routesByPath } = processRouteTree({ + routeTree, + initRoute: (route, i) => { + route.init({ + originalIndex: i, + }) }, - ...opts.router.state.matches.map((match) => { - return match.headers - }), - ) + }) - // Handle Redirects - const { redirect } = opts.router.state + const url = new URL(request.url) + const pathname = url.pathname - if (redirect) { - headers = mergeHeaders(headers, redirect.headers, { - Location: redirect.href, + const history = createMemoryHistory({ + initialEntries: [pathname], + }) + + const { matchedRoutes, foundRoute, routeParams } = + getMatchedRoutes({ + pathname: history.location.pathname, + basepath: '/', + caseSensitive: true, + routesByPath, + routesById, + flatRoutes, + }) + + let response: Response | undefined + + if (foundRoute && foundRoute.id !== rootRouteId) { + // We've found a server route that matches the request, so we can call it. + // TODO: Get the input type-signature correct + // TODO: Perform the middlewares? + // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`? + + const method = Object.keys(foundRoute.options.methods).find( + (method) => method.toLowerCase() === request.method.toLowerCase(), + ) + + if (method) { + const handler = foundRoute.options.methods[method] + + if (handler) { + const middlewares = flattenMiddlewares( + matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean), + ).map((d) => d.options.server) + + middlewares.push(handlerToMiddleware(handler) as TODO) + + // TODO: This is starting to feel too much like a server function + // Do generalize the existing middleware execution? Or do we need to + // build a new middleware execution system for server routes? + const ctx = await executeMiddleware(middlewares, { + request, + context: {}, + params: routeParams, + pathname: history.location.pathname, + }) + + response = ctx.response + } + } + } + + // We return the matched routes too so if + // the app router happens to match the same path, + // it can use any request middleware from server routes + return [matchedRoutes, response] as const +} + +function handlerToMiddleware( + handler: AnyServerRouteWithTypes['options']['methods'][string], +) { + return async ({ next, ...rest }: TODO) => ({ + response: await handler(rest), + }) +} + +function executeMiddleware(middlewares: TODO, ctx: TODO) { + let index = -1 + + const next = async (ctx: TODO) => { + index++ + const middleware = middlewares[index] + if (!middleware) return ctx + + const result = await middleware({ + ...ctx, + // Allow the middleware to call the next middleware in the chain + next: async (nextCtx: TODO) => { + // Allow the caller to extend the context for the next middleware + const nextResult = await next({ ...ctx, ...nextCtx }) + + // Merge the result into the context\ + return Object.assign(ctx, handleCtxResult(nextResult)) + }, + // Allow the middleware result to extend the return context + }).catch((err: TODO) => { + if (isSpecialResponse(err)) { + return { + response: err, + } + } + + throw err }) + + // Merge the middleware result into the context, just in case it + // returns a partial context + return Object.assign(ctx, handleCtxResult(result)) } - return headers + + return handleCtxResult(next(ctx)) +} + +function handleCtxResult(result: TODO) { + if (isSpecialResponse(result)) { + return { + response: result, + } + } + + return result +} + +function isSpecialResponse(err: TODO) { + return err instanceof Response || isRedirect(err) } diff --git a/packages/start-server-core/src/h3.ts b/packages/start-server-core/src/h3.ts index d5a2c94844..72108f0c2d 100644 --- a/packages/start-server-core/src/h3.ts +++ b/packages/start-server-core/src/h3.ts @@ -11,7 +11,9 @@ import { clearResponseHeaders as _clearResponseHeaders, clearSession as _clearSession, defaultContentType as _defaultContentType, + defineEventHandler as _defineEventHandler, deleteCookie as _deleteCookie, + eventHandler as _eventHandler, fetchWithEvent as _fetchWithEvent, getCookie as _getCookie, getHeader as _getHeader, @@ -61,20 +63,24 @@ import { setResponseHeader as _setResponseHeader, setResponseHeaders as _setResponseHeaders, setResponseStatus as _setResponseStatus, + toWebRequest as _toWebRequest, unsealSession as _unsealSession, updateSession as _updateSession, useSession as _useSession, writeEarlyHints as _writeEarlyHints, } from 'h3' -import { getContext as getUnctxContext } from 'unctx' + import type { Encoding, + EventHandler, HTTPHeaderName, InferEventInput, _RequestMiddleware, _ResponseMiddleware, } from 'h3' +const eventStorage = new AsyncLocalStorage() + function _setContext(event: H3Event, key: string, value: any) { event.context[key] = value } @@ -90,46 +96,38 @@ export function defineMiddleware(options: { return options } -function toWebRequestH3(event: H3Event) { - /** - * @type {ReadableStream | undefined} - */ - let readableStream: ReadableStream | undefined +// function toWebRequestH3(event: H3Event) { +// /** +// * @type {ReadableStream | undefined} +// */ +// let readableStream: ReadableStream | undefined - const url = getRequestURL(event) - const base = { - // @ts-ignore Undici option - duplex: 'half', - method: event.method, - headers: event.headers, - } - - if ((event.node.req as any).body instanceof ArrayBuffer) { - return new Request(url, { - ...base, - body: (event.node.req as any).body, - }) - } +// const url = _getRequestURL(event) +// const base = { +// // @ts-ignore Undici option +// duplex: 'half', +// method: event.method, +// headers: event.headers, +// } - return new Request(url, { - ...base, - get body() { - if (readableStream) { - return readableStream - } - readableStream = getRequestWebStream(event) - return readableStream - }, - }) -} +// if ((event.node.req as any).body instanceof ArrayBuffer) { +// return new Request(url, { +// ...base, +// body: (event.node.req as any).body, +// }) +// } -export function toWebRequest(event: H3Event) { - event.web ??= { - request: toWebRequestH3(event), - url: getRequestURL(event), - } - return event.web.request -} +// return new Request(url, { +// ...base, +// get body() { +// if (readableStream) { +// return readableStream +// } +// readableStream = _getRequestWebStream(event) +// return readableStream +// }, +// }) +// } export { H3Error, @@ -140,7 +138,6 @@ export { createAppEventHandler, createEvent, createRouter, - defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, @@ -148,7 +145,6 @@ export { defineResponseMiddleware, dynamicEventHandler, defineWebSocket, - eventHandler, splitCookiesString, fromNodeMiddleware, fromPlainHandler, @@ -163,6 +159,7 @@ export { toNodeListener, toPlainHandler, toWebHandler, + toWebRequest, isCorsOriginAllowed, isStream, createError, @@ -221,8 +218,33 @@ export { type _ResponseMiddleware, } from 'h3' -function getHTTPEvent() { - return getEvent() +export function defineEventHandler(handler: EventHandler) { + return _defineEventHandler((event) => { + return runWithEvent(event, () => handler(event)) + }) +} + +export function eventHandler(handler: EventHandler) { + return _eventHandler((event) => { + return runWithEvent(event, () => handler(event)) + }) +} + +export async function runWithEvent( + event: H3Event, + fn: () => T | Promise, +): Promise { + return eventStorage.run(event, fn) +} + +export function getEvent() { + const event = eventStorage.getStore() as H3Event | undefined + if (!event) { + throw new Error( + `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`, + ) + } + return event } export const HTTPEventSymbol = Symbol('$HTTPEvent') @@ -262,12 +284,7 @@ function createWrapperFunction) => any>( return function (...args: Array) { const event = args[0] if (!isEvent(event)) { - if (!(globalThis as any).app.config.server.experimental?.asyncContext) { - throw new Error( - 'AsyncLocalStorage was not enabled. Use the `server.experimental.asyncContext: true` option in your app configuration to enable it. Or, pass the instance of HTTPEvent that you have as the first argument to the function.', - ) - } - args.unshift(getHTTPEvent()) + args.unshift(getEvent()) } else { args[0] = event instanceof H3Event || (event as any).__is_event__ @@ -463,37 +480,13 @@ export const readValidatedBody: PrependOverload< export const removeResponseHeader = createWrapperFunction(_removeResponseHeader) export const getContext = createWrapperFunction(_getContext) export const setContext = createWrapperFunction(_setContext) - export const clearResponseHeaders = createWrapperFunction(_clearResponseHeaders) +export const getWebRequest = createWrapperFunction(_toWebRequest) -export const getWebRequest = createWrapperFunction(toWebRequest) - -export { createApp as createServer } from 'h3' - -function getNitroAsyncContext() { - const nitroAsyncContext = getUnctxContext('nitro-app', { - asyncContext: (globalThis as any).app.config.server.experimental - ?.asyncContext - ? true - : false, - AsyncLocalStorage, - }) - - return nitroAsyncContext -} - -export function getEvent() { - const event = (getNitroAsyncContext().use() as any).event as - | H3Event - | undefined - if (!event) { - throw new Error( - `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`, - ) - } - return event -} +export type RequestHandler = (ctx: { + request: Request +}) => Promise | Response -export async function handleHTTPEvent(event: H3Event) { - return await (globalThis as any).$handle(event) +export function requestHandler(handler: RequestHandler) { + return handler } diff --git a/packages/start-server-core/src/handlerCallback.ts b/packages/start-server-core/src/handlerCallback.ts index a109f9b94a..a167955389 100644 --- a/packages/start-server-core/src/handlerCallback.ts +++ b/packages/start-server-core/src/handlerCallback.ts @@ -1,22 +1,15 @@ -import type { EventHandlerResponse } from 'h3' import type { AnyRouter } from '@tanstack/router-core' -export interface HandlerCallback< - TRouter extends AnyRouter, - TResponse extends EventHandlerResponse = EventHandlerResponse, -> { +export interface HandlerCallback { (ctx: { request: Request router: TRouter responseHeaders: Headers - }): TResponse + }): Response | Promise } -export function defineHandlerCallback< - TRouter extends AnyRouter, - TResponse = EventHandlerResponse, ->( - handler: HandlerCallback, -): HandlerCallback { +export function defineHandlerCallback( + handler: HandlerCallback, +): HandlerCallback { return handler } diff --git a/packages/start-server-core/src/index.tsx b/packages/start-server-core/src/index.tsx index d24477934d..4803124cfa 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -3,10 +3,22 @@ export { transformPipeableStreamWithRouter, } from './transformStreamWithRouter' -export { createStartHandler } from './createStartHandler' +export { + getStartResponseHeaders, + createStartHandler, +} from './createStartHandler' +export type { CustomizeStartHandler } from './createStartHandler' export { createRequestHandler } from './createRequestHandler' export { defineHandlerCallback } from './handlerCallback' export type { HandlerCallback } from './handlerCallback' +export { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server' +export { handleServerAction } from './server-functions-handler' + export * from './h3' + +export { createServerRoute, createServerFileRoute } from './serverRoute' +export type { CreateServerFileRoute } from './serverRoute' + +export { __getAbsoluteUrl, __setGlobalOrigin } from './undici' diff --git a/packages/start-server-core/src/router-manifest.ts b/packages/start-server-core/src/router-manifest.ts new file mode 100644 index 0000000000..53f999ca35 --- /dev/null +++ b/packages/start-server-core/src/router-manifest.ts @@ -0,0 +1,79 @@ +import { tsrStartManifest } from 'tanstack:start-manifest' +import { rootRouteId } from '@tanstack/router-core' + +declare global { + // eslint-disable-next-line no-var + var TSS_INJECTED_HEAD_SCRIPTS: string | undefined +} + +/** + * @description Returns the router manifest that should be sent to the client. + * This includes only the assets and preloads for the current route and any + * special assets that are needed for the client. It does not include relationships + * between routes or any other data that is not needed for the client. + */ +export function getStartManifest() { + const startManifest = tsrStartManifest() + + const rootRoute = (startManifest.routes[rootRouteId] = + startManifest.routes[rootRouteId] || {}) + + rootRoute.assets = rootRoute.assets || [] + + // Get the entry for the client + // const ClientManifest = getManifest('client') + + // const importPath = + // ClientManifest.inputs[ClientManifest.handler]?.output.path + // if (!importPath) { + // invariant(importPath, 'Could not find client entry in manifest') + // } + + if (process.env.NODE_ENV === 'development' && !process.env.TSS_CLIENT_ENTRY) { + throw new Error( + 'tanstack/start-server-core: TSS_CLIENT_ENTRY must be defined in your environment for getStartManifest()', + ) + } + + if (process.env.NODE_ENV === 'development') { + // Always fake that HMR is ready + // const CLIENT_BASE = sanitizeBase(process.env.TSS_CLIENT_BASE || '') + + // if (!CLIENT_BASE) { + // throw new Error( + // 'tanstack/start-router-manifest: TSS_CLIENT_BASE must be defined in your environment for getFullRouterManifest()', + // ) + // } + + const script = `${globalThis.TSS_INJECTED_HEAD_SCRIPTS ? globalThis.TSS_INJECTED_HEAD_SCRIPTS + '; ' : ''}import(${JSON.stringify(process.env.TSS_CLIENT_ENTRY)})` + + rootRoute.assets.push({ + tag: 'script', + attrs: { + type: 'module', + suppressHydrationWarning: true, + async: true, + }, + children: script, + }) + } + + const manifest = { + ...startManifest, + routes: Object.fromEntries( + Object.entries(startManifest.routes).map(([k, v]) => { + const { preloads, assets } = v + return [ + k, + { + preloads, + assets, + }, + ] + }), + ), + } + + // Strip out anything that isn't needed for the client + return manifest +} diff --git a/packages/start-server-functions-handler/src/index.ts b/packages/start-server-core/src/server-functions-handler.ts similarity index 76% rename from packages/start-server-functions-handler/src/index.ts rename to packages/start-server-core/src/server-functions-handler.ts index 85cbe87783..7643e0aa4b 100644 --- a/packages/start-server-functions-handler/src/index.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -1,21 +1,13 @@ -import { isNotFound, isRedirect } from '@tanstack/router-core' +import { isNotFound } from '@tanstack/router-core' import invariant from 'tiny-invariant' -import { - eventHandler, - getEvent, - getResponseStatus, - toWebRequest, -} from '@tanstack/start-server-core' import { startSerializer } from '@tanstack/start-client-core' // @ts-expect-error -import _serverFnManifest from 'tsr:server-fn-manifest' -import type { H3Event } from '@tanstack/start-server-core' +import _serverFnManifest from 'tanstack:server-fn-manifest' +import { getEvent, getResponseStatus } from './h3' // NOTE: This is a dummy export to silence warnings about // only having a default export. -export const dummy = 1 - -export default eventHandler(handleServerAction) +export const dummy = 2 const serverFnManifest = _serverFnManifest as Record< string, @@ -26,16 +18,6 @@ const serverFnManifest = _serverFnManifest as Record< } > -async function handleServerAction(event: H3Event) { - const request = toWebRequest(event)! - - const response = await handleServerRequest({ - request, - event, - }) - return response -} - function sanitizeBase(base: string | undefined) { if (!base) { throw new Error( @@ -46,17 +28,11 @@ function sanitizeBase(base: string | undefined) { return base.replace(/^\/|\/$/g, '') } -async function handleServerRequest({ - request, - event, -}: { - request: Request - event: H3Event -}) { +export const handleServerAction = async ({ request }: { request: Request }) => { const controller = new AbortController() const signal = controller.signal const abort = () => controller.abort() - event.node.req.on('close', abort) + request.signal.addEventListener('abort', abort) const method = request.method const url = new URL(request.url, 'http://localhost:3000') @@ -84,33 +60,32 @@ async function handleServerRequest({ const serverFnInfo = serverFnManifest[serverFnId] if (!serverFnInfo) { - console.log('serverFnManifest', serverFnManifest) + console.info('serverFnManifest', serverFnManifest) throw new Error('Server function info not found for ' + serverFnId) } - if (process.env.NODE_ENV === 'development') - console.info(`\nServerFn Request: ${serverFnId}`) - let fnModule: undefined | { [key: string]: any } if (process.env.NODE_ENV === 'development') { - fnModule = await (globalThis as any).app - .getRouter('server') - .internals.devServer.ssrLoadModule(serverFnInfo.extractedFilename) + const serverEnv = (globalThis as any).viteDevServer.environments['server'] + if (!serverEnv) { + throw new Error(`'server' vite dev environment not found`) + } + fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename) } else { fnModule = await serverFnInfo.importer() } if (!fnModule) { - console.log('serverFnManifest', serverFnManifest) + console.info('serverFnInfo', serverFnInfo) throw new Error('Server function module not resolved for ' + serverFnId) } const action = fnModule[serverFnInfo.functionName] if (!action) { - console.log('serverFnManifest', serverFnManifest) - console.log('fnModule', fnModule) + console.info('serverFnInfo', serverFnInfo) + console.info('fnModule', fnModule) throw new Error( `Server function module export not resolved for serverFn ID: ${serverFnId}`, ) @@ -208,11 +183,11 @@ async function handleServerRequest({ // return result.result // } - // TODO: RSCs + // TODO: RSCs Where are we getting this package? // if (isValidElement(result)) { // const { renderToPipeableStream } = await import( // // @ts-expect-error - // '@vinxi/react-server-dom/server' + // 'react-server-dom/server' // ) // const pipeableStream = renderToPipeableStream(result) @@ -227,8 +202,8 @@ async function handleServerRequest({ // return new Response(null, { status: 200 }) // } - if (isRedirect(result) || isNotFound(result)) { - return redirectOrNotFoundResponse(result) + if (isNotFound(result)) { + return isNotFoundResponse(result) } return new Response( @@ -257,8 +232,8 @@ async function handleServerRequest({ // The client will check for __redirect and __notFound keys, // and if they exist, it will handle them appropriately. - if (isRedirect(error) || isNotFound(error)) { - return redirectOrNotFoundResponse(error) + if (isNotFound(error)) { + return isNotFoundResponse(error) } console.info() @@ -275,30 +250,17 @@ async function handleServerRequest({ }) } })() - event.node.req.removeListener('close', abort) + + request.signal.removeEventListener('abort', abort) if (isRaw) { return response } - if (process.env.NODE_ENV === 'development') - console.info(`ServerFn Response: ${response.status}`) - - if (response.headers.get('Content-Type') === 'application/json') { - const cloned = response.clone() - const text = await cloned.text() - const payload = text ? JSON.stringify(JSON.parse(text)) : 'undefined' - - if (process.env.NODE_ENV === 'development') - console.info( - ` - Payload: ${payload.length > 100 ? payload.substring(0, 100) + '...' : payload}`, - ) - } - if (process.env.NODE_ENV === 'development') console.info() return response } -function redirectOrNotFoundResponse(error: any) { +function isNotFoundResponse(error: any) { const { headers, ...rest } = error return new Response(JSON.stringify(rest), { diff --git a/packages/start-server-core/src/serverRoute.ts b/packages/start-server-core/src/serverRoute.ts new file mode 100644 index 0000000000..65fa00c8b2 --- /dev/null +++ b/packages/start-server-core/src/serverRoute.ts @@ -0,0 +1,661 @@ +import { joinPaths, rootRouteId, trimPathLeft } from '@tanstack/router-core' +import type { + Assign, + Constrain, + Expand, + ResolveParams, + RouteConstraints, + TrimPathRight, +} from '@tanstack/router-core' +import type { + AnyRequestMiddleware, + AssignAllServerContext, +} from '@tanstack/start-client-core' + +type TODO = any + +export function createServerFileRoute< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TChildren, +>(__?: never): ServerRoute { + return createServerRoute( + undefined, + ) +} + +export interface ServerRouteOptions< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, +> { + id: TId + path: TPath + pathname: TFullPath + originalIndex: number + getParentRoute?: () => TParentRoute + middleware: Constrain> + methods: Record< + string, + ServerRouteMethodHandlerFn + > + caseSensitive?: boolean +} + +export type ServerRouteManifest = { + middleware: boolean + methods: Record +} + +export function createServerRoute< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TChildren, +>( + __?: never, + __opts?: Partial< + ServerRouteOptions + >, +): ServerRoute { + const options = __opts || {} + + const route: ServerRoute = { + path: '' as TPath, + id: '' as TId, + fullPath: '' as TFullPath, + to: '' as TrimPathRight, + options: options as TODO, + parentRoute: undefined as unknown as TParentRoute, + _types: {} as TODO, + // children: undefined as TChildren, + middleware: (middlewares: TODO) => + createServerRoute(undefined, { + ...options, + middleware: middlewares, + }) as TODO, + methods: (methodsOrGetMethods: TODO) => { + const methods = (() => { + if (typeof methodsOrGetMethods === 'function') { + return methodsOrGetMethods(createMethodBuilder()) + } + + return methodsOrGetMethods + })() + + return createServerRoute(undefined, { + ...__opts, + methods, + }) as TODO + }, + update: (opts) => + createServerRoute(undefined, { + ...options, + ...opts, + }) as TODO, + init: (opts: { originalIndex: number }): void => { + options.originalIndex = opts.originalIndex + + const isRoot = !options.path && !options.id + + route.parentRoute = options.getParentRoute?.() as TParentRoute + + if (isRoot) { + route.path = rootRouteId as TPath + } else if (!(route.parentRoute as any)) { + throw new Error( + `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a ServerRoute instance.`, + ) + } + + let path: undefined | string = isRoot ? rootRouteId : options.path + + // If the path is anything other than an index path, trim it up + if (path && path !== '/') { + path = trimPathLeft(path) + } + + const customId = options.id || path + + // Strip the parentId prefix from the first level of children + let id = isRoot + ? rootRouteId + : joinPaths([ + route.parentRoute.id === rootRouteId ? '' : route.parentRoute.id, + customId, + ]) + + if (path === rootRouteId) { + path = '/' + } + + if (id !== rootRouteId) { + id = joinPaths(['/', id]) + } + + const fullPath = + id === rootRouteId ? '/' : joinPaths([route.parentRoute.fullPath, path]) + + route.path = path as TPath + route.id = id as TId + route.fullPath = fullPath as TFullPath + route.to = fullPath as TrimPathRight + }, + + _addFileChildren: (children) => { + if (Array.isArray(children)) { + route.children = children as TChildren as TODO + } + + if (typeof children === 'object' && children !== null) { + route.children = Object.values(children) as TChildren as TODO + } + + return route as any + }, + + _addFileTypes: () => route, + } + + return route +} + +export type ServerRouteAddFileChildrenFn< + in out TParentRoute extends AnyServerRouteWithTypes, + in out TId extends RouteConstraints['TId'], + in out TPath extends RouteConstraints['TPath'], + in out TFullPath extends RouteConstraints['TFullPath'], + in out TMiddlewares, + in out TMethods, + in out TChildren, +> = ( + children: TChildren, +) => ServerRouteWithTypes< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods, + TChildren +> + +const createMethodBuilder = < + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +>( + __opts?: TODO, +): ServerRouteMethodBuilder => { + return { + _options: __opts || {}, + _types: {} as TODO, + middleware: (middlewares) => + createMethodBuilder({ + ...__opts, + middlewares, + }) as TODO, + handler: (handler) => + createMethodBuilder({ + ...__opts, + handler, + }) as TODO, + } +} + +export type CreateServerFileRoute< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TChildren, +> = ( + options?: undefined, +) => ServerRoute + +export type AnyServerRouteWithTypes = ServerRouteWithTypes< + any, + any, + any, + any, + any, + any, + any +> + +export interface ServerRouteWithTypes< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, + TMethods, + TChildren, +> { + _types: ServerRouteTypes< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods + > + path: TPath + id: TId + fullPath: TFullPath + to: TrimPathRight + parentRoute: TParentRoute + children?: TChildren + options: ServerRouteOptions + update: ( + opts: ServerRouteOptions, + ) => ServerRoute + init: (opts: { originalIndex: number }) => void + _addFileChildren: ServerRouteAddFileChildrenFn< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods, + TChildren + > + _addFileTypes: () => ServerRouteWithTypes< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods, + TChildren + > +} + +export interface ServerRouteTypes< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, + TMethods, +> { + id: TId + path: TPath + fullPath: TFullPath + middlewares: TMiddlewares + methods: TMethods + parentRoute: TParentRoute + allContext: ResolveAllServerContext +} + +export type ResolveAllServerContext< + TParentRoute extends AnyServerRouteWithTypes, + TMiddlewares, +> = unknown extends TParentRoute + ? AssignAllServerContext + : Assign< + TParentRoute['_types']['allContext'], + AssignAllServerContext + > + +export type AnyServerRoute = AnyServerRouteWithTypes + +export interface ServerRoute< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TChildren, +> extends ServerRouteWithTypes< + TParentRoute, + TId, + TPath, + TFullPath, + undefined, + undefined, + TChildren + >, + ServerRouteMiddleware, + ServerRouteMethods< + TParentRoute, + TId, + TPath, + TFullPath, + undefined, + TChildren + > {} + +export interface ServerRouteMiddleware< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TChildren, +> { + middleware: ( + middleware: Constrain>, + ) => ServerRouteAfterMiddleware< + TParentRoute, + TId, + TPath, + TFullPath, + TNewMiddleware, + TChildren + > +} + +export interface ServerRouteAfterMiddleware< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, + TChildren, +> extends ServerRouteWithTypes< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + undefined, + TChildren + >, + ServerRouteMethods< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TChildren + > {} + +export interface ServerRouteMethods< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, + TChildren, +> { + methods: ( + methodsOrGetMethods: Constrain< + TMethods, + ServerRouteMethodsOptions + >, + ) => ServerRouteAfterMethods< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods, + TChildren + > +} + +export type ServerRouteMethodsOptions< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +> = + | ServerRouteMethodsRecord + | (( + api: ServerRouteMethodBuilder, + ) => ServerRouteMethodsRecord) + +export interface ServerRouteMethodsRecord< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +> { + GET?: ServerRouteMethodRecordValue + POST?: ServerRouteMethodRecordValue + PUT?: ServerRouteMethodRecordValue + PATCH?: ServerRouteMethodRecordValue + DELETE?: ServerRouteMethodRecordValue + OPTIONS?: ServerRouteMethodRecordValue + HEAD?: ServerRouteMethodRecordValue +} + +export type ServerRouteMethodRecordValue< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +> = + | ServerRouteMethodHandlerFn< + TParentRoute, + TFullPath, + TMiddlewares, + undefined, + any + > + | AnyRouteMethodsBuilder + +export type ServerRouteVerb = (typeof ServerRouteVerbs)[number] + +export const ServerRouteVerbs = [ + 'GET', + 'POST', + 'PUT', + 'PATCH', + 'DELETE', + 'OPTIONS', + 'HEAD', +] as const + +export type ServerRouteMethodHandlerFn< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, + TResponse, +> = ( + ctx: ServerRouteMethodHandlerCtx< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares + >, +) => TResponse | Promise + +export interface ServerRouteMethodHandlerCtx< + in out TParentRoute extends AnyServerRouteWithTypes, + in out TFullPath extends string, + in out TMiddlewares, + in out TMethodMiddlewares, +> { + context: Expand< + AssignAllMethodContext + > + request: Request + params: ResolveParams + pathname: TFullPath +} + +export type MergeMethodMiddlewares = + TMiddlewares extends ReadonlyArray + ? TMethodMiddlewares extends ReadonlyArray + ? readonly [...TMiddlewares, ...TMethodMiddlewares] + : TMiddlewares + : TMethodMiddlewares + +export type AssignAllMethodContext< + TParentRoute extends AnyServerRouteWithTypes, + TMiddlewares, + TMethodMiddlewares, +> = ResolveAllServerContext< + TParentRoute, + MergeMethodMiddlewares +> + +export type AnyRouteMethodsBuilder = ServerRouteMethodBuilderWithTypes< + any, + any, + any, + any +> + +export interface ServerRouteMethodBuilder< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +> extends ServerRouteMethodBuilderWithTypes< + TFullPath, + TMiddlewares, + undefined, + undefined + >, + ServerRouteMethodBuilderMiddleware, + ServerRouteMethodBuilderHandler< + TParentRoute, + TFullPath, + TMiddlewares, + undefined + > {} + +export interface ServerRouteMethodBuilderWithTypes< + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, + TResponse, +> { + _options: TODO + _types: ServerRouteMethodBuilderTypes< + TFullPath, + TMiddlewares, + TMethodMiddlewares, + TResponse + > +} + +export interface ServerRouteMethodBuilderTypes< + in out TFullPath extends string, + in out TMiddlewares, + in out TMethodMiddlewares, + in out TResponse, +> { + middlewares: TMiddlewares + methodMiddleware: TMethodMiddlewares + fullPath: TFullPath + response: TResponse +} + +export interface ServerRouteMethodBuilderMiddleware< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, +> { + middleware: ( + middleware: Constrain< + TNewMethodMiddlewares, + ReadonlyArray + >, + ) => ServerRouteMethodBuilderAfterMiddleware< + TParentRoute, + TFullPath, + TMiddlewares, + TNewMethodMiddlewares + > +} + +export interface ServerRouteMethodBuilderAfterMiddleware< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, +> extends ServerRouteMethodBuilderWithTypes< + TFullPath, + TMiddlewares, + TMethodMiddlewares, + undefined + >, + ServerRouteMethodBuilderHandler< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares + > {} + +export interface ServerRouteMethodBuilderHandler< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, +> { + handler: ( + handler: ServerRouteMethodHandlerFn< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares, + TResponse + >, + ) => ServerRouteMethodBuilderAfterHandler< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares, + TResponse + > +} + +export interface ServerRouteMethodBuilderAfterHandler< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, + TResponse, +> extends ServerRouteMethodBuilderWithTypes< + TFullPath, + TMiddlewares, + TMethodMiddlewares, + TResponse + > { + opts: ServerRouteMethod< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares + > +} + +export interface ServerRouteMethod< + TParentRoute extends AnyServerRouteWithTypes, + TFullPath extends string, + TMiddlewares, + TMethodMiddlewares, +> { + middleware?: Constrain> + handler?: ServerRouteMethodHandlerFn< + TParentRoute, + TFullPath, + TMiddlewares, + TMethodMiddlewares, + undefined + > +} + +export interface ServerRouteAfterMethods< + TParentRoute extends AnyServerRouteWithTypes, + TId extends RouteConstraints['TId'], + TPath extends RouteConstraints['TPath'], + TFullPath extends RouteConstraints['TFullPath'], + TMiddlewares, + TMethods, + TChildren, +> extends ServerRouteWithTypes< + TParentRoute, + TId, + TPath, + TFullPath, + TMiddlewares, + TMethods, + TChildren + > { + options: ServerRouteOptions +} diff --git a/packages/start-server-core/src/tanstack-start.d.ts b/packages/start-server-core/src/tanstack-start.d.ts new file mode 100644 index 0000000000..760f7c0a5a --- /dev/null +++ b/packages/start-server-core/src/tanstack-start.d.ts @@ -0,0 +1,5 @@ +declare module 'tanstack:start-manifest' { + import type { Manifest } from '@tanstack/router-core' + + export const tsrStartManifest: () => Manifest +} diff --git a/packages/start-server-core/src/undici.ts b/packages/start-server-core/src/undici.ts new file mode 100644 index 0000000000..8a3a638acb --- /dev/null +++ b/packages/start-server-core/src/undici.ts @@ -0,0 +1,60 @@ +import { setGlobalOrigin } from 'undici' + +/** + * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY. + * + * @internal + */ +export const __setGlobalOrigin = setGlobalOrigin + +/** + * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY. + * + * Constructs an absolute URL from the given request object and options. + * + * @internal + * @param req - The `Request` object containing the headers to extract the host and protocol. + * @param options - Configuration options for determining the trust level of proxy headers. + * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers + * to determine the host and protocol. Defaults to `false`. + * @returns The absolute URL constructed from the request headers as a string. + * @throws Will throw an error if the `host` cannot be determined from the request headers. + * + * @example + * ```ts + * // Example usage: + * const req = new Request('http://example.com', { + * headers: { + * 'host': 'example.com', + * 'x-forwarded-host': 'proxy.example.com', + * 'x-forwarded-proto': 'https', + * }, + * }); + * + * // Without trusting proxy headers + * const url1 = getAbsoluteUrl(req); + * console.log(url1); // Output: "http://example.com" + * + * // With trusting proxy headers + * const url2 = getAbsoluteUrl(req, { trustProxy: true }); + * console.log(url2); // Output: "https://proxy.example.com" + * ``` + */ +export function __getAbsoluteUrl( + req: Request, + options: { trustProxy: boolean } = { trustProxy: false }, +): string { + const headers = req.headers + + const host = options.trustProxy + ? headers.get('x-forwarded-host') || headers.get('host') + : headers.get('host') + + const protocol = options.trustProxy + ? headers.get('x-forwarded-proto') || 'http' + : 'http' + + if (!host) throw new Error('Cannot determine host from request headers') + + return `${protocol}://${host}` +} diff --git a/packages/start-server-core/tests/serverRoute.test-d.ts b/packages/start-server-core/tests/serverRoute.test-d.ts new file mode 100644 index 0000000000..1934238b06 --- /dev/null +++ b/packages/start-server-core/tests/serverRoute.test-d.ts @@ -0,0 +1,286 @@ +import { expectTypeOf, test } from 'vitest' +import { json } from '../../start-client-core/src/json' +import { createMiddleware } from '../../start-client-core/src/createMiddleware' +import { createServerFileRoute as defaultCreateServerFileRoute } from '../src/serverRoute' +import type { CreateServerFileRoute } from '../src/serverRoute' + +test('createServerFileRoute with methods with no middleware', () => { + type Path = '$detailId' + const createServerFileRoute: CreateServerFileRoute< + any, + Path, + Path, + Path, + unknown + > = defaultCreateServerFileRoute + + const serverFileRoute = createServerFileRoute() + + expectTypeOf(serverFileRoute).toHaveProperty('methods') + expectTypeOf(serverFileRoute).toHaveProperty('middleware') + + serverFileRoute.methods({ + GET: (ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: { detailId: string } + pathname: '$detailId' + request: Request + }>() + + return json({ + test: 'test', + }) + }, + }) + + serverFileRoute.methods((r) => ({ + GET: r.handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: { detailId: string } + pathname: '$detailId' + request: Request + }>() + + return json({ + test: 'test', + }) + }), + })) +}) + +test('createServerFileRoute with methods and route middleware context', () => { + type Path = '$detailId' + const createServerFileRoute: CreateServerFileRoute< + any, + Path, + Path, + Path, + unknown + > = defaultCreateServerFileRoute + + const routeMiddleware = createMiddleware({ type: 'request' }).server( + ({ next }) => next({ context: { a: 'a' } }), + ) + + const serverFileRoute = createServerFileRoute().middleware([routeMiddleware]) + + serverFileRoute.methods({ + GET: (ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: { a: string } + params: { detailId: string } + pathname: '$detailId' + request: Request + }>() + + return json({ + test: 'test', + }) + }, + }) + + serverFileRoute.methods((r) => ({ + GET: r.handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: { a: string } + params: { detailId: string } + pathname: '$detailId' + request: Request + }>() + + return json({ + test: 'test', + }) + }), + })) +}) + +test('createServerFileRoute with methods middleware and route middleware', () => { + type Path = '$detailId' + const createServerFileRoute: CreateServerFileRoute< + any, + Path, + Path, + Path, + unknown + > = defaultCreateServerFileRoute + + const routeMiddleware = createMiddleware({ type: 'request' }).server( + ({ next }) => next({ context: { a: 'a' } }), + ) + + const serverFileRoute = createServerFileRoute().middleware([routeMiddleware]) + + const methodMiddleware = createMiddleware({ type: 'request' }).server( + ({ next }) => next({ context: { b: 'b' } }), + ) + + serverFileRoute.methods((r) => ({ + GET: r.middleware([methodMiddleware]).handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: { a: string; b: string } + params: { detailId: string } + pathname: '$detailId' + request: Request + }>() + + return json({ + test: 'test', + }) + }), + })) +}) + +test('createServerFileRoute with a parent middleware context', () => { + const createDetailsServerFileRoute: CreateServerFileRoute< + any, + 'details', + 'details', + 'details', + unknown + > = defaultCreateServerFileRoute + + const routeMiddleware1 = createMiddleware({ type: 'request' }).server( + ({ next }) => { + return next({ context: { a: 'a' } }) + }, + ) + + const _detailsServerRoute = createDetailsServerFileRoute().middleware([ + routeMiddleware1, + ]) + + const createDetailServerFileRoute: CreateServerFileRoute< + typeof _detailsServerRoute, + 'details/$detailId', + '$detailId', + 'details/$detailId', + unknown + > = defaultCreateServerFileRoute + + const routeMiddleware2 = createMiddleware({ type: 'request' }).server( + ({ next }) => { + return next({ context: { b: 'b' } }) + }, + ) + + createDetailServerFileRoute() + .middleware([routeMiddleware2]) + .methods({ + GET: (ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: { a: string; b: string } + params: { detailId: string } + pathname: 'details/$detailId' + request: Request + }>() + + return json({ test: 'test' }) + }, + }) + + const methodMiddleware = createMiddleware({ type: 'request' }).server( + ({ next }) => { + return next({ context: { c: 'c' } }) + }, + ) + + createDetailServerFileRoute() + .middleware([routeMiddleware2]) + .methods((r) => ({ + GET: r.middleware([methodMiddleware]).handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: { a: string; b: string; c: string } + params: { detailId: string } + pathname: 'details/$detailId' + request: Request + }>() + + return json({ test: 'test' }) + }), + })) +}) + +test('createServerFileRoute with parent middleware params', () => { + const createDetailsServerFileRoute: CreateServerFileRoute< + any, + '$userId', + '$userId', + '$userId', + unknown + > = defaultCreateServerFileRoute + + const _detailsServerRoute = createDetailsServerFileRoute() + + const createDetailServerFileRoute: CreateServerFileRoute< + typeof _detailsServerRoute, + '$userId/$detailId', + '$detailId', + '$userId/$detailId', + unknown + > = defaultCreateServerFileRoute + + createDetailServerFileRoute().methods({ + GET: (ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: { userId: string; detailId: string } + pathname: '$userId/$detailId' + request: Request + }>() + + return json({ test: 'test' }) + }, + }) + + createDetailServerFileRoute().methods((r) => ({ + GET: r.handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: { userId: string; detailId: string } + pathname: '$userId/$detailId' + request: Request + }>() + + return json({ test: 'test' }) + }), + })) +}) + +test('createServerFileRoute with no params', () => { + const createDetailsServerFileRoute: CreateServerFileRoute< + any, + 'details', + 'details', + 'details', + unknown + > = defaultCreateServerFileRoute + + createDetailsServerFileRoute().methods({ + GET: (ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: {} + pathname: 'details' + request: Request + }>() + + return json({ test: 'test' }) + }, + }) + + createDetailsServerFileRoute().methods((r) => ({ + GET: r.handler((ctx) => { + expectTypeOf(ctx).toEqualTypeOf<{ + context: undefined + params: {} + pathname: 'details' + request: Request + }>() + + return json({ test: 'test' }) + }), + })) +}) diff --git a/packages/start-server-core/vite.config.ts b/packages/start-server-core/vite.config.ts index 2f1ffffb80..edc06db539 100644 --- a/packages/start-server-core/vite.config.ts +++ b/packages/start-server-core/vite.config.ts @@ -19,5 +19,10 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', + externalDeps: [ + 'tanstack:server-fn-manifest', + 'tanstack:start-manifest', + 'tanstack:server-routes', + ], }), ) diff --git a/packages/start-server-functions-client/README.md b/packages/start-server-functions-client/README.md index bb009b0c87..68beb4f16b 100644 --- a/packages/start-server-functions-client/README.md +++ b/packages/start-server-functions-client/README.md @@ -1,33 +1,12 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +# TanStack Start - Server Functions Client -🤖 Type-safe router w/ built-in caching & URL state management for React! +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-server-functions-fetcher/README.md b/packages/start-server-functions-fetcher/README.md index bb009b0c87..9039fddc7c 100644 --- a/packages/start-server-functions-fetcher/README.md +++ b/packages/start-server-functions-fetcher/README.md @@ -1,33 +1,12 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +# TanStack Start - Server Functions Fetcher -🤖 Type-safe router w/ built-in caching & URL state management for React! +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index e8e5ec5828..781de68e42 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -66,6 +66,7 @@ "@tanstack/start-client-core": "workspace:^" }, "devDependencies": { - "typescript": "^5.7.2" + "typescript": "^5.7.2", + "vite": "6.1.4" } } diff --git a/packages/start-server-functions-fetcher/src/index.ts b/packages/start-server-functions-fetcher/src/index.ts index f12e725a2f..8908d0652c 100644 --- a/packages/start-server-functions-fetcher/src/index.ts +++ b/packages/start-server-functions-fetcher/src/index.ts @@ -3,9 +3,10 @@ import { isNotFound, isPlainObject, isRedirect, + parseRedirect, } from '@tanstack/router-core' import { startSerializer } from '@tanstack/start-client-core' -import type { MiddlewareClientFnOptions } from '@tanstack/start-client-core' +import type { FunctionMiddlewareClientFnOptions } from '@tanstack/start-client-core' export async function serverFnFetcher( url: string, @@ -17,7 +18,7 @@ export async function serverFnFetcher( // If createServerFn was used to wrap the fetcher, // We need to handle the arguments differently if (isPlainObject(_first) && _first.method) { - const first = _first as MiddlewareClientFnOptions & { + const first = _first as FunctionMiddlewareClientFnOptions & { headers: HeadersInit } const type = first.data instanceof FormData ? 'formData' : 'payload' @@ -28,6 +29,7 @@ export async function serverFnFetcher( ? { 'content-type': 'application/json', accept: 'application/json', + 'x-tsr-redirect': 'manual', } : {}), ...(first.headers instanceof Headers @@ -63,62 +65,34 @@ export async function serverFnFetcher( url += `&raw` } - const handlerResponse = await handler(url, { - method: first.method, - headers, - signal: first.signal, - ...getFetcherRequestOptions(first), - }) - - const response = await handleResponseErrors(handlerResponse) - - // Check if the response is JSON - if (response.headers.get('content-type')?.includes('application/json')) { - // Even though the response is JSON, we need to decode it - // because the server may have transformed it - const json = startSerializer.decode(await response.json()) - - // If the response is a redirect or not found, throw it - // for the router to handle - if (isRedirect(json) || isNotFound(json) || json instanceof Error) { - throw json - } - - return json - } - - // Must be a raw response - return response + return await getResponse(() => + handler(url, { + method: first.method, + headers, + signal: first.signal, + ...getFetcherRequestOptions(first), + }), + ) } // If not a custom fetcher, it was probably // a `use server` function, so just proxy the arguments // through as a POST request - const response = await handleResponseErrors( - await handler(url, { + return await getResponse(() => + handler(url, { method: 'POST', headers: { Accept: 'application/json', 'Content-Type': 'application/json', }, body: JSON.stringify(args), + redirect: 'manual', }), ) - - // If the response is JSON, return it parsed - const contentType = response.headers.get('content-type') - if (contentType && contentType.includes('application/json')) { - return startSerializer.decode(await response.json()) - } else { - // Otherwise, return the text as a fallback - // If the user wants more than this, they can pass a - // request instead - return response.text() - } } function getFetcherRequestOptions( - opts: MiddlewareClientFnOptions, + opts: FunctionMiddlewareClientFnOptions, ) { if (opts.method === 'POST') { if (opts.data instanceof FormData) { @@ -139,17 +113,58 @@ function getFetcherRequestOptions( return {} } -async function handleResponseErrors(response: Response) { +/** + * Retrieves a response from a given function and manages potential errors + * and special response types including redirects and not found errors. + * + * @param fn - The function to execute for obtaining the response. + * @returns The processed response from the function. + * @throws If the response is invalid or an error occurs during processing. + */ +async function getResponse(fn: () => Promise) { + const response = await (async () => { + try { + return await fn() + } catch (error) { + if (error instanceof Response) { + return error + } + + throw error + } + })() + + // If the response is not ok, throw an error if (!response.ok) { const contentType = response.headers.get('content-type') const isJson = contentType && contentType.includes('application/json') if (isJson) { + // If it's JSON, decode it and throw it throw startSerializer.decode(await response.json()) } throw new Error(await response.text()) } + // Check if the response is JSON + if (response.headers.get('content-type')?.includes('application/json')) { + // Even though the response is JSON, we need to decode it + // because the server may have transformed it + let json = startSerializer.decode(await response.json()) + + const redirect = parseRedirect(json) + + if (redirect) json = redirect + + // If the response is a redirect or not found, throw it + // for the router to handle + if (isRedirect(json) || isNotFound(json) || json instanceof Error) { + throw json + } + + return json + } + return response } diff --git a/packages/start-server-functions-handler/README.md b/packages/start-server-functions-handler/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/start-server-functions-handler/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/start-server-functions-handler/eslint.config.js b/packages/start-server-functions-handler/eslint.config.js deleted file mode 100644 index bd7118fa1a..0000000000 --- a/packages/start-server-functions-handler/eslint.config.js +++ /dev/null @@ -1,20 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - files: ['**/*.{ts,tsx}'], - }, - { - plugins: {}, - rules: {}, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/start-server-functions-handler/package.json b/packages/start-server-functions-handler/package.json deleted file mode 100644 index cec8c3d19a..0000000000 --- a/packages/start-server-functions-handler/package.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "name": "@tanstack/start-server-functions-handler", - "version": "1.120.3", - "description": "Modern and scalable routing for applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start-server-functions-handler" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0; vitest", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - }, - "require": { - "types": "./dist/cjs/index.d.cts", - "default": "./dist/cjs/index.cjs" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/router-core": "workspace:^", - "@tanstack/start-client-core": "workspace:^", - "@tanstack/start-server-core": "workspace:^", - "tiny-invariant": "^1.3.3" - }, - "devDependencies": { - "typescript": "^5.7.2" - } -} diff --git a/packages/start-server-functions-handler/tsconfig.json b/packages/start-server-functions-handler/tsconfig.json deleted file mode 100644 index 0484835e6b..0000000000 --- a/packages/start-server-functions-handler/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "module": "esnext" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/start-server-functions-handler/vite.config.ts b/packages/start-server-functions-handler/vite.config.ts deleted file mode 100644 index cc9124d7d8..0000000000 --- a/packages/start-server-functions-handler/vite.config.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import packageJson from './package.json' -import type { ViteUserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [] as ViteUserConfig['plugins'], - test: { - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - externalDeps: ['tsr:server-fn-manifest'], - }), -) diff --git a/packages/start-server-functions-server/README.md b/packages/start-server-functions-server/README.md index 2e1cf02055..5037151f69 100644 --- a/packages/start-server-functions-server/README.md +++ b/packages/start-server-functions-server/README.md @@ -1,33 +1,12 @@ -> 🤫 we're cooking up something special! - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) +# TanStack Start - Server Functions Server -🤖 Type-safe router w/ built-in caching & URL state management! +This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages: - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - +- [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start) +- [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start). -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) +It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router). -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! +Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started. diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index d7011d4a02..dfc8ca60ff 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -63,7 +63,8 @@ }, "dependencies": { "@tanstack/server-functions-plugin": "workspace:^", - "tiny-invariant": "^1.3.3" + "tiny-invariant": "^1.3.3", + "vite": "6.1.0" }, "devDependencies": { "typescript": "^5.7.2" diff --git a/packages/start-server-functions-ssr/README.md b/packages/start-server-functions-ssr/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/start-server-functions-ssr/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/start-server-functions-ssr/eslint.config.js b/packages/start-server-functions-ssr/eslint.config.js deleted file mode 100644 index bd7118fa1a..0000000000 --- a/packages/start-server-functions-ssr/eslint.config.js +++ /dev/null @@ -1,20 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - files: ['**/*.{ts,tsx}'], - }, - { - plugins: {}, - rules: {}, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/start-server-functions-ssr/package.json b/packages/start-server-functions-ssr/package.json deleted file mode 100644 index b9feda56bc..0000000000 --- a/packages/start-server-functions-ssr/package.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "name": "@tanstack/start-server-functions-ssr", - "version": "1.120.3", - "description": "Modern and scalable routing for applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start-server-functions-ssr" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "exit 0; vitest", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - }, - "require": { - "types": "./dist/cjs/index.d.cts", - "default": "./dist/cjs/index.cjs" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/start-server-functions-fetcher": "workspace:^", - "@tanstack/start-client-core": "workspace:^", - "@tanstack/start-server-core": "workspace:^", - "tiny-invariant": "^1.3.3" - }, - "devDependencies": { - "typescript": "^5.7.2" - } -} diff --git a/packages/start-server-functions-ssr/src/index.ts b/packages/start-server-functions-ssr/src/index.ts deleted file mode 100644 index 0d3430fe71..0000000000 --- a/packages/start-server-functions-ssr/src/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -/// -import { serverFnFetcher } from '@tanstack/start-server-functions-fetcher' -import { mergeHeaders } from '@tanstack/start-client-core' -import { getEvent, getHeaders } from '@tanstack/start-server-core' -import type { CreateRpcFn } from '@tanstack/server-functions-plugin' - -function sanitizeBase(base: string) { - return base.replace(/^\/|\/$/g, '') -} - -export const createSsrRpc: CreateRpcFn = (functionId, serverBase) => { - const url = `/${sanitizeBase(serverBase)}/${functionId}` - - const ssrFn = (...args: Array) => { - return serverFnFetcher(url, args, async (url, requestInit) => { - // pass on the headers from the document request to the server function fetch - requestInit.headers = mergeHeaders(getHeaders(), requestInit.headers) - // @ts-expect-error The $fetch.native method is not typed yet - const res: Response = await $fetch.native(url, requestInit) - const event = getEvent() - const mergedHeaders = mergeHeaders( - res.headers, - (event as any).___ssrRpcResponseHeaders, - ) - - // any response headers set in the server function need to be set on the document response - // we attach the headers to the event so we can later set them - ;(event as any).___ssrRpcResponseHeaders = mergedHeaders - return res - }) - } - - return Object.assign(ssrFn, { - url, - functionId, - }) -} diff --git a/packages/start-server-functions-ssr/tsconfig.json b/packages/start-server-functions-ssr/tsconfig.json deleted file mode 100644 index 51dda9abf2..0000000000 --- a/packages/start-server-functions-ssr/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx", - "module": "esnext" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json b/packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json deleted file mode 100644 index 58fc33fb0a..0000000000 --- a/packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "include": ["../src/config/index.ts"], - "compilerOptions": { - "rootDir": "../src/config", - "outDir": "../dist/esm/config", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json b/packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json deleted file mode 100644 index cc108d2494..0000000000 --- a/packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "include": ["../src/router-manifest/index.ts"], - "compilerOptions": { - "rootDir": "../src/router-manifest", - "outDir": "../dist/esm/router-manifest", - "target": "esnext", - "noEmit": false - } -} diff --git a/packages/start/README.md b/packages/start/README.md deleted file mode 100644 index bb009b0c87..0000000000 --- a/packages/start/README.md +++ /dev/null @@ -1,33 +0,0 @@ -> 🤫 we're cooking up something special! - - - -# TanStack Start - -![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) - -🤖 Type-safe router w/ built-in caching & URL state management for React! - - - #TanStack - - - - - - - - semantic-release - - Join the discussion on Github -Best of JS - - - - - - - -Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) - -## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/start/eslint.config.js b/packages/start/eslint.config.js deleted file mode 100644 index 931f0ec774..0000000000 --- a/packages/start/eslint.config.js +++ /dev/null @@ -1,31 +0,0 @@ -// @ts-check - -import pluginReact from '@eslint-react/eslint-plugin' -import pluginReactHooks from 'eslint-plugin-react-hooks' -import rootConfig from '../../eslint.config.js' - -export default [ - ...rootConfig, - { - ...pluginReact.configs.recommended, - files: ['**/*.{ts,tsx}'], - }, - { - plugins: { - 'react-hooks': pluginReactHooks, - }, - rules: { - '@eslint-react/no-unstable-context-value': 'off', - '@eslint-react/no-unstable-default-props': 'off', - '@eslint-react/dom/no-missing-button-type': 'off', - 'react-hooks/exhaustive-deps': 'error', - 'react-hooks/rules-of-hooks': 'error', - }, - }, - { - files: ['**/__tests__/**'], - rules: { - '@typescript-eslint/no-unnecessary-condition': 'off', - }, - }, -] diff --git a/packages/start/package.json b/packages/start/package.json deleted file mode 100644 index 2a4f92a117..0000000000 --- a/packages/start/package.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "name": "@tanstack/start", - "version": "1.120.3", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" - }, - "homepage": "https://tanstack.com/start", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:build", - "test:build": "exit 0; vitest", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/client.d.ts", - "exports": { - ".": { - "import": { - "types": "./dist/esm/client.d.ts", - "default": "./dist/esm/client.js" - }, - "require": { - "types": "./dist/cjs/client.d.cts", - "default": "./dist/cjs/client.cjs" - } - }, - "./client": { - "import": { - "types": "./dist/esm/client.d.ts", - "default": "./dist/esm/client.js" - }, - "require": { - "types": "./dist/cjs/client.d.cts", - "default": "./dist/cjs/client.cjs" - } - }, - "./server": { - "import": { - "types": "./dist/esm/server.d.ts", - "default": "./dist/esm/server.js" - }, - "require": { - "types": "./dist/cjs/server.d.cts", - "default": "./dist/cjs/server.cjs" - } - }, - "./config": { - "import": { - "types": "./dist/esm/config.d.ts", - "default": "./dist/esm/config.js" - }, - "require": { - "types": "./dist/cjs/config.d.cts", - "default": "./dist/cjs/config.cjs" - } - }, - "./api": { - "import": { - "types": "./dist/esm/api.d.ts", - "default": "./dist/esm/api.js" - }, - "require": { - "types": "./dist/cjs/api.d.cts", - "default": "./dist/cjs/api.cjs" - } - }, - "./router-manifest": { - "import": { - "types": "./dist/esm/router-manifest.d.ts", - "default": "./dist/esm/router-manifest.js" - }, - "require": { - "types": "./dist/cjs/router-manifest.d.cts", - "default": "./dist/cjs/router-manifest.cjs" - } - }, - "./server-functions-client": { - "import": { - "types": "./dist/esm/server-functions-client.d.ts", - "default": "./dist/esm/server-functions-client.js" - }, - "require": { - "types": "./dist/cjs/server-functions-client.d.cts", - "default": "./dist/cjs/server-functions-client.cjs" - } - }, - "./server-functions-server": { - "import": { - "types": "./dist/esm/server-functions-server.d.ts", - "default": "./dist/esm/server-functions-server.js" - }, - "require": { - "types": "./dist/cjs/server-functions-server.d.cts", - "default": "./dist/cjs/server-functions-server.cjs" - } - }, - "./server-functions-handler": { - "import": { - "types": "./dist/esm/server-functions-handler.d.ts", - "default": "./dist/esm/server-functions-handler.js" - }, - "require": { - "types": "./dist/cjs/server-functions-handler.d.cts", - "default": "./dist/cjs/server-functions-handler.cjs" - } - }, - "./server-functions-ssr": { - "import": { - "types": "./dist/esm/server-functions-ssr.d.ts", - "default": "./dist/esm/server-functions-ssr.js" - }, - "require": { - "types": "./dist/cjs/server-functions-ssr.d.cts", - "default": "./dist/cjs/server-functions-ssr.cjs" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=12" - }, - "dependencies": { - "@tanstack/react-start-client": "workspace:^", - "@tanstack/react-start-server": "workspace:^", - "@tanstack/start-config": "workspace:^", - "@tanstack/react-start-router-manifest": "workspace:^", - "@tanstack/start-server-functions-client": "workspace:^", - "@tanstack/start-server-functions-server": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@tanstack/start-server-functions-ssr": "workspace:^", - "@tanstack/start-api-routes": "workspace:^" - } -} diff --git a/packages/start/src/api.tsx b/packages/start/src/api.tsx deleted file mode 100644 index a28d259a44..0000000000 --- a/packages/start/src/api.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-api-routes' diff --git a/packages/start/src/client.tsx b/packages/start/src/client.tsx deleted file mode 100644 index e2a9aa5466..0000000000 --- a/packages/start/src/client.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/react-start-client' diff --git a/packages/start/src/config.tsx b/packages/start/src/config.tsx deleted file mode 100644 index 262bac966c..0000000000 --- a/packages/start/src/config.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-config' diff --git a/packages/start/src/router-manifest.tsx b/packages/start/src/router-manifest.tsx deleted file mode 100644 index 10e98ba06d..0000000000 --- a/packages/start/src/router-manifest.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/react-start-router-manifest' diff --git a/packages/start/src/server-functions-client.tsx b/packages/start/src/server-functions-client.tsx deleted file mode 100644 index d7baf052e5..0000000000 --- a/packages/start/src/server-functions-client.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-server-functions-client' diff --git a/packages/start/src/server-functions-handler.tsx b/packages/start/src/server-functions-handler.tsx deleted file mode 100644 index 9e7afcffff..0000000000 --- a/packages/start/src/server-functions-handler.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-server-functions-handler' diff --git a/packages/start/src/server-functions-server.tsx b/packages/start/src/server-functions-server.tsx deleted file mode 100644 index b78ff17125..0000000000 --- a/packages/start/src/server-functions-server.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-server-functions-server' diff --git a/packages/start/src/server-functions-ssr.tsx b/packages/start/src/server-functions-ssr.tsx deleted file mode 100644 index e66ed969c8..0000000000 --- a/packages/start/src/server-functions-ssr.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/start-server-functions-ssr' diff --git a/packages/start/src/server.tsx b/packages/start/src/server.tsx deleted file mode 100644 index 502e50b680..0000000000 --- a/packages/start/src/server.tsx +++ /dev/null @@ -1,4 +0,0 @@ -console.warn( - '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', -) -export * from '@tanstack/react-start-server' diff --git a/packages/start/tsconfig.json b/packages/start/tsconfig.json deleted file mode 100644 index 51dda9abf2..0000000000 --- a/packages/start/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx", - "module": "esnext" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/start/vite.config.ts b/packages/start/vite.config.ts deleted file mode 100644 index 7c6fa9afe4..0000000000 --- a/packages/start/vite.config.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import packageJson from './package.json' - -const config = defineConfig({ - test: { - name: packageJson.name, - watch: false, - environment: 'jsdom', - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - srcDir: './src', - entry: [ - './src/client.tsx', - './src/server.tsx', - './src/config.tsx', - './src/router-manifest.tsx', - './src/server-functions-client.tsx', - './src/server-functions-server.tsx', - './src/server-functions-ssr.tsx', - './src/api.tsx', - ], - externalDeps: [ - '@tanstack/react-start-client', - '@tanstack/react-start-server', - '@tanstack/start-config', - '@tanstack/react-start-router-manifest', - '@tanstack/start-server-functions-client', - '@tanstack/start-server-functions-server', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-api-routes', - ], - }), -) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93f882fd74..a1d471b7f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,12 +42,10 @@ overrides: '@tanstack/solid-start-plugin': workspace:* '@tanstack/solid-start-router-manifest': workspace:* '@tanstack/solid-start-server': workspace:* - '@tanstack/start-api-routes': workspace:* '@tanstack/start-server-functions-fetcher': workspace:* - '@tanstack/start-server-functions-handler': workspace:* '@tanstack/start-server-functions-client': workspace:* - '@tanstack/start-server-functions-ssr': workspace:* '@tanstack/start-server-functions-server': workspace:* + '@tanstack/start-plugin-core': workspace:* '@tanstack/start-client-core': workspace:* '@tanstack/start-server-core': workspace:* '@tanstack/eslint-plugin-router': workspace:* @@ -70,7 +68,7 @@ importers: version: 1.52.0 '@tanstack/config': specifier: ^0.16.1 - version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.0)(eslint@9.22.0(jiti@2.4.2))(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@tanstack/react-query': specifier: 5.66.0 version: 5.66.0(react@19.0.0) @@ -239,7 +237,7 @@ importers: version: 19.0.3(@types/react@19.0.8) esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 e2e/react-router/basic-file-based: dependencies: @@ -940,9 +938,9 @@ importers: '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../packages/react-router-devtools - '@tanstack/start': - specifier: workspace:^ - version: link:../../../packages/start + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start react: specifier: ^19.0.0 version: 19.0.0 @@ -955,9 +953,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1028,9 +1023,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1098,9 +1093,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1162,9 +1157,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -1205,59 +1200,10 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) - devDependencies: - '@tanstack/router-e2e-utils': - specifier: workspace:^ - version: link:../../e2e-utils - '@types/node': - specifier: ^22.10.2 - version: 22.13.4 - '@types/react': - specifier: ^19.0.8 - version: 19.0.8 - '@types/react-dom': - specifier: ^19.0.3 - version: 19.0.3(@types/react@19.0.8) - typescript: - specifier: ^5.7.2 - version: 5.8.2 - - e2e/react-start/clerk-basic: - dependencies: - '@clerk/tanstack-react-start': - specifier: ^0.12.0 - version: 0.12.0(@tanstack/react-router@packages+react-router)(@tanstack/react-start@packages+react-start)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-router-devtools': - specifier: workspace:^ - version: link:../../../packages/react-router-devtools - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - redaxios: - specifier: ^0.5.1 - version: 0.5.1 - tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: - '@playwright/test': - specifier: ^1.52.0 - version: 1.52.0 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1270,24 +1216,9 @@ importers: '@types/react-dom': specifier: ^19.0.3 version: 19.0.3(@types/react@19.0.8) - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - autoprefixer: - specifier: ^10.4.20 - version: 10.4.20(postcss@8.5.3) - postcss: - specifier: ^8.5.1 - version: 8.5.3 - tailwindcss: - specifier: ^3.4.17 - version: 3.4.17 typescript: specifier: ^5.7.2 version: 5.8.2 - vite-tsconfig-paths: - specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/scroll-restoration: dependencies: @@ -1315,9 +1246,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1385,9 +1316,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1455,9 +1386,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1492,6 +1420,9 @@ importers: typescript: specifier: ^5.7.2 version: 5.8.2 + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-tsconfig-paths: specifier: ^5.1.4 version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) @@ -1565,10 +1496,10 @@ importers: version: link:../../e2e-utils esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.25.0)(solid-js@1.9.5) + version: 0.6.0(esbuild@0.25.2)(solid-js@1.9.5) e2e/solid-router/basic-file-based: dependencies: @@ -1703,10 +1634,10 @@ importers: dependencies: '@tanstack/solid-query': specifier: ^5.71.9 - version: 5.71.9(solid-js@1.9.5) + version: 5.72.2(solid-js@1.9.5) '@tanstack/solid-query-devtools': specifier: ^5.71.9 - version: 5.71.9(@tanstack/solid-query@5.71.9(solid-js@1.9.5))(solid-js@1.9.5) + version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -1749,10 +1680,10 @@ importers: version: link:../../../packages/router-plugin '@tanstack/solid-query': specifier: ^5.71.9 - version: 5.71.9(solid-js@1.9.5) + version: 5.72.2(solid-js@1.9.5) '@tanstack/solid-query-devtools': specifier: ^5.71.9 - version: 5.71.9(@tanstack/solid-query@5.71.9(solid-js@1.9.5))(solid-js@1.9.5) + version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -2044,9 +1975,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2096,9 +2024,6 @@ importers: solid-js: specifier: ^1.9.5 version: 1.9.5 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -2109,6 +2034,9 @@ importers: typescript: specifier: ^5.7.2 version: 5.8.2 + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/scroll-restoration: dependencies: @@ -2133,9 +2061,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2194,9 +2119,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2255,9 +2177,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2728,149 +2647,6 @@ importers: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - examples/react/basic-ssr-file-based: - dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-router-devtools': - specifier: workspace:^ - version: link:../../../packages/react-router-devtools - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../../../packages/router-plugin - get-port: - specifier: ^7.1.0 - version: 7.1.0 - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - redaxios: - specifier: ^0.5.1 - version: 0.5.1 - devDependencies: - '@babel/core': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/generator': - specifier: ^7.26.8 - version: 7.26.8 - '@rollup/plugin-babel': - specifier: ^6.0.4 - version: 6.0.4(@babel/core@7.26.8)(@types/babel__core@7.20.5)(rollup@4.39.0) - '@types/express': - specifier: ^4.17.21 - version: 4.17.21 - '@types/react': - specifier: ^19.0.8 - version: 19.0.8 - '@types/react-dom': - specifier: ^19.0.3 - version: 19.0.3(@types/react@19.0.8) - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - compression: - specifier: ^1.7.5 - version: 1.7.5 - express: - specifier: ^4.21.2 - version: 4.21.2 - isbot: - specifier: ^5.1.22 - version: 5.1.22 - node-fetch: - specifier: ^3.3.2 - version: 3.3.2 - serve-static: - specifier: ^1.16.2 - version: 1.16.2 - typescript: - specifier: ^5.7.2 - version: 5.8.2 - vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - - examples/react/basic-ssr-streaming-file-based: - dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-router-devtools': - specifier: workspace:^ - version: link:../../../packages/react-router-devtools - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../../../packages/router-plugin - get-port: - specifier: ^7.1.0 - version: 7.1.0 - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - redaxios: - specifier: ^0.5.1 - version: 0.5.1 - superjson: - specifier: ^2.2.2 - version: 2.2.2 - devDependencies: - '@babel/core': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/generator': - specifier: ^7.26.8 - version: 7.26.8 - '@rollup/plugin-babel': - specifier: ^6.0.4 - version: 6.0.4(@babel/core@7.26.8)(@types/babel__core@7.20.5)(rollup@4.39.0) - '@types/express': - specifier: ^4.17.21 - version: 4.17.21 - '@types/react': - specifier: ^19.0.8 - version: 19.0.8 - '@types/react-dom': - specifier: ^19.0.3 - version: 19.0.3(@types/react@19.0.8) - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - compression: - specifier: ^1.7.5 - version: 1.7.5 - express: - specifier: ^4.21.2 - version: 4.21.2 - isbot: - specifier: ^5.1.22 - version: 5.1.22 - node-fetch: - specifier: ^3.3.2 - version: 3.3.2 - serve-static: - specifier: ^1.16.2 - version: 1.16.2 - typescript: - specifier: ^5.7.2 - version: 5.8.2 - vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - examples/react/basic-virtual-file-based: dependencies: '@tanstack/react-router': @@ -3291,7 +3067,7 @@ importers: dependencies: '@radix-ui/react-dialog': specifier: ^1.1.6 - version: 1.1.6(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + version: 1.1.7(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@tanstack/react-query': specifier: 5.66.0 version: 5.66.0(react@19.0.0) @@ -3454,7 +3230,7 @@ importers: version: 19.0.3(@types/react@19.0.8) esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 examples/react/quickstart-file-based: dependencies: @@ -3586,7 +3362,7 @@ importers: version: 5.8.2 webpack: specifier: ^5.97.1 - version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) @@ -3641,7 +3417,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -3690,7 +3466,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -3727,7 +3503,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: @@ -3798,7 +3574,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple: dependencies: @@ -3841,7 +3617,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -3884,7 +3660,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -3930,7 +3706,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -3964,7 +3740,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -4007,7 +3783,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -4053,7 +3829,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -4084,7 +3860,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -4127,7 +3903,7 @@ importers: version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/scroll-restoration: dependencies: @@ -4259,9 +4035,6 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4308,9 +4081,12 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.2 + version: 3.24.2 devDependencies: '@types/node': specifier: ^22.5.4 @@ -4366,9 +4142,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4427,9 +4200,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4482,9 +4252,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -4531,9 +4298,6 @@ importers: tailwind-merge: specifier: ^2.5.5 version: 2.6.0 - vinxi: - specifier: 0.5.1 - version: 0.5.1(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4586,9 +4350,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4668,9 +4429,6 @@ importers: tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4714,9 +4472,6 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4760,9 +4515,6 @@ importers: valibot: specifier: ^1.0.0-beta.15 version: 1.0.0-beta.15(typescript@5.8.2) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -4824,9 +4576,6 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4870,9 +4619,6 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -4940,9 +4686,6 @@ importers: tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4985,7 +4728,7 @@ importers: version: link:../../../packages/react-start '@workos-inc/node': specifier: ^7.45.0 - version: 7.45.0(express@4.21.2) + version: 7.46.0(express@4.21.2) iron-session: specifier: ^8.0.4 version: 8.0.4 @@ -4998,9 +4741,9 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -5160,9 +4903,6 @@ importers: tailwindcss: specifier: ^3.4.17 version: 3.4.17 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -5224,9 +4964,6 @@ importers: tailwindcss: specifier: ^3.4.17 version: 3.4.17 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -5399,10 +5136,10 @@ importers: dependencies: '@tanstack/solid-query': specifier: ^5.71.9 - version: 5.71.9(solid-js@1.9.5) + version: 5.72.2(solid-js@1.9.5) '@tanstack/solid-query-devtools': specifier: ^5.71.9 - version: 5.71.9(@tanstack/solid-query@5.71.9(solid-js@1.9.5))(solid-js@1.9.5) + version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': specifier: ^1.120.3 version: link:../../../packages/solid-router @@ -5442,10 +5179,10 @@ importers: dependencies: '@tanstack/solid-query': specifier: ^5.71.9 - version: 5.71.9(solid-js@1.9.5) + version: 5.72.2(solid-js@1.9.5) '@tanstack/solid-query-devtools': specifier: ^5.71.9 - version: 5.71.9(@tanstack/solid-query@5.71.9(solid-js@1.9.5))(solid-js@1.9.5) + version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': specifier: ^1.120.3 version: link:../../../packages/solid-router @@ -5587,9 +5324,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -5636,9 +5373,6 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) vite: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -5847,30 +5581,18 @@ importers: '@tanstack/react-start-client': specifier: workspace:* version: link:../react-start-client - '@tanstack/react-start-config': - specifier: workspace:* - version: link:../react-start-config - '@tanstack/react-start-router-manifest': + '@tanstack/react-start-plugin': specifier: workspace:* - version: link:../react-start-router-manifest + version: link:../react-start-plugin '@tanstack/react-start-server': specifier: workspace:* version: link:../react-start-server - '@tanstack/start-api-routes': - specifier: workspace:* - version: link:../start-api-routes '@tanstack/start-server-functions-client': specifier: workspace:* version: link:../start-server-functions-client - '@tanstack/start-server-functions-handler': - specifier: workspace:* - version: link:../start-server-functions-handler '@tanstack/start-server-functions-server': specifier: workspace:* version: link:../start-server-functions-server - '@tanstack/start-server-functions-ssr': - specifier: workspace:* - version: link:../start-server-functions-ssr react: specifier: ^19.0.0 version: 19.0.0 @@ -5883,7 +5605,7 @@ importers: devDependencies: esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 packages/react-start-client: dependencies: @@ -5914,9 +5636,6 @@ importers: tiny-warning: specifier: ^1.0.3 version: 1.0.3 - vinxi: - specifier: ^0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@testing-library/react': specifier: ^16.2.0 @@ -5928,47 +5647,23 @@ importers: specifier: ^4.3.4 version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - packages/react-start-config: + packages/react-start-plugin: dependencies: - '@tanstack/react-start-plugin': - specifier: workspace:* - version: link:../react-start-plugin - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - '@tanstack/router-generator': - specifier: workspace:* - version: link:../router-generator '@tanstack/router-plugin': specifier: workspace:* version: link:../router-plugin + '@tanstack/router-utils': + specifier: workspace:* + version: link:../router-utils '@tanstack/server-functions-plugin': specifier: workspace:* version: link:../server-functions-plugin - '@tanstack/start-server-functions-handler': + '@tanstack/start-plugin-core': specifier: workspace:* - version: link:../start-server-functions-handler + version: link:../start-plugin-core '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - import-meta-resolve: - specifier: ^4.1.0 - version: 4.1.0 - nitropack: - specifier: ^2.10.4 - version: 2.10.4(typescript@5.8.2) - ofetch: - specifier: ^1.4.1 - version: 1.4.1 - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) vite: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -5976,74 +5671,9 @@ importers: specifier: ^3.24.2 version: 3.24.2 - packages/react-start-plugin: + packages/react-start-server: dependencies: - '@babel/code-frame': - specifier: 7.26.2 - version: 7.26.2 - '@babel/core': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/plugin-syntax-jsx': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/plugin-syntax-typescript': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/template': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/traverse': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/types': - specifier: ^7.26.8 - version: 7.26.8 - '@tanstack/router-utils': - specifier: workspace:* - version: link:../router-utils - babel-dead-code-elimination: - specifier: ^1.0.10 - version: 1.0.10 - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - devDependencies: - '@types/babel__code-frame': - specifier: ^7.0.6 - version: 7.0.6 - '@types/babel__core': - specifier: ^7.20.5 - version: 7.20.5 - '@types/babel__template': - specifier: ^7.4.4 - version: 7.4.4 - '@types/babel__traverse': - specifier: ^7.20.6 - version: 7.20.6 - - packages/react-start-router-manifest: - dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.8.2 - - packages/react-start-server: - dependencies: - '@tanstack/history': + '@tanstack/history': specifier: workspace:* version: link:../history '@tanstack/react-router': @@ -6067,6 +5697,9 @@ importers: jsesc: specifier: ^3.1.0 version: 3.1.0 + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 tiny-warning: specifier: ^1.0.3 version: 1.0.3 @@ -6082,7 +5715,7 @@ importers: version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 react: specifier: ^19.0.0 version: 19.0.0 @@ -6247,7 +5880,7 @@ importers: version: 3.6.0 unplugin: specifier: ^2.1.2 - version: 2.1.2 + version: 2.2.2 vite: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -6256,7 +5889,7 @@ importers: version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) webpack: specifier: '>=5.92.0' - version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0) + version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) zod: specifier: ^3.24.2 version: 3.24.2 @@ -6417,30 +6050,18 @@ importers: '@tanstack/solid-start-client': specifier: workspace:* version: link:../solid-start-client - '@tanstack/solid-start-config': - specifier: workspace:* - version: link:../solid-start-config - '@tanstack/solid-start-router-manifest': + '@tanstack/solid-start-plugin': specifier: workspace:* - version: link:../solid-start-router-manifest + version: link:../solid-start-plugin '@tanstack/solid-start-server': specifier: workspace:* version: link:../solid-start-server - '@tanstack/start-api-routes': - specifier: workspace:* - version: link:../start-api-routes '@tanstack/start-server-functions-client': specifier: workspace:* version: link:../start-server-functions-client - '@tanstack/start-server-functions-handler': - specifier: workspace:* - version: link:../start-server-functions-handler '@tanstack/start-server-functions-server': specifier: workspace:* version: link:../start-server-functions-server - '@tanstack/start-server-functions-ssr': - specifier: workspace:* - version: link:../start-server-functions-ssr solid-js: specifier: '>=1.0.0' version: 1.9.5 @@ -6450,7 +6071,7 @@ importers: devDependencies: esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 packages/solid-start-client: dependencies: @@ -6478,9 +6099,6 @@ importers: tiny-warning: specifier: ^1.0.3 version: 1.0.3 - vinxi: - specifier: ^0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@solidjs/testing-library': specifier: ^0.8.10 @@ -6495,116 +6113,30 @@ importers: specifier: ^2.11.2 version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - packages/solid-start-config: + packages/solid-start-plugin: dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - '@tanstack/router-generator': - specifier: workspace:* - version: link:../router-generator '@tanstack/router-plugin': specifier: workspace:* version: link:../router-plugin + '@tanstack/router-utils': + specifier: workspace:* + version: link:../router-utils '@tanstack/server-functions-plugin': specifier: workspace:* version: link:../server-functions-plugin - '@tanstack/solid-start-plugin': - specifier: workspace:* - version: link:../solid-start-plugin - '@tanstack/start-server-functions-handler': + '@tanstack/start-plugin-core': specifier: workspace:* - version: link:../start-server-functions-handler - import-meta-resolve: - specifier: ^4.1.0 - version: 4.1.0 - nitropack: - specifier: ^2.10.4 - version: 2.10.4(typescript@5.8.2) - ofetch: - specifier: ^1.4.1 - version: 1.4.1 - solid-js: - specifier: '>=1.0.0' - version: 1.9.5 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + version: link:../start-plugin-core vite: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: - specifier: ^2.11.2 + specifier: ^2.11.6 version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) zod: specifier: ^3.24.2 version: 3.24.2 - packages/solid-start-plugin: - dependencies: - '@babel/code-frame': - specifier: 7.26.2 - version: 7.26.2 - '@babel/core': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/plugin-syntax-jsx': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/plugin-syntax-typescript': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/template': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/traverse': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/types': - specifier: ^7.26.8 - version: 7.26.8 - '@tanstack/router-utils': - specifier: workspace:* - version: link:../router-utils - babel-dead-code-elimination: - specifier: ^1.0.9 - version: 1.0.10 - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - devDependencies: - '@types/babel__code-frame': - specifier: ^7.0.6 - version: 7.0.6 - '@types/babel__core': - specifier: ^7.20.5 - version: 7.20.5 - '@types/babel__template': - specifier: ^7.4.4 - version: 7.4.4 - '@types/babel__traverse': - specifier: ^7.20.6 - version: 7.20.6 - - packages/solid-start-router-manifest: - dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.8.2 - packages/solid-start-server: dependencies: '@solidjs/meta': @@ -6646,7 +6178,7 @@ importers: version: 3.0.3 esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 solid-js: specifier: ^1.9.5 version: 1.9.5 @@ -6657,52 +6189,6 @@ importers: specifier: ^2.11.2 version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - packages/start: - dependencies: - '@tanstack/react-start-client': - specifier: workspace:* - version: link:../react-start-client - '@tanstack/react-start-router-manifest': - specifier: workspace:* - version: link:../react-start-router-manifest - '@tanstack/react-start-server': - specifier: workspace:* - version: link:../react-start-server - '@tanstack/start-api-routes': - specifier: workspace:* - version: link:../start-api-routes - '@tanstack/start-config': - specifier: workspace:^ - version: link:../start-config - '@tanstack/start-server-functions-client': - specifier: workspace:* - version: link:../start-server-functions-client - '@tanstack/start-server-functions-handler': - specifier: workspace:* - version: link:../start-server-functions-handler - '@tanstack/start-server-functions-server': - specifier: workspace:* - version: link:../start-server-functions-server - '@tanstack/start-server-functions-ssr': - specifier: workspace:* - version: link:../start-server-functions-ssr - - packages/start-api-routes: - dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - '@tanstack/start-server-core': - specifier: workspace:* - version: link:../start-server-core - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.8.2 - packages/start-client-core: dependencies: '@tanstack/router-core': @@ -6718,50 +6204,56 @@ importers: specifier: ^1.0.3 version: 1.0.3 - packages/start-config: + packages/start-plugin-core: dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../react-router - '@tanstack/react-start-plugin': + '@babel/code-frame': + specifier: 7.26.2 + version: 7.26.2 + '@babel/core': + specifier: ^7.26.8 + version: 7.26.8 + '@babel/types': + specifier: ^7.26.8 + version: 7.26.8 + '@tanstack/router-core': specifier: workspace:* - version: link:../react-start-plugin + version: link:../router-core '@tanstack/router-generator': specifier: workspace:* version: link:../router-generator - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../router-plugin - '@tanstack/server-functions-plugin': - specifier: workspace:* - version: link:../server-functions-plugin - '@tanstack/start-server-functions-handler': + '@tanstack/router-utils': specifier: workspace:* - version: link:../start-server-functions-handler - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - import-meta-resolve: - specifier: ^4.1.0 - version: 4.1.0 + version: link:../router-utils + '@types/babel__code-frame': + specifier: ^7.0.6 + version: 7.0.6 + '@types/babel__core': + specifier: ^7.20.5 + version: 7.20.5 + babel-dead-code-elimination: + specifier: ^1.0.9 + version: 1.0.10 + cheerio: + specifier: ^1.0.0 + version: 1.0.0 + h3: + specifier: 1.13.0 + version: 1.13.0 nitropack: - specifier: ^2.10.4 - version: 2.10.4(typescript@5.8.2) - ofetch: - specifier: ^1.4.1 - version: 1.4.1 - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) + specifier: ^2.11.8 + version: 2.11.8 + pathe: + specifier: ^2.0.3 + version: 2.0.3 + ufo: + specifier: ^1.5.4 + version: 1.5.4 vite: specifier: 6.1.4 version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + xmlbuilder2: + specifier: ^3.1.1 + version: 3.1.1 zod: specifier: ^3.24.2 version: 3.24.2 @@ -6786,22 +6278,31 @@ importers: jsesc: specifier: ^3.1.0 version: 3.1.0 + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 tiny-warning: specifier: ^1.0.3 version: 1.0.3 unctx: specifier: ^2.4.1 version: 2.4.1 + undici: + specifier: ^7.8.0 + version: 7.8.0 devDependencies: '@types/jsesc': specifier: ^3.0.3 version: 3.0.3 esbuild: specifier: ^0.25.0 - version: 0.25.0 + version: 0.25.2 typescript: specifier: ^5.7.2 version: 5.8.2 + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-client: dependencies: @@ -6828,25 +6329,9 @@ importers: typescript: specifier: ^5.7.2 version: 5.8.2 - - packages/start-server-functions-handler: - dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - '@tanstack/start-client-core': - specifier: workspace:* - version: link:../start-client-core - '@tanstack/start-server-core': - specifier: workspace:* - version: link:../start-server-core - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.8.2 + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-server: dependencies: @@ -6856,28 +6341,9 @@ importers: tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.8.2 - - packages/start-server-functions-ssr: - dependencies: - '@tanstack/server-functions-plugin': - specifier: workspace:* - version: link:../server-functions-plugin - '@tanstack/start-client-core': - specifier: workspace:* - version: link:../start-client-core - '@tanstack/start-server-core': - specifier: workspace:* - version: link:../start-server-core - '@tanstack/start-server-functions-fetcher': - specifier: workspace:* - version: link:../start-server-functions-fetcher - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 + vite: + specifier: 6.1.4 + version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: typescript: specifier: ^5.7.2 @@ -7112,10 +6578,6 @@ packages: resolution: {integrity: sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==} engines: {node: '>=6.9.0'} - '@babel/standalone@7.26.7': - resolution: {integrity: sha512-Fvdo9Dd20GDUAREzYMIR2EFMKAJ+ccxstgQdb39XV/yvygHL4UPcqgTkiChPyltAe/b+zgq+vUPXeukEZ6aUeA==} - engines: {node: '>=6.9.0'} - '@babel/template@7.26.8': resolution: {integrity: sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==} engines: {node: '>=6.9.0'} @@ -7173,9 +6635,9 @@ packages: resolution: {integrity: sha512-b4LR3Xsegqe0S6ZkaSJ1skO5a36EIiYRCFBzrJIbJX58vh25FFbOs4VHcK71uCLGJ1Jm1bViPi8QPGYoqYAUuw==} engines: {node: '>=18.17.0'} - '@cloudflare/kv-asset-handler@0.3.4': - resolution: {integrity: sha512-YLPHc8yASwjNkmcDMQMY35yiWjoKAKnhUbPRszBRS0YgH+IXtsMp61j+yTcnCE3oO2DgP0U3iejLC8FTtKDC8Q==} - engines: {node: '>=16.13'} + '@cloudflare/kv-asset-handler@0.4.0': + resolution: {integrity: sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA==} + engines: {node: '>=18.0.0'} '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} @@ -7223,12 +6685,6 @@ packages: resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==} engines: {node: '>=18'} - '@deno/shim-deno-test@0.5.0': - resolution: {integrity: sha512-4nMhecpGlPi0cSzT67L+Tm+GOJqvuk8gqHBziqcUQOarnuIax1z96/gJHCSIz2Z0zhxE6Rzwb3IZXPtFh51j+w==} - - '@deno/shim-deno@0.19.2': - resolution: {integrity: sha512-q3VTHl44ad8T2Tw2SpeAvghdGOjlnLPDNO2cpOxwMrBE/PVas6geWpbpIgrM+czOCH0yejp0yi8OaTuB+NU40Q==} - '@discoveryjs/json-ext@0.5.7': resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} engines: {node: '>=10.0.0'} @@ -7296,12 +6752,6 @@ packages: '@emotion/weak-memoize@0.4.0': resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==} - '@esbuild/aix-ppc64@0.20.2': - resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - '@esbuild/aix-ppc64@0.23.0': resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==} engines: {node: '>=18'} @@ -7320,18 +6770,12 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.25.0': - resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==} + '@esbuild/aix-ppc64@0.25.2': + resolution: {integrity: sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.20.2': - resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm64@0.23.0': resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==} engines: {node: '>=18'} @@ -7350,18 +6794,12 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.25.0': - resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==} + '@esbuild/android-arm64@0.25.2': + resolution: {integrity: sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.20.2': - resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - '@esbuild/android-arm@0.23.0': resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==} engines: {node: '>=18'} @@ -7380,18 +6818,12 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.25.0': - resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==} + '@esbuild/android-arm@0.25.2': + resolution: {integrity: sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.20.2': - resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - '@esbuild/android-x64@0.23.0': resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==} engines: {node: '>=18'} @@ -7410,18 +6842,12 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.25.0': - resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==} + '@esbuild/android-x64@0.25.2': + resolution: {integrity: sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.20.2': - resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-arm64@0.23.0': resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==} engines: {node: '>=18'} @@ -7440,18 +6866,12 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.25.0': - resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==} + '@esbuild/darwin-arm64@0.25.2': + resolution: {integrity: sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.20.2': - resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - '@esbuild/darwin-x64@0.23.0': resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==} engines: {node: '>=18'} @@ -7470,18 +6890,12 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.25.0': - resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==} + '@esbuild/darwin-x64@0.25.2': + resolution: {integrity: sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.20.2': - resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-arm64@0.23.0': resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==} engines: {node: '>=18'} @@ -7500,18 +6914,12 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.25.0': - resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==} + '@esbuild/freebsd-arm64@0.25.2': + resolution: {integrity: sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.20.2': - resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - '@esbuild/freebsd-x64@0.23.0': resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==} engines: {node: '>=18'} @@ -7530,18 +6938,12 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.25.0': - resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==} + '@esbuild/freebsd-x64@0.25.2': + resolution: {integrity: sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.20.2': - resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm64@0.23.0': resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==} engines: {node: '>=18'} @@ -7560,18 +6962,12 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.25.0': - resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==} + '@esbuild/linux-arm64@0.25.2': + resolution: {integrity: sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.20.2': - resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - '@esbuild/linux-arm@0.23.0': resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==} engines: {node: '>=18'} @@ -7590,18 +6986,12 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.25.0': - resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==} + '@esbuild/linux-arm@0.25.2': + resolution: {integrity: sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.20.2': - resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-ia32@0.23.0': resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==} engines: {node: '>=18'} @@ -7620,18 +7010,12 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.25.0': - resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==} + '@esbuild/linux-ia32@0.25.2': + resolution: {integrity: sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.20.2': - resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-loong64@0.23.0': resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==} engines: {node: '>=18'} @@ -7650,18 +7034,12 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.25.0': - resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==} + '@esbuild/linux-loong64@0.25.2': + resolution: {integrity: sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.20.2': - resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-mips64el@0.23.0': resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==} engines: {node: '>=18'} @@ -7680,18 +7058,12 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.25.0': - resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==} + '@esbuild/linux-mips64el@0.25.2': + resolution: {integrity: sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.20.2': - resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-ppc64@0.23.0': resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==} engines: {node: '>=18'} @@ -7710,18 +7082,12 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.25.0': - resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==} + '@esbuild/linux-ppc64@0.25.2': + resolution: {integrity: sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.20.2': - resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-riscv64@0.23.0': resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==} engines: {node: '>=18'} @@ -7740,18 +7106,12 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.25.0': - resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==} + '@esbuild/linux-riscv64@0.25.2': + resolution: {integrity: sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.20.2': - resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-s390x@0.23.0': resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==} engines: {node: '>=18'} @@ -7770,18 +7130,12 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.25.0': - resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==} + '@esbuild/linux-s390x@0.25.2': + resolution: {integrity: sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.20.2': - resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - '@esbuild/linux-x64@0.23.0': resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==} engines: {node: '>=18'} @@ -7800,8 +7154,8 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.25.0': - resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==} + '@esbuild/linux-x64@0.25.2': + resolution: {integrity: sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==} engines: {node: '>=18'} cpu: [x64] os: [linux] @@ -7812,18 +7166,12 @@ packages: cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-arm64@0.25.0': - resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==} + '@esbuild/netbsd-arm64@0.25.2': + resolution: {integrity: sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.20.2': - resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - '@esbuild/netbsd-x64@0.23.0': resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==} engines: {node: '>=18'} @@ -7842,8 +7190,8 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.25.0': - resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==} + '@esbuild/netbsd-x64@0.25.2': + resolution: {integrity: sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] @@ -7866,18 +7214,12 @@ packages: cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.25.0': - resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==} + '@esbuild/openbsd-arm64@0.25.2': + resolution: {integrity: sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.20.2': - resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - '@esbuild/openbsd-x64@0.23.0': resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==} engines: {node: '>=18'} @@ -7896,18 +7238,12 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.25.0': - resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==} + '@esbuild/openbsd-x64@0.25.2': + resolution: {integrity: sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.20.2': - resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - '@esbuild/sunos-x64@0.23.0': resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==} engines: {node: '>=18'} @@ -7926,18 +7262,12 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.25.0': - resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==} + '@esbuild/sunos-x64@0.25.2': + resolution: {integrity: sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.20.2': - resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-arm64@0.23.0': resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==} engines: {node: '>=18'} @@ -7956,18 +7286,12 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.25.0': - resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==} + '@esbuild/win32-arm64@0.25.2': + resolution: {integrity: sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.20.2': - resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-ia32@0.23.0': resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==} engines: {node: '>=18'} @@ -7986,18 +7310,12 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.25.0': - resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==} + '@esbuild/win32-ia32@0.25.2': + resolution: {integrity: sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.20.2': - resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - '@esbuild/win32-x64@0.23.0': resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==} engines: {node: '>=18'} @@ -8016,8 +7334,8 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.25.0': - resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==} + '@esbuild/win32-x64@0.25.2': + resolution: {integrity: sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -8567,16 +7885,12 @@ packages: '@napi-rs/wasm-runtime@0.2.4': resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==} - '@netlify/functions@2.8.2': - resolution: {integrity: sha512-DeoAQh8LuNPvBE4qsKlezjKj0PyXDryOFJfJKo3Z1qZLKzQ21sT314KQKPVjfvw6knqijj+IO+0kHXy/TJiqNA==} - engines: {node: '>=14.0.0'} - - '@netlify/node-cookies@0.1.0': - resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==} - engines: {node: ^14.16.0 || >=16.0.0} + '@netlify/functions@3.0.4': + resolution: {integrity: sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==} + engines: {node: '>=18.0.0'} - '@netlify/serverless-functions-api@1.26.1': - resolution: {integrity: sha512-q3L9i3HoNfz0SGpTIS4zTcKBbRkxzCRpd169eyiTuk3IwcPC3/85mzLHranlKo2b+HYT0gu37YxGB45aD8A3Tw==} + '@netlify/serverless-functions-api@1.36.0': + resolution: {integrity: sha512-z6okREyK8in0486a22Oro0k+YsuyEjDXJt46FpgeOgXqKJ9ElM8QPll0iuLBkpbH33ENiNbIPLd1cuClRQnhiw==} engines: {node: '>=18.0.0'} '@nodelib/fs.scandir@2.1.5': @@ -8654,6 +7968,22 @@ packages: cpu: [x64] os: [win32] + '@oozcitak/dom@1.15.10': + resolution: {integrity: sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==} + engines: {node: '>=8.0'} + + '@oozcitak/infra@1.0.8': + resolution: {integrity: sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==} + engines: {node: '>=6.0'} + + '@oozcitak/url@1.0.4': + resolution: {integrity: sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==} + engines: {node: '>=8.0'} + + '@oozcitak/util@8.3.8': + resolution: {integrity: sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==} + engines: {node: '>=8.0'} + '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} @@ -8723,12 +8053,6 @@ packages: cpu: [x64] os: [linux] - '@parcel/watcher-wasm@2.3.0': - resolution: {integrity: sha512-ejBAX8H0ZGsD8lSICDNyMbSEtPMWgDL0WFCt/0z7hyf5v8Imz4rAM8xY379mBsECkq/Wdqa5WEDLqtjZ+6NxfA==} - engines: {node: '>= 10.0.0'} - bundledDependencies: - - napi-wasm - '@parcel/watcher-wasm@2.5.1': resolution: {integrity: sha512-RJxlQQLkaMMIuWRozy+z2vEqbaQlCuaCgVZIUCzQLYggY22LZbP5Y1+ia+FD724Ids9e+XIyOLXLrLgQSHIthw==} engines: {node: '>= 10.0.0'} @@ -8783,6 +8107,17 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + '@poppinss/colors@4.1.4': + resolution: {integrity: sha512-FA+nTU8p6OcSH4tLDY5JilGYr1bVWHpNmcLr7xmMEdbWmKHa+3QZ+DqefrXKmdjO/brHTnQZo20lLSjaO7ydog==} + engines: {node: '>=18.16.0'} + + '@poppinss/dumper@0.6.3': + resolution: {integrity: sha512-iombbn8ckOixMtuV1p3f8jN6vqhXefNjJttoPaJDMeIk/yIGhkkL3OrHkEjE9SRsgoAx1vBUU2GtgggjvA5hCA==} + + '@poppinss/exception@1.2.1': + resolution: {integrity: sha512-aQypoot0HPSJa6gDPEPTntc1GT6QINrSbgRlRhadGW2WaYqUK3tK4Bw9SBMZXhmxd3GeAlZjVcODHgiu+THY7A==} + engines: {node: '>=18'} + '@prisma/client@5.22.0': resolution: {integrity: sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==} engines: {node: '>=16.13'} @@ -8847,9 +8182,6 @@ packages: '@radix-ui/number@1.1.1': resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==} - '@radix-ui/primitive@1.1.1': - resolution: {integrity: sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==} - '@radix-ui/primitive@1.1.2': resolution: {integrity: sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==} @@ -8970,15 +8302,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-compose-refs@1.1.1': - resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-compose-refs@1.1.2': resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==} peerDependencies: @@ -9001,15 +8324,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-context@1.1.1': - resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-context@1.1.2': resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==} peerDependencies: @@ -9019,19 +8333,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-dialog@1.1.6': - resolution: {integrity: sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==} - peerDependencies: - '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 - react: ^19.0.0 - react-dom: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-dialog@1.1.7': resolution: {integrity: sha512-EIdma8C0C/I6kL6sO02avaCRqi3fmWJpxH6mqbVScorW6nNktzKJT/le7VPho3o/7wCsyRg3z0+Q+Obr0Gy/VQ==} peerDependencies: @@ -9042,30 +8343,17 @@ packages: peerDependenciesMeta: '@types/react': optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-direction@1.1.1': - resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': + '@types/react-dom': optional: true - '@radix-ui/react-dismissable-layer@1.1.5': - resolution: {integrity: sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==} + '@radix-ui/react-direction@1.1.1': + resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==} peerDependencies: '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 react: ^19.0.0 - react-dom: ^19.0.0 peerDependenciesMeta: '@types/react': optional: true - '@types/react-dom': - optional: true '@radix-ui/react-dismissable-layer@1.1.6': resolution: {integrity: sha512-7gpgMT2gyKym9Jz2ZhlRXSg2y6cNQIK8d/cqBZ0RBCaps8pFryCWXiUKI+uHGFrhMrbGUP7U6PWgiXzIxoyF3Q==} @@ -9093,15 +8381,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-focus-guards@1.1.1': - resolution: {integrity: sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-focus-guards@1.1.2': resolution: {integrity: sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==} peerDependencies: @@ -9111,19 +8390,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-focus-scope@1.1.2': - resolution: {integrity: sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==} - peerDependencies: - '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 - react: ^19.0.0 - react-dom: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-focus-scope@1.1.3': resolution: {integrity: sha512-4XaDlq0bPt7oJwR+0k0clCiCO/7lO7NKZTAaJBYxDNQT/vj4ig0/UvctrRscZaFREpRvUTkpKR96ov1e6jptQg==} peerDependencies: @@ -9163,15 +8429,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-id@1.1.0': - resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-id@1.1.1': resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==} peerDependencies: @@ -9259,19 +8516,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-portal@1.1.4': - resolution: {integrity: sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==} - peerDependencies: - '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 - react: ^19.0.0 - react-dom: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-portal@1.1.5': resolution: {integrity: sha512-ps/67ZqsFm+Mb6lSPJpfhRLrVL2i2fntgCmGMqqth4eaGUf+knAuuRtWVJrNjUhExgmdRqftSgzpf0DF0n6yXA==} peerDependencies: @@ -9285,19 +8529,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-presence@1.1.2': - resolution: {integrity: sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==} - peerDependencies: - '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 - react: ^19.0.0 - react-dom: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-presence@1.1.3': resolution: {integrity: sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==} peerDependencies: @@ -9311,19 +8542,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-primitive@2.0.2': - resolution: {integrity: sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==} - peerDependencies: - '@types/react': ^19.0.8 - '@types/react-dom': ^19.0.3 - react: ^19.0.0 - react-dom: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-primitive@2.0.3': resolution: {integrity: sha512-Pf/t/GkndH7CQ8wE2hbkXA+WyZ83fhQQn5DDmwDiDo6AwN/fhaH8oqZ0jRjMrO2iaMhDi6P1HRx6AZwyMinY1g==} peerDependencies: @@ -9428,15 +8646,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-slot@1.1.2': - resolution: {integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-slot@1.2.0': resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==} peerDependencies: @@ -9537,15 +8746,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-use-callback-ref@1.1.0': - resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-callback-ref@1.1.1': resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==} peerDependencies: @@ -9555,15 +8755,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-controllable-state@1.1.0': - resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-controllable-state@1.1.1': resolution: {integrity: sha512-YnEXIy8/ga01Y1PN0VfaNH//MhA91JlEGVBDxDzROqwrAtG5Yr2QGEPz8A/rJA3C7ZAHryOYGaUv8fLSW2H/mg==} peerDependencies: @@ -9573,15 +8764,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-escape-keydown@1.1.0': - resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-escape-keydown@1.1.1': resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==} peerDependencies: @@ -9591,15 +8773,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-layout-effect@1.1.0': - resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==} - peerDependencies: - '@types/react': ^19.0.8 - react: ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-layout-effect@1.1.1': resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==} peerDependencies: @@ -9665,16 +8838,6 @@ packages: '@types/react-dom': optional: true - '@redocly/ajv@8.11.2': - resolution: {integrity: sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==} - - '@redocly/config@0.20.3': - resolution: {integrity: sha512-Nyyv1Bj7GgYwj/l46O0nkH1GTKWbO3Ixe7KFcn021aZipkZd+z8Vlu1BwkhqtVgivcKaClaExtWU/lDHkjBzag==} - - '@redocly/openapi-core@1.28.0': - resolution: {integrity: sha512-jnUsOFnz8w71l14Ww34Iswlj0AI4e/R0C5+K2W4v4GaY/sUkpH/145gHLJYlG4XV0neET4lNIptd4I8+yLyEHQ==} - engines: {node: '>=18.17.0', npm: '>=10.8.2'} - '@rollup/plugin-alias@5.1.1': resolution: {integrity: sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==} engines: {node: '>=14.0.0'} @@ -9684,21 +8847,8 @@ packages: rollup: optional: true - '@rollup/plugin-babel@6.0.4': - resolution: {integrity: sha512-YF7Y52kFdFT/xVSuVdjkV5ZdX/3YtmX0QulG+x0taQOtJdHYzVU61aSSkAgVJ7NOv6qPkIYiJSgSWWN/DM5sGw==} - engines: {node: '>=14.0.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@types/babel__core': ^7.1.9 - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - '@types/babel__core': - optional: true - rollup: - optional: true - - '@rollup/plugin-commonjs@28.0.2': - resolution: {integrity: sha512-BEFI2EDqzl+vA1rl97IDRZ61AIwGH093d9nz8+dThxJNH8oSoB7MjWvPCX3dkaK1/RCJ/1v/R1XB15FuSs0fQw==} + '@rollup/plugin-commonjs@28.0.3': + resolution: {integrity: sha512-pyltgilam1QPdn+Zd9gaCfOLcnjMEJ9gV+bTw6/r73INdvzf1ah9zLIJBm+kW7R6IUFIQ1YO+VqZtYxZNWFPEQ==} engines: {node: '>=16.0.0 || 14 >= 14.17'} peerDependencies: rollup: ^2.68.0||^3.0.0||^4.0.0 @@ -9724,8 +8874,8 @@ packages: rollup: optional: true - '@rollup/plugin-node-resolve@15.3.1': - resolution: {integrity: sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==} + '@rollup/plugin-node-resolve@16.0.1': + resolution: {integrity: sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^2.78.0||^3.0.0||^4.0.0 @@ -9760,103 +8910,103 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.39.0': - resolution: {integrity: sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==} + '@rollup/rollup-android-arm-eabi@4.38.0': + resolution: {integrity: sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.39.0': - resolution: {integrity: sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==} + '@rollup/rollup-android-arm64@4.38.0': + resolution: {integrity: sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.39.0': - resolution: {integrity: sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==} + '@rollup/rollup-darwin-arm64@4.38.0': + resolution: {integrity: sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.39.0': - resolution: {integrity: sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==} + '@rollup/rollup-darwin-x64@4.38.0': + resolution: {integrity: sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.39.0': - resolution: {integrity: sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==} + '@rollup/rollup-freebsd-arm64@4.38.0': + resolution: {integrity: sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.39.0': - resolution: {integrity: sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==} + '@rollup/rollup-freebsd-x64@4.38.0': + resolution: {integrity: sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.39.0': - resolution: {integrity: sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==} + '@rollup/rollup-linux-arm-gnueabihf@4.38.0': + resolution: {integrity: sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.39.0': - resolution: {integrity: sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==} + '@rollup/rollup-linux-arm-musleabihf@4.38.0': + resolution: {integrity: sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.39.0': - resolution: {integrity: sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==} + '@rollup/rollup-linux-arm64-gnu@4.38.0': + resolution: {integrity: sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.39.0': - resolution: {integrity: sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==} + '@rollup/rollup-linux-arm64-musl@4.38.0': + resolution: {integrity: sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.39.0': - resolution: {integrity: sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==} + '@rollup/rollup-linux-loongarch64-gnu@4.38.0': + resolution: {integrity: sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.39.0': - resolution: {integrity: sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==} + '@rollup/rollup-linux-powerpc64le-gnu@4.38.0': + resolution: {integrity: sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.39.0': - resolution: {integrity: sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==} + '@rollup/rollup-linux-riscv64-gnu@4.38.0': + resolution: {integrity: sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-musl@4.39.0': - resolution: {integrity: sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==} + '@rollup/rollup-linux-riscv64-musl@4.38.0': + resolution: {integrity: sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.39.0': - resolution: {integrity: sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==} + '@rollup/rollup-linux-s390x-gnu@4.38.0': + resolution: {integrity: sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.39.0': - resolution: {integrity: sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==} + '@rollup/rollup-linux-x64-gnu@4.38.0': + resolution: {integrity: sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.39.0': - resolution: {integrity: sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==} + '@rollup/rollup-linux-x64-musl@4.38.0': + resolution: {integrity: sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.39.0': - resolution: {integrity: sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==} + '@rollup/rollup-win32-arm64-msvc@4.38.0': + resolution: {integrity: sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.39.0': - resolution: {integrity: sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==} + '@rollup/rollup-win32-ia32-msvc@4.38.0': + resolution: {integrity: sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.39.0': - resolution: {integrity: sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==} + '@rollup/rollup-win32-x64-msvc@4.38.0': + resolution: {integrity: sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==} cpu: [x64] os: [win32] @@ -10117,6 +9267,10 @@ packages: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} + '@sindresorhus/is@7.0.1': + resolution: {integrity: sha512-QWLl2P+rsCJeofkDNIT3WFmb6NrRud1SUYW8dIhXK/46XFV8Q/g7Bsvib0Askb0reRLe+WYPeeE+l5cH7SlkuQ==} + engines: {node: '>=18'} + '@sindresorhus/merge-streams@2.3.0': resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} @@ -10221,6 +9375,9 @@ packages: '@solidjs/router': optional: true + '@speed-highlight/core@1.2.7': + resolution: {integrity: sha512-0dxmVj4gxg3Jg879kvFS/msl4s9F3T9UXC1InxgOf7t5NvcPD97u/WTA5vL/IxWHMn7qSxBozqrnnE2wvl1m8g==} + '@stylistic/eslint-plugin-js@2.13.0': resolution: {integrity: sha512-GPPDK4+fcbsQD58a3abbng2Dx+jBoxM5cnYjBM4T24WFZRZdlNSKvR19TxP8CPevzMOodQ9QVzNeqWvMXzfJRA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -10418,14 +9575,14 @@ packages: '@tanstack/query-core@5.66.0': resolution: {integrity: sha512-J+JeBtthiKxrpzUu7rfIPDzhscXF2p5zE/hVdrqkACBP8Yu0M96mwJ5m/8cPPYQE9aRNvXztXHlNwIh4FEeMZw==} - '@tanstack/query-core@5.71.5': - resolution: {integrity: sha512-XOQ5SyjCdwhxyLksGKWSL5poqyEXYPDnsrZAzJm2LgrMm4Yh6VOrfC+IFosXreDw9HNqC11YAMY3HlfHjNzuaA==} + '@tanstack/query-core@5.72.2': + resolution: {integrity: sha512-fxl9/0yk3mD/FwTmVEf1/H6N5B975H0luT+icKyX566w6uJG0x6o+Yl+I38wJRCaogiMkstByt+seXfDbWDAcA==} '@tanstack/query-devtools@5.67.2': resolution: {integrity: sha512-O4QXFFd7xqp6EX7sdvc9tsVO8nm4lpWBqwpgjpVLW5g7IeOY6VnS/xvs/YzbRhBVkKTMaJMOUGU7NhSX+YGoNg==} - '@tanstack/query-devtools@5.71.5': - resolution: {integrity: sha512-Fq1JeAp+I52Md/KnyeFxzG7G0RpdHgeOfDNhSPkZQs/JqqXuAfpUf+wFHDz+vP0GZbSnla2JmcLSQebOkIb1yA==} + '@tanstack/query-devtools@5.72.2': + resolution: {integrity: sha512-mMKnGb+iOhVBcj6jaerCFRpg8pACStdG8hmUBHPtToeZzs4ctjBUL1FajqpVn2WaMxnq8Wya+P3Q5tPFNM9jQw==} '@tanstack/react-query-devtools@5.67.2': resolution: {integrity: sha512-cmj2DxBc+/9btQ66n5xI8wTtAma2BLVa403K7zIYiguzJ/kV201jnGensYqJeu1Rd8uRMLLRM74jLVMLDWNRJA==} @@ -10450,14 +9607,14 @@ packages: react: ^19.0.0 react-dom: ^19.0.0 - '@tanstack/solid-query-devtools@5.71.9': - resolution: {integrity: sha512-i2U8UcJM7TnciR7QBWFynAaEub+uhzYcS9L80pAu0J3nETTojjZl3Hl1UUMUYiA7jCFPU9bWQWHjJouUvzGU1w==} + '@tanstack/solid-query-devtools@5.72.2': + resolution: {integrity: sha512-duYFN6EMsV0iwz1vV60GvxsQy3PXycgHhrucaik2yvJlRKrEYuHTYGqpRTy+P3JrFZkEzVLjevMnbzR4IIt5vw==} peerDependencies: - '@tanstack/solid-query': ^5.71.9 + '@tanstack/solid-query': ^5.72.2 solid-js: ^1.6.0 - '@tanstack/solid-query@5.71.9': - resolution: {integrity: sha512-ue9xAX2okLGdXxSWcnYfOedL/QgOx9eNKEJdoM9D3RF5xxxn3p+dXp7+Buzqu2OmfwRnAjHkWRASgS/9NlDMLg==} + '@tanstack/solid-query@5.72.2': + resolution: {integrity: sha512-ty4J5q+DIPEs7xB01TqkTfx0wYkcccJaofb378Nq/HfWoQ/0300A8TM7CU7YotJUmVWA3qwBHnJLChXlNzX4ow==} peerDependencies: solid-js: ^1.6.0 @@ -10560,9 +9717,6 @@ packages: '@types/bonjour@3.5.13': resolution: {integrity: sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==} - '@types/braces@3.0.5': - resolution: {integrity: sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w==} - '@types/connect-history-api-fallback@1.5.4': resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==} @@ -10644,9 +9798,6 @@ packages: '@types/koa@2.15.0': resolution: {integrity: sha512-7QFsywoE5URbuVnG3loe03QXuGajrnotr3gQkXcEBShORai23MePfFYdhz90FEtBBpkyIYQbVD+evKtloCgX3g==} - '@types/micromatch@4.0.9': - resolution: {integrity: sha512-7V+8ncr22h4UoYRLnLXSpTxjQrNUXtWHGeMPRJt1nULXI57G9bIcpyrHlmrQ7QK24EyyuXvYcSSWAM8GA9nqCg==} - '@types/mime@1.3.5': resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==} @@ -10808,13 +9959,9 @@ packages: resolution: {integrity: sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vercel/nft@0.27.10': - resolution: {integrity: sha512-zbaF9Wp/NsZtKLE4uVmL3FyfFwlpDyuymQM1kPbeT0mVOHKDQQNjnnfslB3REg3oZprmNFJuh3pkHBk2qAaizg==} - engines: {node: '>=16'} - hasBin: true - - '@vinxi/listhen@1.5.6': - resolution: {integrity: sha512-WSN1z931BtasZJlgPp704zJFnQFRg7yzSjkm3MzAWQYe4uXFXlFr1hc5Ac2zae5/HDOz5x1/zDM5Cb54vTCnWw==} + '@vercel/nft@0.29.2': + resolution: {integrity: sha512-A/Si4mrTkQqJ6EXJKv5EYCDQ3NL6nJXxG8VGXePsaiQigsomHYQC9xSpX8qGk7AEZk4b1ssbYIqJ0ISQQ7bfcA==} + engines: {node: '>=18'} hasBin: true '@vitejs/plugin-react@4.3.4': @@ -10979,8 +10126,8 @@ packages: webpack-dev-server: optional: true - '@workos-inc/node@7.45.0': - resolution: {integrity: sha512-8wx2YuhkmTc3bKc1Py/Gv8X44QovIDQVLfDL8qNMRybCLD5Cu7R6AnWP/ZI5VHwSgeird0g+Cuukqk3ZG8ycMg==} + '@workos-inc/node@7.46.0': + resolution: {integrity: sha512-r/j+l/nlHkOqgIt0U70shZMKIQwLYFFU9aYmFW53l16+FwG+61SfldaK3ckjb3gscoGxWq+t7RlxcEe7Tz5eRA==} engines: {node: '>=16'} '@xtuc/ieee754@1.2.0': @@ -11026,8 +10173,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.14.0: - resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + acorn@8.14.1: + resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} engines: {node: '>=0.4.0'} hasBin: true @@ -11088,9 +10235,6 @@ packages: alien-signals@0.4.14: resolution: {integrity: sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==} - ansi-align@3.0.1: - resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==} - ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} @@ -11266,10 +10410,6 @@ packages: boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} - boxen@7.1.1: - resolution: {integrity: sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==} - engines: {node: '>=14.16'} - brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -11306,8 +10446,8 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} - c12@2.0.1: - resolution: {integrity: sha512-Z4JgsKXHG37C6PYUtIxCfLJZvo6FyhHJoClwwb9ftUkLpPSkuYqn6Tr+vnaN8hymm0kIbcg6Ey3kv/Q71k5w/A==} + c12@3.0.2: + resolution: {integrity: sha512-6Tzk1/TNeI3WBPpK0j/Ss4+gPj3PUJYbWl/MWDJBThFvwNGNkXtd7Cz8BJtD4aRwoGHtzQD0SnxamgUiBH0/Nw==} peerDependencies: magicast: ^0.3.5 peerDependenciesMeta: @@ -11337,10 +10477,6 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - camelcase@7.0.1: - resolution: {integrity: sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==} - engines: {node: '>=14.16'} - caniuse-lite@1.0.30001696: resolution: {integrity: sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==} @@ -11360,9 +10496,6 @@ packages: resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - change-case@5.4.4: - resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==} - char-regex@1.0.2: resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} @@ -11371,6 +10504,13 @@ packages: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} + cheerio-select@2.1.0: + resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==} + + cheerio@1.0.0: + resolution: {integrity: sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==} + engines: {node: '>=18.17'} + chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} @@ -11379,10 +10519,6 @@ packages: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} - chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} - chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} @@ -11404,10 +10540,6 @@ packages: resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==} engines: {node: '>= 10.0'} - cli-boxes@3.0.0: - resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==} - engines: {node: '>=10'} - cli-cursor@3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} @@ -11463,9 +10595,6 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - colorette@1.4.0: - resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} - colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} @@ -11533,12 +10662,15 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} + confbox@0.2.1: + resolution: {integrity: sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==} + connect-history-api-fallback@2.0.0: resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} engines: {node: '>=0.8'} - consola@3.4.0: - resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} + consola@3.4.2: + resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==} engines: {node: ^14.18.0 || >=16.10.0} content-disposition@0.5.4: @@ -11586,6 +10718,9 @@ packages: cookie-es@1.2.2: resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} + cookie-es@2.0.0: + resolution: {integrity: sha512-RAj4E421UYRgqokKUmotqAwuplYw15qtdXfY+hGzgCJ/MBjCVZcSoHK/kH9kocfjRjcDME7IiDWR/1WX1TM2Pg==} + cookie-signature@1.0.6: resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} @@ -11605,10 +10740,6 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} - copy-anything@3.0.5: - resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==} - engines: {node: '>=12.13'} - core-js@3.40.0: resolution: {integrity: sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==} @@ -11636,12 +10767,15 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - crossws@0.3.3: - resolution: {integrity: sha512-/71DJT3xJlqSnBr83uGJesmVHSzZEvgxHt/fIKxBAAngqMHmnBWQNxCphVxxJ2XL3xleu5+hJD6IQ3TglBedcw==} + crossws@0.3.4: + resolution: {integrity: sha512-uj0O1ETYX1Bh6uSgktfPvwDiPYGQ3aI4qVsaC/LWpkIzGj1nUYm5FK3K+t11oOlpN01lGbprFCH4wBlKdJjVgw==} css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} + css-select@5.1.0: + resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==} + css-what@6.1.0: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} engines: {node: '>= 6'} @@ -11661,10 +10795,6 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - data-uri-to-buffer@4.0.1: - resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==} - engines: {node: '>= 12'} - data-urls@5.0.0: resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==} engines: {node: '>=18'} @@ -11673,11 +10803,8 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} - dax-sh@0.39.2: - resolution: {integrity: sha512-gpuGEkBQM+5y6p4cWaw9+ePy5TNon+fdwFVtTI8leU3UhwhsBfPewRxMXGuQNC+M2b/MDGMlfgpqynkcd0C3FQ==} - - db0@0.2.3: - resolution: {integrity: sha512-PunuHESDNefmwVy1LDpY663uWwKt2ogLGoB6NOz2sflGREWqDreMwDgF8gfkXxgNXW+dqviyiJGm924H1BaGiw==} + db0@0.3.1: + resolution: {integrity: sha512-3RogPLE2LLq6t4YiFCREyl572aBjkfMvfwPyN51df00TbPbryL3XqBYuJ/j6mgPssPK8AKfYdLxizaO5UG10sA==} peerDependencies: '@electric-sql/pglite': '*' '@libsql/client': '*' @@ -11854,6 +10981,9 @@ packages: dom-serializer@1.4.1: resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} + dom-serializer@2.0.0: + resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} + domelementtype@2.3.0: resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} @@ -11861,9 +10991,16 @@ packages: resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} engines: {node: '>= 4'} + domhandler@5.0.3: + resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} + engines: {node: '>= 4'} + domutils@2.8.0: resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} + domutils@3.2.2: + resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} + dot-case@3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} @@ -11916,6 +11053,9 @@ packages: resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} engines: {node: '>= 0.8'} + encoding-sniffer@0.2.0: + resolution: {integrity: sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==} + end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} @@ -11934,6 +11074,10 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + entities@6.0.0: + resolution: {integrity: sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==} + engines: {node: '>=0.12'} + envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} engines: {node: '>=4'} @@ -11946,6 +11090,9 @@ packages: error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + error-stack-parser-es@1.0.5: + resolution: {integrity: sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==} + error-stack-parser@2.1.4: resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==} @@ -11975,11 +11122,6 @@ packages: peerDependencies: esbuild: '>=0.12 <1' - esbuild@0.20.2: - resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} - engines: {node: '>=12'} - hasBin: true - esbuild@0.23.0: resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==} engines: {node: '>=18'} @@ -11995,8 +11137,8 @@ packages: engines: {node: '>=18'} hasBin: true - esbuild@0.25.0: - resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==} + esbuild@0.25.2: + resolution: {integrity: sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==} engines: {node: '>=18'} hasBin: true @@ -12231,6 +11373,9 @@ packages: resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} engines: {node: '>= 0.10.0'} + exsolve@1.0.4: + resolution: {integrity: sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==} + extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -12272,10 +11417,6 @@ packages: picomatch: optional: true - fetch-blob@3.2.0: - resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} - engines: {node: ^12.20 || >= 14.13} - fflate@0.8.2: resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} @@ -12360,10 +11501,6 @@ packages: resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==} engines: {node: '>= 6'} - formdata-polyfill@4.0.10: - resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} - engines: {node: '>=12.20.0'} - forwarded@0.2.0: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} engines: {node: '>= 0.6'} @@ -12403,10 +11540,6 @@ packages: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} - fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -12442,10 +11575,6 @@ packages: get-port-please@3.1.2: resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==} - get-port@7.1.0: - resolution: {integrity: sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==} - engines: {node: '>=16'} - get-proto@1.0.1: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} @@ -12457,8 +11586,8 @@ packages: get-tsconfig@4.10.0: resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==} - giget@1.2.4: - resolution: {integrity: sha512-Wv+daGyispVoA31TrWAVR+aAdP7roubTPEM/8JzRnqXhLbdJH0T9eQyXVFF8fjk3WKTsctII6QcyxILYgNp2DA==} + giget@2.0.0: + resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==} hasBin: true glob-parent@5.1.2: @@ -12481,10 +11610,6 @@ packages: engines: {node: 20 || >=22} hasBin: true - glob@7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported - glob@9.3.5: resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} engines: {node: '>=16 || 14 >=14.17'} @@ -12509,8 +11634,8 @@ packages: resolution: {integrity: sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==} engines: {node: '>=18'} - globby@14.0.2: - resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==} + globby@14.1.0: + resolution: {integrity: sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==} engines: {node: '>=18'} globrex@0.1.2: @@ -12542,6 +11667,9 @@ packages: h3@1.13.0: resolution: {integrity: sha512-vFEAu/yf8UMUcB4s43OaDaigcqpQd14yanmOsn+NcRX3/guSKncyE2rOYhq8RIchgJrPSs/QiIddnTTR1ddiAg==} + h3@1.15.1: + resolution: {integrity: sha512-+ORaOBttdUm1E2Uu/obAyCguiI7MbBvsLTndc3gyK3zU+SYLoZXlyCP9Xgy0gikkGufFLTZXCXD6+4BsufnmHA==} + handle-thing@2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} @@ -12614,6 +11742,9 @@ packages: htmlparser2@6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} + htmlparser2@9.1.0: + resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==} + http-deceiver@1.2.7: resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==} @@ -12686,6 +11817,10 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} + ignore@7.0.3: + resolution: {integrity: sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==} + engines: {node: '>= 4'} + immer@10.1.1: resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==} @@ -12702,9 +11837,6 @@ packages: engines: {node: '>=8'} hasBin: true - import-meta-resolve@4.1.0: - resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==} - imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -12713,14 +11845,6 @@ packages: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} - index-to-position@0.1.2: - resolution: {integrity: sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==} - engines: {node: '>=18'} - - inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. - inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -12737,8 +11861,8 @@ packages: resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==} engines: {node: '>=10.13.0'} - ioredis@5.4.2: - resolution: {integrity: sha512-0SZXGNGZ+WzISQ67QDyZ2x0+wVxjjUndtD8oSeik/4ajifeiRufed8fCb8QW8VMyi4MXcS+UO1k/0NGhvq1PAg==} + ioredis@5.6.0: + resolution: {integrity: sha512-tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==} engines: {node: '>=12.22.0'} ipaddr.js@1.9.1: @@ -12919,10 +12043,6 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - isexe@3.1.1: - resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} - engines: {node: '>=16'} - isobject@3.0.1: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} engines: {node: '>=0.10.0'} @@ -12971,10 +12091,6 @@ packages: resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} engines: {node: '>=14'} - js-levenshtein@1.1.6: - resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==} - engines: {node: '>=0.10.0'} - js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -13049,6 +12165,10 @@ packages: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} + kleur@4.1.5: + resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} + engines: {node: '>=6'} + klona@2.0.6: resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} engines: {node: '>= 8'} @@ -13174,8 +12294,8 @@ packages: resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==} engines: {node: '>=14'} - local-pkg@1.0.0: - resolution: {integrity: sha512-bbgPw/wmroJsil/GgL4qjDzs5YLTBMQ99weRsok1XCDccQeehbHA/I1oRvk2NPtr7KGZgT/Y5tPRnAtMqeG2Kg==} + local-pkg@1.1.1: + resolution: {integrity: sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==} engines: {node: '>=14'} locate-path@5.0.0: @@ -13384,35 +12504,18 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} - engines: {node: '>=8'} - minipass@4.2.8: resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} engines: {node: '>=8'} - minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - minipass@7.1.2: resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} - minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} - minizlib@3.0.1: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} - mkdirp@1.0.4: - resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} - engines: {node: '>=10'} - hasBin: true - mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} @@ -13484,8 +12587,8 @@ packages: neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - nitropack@2.10.4: - resolution: {integrity: sha512-sJiG/MIQlZCVSw2cQrFG1H6mLeSqHlYfFerRjLKz69vUfdu0EL2l0WdOxlQbzJr3mMv/l4cOlCCLzVRzjzzF/g==} + nitropack@2.11.8: + resolution: {integrity: sha512-ummTu4R8Lhd1nO3nWrW7eeiHA2ey3ntbWFKkYakm4rcbvT6meWp+oykyrYBNFQKhobQl9CydmUWlCyztYXFPJw==} engines: {node: ^16.11.0 || >=17.0.0} hasBin: true peerDependencies: @@ -13500,10 +12603,6 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} - node-domexception@1.0.0: - resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} - engines: {node: '>=10.5.0'} - node-emoji@2.2.0: resolution: {integrity: sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==} engines: {node: '>=18'} @@ -13520,10 +12619,6 @@ packages: encoding: optional: true - node-fetch@3.3.2: - resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - node-forge@1.3.1: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} @@ -13535,6 +12630,9 @@ packages: node-machine-id@1.1.12: resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==} + node-mock-http@1.0.0: + resolution: {integrity: sha512-0uGYQ1WQL1M5kKvGRXWQ3uZCHtLTO8hln3oBjIusM75WoesZ909uQJs/Hb946i2SS+Gsrhkaa6iAO17jRIv6DQ==} + node-releases@2.0.19: resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} @@ -13577,8 +12675,8 @@ packages: '@swc/core': optional: true - nypm@0.5.2: - resolution: {integrity: sha512-AHzvnyUJYSrrphPhRWWZNcoZfArGNp3Vrc4pm/ZurO74tYNTgAPrEyBQEKy+qioqmWlPXwvMZCG2wOaHlPG0Pw==} + nypm@0.6.0: + resolution: {integrity: sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==} engines: {node: ^14.16.0 || >=16.10.0} hasBin: true @@ -13611,6 +12709,9 @@ packages: ohash@1.1.4: resolution: {integrity: sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==} + ohash@2.0.11: + resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} + on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -13638,12 +12739,6 @@ packages: resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} engines: {node: '>=12'} - openapi-typescript@7.6.0: - resolution: {integrity: sha512-p/xxKcWFR7aZDOAdnqYBQ1NdNyWdine+gHKHKvjxGXmlq8JT1G9+SkY8I5csKaktLHMbDDH6ZDeWQpydwBHa+Q==} - hasBin: true - peerDependencies: - typescript: ^5.x - optionator@0.9.4: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} @@ -13700,10 +12795,6 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} - parse-json@8.1.0: - resolution: {integrity: sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==} - engines: {node: '>=18'} - parse-passwd@1.0.0: resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==} engines: {node: '>=0.10.0'} @@ -13711,6 +12802,12 @@ packages: parse5-htmlparser2-tree-adapter@6.0.1: resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==} + parse5-htmlparser2-tree-adapter@7.1.0: + resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==} + + parse5-parser-stream@7.1.2: + resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==} + parse5@5.1.1: resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==} @@ -13720,6 +12817,9 @@ packages: parse5@7.2.1: resolution: {integrity: sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==} + parse5@7.3.0: + resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==} + parseurl@1.3.3: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} engines: {node: '>= 0.8'} @@ -13734,10 +12834,6 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} - path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} @@ -13775,9 +12871,9 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - path-type@5.0.0: - resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} - engines: {node: '>=12'} + path-type@6.0.0: + resolution: {integrity: sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==} + engines: {node: '>=18'} pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} @@ -13818,6 +12914,9 @@ packages: pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + pkg-types@2.1.0: + resolution: {integrity: sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==} + playwright-core@1.52.0: resolution: {integrity: sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==} engines: {node: '>=18'} @@ -13959,6 +13058,9 @@ packages: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} + quansync@0.2.10: + resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==} + querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -14202,8 +13304,8 @@ packages: rollup: optional: true - rollup@4.39.0: - resolution: {integrity: sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==} + rollup@4.38.0: + resolution: {integrity: sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -14270,8 +13372,8 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.7.0: - resolution: {integrity: sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==} + semver@7.7.1: + resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} engines: {node: '>=10'} hasBin: true @@ -14447,8 +13549,8 @@ packages: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} - std-env@3.8.0: - resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==} + std-env@3.8.1: + resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==} streamx@2.22.0: resolution: {integrity: sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==} @@ -14501,8 +13603,8 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - strip-literal@2.1.1: - resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==} + strip-literal@3.0.0: + resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==} style-to-object@1.0.8: resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==} @@ -14515,9 +13617,9 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - superjson@2.2.2: - resolution: {integrity: sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==} - engines: {node: '>=16'} + supports-color@10.0.0: + resolution: {integrity: sha512-HRVVSbCCMbj7/kdWF9Q+bbckjBHLtHMEoJWlkmYzzdwhYMkjkOwubLM6t7NbWKjgKamGDrWL1++KrjUO1t9oAQ==} + engines: {node: '>=18'} supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} @@ -14527,10 +13629,6 @@ packages: resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} engines: {node: '>=10'} - supports-color@9.4.0: - resolution: {integrity: sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==} - engines: {node: '>=12'} - supports-hyperlinks@3.1.0: resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==} engines: {node: '>=14.18'} @@ -14579,10 +13677,6 @@ packages: tar-stream@3.1.7: resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==} - tar@6.2.1: - resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} - engines: {node: '>=10'} - tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} @@ -14757,10 +13851,6 @@ packages: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} - type-fest@2.19.0: - resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} - engines: {node: '>=12.20'} - type-fest@4.33.0: resolution: {integrity: sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==} engines: {node: '>=16'} @@ -14845,6 +13935,9 @@ packages: ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} + ultrahtml@1.5.3: + resolution: {integrity: sha512-GykOvZwgDWZlTQMtp5jrD4BVL+gNn2NVlVafjcFUJ7taY20tqYdwdoWBFy6GBJsNTZe1GkGPkSl5knQAjtgceg==} + unc-path-regex@0.1.2: resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==} engines: {node: '>=0.10.0'} @@ -14855,25 +13948,34 @@ packages: unctx@2.4.1: resolution: {integrity: sha512-AbaYw0Nm4mK4qjhns67C+kgxR2YWiwlDBPzxrN8h8C6VtAdCgditAY5Dezu3IJy4XVqAnbrXt9oQJvsn3fyozg==} - undici-types@5.28.4: - resolution: {integrity: sha512-3OeMF5Lyowe8VW0skf5qaIE7Or3yS9LS7fvMUI0gg4YxpIBVg0L8BxCmROw2CcYhSkpR68Epz7CGc8MPj94Uww==} - undici-types@6.20.0: resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + undici@6.21.2: + resolution: {integrity: sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==} + engines: {node: '>=18.17'} + + undici@7.8.0: + resolution: {integrity: sha512-vFv1GA99b7eKO1HG/4RPu2Is3FBTWBrmzqzO0mz+rLxN3yXkE4mqRcb8g8fHxzX4blEysrNZLqg5RbJLqX5buA==} + engines: {node: '>=20.18.1'} + unenv@1.10.0: resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==} + unenv@2.0.0-rc.15: + resolution: {integrity: sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==} + unicode-emoji-modifier-base@1.0.0: resolution: {integrity: sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==} engines: {node: '>=4'} - unicorn-magic@0.1.0: - resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} + unicorn-magic@0.3.0: + resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} engines: {node: '>=18'} - unimport@3.14.6: - resolution: {integrity: sha512-CYvbDaTT04Rh8bmD8jz3WPmHYZRG/NnvYVzwD6V1YAlvvKROlAeNDUBhkBGzNav2RKaeuXvlWYaa1V4Lfi/O0g==} + unimport@4.1.3: + resolution: {integrity: sha512-H+IVJ7rAkE3b+oC8rSJ2FsPaVsweeMC8eKZc+C6Mz7+hxDF45AnrY/tVCNRBvzMwWNcJEV67WdAVcal27iMjOw==} + engines: {node: '>=18.12.0'} universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} @@ -14891,6 +13993,10 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} + unplugin-utils@0.2.4: + resolution: {integrity: sha512-8U/MtpkPkkk3Atewj1+RcKIjb5WBimZ/WSLhhR3w6SsIj8XJuKTacSP8g+2JhfSGw0Cb125Y+2zA/IzJZDVbhA==} + engines: {node: '>=18.12.0'} + unplugin@1.0.1: resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} @@ -14898,31 +14004,31 @@ packages: resolution: {integrity: sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==} engines: {node: '>=14.0.0'} - unplugin@2.1.2: - resolution: {integrity: sha512-Q3LU0e4zxKfRko1wMV2HmP8lB9KWislY7hxXpxd+lGx0PRInE4vhMBVEZwpdVYHvtqzhSrzuIfErsob6bQfCzw==} + unplugin@2.2.2: + resolution: {integrity: sha512-Qp+iiD+qCRnUek+nDoYvtWX7tfnYyXsrOnJ452FRTgOyKmTM7TUJ3l+PLPJOOWPTUyKISKp4isC5JJPSXUjGgw==} engines: {node: '>=18.12.0'} - unstorage@1.14.4: - resolution: {integrity: sha512-1SYeamwuYeQJtJ/USE1x4l17LkmQBzg7deBJ+U9qOBoHo15d1cDxG4jM31zKRgF7pG0kirZy4wVMX6WL6Zoscg==} + unstorage@1.15.0: + resolution: {integrity: sha512-m40eHdGY/gA6xAPqo8eaxqXgBuzQTlAKfmB1iF7oCKXE1HfwHwzDJBywK+qQGn52dta+bPlZluPF7++yR3p/bg==} peerDependencies: '@azure/app-configuration': ^1.8.0 '@azure/cosmos': ^4.2.0 '@azure/data-tables': ^13.3.0 - '@azure/identity': ^4.5.0 + '@azure/identity': ^4.6.0 '@azure/keyvault-secrets': ^4.9.0 '@azure/storage-blob': ^12.26.0 '@capacitor/preferences': ^6.0.3 - '@deno/kv': '>=0.8.4' + '@deno/kv': '>=0.9.0' '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 '@planetscale/database': ^1.19.0 '@upstash/redis': ^1.34.3 - '@vercel/blob': '>=0.27.0' + '@vercel/blob': '>=0.27.1' '@vercel/kv': ^1.0.1 aws4fetch: ^1.0.20 db0: '>=0.2.1' idb-keyval: ^6.2.1 ioredis: ^5.4.2 - uploadthing: ^7.4.1 + uploadthing: ^7.4.4 peerDependenciesMeta: '@azure/app-configuration': optional: true @@ -14965,8 +14071,8 @@ packages: resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} hasBin: true - untyped@1.5.2: - resolution: {integrity: sha512-eL/8PlhLcMmlMDtNPKhyyz9kEBDS3Uk4yMu/ewlkT2WFbtzScjHWPJLdQLmaGPUKjXzwe9MumOtOgc4Fro96Kg==} + untyped@2.0.0: + resolution: {integrity: sha512-nwNCjxJTjNuLCgFr42fEak5OcLuB3ecca+9ksPFNvtfYSLpjf+iJqSIaSnIile6ZPbKYxI5k2AfXqeopGudK/g==} hasBin: true unwasm@0.3.9: @@ -14985,18 +14091,12 @@ packages: uqr@0.1.2: resolution: {integrity: sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==} - uri-js-replace@1.0.1: - resolution: {integrity: sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==} - uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - urlpattern-polyfill@8.0.2: - resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==} - use-callback-ref@1.3.3: resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==} engines: {node: '>=10'} @@ -15059,14 +14159,6 @@ packages: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} - vinxi@0.5.1: - resolution: {integrity: sha512-jvl2hJ0fyWwfDVQdDDHCJiVxqU4k0A6kFAnljS0kIjrGfhdTvKEWIoj0bcJgMyrKhxNMoZZGmHZsstQgjDIL3g==} - hasBin: true - - vinxi@0.5.3: - resolution: {integrity: sha512-4sL2SMrRzdzClapP44oXdGjCE1oq7/DagsbjY5A09EibmoIO4LP8ScRVdh03lfXxKRk7nCWK7n7dqKvm+fp/9w==} - hasBin: true - vite-node@3.0.6: resolution: {integrity: sha512-s51RzrTkXKJrhNbUzQRsarjmAae7VmMPAsRT7lppVpIg6mK3zGthP9Hgz0YQQKuNcF+Ii7DfYk3Fxz40jRmePw==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} @@ -15219,10 +14311,6 @@ packages: wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} - web-streams-polyfill@3.3.3: - resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==} - engines: {node: '>= 8'} - web-vitals@4.2.4: resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==} @@ -15331,20 +14419,11 @@ packages: engines: {node: '>= 8'} hasBin: true - which@4.0.0: - resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} - engines: {node: ^16.13.0 || >=18.0.0} - hasBin: true - why-is-node-running@2.3.0: resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==} engines: {node: '>=8'} hasBin: true - widest-line@4.0.1: - resolution: {integrity: sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==} - engines: {node: '>=12'} - wildcard@2.0.1: resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} @@ -15383,6 +14462,10 @@ packages: resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} engines: {node: '>=18'} + xmlbuilder2@3.1.1: + resolution: {integrity: sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==} + engines: {node: '>=12.0'} + xmlchars@2.2.0: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} @@ -15400,9 +14483,6 @@ packages: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} - yaml-ast-parser@0.0.43: - resolution: {integrity: sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==} - yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -15436,6 +14516,14 @@ packages: resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==} engines: {node: '>=18'} + youch-core@0.3.2: + resolution: {integrity: sha512-fusrlIMLeRvTFYLUjJ9KzlGC3N+6MOPJ68HNj/yJv2nz7zq8t4HEviLms2gkdRPUS7F5rZ5n+pYx9r88m6IE1g==} + engines: {node: '>=18'} + + youch@4.1.0-beta.7: + resolution: {integrity: sha512-HUn0M24AUTMvjdkoMtH8fJz2FEd+k1xvtR9EoTrDUoVUi6o7xl5X+pST/vjk4T3GEQo2mJ9FlAvhWBm8dIdD4g==} + engines: {node: '>=18'} + zip-stream@6.0.1: resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} engines: {node: '>= 14'} @@ -15464,7 +14552,7 @@ snapshots: commander: 10.0.1 marked: 9.1.6 marked-terminal: 7.3.0(marked@9.1.6) - semver: 7.7.0 + semver: 7.7.1 '@arethetypeswrong/core@0.17.3': dependencies: @@ -15472,7 +14560,7 @@ snapshots: cjs-module-lexer: 1.4.3 fflate: 0.8.2 lru-cache: 10.4.3 - semver: 7.7.0 + semver: 7.7.1 typescript: 5.6.1-rc validate-npm-package-name: 5.0.1 @@ -15512,7 +14600,7 @@ snapshots: '@babel/types': 7.26.8 '@types/gensync': 1.0.4 convert-source-map: 2.0.0 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -15692,8 +14780,6 @@ snapshots: dependencies: regenerator-runtime: 0.14.1 - '@babel/standalone@7.26.7': {} - '@babel/template@7.26.8': dependencies: '@babel/code-frame': 7.26.2 @@ -15707,7 +14793,7 @@ snapshots: '@babel/parser': 7.26.8 '@babel/template': 7.26.8 '@babel/types': 7.26.8 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -15755,7 +14841,7 @@ snapshots: dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 - std-env: 3.8.0 + std-env: 3.8.1 swr: 2.3.0(react@19.0.0) optionalDependencies: react: 19.0.0 @@ -15777,7 +14863,7 @@ snapshots: dependencies: csstype: 3.1.3 - '@cloudflare/kv-asset-handler@0.3.4': + '@cloudflare/kv-asset-handler@0.4.0': dependencies: mime: 3.0.0 @@ -15820,13 +14906,6 @@ snapshots: '@csstools/css-tokenizer@3.0.3': {} - '@deno/shim-deno-test@0.5.0': {} - - '@deno/shim-deno@0.19.2': - dependencies: - '@deno/shim-deno-test': 0.5.0 - which: 4.0.0 - '@discoveryjs/json-ext@0.5.7': {} '@emnapi/core@1.3.1': @@ -15925,9 +15004,6 @@ snapshots: '@emotion/weak-memoize@0.4.0': {} - '@esbuild/aix-ppc64@0.20.2': - optional: true - '@esbuild/aix-ppc64@0.23.0': optional: true @@ -15937,10 +15013,7 @@ snapshots: '@esbuild/aix-ppc64@0.24.2': optional: true - '@esbuild/aix-ppc64@0.25.0': - optional: true - - '@esbuild/android-arm64@0.20.2': + '@esbuild/aix-ppc64@0.25.2': optional: true '@esbuild/android-arm64@0.23.0': @@ -15952,10 +15025,7 @@ snapshots: '@esbuild/android-arm64@0.24.2': optional: true - '@esbuild/android-arm64@0.25.0': - optional: true - - '@esbuild/android-arm@0.20.2': + '@esbuild/android-arm64@0.25.2': optional: true '@esbuild/android-arm@0.23.0': @@ -15967,10 +15037,7 @@ snapshots: '@esbuild/android-arm@0.24.2': optional: true - '@esbuild/android-arm@0.25.0': - optional: true - - '@esbuild/android-x64@0.20.2': + '@esbuild/android-arm@0.25.2': optional: true '@esbuild/android-x64@0.23.0': @@ -15982,10 +15049,7 @@ snapshots: '@esbuild/android-x64@0.24.2': optional: true - '@esbuild/android-x64@0.25.0': - optional: true - - '@esbuild/darwin-arm64@0.20.2': + '@esbuild/android-x64@0.25.2': optional: true '@esbuild/darwin-arm64@0.23.0': @@ -15997,10 +15061,7 @@ snapshots: '@esbuild/darwin-arm64@0.24.2': optional: true - '@esbuild/darwin-arm64@0.25.0': - optional: true - - '@esbuild/darwin-x64@0.20.2': + '@esbuild/darwin-arm64@0.25.2': optional: true '@esbuild/darwin-x64@0.23.0': @@ -16012,10 +15073,7 @@ snapshots: '@esbuild/darwin-x64@0.24.2': optional: true - '@esbuild/darwin-x64@0.25.0': - optional: true - - '@esbuild/freebsd-arm64@0.20.2': + '@esbuild/darwin-x64@0.25.2': optional: true '@esbuild/freebsd-arm64@0.23.0': @@ -16027,10 +15085,7 @@ snapshots: '@esbuild/freebsd-arm64@0.24.2': optional: true - '@esbuild/freebsd-arm64@0.25.0': - optional: true - - '@esbuild/freebsd-x64@0.20.2': + '@esbuild/freebsd-arm64@0.25.2': optional: true '@esbuild/freebsd-x64@0.23.0': @@ -16042,10 +15097,7 @@ snapshots: '@esbuild/freebsd-x64@0.24.2': optional: true - '@esbuild/freebsd-x64@0.25.0': - optional: true - - '@esbuild/linux-arm64@0.20.2': + '@esbuild/freebsd-x64@0.25.2': optional: true '@esbuild/linux-arm64@0.23.0': @@ -16057,10 +15109,7 @@ snapshots: '@esbuild/linux-arm64@0.24.2': optional: true - '@esbuild/linux-arm64@0.25.0': - optional: true - - '@esbuild/linux-arm@0.20.2': + '@esbuild/linux-arm64@0.25.2': optional: true '@esbuild/linux-arm@0.23.0': @@ -16072,10 +15121,7 @@ snapshots: '@esbuild/linux-arm@0.24.2': optional: true - '@esbuild/linux-arm@0.25.0': - optional: true - - '@esbuild/linux-ia32@0.20.2': + '@esbuild/linux-arm@0.25.2': optional: true '@esbuild/linux-ia32@0.23.0': @@ -16087,10 +15133,7 @@ snapshots: '@esbuild/linux-ia32@0.24.2': optional: true - '@esbuild/linux-ia32@0.25.0': - optional: true - - '@esbuild/linux-loong64@0.20.2': + '@esbuild/linux-ia32@0.25.2': optional: true '@esbuild/linux-loong64@0.23.0': @@ -16102,10 +15145,7 @@ snapshots: '@esbuild/linux-loong64@0.24.2': optional: true - '@esbuild/linux-loong64@0.25.0': - optional: true - - '@esbuild/linux-mips64el@0.20.2': + '@esbuild/linux-loong64@0.25.2': optional: true '@esbuild/linux-mips64el@0.23.0': @@ -16117,10 +15157,7 @@ snapshots: '@esbuild/linux-mips64el@0.24.2': optional: true - '@esbuild/linux-mips64el@0.25.0': - optional: true - - '@esbuild/linux-ppc64@0.20.2': + '@esbuild/linux-mips64el@0.25.2': optional: true '@esbuild/linux-ppc64@0.23.0': @@ -16132,10 +15169,7 @@ snapshots: '@esbuild/linux-ppc64@0.24.2': optional: true - '@esbuild/linux-ppc64@0.25.0': - optional: true - - '@esbuild/linux-riscv64@0.20.2': + '@esbuild/linux-ppc64@0.25.2': optional: true '@esbuild/linux-riscv64@0.23.0': @@ -16147,10 +15181,7 @@ snapshots: '@esbuild/linux-riscv64@0.24.2': optional: true - '@esbuild/linux-riscv64@0.25.0': - optional: true - - '@esbuild/linux-s390x@0.20.2': + '@esbuild/linux-riscv64@0.25.2': optional: true '@esbuild/linux-s390x@0.23.0': @@ -16162,10 +15193,7 @@ snapshots: '@esbuild/linux-s390x@0.24.2': optional: true - '@esbuild/linux-s390x@0.25.0': - optional: true - - '@esbuild/linux-x64@0.20.2': + '@esbuild/linux-s390x@0.25.2': optional: true '@esbuild/linux-x64@0.23.0': @@ -16177,16 +15205,13 @@ snapshots: '@esbuild/linux-x64@0.24.2': optional: true - '@esbuild/linux-x64@0.25.0': + '@esbuild/linux-x64@0.25.2': optional: true '@esbuild/netbsd-arm64@0.24.2': optional: true - '@esbuild/netbsd-arm64@0.25.0': - optional: true - - '@esbuild/netbsd-x64@0.20.2': + '@esbuild/netbsd-arm64@0.25.2': optional: true '@esbuild/netbsd-x64@0.23.0': @@ -16198,7 +15223,7 @@ snapshots: '@esbuild/netbsd-x64@0.24.2': optional: true - '@esbuild/netbsd-x64@0.25.0': + '@esbuild/netbsd-x64@0.25.2': optional: true '@esbuild/openbsd-arm64@0.23.0': @@ -16210,10 +15235,7 @@ snapshots: '@esbuild/openbsd-arm64@0.24.2': optional: true - '@esbuild/openbsd-arm64@0.25.0': - optional: true - - '@esbuild/openbsd-x64@0.20.2': + '@esbuild/openbsd-arm64@0.25.2': optional: true '@esbuild/openbsd-x64@0.23.0': @@ -16225,10 +15247,7 @@ snapshots: '@esbuild/openbsd-x64@0.24.2': optional: true - '@esbuild/openbsd-x64@0.25.0': - optional: true - - '@esbuild/sunos-x64@0.20.2': + '@esbuild/openbsd-x64@0.25.2': optional: true '@esbuild/sunos-x64@0.23.0': @@ -16240,10 +15259,7 @@ snapshots: '@esbuild/sunos-x64@0.24.2': optional: true - '@esbuild/sunos-x64@0.25.0': - optional: true - - '@esbuild/win32-arm64@0.20.2': + '@esbuild/sunos-x64@0.25.2': optional: true '@esbuild/win32-arm64@0.23.0': @@ -16255,10 +15271,7 @@ snapshots: '@esbuild/win32-arm64@0.24.2': optional: true - '@esbuild/win32-arm64@0.25.0': - optional: true - - '@esbuild/win32-ia32@0.20.2': + '@esbuild/win32-arm64@0.25.2': optional: true '@esbuild/win32-ia32@0.23.0': @@ -16270,10 +15283,7 @@ snapshots: '@esbuild/win32-ia32@0.24.2': optional: true - '@esbuild/win32-ia32@0.25.0': - optional: true - - '@esbuild/win32-x64@0.20.2': + '@esbuild/win32-ia32@0.25.2': optional: true '@esbuild/win32-x64@0.23.0': @@ -16285,7 +15295,7 @@ snapshots: '@esbuild/win32-x64@0.24.2': optional: true - '@esbuild/win32-x64@0.25.0': + '@esbuild/win32-x64@0.25.2': optional: true '@eslint-community/eslint-utils@4.4.1(eslint@9.22.0(jiti@2.4.2))': @@ -16391,7 +15401,7 @@ snapshots: '@eslint/config-array@0.19.2': dependencies: '@eslint/object-schema': 2.1.6 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -16405,7 +15415,7 @@ snapshots: '@eslint/eslintrc@3.3.0': dependencies: ajv: 6.12.6 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 @@ -16877,7 +15887,7 @@ snapshots: '@kwsites/file-exists@1.1.1': dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -16887,12 +15897,12 @@ snapshots: '@mapbox/node-pre-gyp@2.0.0': dependencies: - consola: 3.4.0 + consola: 3.4.2 detect-libc: 2.0.3 - https-proxy-agent: 7.0.6(supports-color@9.4.0) + https-proxy-agent: 7.0.6 node-fetch: 2.7.0 nopt: 8.1.0 - semver: 7.7.0 + semver: 7.7.1 tar: 7.4.3 transitivePeerDependencies: - encoding @@ -17072,16 +16082,11 @@ snapshots: '@emnapi/runtime': 1.3.1 '@tybys/wasm-util': 0.9.0 - '@netlify/functions@2.8.2': + '@netlify/functions@3.0.4': dependencies: - '@netlify/serverless-functions-api': 1.26.1 + '@netlify/serverless-functions-api': 1.36.0 - '@netlify/node-cookies@0.1.0': {} - - '@netlify/serverless-functions-api@1.26.1': - dependencies: - '@netlify/node-cookies': 0.1.0 - urlpattern-polyfill: 8.0.2 + '@netlify/serverless-functions-api@1.36.0': {} '@nodelib/fs.scandir@2.1.5': dependencies: @@ -17127,6 +16132,23 @@ snapshots: '@nx/nx-win32-x64-msvc@20.8.1': optional: true + '@oozcitak/dom@1.15.10': + dependencies: + '@oozcitak/infra': 1.0.8 + '@oozcitak/url': 1.0.4 + '@oozcitak/util': 8.3.8 + + '@oozcitak/infra@1.0.8': + dependencies: + '@oozcitak/util': 8.3.8 + + '@oozcitak/url@1.0.4': + dependencies: + '@oozcitak/infra': 1.0.8 + '@oozcitak/util': 8.3.8 + + '@oozcitak/util@8.3.8': {} + '@open-draft/deferred-promise@2.2.0': {} '@open-draft/logger@0.3.0': @@ -17166,11 +16188,6 @@ snapshots: '@parcel/watcher-linux-x64-musl@2.5.1': optional: true - '@parcel/watcher-wasm@2.3.0': - dependencies: - is-glob: 4.0.3 - micromatch: 4.0.8 - '@parcel/watcher-wasm@2.5.1': dependencies: is-glob: 4.0.3 @@ -17235,6 +16252,18 @@ snapshots: '@popperjs/core@2.11.8': {} + '@poppinss/colors@4.1.4': + dependencies: + kleur: 4.1.5 + + '@poppinss/dumper@0.6.3': + dependencies: + '@poppinss/colors': 4.1.4 + '@sindresorhus/is': 7.0.1 + supports-color: 10.0.0 + + '@poppinss/exception@1.2.1': {} + '@prisma/client@5.22.0(prisma@5.22.0)': optionalDependencies: prisma: 5.22.0 @@ -17289,8 +16318,6 @@ snapshots: '@radix-ui/number@1.1.1': {} - '@radix-ui/primitive@1.1.1': {} - '@radix-ui/primitive@1.1.2': {} '@radix-ui/react-accessible-icon@1.1.3(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': @@ -17407,12 +16434,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-compose-refs@1.1.1(@types/react@19.0.8)(react@19.0.0)': - dependencies: - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-compose-refs@1.1.2(@types/react@19.0.8)(react@19.0.0)': dependencies: react: 19.0.0 @@ -17433,40 +16454,12 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-context@1.1.1(@types/react@19.0.8)(react@19.0.0)': - dependencies: - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-context@1.1.2(@types/react@19.0.8)(react@19.0.0)': dependencies: react: 19.0.0 optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-dialog@1.1.6(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/primitive': 1.1.1 - '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-context': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-dismissable-layer': 1.1.5(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-focus-guards': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-focus-scope': 1.1.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-id': 1.1.0(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-portal': 1.1.4(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-presence': 1.1.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-slot': 1.1.2(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@19.0.8)(react@19.0.0) - aria-hidden: 1.2.4 - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - react-remove-scroll: 2.6.3(@types/react@19.0.8)(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-dialog@1.1.7(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/primitive': 1.1.2 @@ -17495,19 +16488,6 @@ snapshots: optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-dismissable-layer@1.1.5(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/primitive': 1.1.1 - '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-dismissable-layer@1.1.6(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/primitive': 1.1.2 @@ -17536,29 +16516,12 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-focus-guards@1.1.1(@types/react@19.0.8)(react@19.0.0)': - dependencies: - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-focus-guards@1.1.2(@types/react@19.0.8)(react@19.0.0)': dependencies: react: 19.0.0 optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-focus-scope@1.1.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-focus-scope@1.1.3(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.0.8)(react@19.0.0) @@ -17601,13 +16564,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-id@1.1.0(@types/react@19.0.8)(react@19.0.0)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-id@1.1.1(@types/react@19.0.8)(react@19.0.0)': dependencies: '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.0.8)(react@19.0.0) @@ -17731,16 +16687,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-portal@1.1.4(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-portal@1.1.5(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) @@ -17751,16 +16697,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-presence@1.1.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.8)(react@19.0.0) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-presence@1.1.3(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.0.8)(react@19.0.0) @@ -17771,15 +16707,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-primitive@2.0.2(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': - dependencies: - '@radix-ui/react-slot': 1.1.2(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - react-dom: 19.0.0(react@19.0.0) - optionalDependencies: - '@types/react': 19.0.8 - '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-primitive@2.0.3(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@radix-ui/react-slot': 1.2.0(@types/react@19.0.8)(react@19.0.0) @@ -17908,13 +16835,6 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-slot@1.1.2(@types/react@19.0.8)(react@19.0.0)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-slot@1.2.0(@types/react@19.0.8)(react@19.0.0)': dependencies: '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.0.8)(react@19.0.0) @@ -18034,25 +16954,12 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@radix-ui/react-use-callback-ref@1.1.0(@types/react@19.0.8)(react@19.0.0)': - dependencies: - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.0.8)(react@19.0.0)': dependencies: react: 19.0.0 optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-use-controllable-state@1.1.0(@types/react@19.0.8)(react@19.0.0)': - dependencies: - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-use-controllable-state@1.1.1(@types/react@19.0.8)(react@19.0.0)': dependencies: '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.0.8)(react@19.0.0) @@ -18060,13 +16967,6 @@ snapshots: optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@19.0.8)(react@19.0.0)': - dependencies: - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@19.0.8)(react@19.0.0) - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.0.8)(react@19.0.0)': dependencies: '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.0.8)(react@19.0.0) @@ -18074,12 +16974,6 @@ snapshots: optionalDependencies: '@types/react': 19.0.8 - '@radix-ui/react-use-layout-effect@1.1.0(@types/react@19.0.8)(react@19.0.0)': - dependencies: - react: 19.0.0 - optionalDependencies: - '@types/react': 19.0.8 - '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.0.8)(react@19.0.0)': dependencies: react: 19.0.0 @@ -18129,47 +17023,13 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@redocly/ajv@8.11.2': - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js-replace: 1.0.1 - - '@redocly/config@0.20.3': {} - - '@redocly/openapi-core@1.28.0(supports-color@9.4.0)': - dependencies: - '@redocly/ajv': 8.11.2 - '@redocly/config': 0.20.3 - colorette: 1.4.0 - https-proxy-agent: 7.0.6(supports-color@9.4.0) - js-levenshtein: 1.1.6 - js-yaml: 4.1.0 - minimatch: 5.1.6 - pluralize: 8.0.0 - yaml-ast-parser: 0.0.43 - transitivePeerDependencies: - - supports-color - - '@rollup/plugin-alias@5.1.1(rollup@4.39.0)': + '@rollup/plugin-alias@5.1.1(rollup@4.38.0)': optionalDependencies: - rollup: 4.39.0 - - '@rollup/plugin-babel@6.0.4(@babel/core@7.26.8)(@types/babel__core@7.20.5)(rollup@4.39.0)': - dependencies: - '@babel/core': 7.26.8 - '@babel/helper-module-imports': 7.25.9 - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) - optionalDependencies: - '@types/babel__core': 7.20.5 - rollup: 4.39.0 - transitivePeerDependencies: - - supports-color + rollup: 4.38.0 - '@rollup/plugin-commonjs@28.0.2(rollup@4.39.0)': + '@rollup/plugin-commonjs@28.0.3(rollup@4.38.0)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) commondir: 1.0.1 estree-walker: 2.0.2 fdir: 6.4.3(picomatch@4.0.2) @@ -18177,113 +17037,113 @@ snapshots: magic-string: 0.30.17 picomatch: 4.0.2 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/plugin-inject@5.0.5(rollup@4.39.0)': + '@rollup/plugin-inject@5.0.5(rollup@4.38.0)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) estree-walker: 2.0.2 magic-string: 0.30.17 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/plugin-json@6.1.0(rollup@4.39.0)': + '@rollup/plugin-json@6.1.0(rollup@4.38.0)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/plugin-node-resolve@15.3.1(rollup@4.39.0)': + '@rollup/plugin-node-resolve@16.0.1(rollup@4.38.0)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.10 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/plugin-replace@6.0.2(rollup@4.39.0)': + '@rollup/plugin-replace@6.0.2(rollup@4.38.0)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) magic-string: 0.30.17 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/plugin-terser@0.4.4(rollup@4.39.0)': + '@rollup/plugin-terser@0.4.4(rollup@4.38.0)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.37.0 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/pluginutils@5.1.4(rollup@4.39.0)': + '@rollup/pluginutils@5.1.4(rollup@4.38.0)': dependencies: '@types/estree': 1.0.7 estree-walker: 2.0.2 picomatch: 4.0.2 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - '@rollup/rollup-android-arm-eabi@4.39.0': + '@rollup/rollup-android-arm-eabi@4.38.0': optional: true - '@rollup/rollup-android-arm64@4.39.0': + '@rollup/rollup-android-arm64@4.38.0': optional: true - '@rollup/rollup-darwin-arm64@4.39.0': + '@rollup/rollup-darwin-arm64@4.38.0': optional: true - '@rollup/rollup-darwin-x64@4.39.0': + '@rollup/rollup-darwin-x64@4.38.0': optional: true - '@rollup/rollup-freebsd-arm64@4.39.0': + '@rollup/rollup-freebsd-arm64@4.38.0': optional: true - '@rollup/rollup-freebsd-x64@4.39.0': + '@rollup/rollup-freebsd-x64@4.38.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.39.0': + '@rollup/rollup-linux-arm-gnueabihf@4.38.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.39.0': + '@rollup/rollup-linux-arm-musleabihf@4.38.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.39.0': + '@rollup/rollup-linux-arm64-gnu@4.38.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.39.0': + '@rollup/rollup-linux-arm64-musl@4.38.0': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.39.0': + '@rollup/rollup-linux-loongarch64-gnu@4.38.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.39.0': + '@rollup/rollup-linux-powerpc64le-gnu@4.38.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.39.0': + '@rollup/rollup-linux-riscv64-gnu@4.38.0': optional: true - '@rollup/rollup-linux-riscv64-musl@4.39.0': + '@rollup/rollup-linux-riscv64-musl@4.38.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.39.0': + '@rollup/rollup-linux-s390x-gnu@4.38.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.39.0': + '@rollup/rollup-linux-x64-gnu@4.38.0': optional: true - '@rollup/rollup-linux-x64-musl@4.39.0': + '@rollup/rollup-linux-x64-musl@4.38.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.39.0': + '@rollup/rollup-win32-arm64-msvc@4.38.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.39.0': + '@rollup/rollup-win32-ia32-msvc@4.38.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.39.0': + '@rollup/rollup-win32-x64-msvc@4.38.0': optional: true '@rsbuild/core@1.2.4': @@ -18582,6 +17442,8 @@ snapshots: '@sindresorhus/is@4.6.0': {} + '@sindresorhus/is@7.0.1': {} + '@sindresorhus/merge-streams@2.3.0': {} '@solid-devtools/debugger@0.26.0(solid-js@1.9.5)': @@ -18708,6 +17570,8 @@ snapshots: '@testing-library/dom': 10.4.0 solid-js: 1.9.5 + '@speed-highlight/core@1.2.7': {} + '@stylistic/eslint-plugin-js@2.13.0(eslint@9.22.0(jiti@2.4.2))': dependencies: eslint: 9.22.0(jiti@2.4.2) @@ -18880,13 +17744,13 @@ snapshots: tailwindcss: 4.0.8 vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.0)(eslint@9.22.0(jiti@2.4.2))(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@commitlint/parse': 19.5.0 '@eslint/js': 9.22.0 '@stylistic/eslint-plugin-js': 2.13.0(eslint@9.22.0(jiti@2.4.2)) commander: 13.1.0 - esbuild-register: 3.6.0(esbuild@0.25.0) + esbuild-register: 3.6.0(esbuild@0.25.2) eslint-plugin-import-x: 4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) eslint-plugin-n: 17.15.1(eslint@9.22.0(jiti@2.4.2)) globals: 15.14.0 @@ -18894,15 +17758,15 @@ snapshots: jsonfile: 6.1.0 liftoff: 5.0.0 minimist: 1.2.8 - rollup-plugin-preserve-directives: 0.4.0(rollup@4.39.0) - semver: 7.7.0 + rollup-plugin-preserve-directives: 0.4.0(rollup@4.38.0) + semver: 7.7.1 simple-git: 3.27.0 typedoc: 0.27.6(typescript@5.8.2) typedoc-plugin-frontmatter: 1.1.2(typedoc-plugin-markdown@4.4.1(typedoc@0.27.6(typescript@5.8.2))) typedoc-plugin-markdown: 4.4.1(typedoc@0.27.6(typescript@5.8.2)) typescript-eslint: 8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) v8flags: 4.0.1 - vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-plugin-externalize-deps: 0.9.0(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vue-eslint-parser: 9.4.3(eslint@9.22.0(jiti@2.4.2)) @@ -18917,11 +17781,11 @@ snapshots: '@tanstack/query-core@5.66.0': {} - '@tanstack/query-core@5.71.5': {} + '@tanstack/query-core@5.72.2': {} '@tanstack/query-devtools@5.67.2': {} - '@tanstack/query-devtools@5.71.5': {} + '@tanstack/query-devtools@5.72.2': {} '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.66.0(react@19.0.0))(react@19.0.0)': dependencies: @@ -18947,15 +17811,15 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) - '@tanstack/solid-query-devtools@5.71.9(@tanstack/solid-query@5.71.9(solid-js@1.9.5))(solid-js@1.9.5)': + '@tanstack/solid-query-devtools@5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5)': dependencies: - '@tanstack/query-devtools': 5.71.5 - '@tanstack/solid-query': 5.71.9(solid-js@1.9.5) + '@tanstack/query-devtools': 5.72.2 + '@tanstack/solid-query': 5.72.2(solid-js@1.9.5) solid-js: 1.9.5 - '@tanstack/solid-query@5.71.9(solid-js@1.9.5)': + '@tanstack/solid-query@5.72.2(solid-js@1.9.5)': dependencies: - '@tanstack/query-core': 5.71.5 + '@tanstack/query-core': 5.72.2 solid-js: 1.9.5 '@tanstack/solid-store@0.7.0(solid-js@1.9.5)': @@ -19069,8 +17933,6 @@ snapshots: dependencies: '@types/node': 22.13.4 - '@types/braces@3.0.5': {} - '@types/connect-history-api-fallback@1.5.4': dependencies: '@types/express-serve-static-core': 5.0.6 @@ -19173,10 +18035,6 @@ snapshots: '@types/koa-compose': 3.2.8 '@types/node': 22.13.4 - '@types/micromatch@4.0.9': - dependencies: - '@types/braces': 3.0.5 - '@types/mime@1.3.5': {} '@types/node-forge@1.3.11': @@ -19273,7 +18131,7 @@ snapshots: '@typescript-eslint/types': 8.22.0 '@typescript-eslint/typescript-estree': 8.22.0(typescript@5.8.2) '@typescript-eslint/visitor-keys': 8.22.0 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 eslint: 9.22.0(jiti@2.4.2) typescript: 5.8.2 transitivePeerDependencies: @@ -19287,7 +18145,7 @@ snapshots: eslint: 9.22.0(jiti@2.4.2) json-stable-stringify-without-jsonify: 1.0.1 lodash.merge: 4.6.2 - semver: 7.7.0 + semver: 7.7.1 transitivePeerDependencies: - supports-color - typescript @@ -19306,7 +18164,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 8.22.0(typescript@5.8.2) '@typescript-eslint/utils': 8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 eslint: 9.22.0(jiti@2.4.2) ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 @@ -19317,7 +18175,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 8.23.0(typescript@5.8.2) '@typescript-eslint/utils': 8.23.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 eslint: 9.22.0(jiti@2.4.2) ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 @@ -19332,11 +18190,11 @@ snapshots: dependencies: '@typescript-eslint/types': 8.22.0 '@typescript-eslint/visitor-keys': 8.22.0 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.0 + semver: 7.7.1 ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 transitivePeerDependencies: @@ -19346,11 +18204,11 @@ snapshots: dependencies: '@typescript-eslint/types': 8.23.0 '@typescript-eslint/visitor-keys': 8.23.0 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.0 + semver: 7.7.1 ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 transitivePeerDependencies: @@ -19388,16 +18246,16 @@ snapshots: '@typescript-eslint/types': 8.23.0 eslint-visitor-keys: 4.2.0 - '@vercel/nft@0.27.10(rollup@4.39.0)': + '@vercel/nft@0.29.2(rollup@4.38.0)': dependencies: '@mapbox/node-pre-gyp': 2.0.0 - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) - acorn: 8.14.0 - acorn-import-attributes: 1.9.5(acorn@8.14.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + acorn: 8.14.1 + acorn-import-attributes: 1.9.5(acorn@8.14.1) async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 - glob: 7.2.3 + glob: 10.4.5 graceful-fs: 4.2.11 node-gyp-build: 4.8.4 picomatch: 4.0.2 @@ -19407,26 +18265,6 @@ snapshots: - rollup - supports-color - '@vinxi/listhen@1.5.6': - dependencies: - '@parcel/watcher': 2.5.1 - '@parcel/watcher-wasm': 2.3.0 - citty: 0.1.6 - clipboardy: 4.0.0 - consola: 3.4.0 - defu: 6.1.4 - get-port-please: 3.1.2 - h3: 1.13.0 - http-shutdown: 1.2.2 - jiti: 1.21.7 - mlly: 1.7.4 - node-forge: 1.3.1 - pathe: 1.1.2 - std-env: 3.8.0 - ufo: 1.5.4 - untun: 0.1.3 - uqr: 0.1.2 - '@vitejs/plugin-react@4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@babel/core': 7.26.8 @@ -19647,22 +18485,22 @@ snapshots: '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) - '@workos-inc/node@7.45.0(express@4.21.2)': + '@workos-inc/node@7.46.0(express@4.21.2)': dependencies: iron-session: 6.3.1(express@4.21.2) jose: 5.6.3 @@ -19704,19 +18542,19 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 - acorn-import-attributes@1.9.5(acorn@8.14.0): + acorn-import-attributes@1.9.5(acorn@8.14.1): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 - acorn-jsx@5.3.2(acorn@8.14.0): + acorn-jsx@5.3.2(acorn@8.14.1): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 - acorn@8.14.0: {} + acorn@8.14.1: {} agent-base@6.0.2: dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -19773,10 +18611,6 @@ snapshots: alien-signals@0.4.14: {} - ansi-align@3.0.1: - dependencies: - string-width: 4.2.3 - ansi-colors@4.1.3: {} ansi-escapes@4.3.2: @@ -19911,7 +18745,7 @@ snapshots: '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.8) '@babel/types': 7.26.8 html-entities: 2.3.3 - parse5: 7.2.1 + parse5: 7.3.0 validate-html-nesting: 1.2.2 babel-plugin-macros@3.1.0: @@ -19972,17 +18806,6 @@ snapshots: boolbase@1.0.0: {} - boxen@7.1.1: - dependencies: - ansi-align: 3.0.1 - camelcase: 7.0.1 - chalk: 5.4.1 - cli-boxes: 3.0.0 - string-width: 5.1.2 - type-fest: 2.19.0 - widest-line: 4.0.1 - wrap-ansi: 8.1.0 - brace-expansion@1.1.11: dependencies: balanced-match: 1.0.2 @@ -20023,19 +18846,19 @@ snapshots: bytes@3.1.2: {} - c12@2.0.1(magicast@0.3.5): + c12@3.0.2(magicast@0.3.5): dependencies: chokidar: 4.0.3 confbox: 0.1.8 defu: 6.1.4 dotenv: 16.4.7 - giget: 1.2.4 + exsolve: 1.0.4 + giget: 2.0.0 jiti: 2.4.2 - mlly: 1.7.4 - ohash: 1.1.4 - pathe: 1.1.2 + ohash: 2.0.11 + pathe: 2.0.3 perfect-debounce: 1.0.0 - pkg-types: 1.3.1 + pkg-types: 2.1.0 rc9: 2.1.2 optionalDependencies: magicast: 0.3.5 @@ -20061,8 +18884,6 @@ snapshots: camelcase-css@2.0.1: {} - camelcase@7.0.1: {} - caniuse-lite@1.0.30001696: {} chai@5.2.0: @@ -20085,12 +18906,33 @@ snapshots: chalk@5.4.1: {} - change-case@5.4.4: {} - char-regex@1.0.2: {} check-error@2.1.1: {} + cheerio-select@2.1.0: + dependencies: + boolbase: 1.0.0 + css-select: 5.1.0 + css-what: 6.1.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 + domutils: 3.2.2 + + cheerio@1.0.0: + dependencies: + cheerio-select: 2.1.0 + dom-serializer: 2.0.0 + domhandler: 5.0.3 + domutils: 3.2.2 + encoding-sniffer: 0.2.0 + htmlparser2: 9.1.0 + parse5: 7.3.0 + parse5-htmlparser2-tree-adapter: 7.1.0 + parse5-parser-stream: 7.1.2 + undici: 6.21.2 + whatwg-mimetype: 4.0.0 + chokidar@3.6.0: dependencies: anymatch: 3.1.3 @@ -20107,15 +18949,13 @@ snapshots: dependencies: readdirp: 4.1.1 - chownr@2.0.0: {} - chownr@3.0.0: {} chrome-trace-event@1.0.4: {} citty@0.1.6: dependencies: - consola: 3.4.0 + consola: 3.4.2 cjs-module-lexer@1.4.3: {} @@ -20125,8 +18965,6 @@ snapshots: dependencies: source-map: 0.6.1 - cli-boxes@3.0.0: {} - cli-cursor@3.1.0: dependencies: restore-cursor: 3.1.0 @@ -20186,8 +19024,6 @@ snapshots: color-name@1.1.4: {} - colorette@1.4.0: {} - colorette@2.0.20: {} combinate@1.1.11: {} @@ -20259,9 +19095,11 @@ snapshots: confbox@0.1.8: {} + confbox@0.2.1: {} + connect-history-api-fallback@2.0.0: {} - consola@3.4.0: {} + consola@3.4.2: {} content-disposition@0.5.4: dependencies: @@ -20296,6 +19134,8 @@ snapshots: cookie-es@1.2.2: {} + cookie-es@2.0.0: {} + cookie-signature@1.0.6: {} cookie@0.5.0: {} @@ -20306,10 +19146,6 @@ snapshots: cookie@1.0.2: {} - copy-anything@3.0.5: - dependencies: - is-what: 4.1.16 - core-js@3.40.0: {} core-util-is@1.0.3: {} @@ -20337,7 +19173,7 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - crossws@0.3.3: + crossws@0.3.4: dependencies: uncrypto: 0.1.3 @@ -20349,6 +19185,14 @@ snapshots: domutils: 2.8.0 nth-check: 2.1.1 + css-select@5.1.0: + dependencies: + boolbase: 1.0.0 + css-what: 6.1.0 + domhandler: 5.0.3 + domutils: 3.2.2 + nth-check: 2.1.1 + css-what@6.1.0: {} css.escape@1.5.1: {} @@ -20362,8 +19206,6 @@ snapshots: csstype@3.1.3: {} - data-uri-to-buffer@4.0.1: {} - data-urls@5.0.0: dependencies: whatwg-mimetype: 4.0.0 @@ -20373,12 +19215,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 - dax-sh@0.39.2: - dependencies: - '@deno/shim-deno': 0.19.2 - undici-types: 5.28.4 - - db0@0.2.3: {} + db0@0.3.1: {} de-indent@1.0.2: {} @@ -20390,11 +19227,9 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.4.0(supports-color@9.4.0): + debug@4.4.0: dependencies: ms: 2.1.3 - optionalDependencies: - supports-color: 9.4.0 decimal.js@10.5.0: {} @@ -20484,18 +19319,34 @@ snapshots: domhandler: 4.3.1 entities: 2.2.0 + dom-serializer@2.0.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 5.0.3 + entities: 4.5.0 + domelementtype@2.3.0: {} domhandler@4.3.1: dependencies: domelementtype: 2.3.0 + domhandler@5.0.3: + dependencies: + domelementtype: 2.3.0 + domutils@2.8.0: dependencies: dom-serializer: 1.4.1 domelementtype: 2.3.0 domhandler: 4.3.1 + domutils@3.2.2: + dependencies: + dom-serializer: 2.0.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 + dot-case@3.0.4: dependencies: no-case: 3.0.4 @@ -20539,6 +19390,11 @@ snapshots: encodeurl@2.0.0: {} + encoding-sniffer@0.2.0: + dependencies: + iconv-lite: 0.6.3 + whatwg-encoding: 3.1.1 + end-of-stream@1.4.4: dependencies: once: 1.4.0 @@ -20556,6 +19412,8 @@ snapshots: entities@4.5.0: {} + entities@6.0.0: {} + envinfo@7.14.0: {} environment@1.1.0: {} @@ -20564,6 +19422,8 @@ snapshots: dependencies: is-arrayish: 0.2.1 + error-stack-parser-es@1.0.5: {} + error-stack-parser@2.1.4: dependencies: stackframe: 1.3.4 @@ -20578,49 +19438,23 @@ snapshots: dependencies: es-errors: 1.3.0 - esbuild-plugin-solid@0.6.0(esbuild@0.25.0)(solid-js@1.9.5): + esbuild-plugin-solid@0.6.0(esbuild@0.25.2)(solid-js@1.9.5): dependencies: '@babel/core': 7.26.8 '@babel/preset-typescript': 7.26.0(@babel/core@7.26.8) babel-preset-solid: 1.9.3(@babel/core@7.26.8) - esbuild: 0.25.0 + esbuild: 0.25.2 solid-js: 1.9.5 transitivePeerDependencies: - supports-color - esbuild-register@3.6.0(esbuild@0.25.0): + esbuild-register@3.6.0(esbuild@0.25.2): dependencies: - debug: 4.4.0(supports-color@9.4.0) - esbuild: 0.25.0 + debug: 4.4.0 + esbuild: 0.25.2 transitivePeerDependencies: - supports-color - esbuild@0.20.2: - optionalDependencies: - '@esbuild/aix-ppc64': 0.20.2 - '@esbuild/android-arm': 0.20.2 - '@esbuild/android-arm64': 0.20.2 - '@esbuild/android-x64': 0.20.2 - '@esbuild/darwin-arm64': 0.20.2 - '@esbuild/darwin-x64': 0.20.2 - '@esbuild/freebsd-arm64': 0.20.2 - '@esbuild/freebsd-x64': 0.20.2 - '@esbuild/linux-arm': 0.20.2 - '@esbuild/linux-arm64': 0.20.2 - '@esbuild/linux-ia32': 0.20.2 - '@esbuild/linux-loong64': 0.20.2 - '@esbuild/linux-mips64el': 0.20.2 - '@esbuild/linux-ppc64': 0.20.2 - '@esbuild/linux-riscv64': 0.20.2 - '@esbuild/linux-s390x': 0.20.2 - '@esbuild/linux-x64': 0.20.2 - '@esbuild/netbsd-x64': 0.20.2 - '@esbuild/openbsd-x64': 0.20.2 - '@esbuild/sunos-x64': 0.20.2 - '@esbuild/win32-arm64': 0.20.2 - '@esbuild/win32-ia32': 0.20.2 - '@esbuild/win32-x64': 0.20.2 - esbuild@0.23.0: optionalDependencies: '@esbuild/aix-ppc64': 0.23.0 @@ -20703,33 +19537,33 @@ snapshots: '@esbuild/win32-ia32': 0.24.2 '@esbuild/win32-x64': 0.24.2 - esbuild@0.25.0: + esbuild@0.25.2: optionalDependencies: - '@esbuild/aix-ppc64': 0.25.0 - '@esbuild/android-arm': 0.25.0 - '@esbuild/android-arm64': 0.25.0 - '@esbuild/android-x64': 0.25.0 - '@esbuild/darwin-arm64': 0.25.0 - '@esbuild/darwin-x64': 0.25.0 - '@esbuild/freebsd-arm64': 0.25.0 - '@esbuild/freebsd-x64': 0.25.0 - '@esbuild/linux-arm': 0.25.0 - '@esbuild/linux-arm64': 0.25.0 - '@esbuild/linux-ia32': 0.25.0 - '@esbuild/linux-loong64': 0.25.0 - '@esbuild/linux-mips64el': 0.25.0 - '@esbuild/linux-ppc64': 0.25.0 - '@esbuild/linux-riscv64': 0.25.0 - '@esbuild/linux-s390x': 0.25.0 - '@esbuild/linux-x64': 0.25.0 - '@esbuild/netbsd-arm64': 0.25.0 - '@esbuild/netbsd-x64': 0.25.0 - '@esbuild/openbsd-arm64': 0.25.0 - '@esbuild/openbsd-x64': 0.25.0 - '@esbuild/sunos-x64': 0.25.0 - '@esbuild/win32-arm64': 0.25.0 - '@esbuild/win32-ia32': 0.25.0 - '@esbuild/win32-x64': 0.25.0 + '@esbuild/aix-ppc64': 0.25.2 + '@esbuild/android-arm': 0.25.2 + '@esbuild/android-arm64': 0.25.2 + '@esbuild/android-x64': 0.25.2 + '@esbuild/darwin-arm64': 0.25.2 + '@esbuild/darwin-x64': 0.25.2 + '@esbuild/freebsd-arm64': 0.25.2 + '@esbuild/freebsd-x64': 0.25.2 + '@esbuild/linux-arm': 0.25.2 + '@esbuild/linux-arm64': 0.25.2 + '@esbuild/linux-ia32': 0.25.2 + '@esbuild/linux-loong64': 0.25.2 + '@esbuild/linux-mips64el': 0.25.2 + '@esbuild/linux-ppc64': 0.25.2 + '@esbuild/linux-riscv64': 0.25.2 + '@esbuild/linux-s390x': 0.25.2 + '@esbuild/linux-x64': 0.25.2 + '@esbuild/netbsd-arm64': 0.25.2 + '@esbuild/netbsd-x64': 0.25.2 + '@esbuild/openbsd-arm64': 0.25.2 + '@esbuild/openbsd-x64': 0.25.2 + '@esbuild/sunos-x64': 0.25.2 + '@esbuild/win32-arm64': 0.25.2 + '@esbuild/win32-ia32': 0.25.2 + '@esbuild/win32-x64': 0.25.2 escalade@3.2.0: {} @@ -20744,7 +19578,7 @@ snapshots: eslint-compat-utils@0.5.1(eslint@9.22.0(jiti@2.4.2)): dependencies: eslint: 9.22.0(jiti@2.4.2) - semver: 7.7.0 + semver: 7.7.1 eslint-import-resolver-node@0.3.9: dependencies: @@ -20766,7 +19600,7 @@ snapshots: '@types/doctrine': 0.0.9 '@typescript-eslint/scope-manager': 8.23.0 '@typescript-eslint/utils': 8.23.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 doctrine: 3.0.0 enhanced-resolve: 5.18.1 eslint: 9.22.0(jiti@2.4.2) @@ -20774,7 +19608,7 @@ snapshots: get-tsconfig: 4.10.0 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.0 + semver: 7.7.1 stable-hash: 0.0.4 tslib: 2.8.1 transitivePeerDependencies: @@ -20791,7 +19625,7 @@ snapshots: globals: 15.14.0 ignore: 5.3.2 minimatch: 9.0.5 - semver: 7.7.0 + semver: 7.7.1 eslint-plugin-react-debug@1.26.2(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): dependencies: @@ -20974,7 +19808,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 escape-string-regexp: 4.0.0 eslint-scope: 8.3.0 eslint-visitor-keys: 4.2.0 @@ -21000,14 +19834,14 @@ snapshots: espree@10.3.0: dependencies: - acorn: 8.14.0 - acorn-jsx: 5.3.2(acorn@8.14.0) + acorn: 8.14.1 + acorn-jsx: 5.3.2(acorn@8.14.1) eslint-visitor-keys: 4.2.0 espree@9.6.1: dependencies: - acorn: 8.14.0 - acorn-jsx: 5.3.2(acorn@8.14.0) + acorn: 8.14.1 + acorn-jsx: 5.3.2(acorn@8.14.1) eslint-visitor-keys: 3.4.3 esprima@4.0.1: {} @@ -21094,6 +19928,8 @@ snapshots: transitivePeerDependencies: - supports-color + exsolve@1.0.4: {} + extend@3.0.2: {} fast-deep-equal@3.1.3: {} @@ -21128,11 +19964,6 @@ snapshots: optionalDependencies: picomatch: 4.0.2 - fetch-blob@3.2.0: - dependencies: - node-domexception: 1.0.0 - web-streams-polyfill: 3.3.3 - fflate@0.8.2: {} figures@3.2.0: @@ -21251,10 +20082,6 @@ snapshots: combined-stream: 1.0.8 mime-types: 2.1.35 - formdata-polyfill@4.0.10: - dependencies: - fetch-blob: 3.2.0 - forwarded@0.2.0: {} fraction.js@4.3.7: {} @@ -21289,10 +20116,6 @@ snapshots: jsonfile: 4.0.0 universalify: 0.1.2 - fs-minipass@2.1.0: - dependencies: - minipass: 3.3.6 - fs.realpath@1.0.0: {} fsevents@2.3.2: @@ -21324,8 +20147,6 @@ snapshots: get-port-please@3.1.2: {} - get-port@7.1.0: {} - get-proto@1.0.1: dependencies: dunder-proto: 1.0.1 @@ -21337,16 +20158,14 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 - giget@1.2.4: + giget@2.0.0: dependencies: citty: 0.1.6 - consola: 3.4.0 + consola: 3.4.2 defu: 6.1.4 node-fetch-native: 1.6.6 - nypm: 0.5.2 - ohash: 1.1.4 + nypm: 0.6.0 pathe: 2.0.3 - tar: 6.2.1 glob-parent@5.1.2: dependencies: @@ -21374,16 +20193,7 @@ snapshots: minimatch: 10.0.1 minipass: 7.1.2 package-json-from-dist: 1.0.1 - path-scurry: 2.0.0 - - glob@7.2.3: - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 + path-scurry: 2.0.0 glob@9.3.5: dependencies: @@ -21412,14 +20222,14 @@ snapshots: globals@15.14.0: {} - globby@14.0.2: + globby@14.1.0: dependencies: '@sindresorhus/merge-streams': 2.3.0 fast-glob: 3.3.3 - ignore: 5.3.2 - path-type: 5.0.0 + ignore: 7.0.3 + path-type: 6.0.0 slash: 5.1.0 - unicorn-magic: 0.1.0 + unicorn-magic: 0.3.0 globrex@0.1.2: {} @@ -21442,7 +20252,7 @@ snapshots: h3@1.13.0: dependencies: cookie-es: 1.2.2 - crossws: 0.3.3 + crossws: 0.3.4 defu: 6.1.4 destr: 2.0.3 iron-webcrypto: 1.2.1 @@ -21452,6 +20262,18 @@ snapshots: uncrypto: 0.1.3 unenv: 1.10.0 + h3@1.15.1: + dependencies: + cookie-es: 1.2.2 + crossws: 0.3.4 + defu: 6.1.4 + destr: 2.0.3 + iron-webcrypto: 1.2.1 + node-mock-http: 1.0.0 + radix3: 1.1.2 + ufo: 1.5.4 + uncrypto: 0.1.3 + handle-thing@2.0.1: {} has-flag@4.0.0: {} @@ -21514,7 +20336,7 @@ snapshots: tapable: 2.2.1 optionalDependencies: '@rspack/core': 1.2.2(@swc/helpers@0.5.15) - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) htmlparser2@6.1.0: dependencies: @@ -21523,6 +20345,13 @@ snapshots: domutils: 2.8.0 entities: 2.2.0 + htmlparser2@9.1.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 5.0.3 + domutils: 3.2.2 + entities: 4.5.0 + http-deceiver@1.2.7: {} http-errors@1.6.3: @@ -21545,7 +20374,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.3 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -21574,14 +20403,14 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.6(supports-color@9.4.0): + https-proxy-agent@7.0.6: dependencies: agent-base: 7.1.3 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -21605,6 +20434,8 @@ snapshots: ignore@5.3.2: {} + ignore@7.0.3: {} + immer@10.1.1: {} import-fresh@3.3.0: @@ -21619,19 +20450,10 @@ snapshots: pkg-dir: 4.2.0 resolve-cwd: 3.0.0 - import-meta-resolve@4.1.0: {} - imurmurhash@0.1.4: {} indent-string@4.0.0: {} - index-to-position@0.1.2: {} - - inflight@1.0.6: - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - inherits@2.0.3: {} inherits@2.0.4: {} @@ -21642,11 +20464,11 @@ snapshots: interpret@3.1.1: {} - ioredis@5.4.2: + ioredis@5.6.0: dependencies: '@ioredis/commands': 1.2.0 cluster-key-slot: 1.1.2 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 denque: 2.1.0 lodash.defaults: 4.2.0 lodash.isarguments: 3.1.0 @@ -21795,8 +20617,6 @@ snapshots: isexe@2.0.0: {} - isexe@3.1.1: {} - isobject@3.0.1: {} isomorphic-rslog@0.0.6: {} @@ -21838,8 +20658,6 @@ snapshots: js-cookie@3.0.5: {} - js-levenshtein@1.1.6: {} - js-tokens@4.0.0: {} js-tokens@9.0.1: {} @@ -21861,7 +20679,7 @@ snapshots: form-data: 4.0.1 html-encoding-sniffer: 4.0.0 http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.6(supports-color@9.4.0) + https-proxy-agent: 7.0.6 is-potential-custom-element-name: 1.0.1 nwsapi: 2.2.16 parse5: 7.2.1 @@ -21919,6 +20737,8 @@ snapshots: kind-of@6.0.3: {} + kleur@4.1.5: {} + klona@2.0.6: {} knitwork@1.2.0: {} @@ -22016,8 +20836,8 @@ snapshots: '@parcel/watcher-wasm': 2.5.1 citty: 0.1.6 clipboardy: 4.0.0 - consola: 3.4.0 - crossws: 0.3.3 + consola: 3.4.2 + crossws: 0.3.4 defu: 6.1.4 get-port-please: 3.1.2 h3: 1.13.0 @@ -22026,7 +20846,7 @@ snapshots: mlly: 1.7.4 node-forge: 1.3.1 pathe: 1.1.2 - std-env: 3.8.0 + std-env: 3.8.1 ufo: 1.5.4 untun: 0.1.3 uqr: 0.1.2 @@ -22038,10 +20858,11 @@ snapshots: mlly: 1.7.4 pkg-types: 1.3.1 - local-pkg@1.0.0: + local-pkg@1.1.1: dependencies: mlly: 1.7.4 - pkg-types: 1.3.1 + pkg-types: 2.1.0 + quansync: 0.2.10 locate-path@5.0.0: dependencies: @@ -22218,33 +21039,20 @@ snapshots: minimist@1.2.8: {} - minipass@3.3.6: - dependencies: - yallist: 4.0.0 - minipass@4.2.8: {} - minipass@5.0.0: {} - minipass@7.1.2: {} - minizlib@2.1.2: - dependencies: - minipass: 3.3.6 - yallist: 4.0.0 - minizlib@3.0.1: dependencies: minipass: 7.1.2 rimraf: 5.0.10 - mkdirp@1.0.4: {} - mkdirp@3.0.1: {} mlly@1.7.4: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 pathe: 2.0.3 pkg-types: 1.3.1 ufo: 1.5.4 @@ -22313,44 +21121,42 @@ snapshots: neo-async@2.6.2: {} - nitropack@2.10.4(typescript@5.8.2): - dependencies: - '@cloudflare/kv-asset-handler': 0.3.4 - '@netlify/functions': 2.8.2 - '@rollup/plugin-alias': 5.1.1(rollup@4.39.0) - '@rollup/plugin-commonjs': 28.0.2(rollup@4.39.0) - '@rollup/plugin-inject': 5.0.5(rollup@4.39.0) - '@rollup/plugin-json': 6.1.0(rollup@4.39.0) - '@rollup/plugin-node-resolve': 15.3.1(rollup@4.39.0) - '@rollup/plugin-replace': 6.0.2(rollup@4.39.0) - '@rollup/plugin-terser': 0.4.4(rollup@4.39.0) - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) - '@types/http-proxy': 1.17.15 - '@vercel/nft': 0.27.10(rollup@4.39.0) + nitropack@2.11.8: + dependencies: + '@cloudflare/kv-asset-handler': 0.4.0 + '@netlify/functions': 3.0.4 + '@rollup/plugin-alias': 5.1.1(rollup@4.38.0) + '@rollup/plugin-commonjs': 28.0.3(rollup@4.38.0) + '@rollup/plugin-inject': 5.0.5(rollup@4.38.0) + '@rollup/plugin-json': 6.1.0(rollup@4.38.0) + '@rollup/plugin-node-resolve': 16.0.1(rollup@4.38.0) + '@rollup/plugin-replace': 6.0.2(rollup@4.38.0) + '@rollup/plugin-terser': 0.4.4(rollup@4.38.0) + '@vercel/nft': 0.29.2(rollup@4.38.0) archiver: 7.0.1 - c12: 2.0.1(magicast@0.3.5) - chokidar: 3.6.0 + c12: 3.0.2(magicast@0.3.5) + chokidar: 4.0.3 citty: 0.1.6 compatx: 0.1.8 - confbox: 0.1.8 - consola: 3.4.0 - cookie-es: 1.2.2 + confbox: 0.2.1 + consola: 3.4.2 + cookie-es: 2.0.0 croner: 9.0.0 - crossws: 0.3.3 - db0: 0.2.3 + crossws: 0.3.4 + db0: 0.3.1 defu: 6.1.4 destr: 2.0.3 dot-prop: 9.0.0 - esbuild: 0.24.2 + esbuild: 0.25.2 escape-string-regexp: 5.0.0 etag: 1.8.1 - fs-extra: 11.3.0 - globby: 14.0.2 + exsolve: 1.0.4 + globby: 14.1.0 gzip-size: 7.0.0 - h3: 1.13.0 + h3: 1.15.1 hookable: 5.5.3 httpxy: 0.1.7 - ioredis: 5.4.2 + ioredis: 5.6.0 jiti: 2.4.2 klona: 2.0.6 knitwork: 1.2.0 @@ -22360,29 +21166,34 @@ snapshots: mime: 4.0.6 mlly: 1.7.4 node-fetch-native: 1.6.6 + node-mock-http: 1.0.0 ofetch: 1.4.1 - ohash: 1.1.4 - openapi-typescript: 7.6.0(typescript@5.8.2) - pathe: 1.1.2 + ohash: 2.0.11 + pathe: 2.0.3 perfect-debounce: 1.0.0 - pkg-types: 1.3.1 + pkg-types: 2.1.0 pretty-bytes: 6.1.1 radix3: 1.1.2 - rollup: 4.39.0 - rollup-plugin-visualizer: 5.14.0(rollup@4.39.0) + rollup: 4.38.0 + rollup-plugin-visualizer: 5.14.0(rollup@4.38.0) scule: 1.3.0 - semver: 7.7.0 + semver: 7.7.1 serve-placeholder: 2.0.2 serve-static: 1.16.2 - std-env: 3.8.0 + source-map: 0.7.4 + std-env: 3.8.1 ufo: 1.5.4 + ultrahtml: 1.5.3 uncrypto: 0.1.3 unctx: 2.4.1 - unenv: 1.10.0 - unimport: 3.14.6(rollup@4.39.0) - unstorage: 1.14.4(db0@0.2.3)(ioredis@5.4.2) - untyped: 1.5.2 + unenv: 2.0.0-rc.15 + unimport: 4.1.3 + unplugin-utils: 0.2.4 + unstorage: 1.15.0(db0@0.3.1)(ioredis@5.6.0) + untyped: 2.0.0 unwasm: 0.3.9 + youch: 4.1.0-beta.7 + youch-core: 0.3.2 transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -22408,7 +21219,6 @@ snapshots: - rolldown - sqlite3 - supports-color - - typescript - uploadthing no-case@3.0.4: @@ -22418,8 +21228,6 @@ snapshots: node-addon-api@7.1.1: {} - node-domexception@1.0.0: {} - node-emoji@2.2.0: dependencies: '@sindresorhus/is': 4.6.0 @@ -22433,18 +21241,14 @@ snapshots: dependencies: whatwg-url: 5.0.0 - node-fetch@3.3.2: - dependencies: - data-uri-to-buffer: 4.0.1 - fetch-blob: 3.2.0 - formdata-polyfill: 4.0.10 - node-forge@1.3.1: {} node-gyp-build@4.8.4: {} node-machine-id@1.1.12: {} + node-mock-http@1.0.0: {} + node-releases@2.0.19: {} nopt@8.1.0: @@ -22496,7 +21300,7 @@ snapshots: open: 8.4.2 ora: 5.3.0 resolve.exports: 2.0.3 - semver: 7.7.0 + semver: 7.7.1 string-width: 4.2.3 tar-stream: 2.2.0 tmp: 0.2.3 @@ -22520,14 +21324,13 @@ snapshots: transitivePeerDependencies: - debug - nypm@0.5.2: + nypm@0.6.0: dependencies: citty: 0.1.6 - consola: 3.4.0 + consola: 3.4.2 pathe: 2.0.3 - pkg-types: 1.3.1 + pkg-types: 2.1.0 tinyexec: 0.3.2 - ufo: 1.5.4 object-assign@4.1.1: {} @@ -22556,6 +21359,8 @@ snapshots: ohash@1.1.4: {} + ohash@2.0.11: {} + on-finished@2.4.1: dependencies: ee-first: 1.1.1 @@ -22587,16 +21392,6 @@ snapshots: is-docker: 2.2.1 is-wsl: 2.2.0 - openapi-typescript@7.6.0(typescript@5.8.2): - dependencies: - '@redocly/openapi-core': 1.28.0(supports-color@9.4.0) - ansi-colors: 4.1.3 - change-case: 5.4.4 - parse-json: 8.1.0 - supports-color: 9.4.0 - typescript: 5.8.2 - yargs-parser: 21.1.1 - optionator@0.9.4: dependencies: deep-is: 0.1.4 @@ -22669,18 +21464,21 @@ snapshots: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 - parse-json@8.1.0: - dependencies: - '@babel/code-frame': 7.26.2 - index-to-position: 0.1.2 - type-fest: 4.33.0 - parse-passwd@1.0.0: {} parse5-htmlparser2-tree-adapter@6.0.1: dependencies: parse5: 6.0.1 + parse5-htmlparser2-tree-adapter@7.1.0: + dependencies: + domhandler: 5.0.3 + parse5: 7.3.0 + + parse5-parser-stream@7.1.2: + dependencies: + parse5: 7.3.0 + parse5@5.1.1: {} parse5@6.0.1: {} @@ -22689,6 +21487,10 @@ snapshots: dependencies: entities: 4.5.0 + parse5@7.3.0: + dependencies: + entities: 6.0.0 + parseurl@1.3.3: {} pascal-case@3.1.2: @@ -22700,8 +21502,6 @@ snapshots: path-exists@4.0.0: {} - path-is-absolute@1.0.1: {} - path-key@3.1.1: {} path-key@4.0.0: {} @@ -22730,7 +21530,7 @@ snapshots: path-type@4.0.0: {} - path-type@5.0.0: {} + path-type@6.0.0: {} pathe@1.1.2: {} @@ -22760,6 +21560,12 @@ snapshots: mlly: 1.7.4 pathe: 2.0.3 + pkg-types@2.1.0: + dependencies: + confbox: 0.2.1 + exsolve: 1.0.4 + pathe: 2.0.3 + playwright-core@1.52.0: {} playwright@1.52.0: @@ -22897,6 +21703,8 @@ snapshots: dependencies: side-channel: 1.1.0 + quansync@0.2.10: {} + querystringify@2.2.0: {} queue-microtask@1.2.3: {} @@ -23157,45 +21965,45 @@ snapshots: glob: 11.0.1 package-json-from-dist: 1.0.1 - rollup-plugin-preserve-directives@0.4.0(rollup@4.39.0): + rollup-plugin-preserve-directives@0.4.0(rollup@4.38.0): dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) magic-string: 0.30.17 - rollup: 4.39.0 + rollup: 4.38.0 - rollup-plugin-visualizer@5.14.0(rollup@4.39.0): + rollup-plugin-visualizer@5.14.0(rollup@4.38.0): dependencies: open: 8.4.2 picomatch: 4.0.2 source-map: 0.7.4 yargs: 17.7.2 optionalDependencies: - rollup: 4.39.0 + rollup: 4.38.0 - rollup@4.39.0: + rollup@4.38.0: dependencies: '@types/estree': 1.0.7 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.39.0 - '@rollup/rollup-android-arm64': 4.39.0 - '@rollup/rollup-darwin-arm64': 4.39.0 - '@rollup/rollup-darwin-x64': 4.39.0 - '@rollup/rollup-freebsd-arm64': 4.39.0 - '@rollup/rollup-freebsd-x64': 4.39.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.39.0 - '@rollup/rollup-linux-arm-musleabihf': 4.39.0 - '@rollup/rollup-linux-arm64-gnu': 4.39.0 - '@rollup/rollup-linux-arm64-musl': 4.39.0 - '@rollup/rollup-linux-loongarch64-gnu': 4.39.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.39.0 - '@rollup/rollup-linux-riscv64-gnu': 4.39.0 - '@rollup/rollup-linux-riscv64-musl': 4.39.0 - '@rollup/rollup-linux-s390x-gnu': 4.39.0 - '@rollup/rollup-linux-x64-gnu': 4.39.0 - '@rollup/rollup-linux-x64-musl': 4.39.0 - '@rollup/rollup-win32-arm64-msvc': 4.39.0 - '@rollup/rollup-win32-ia32-msvc': 4.39.0 - '@rollup/rollup-win32-x64-msvc': 4.39.0 + '@rollup/rollup-android-arm-eabi': 4.38.0 + '@rollup/rollup-android-arm64': 4.38.0 + '@rollup/rollup-darwin-arm64': 4.38.0 + '@rollup/rollup-darwin-x64': 4.38.0 + '@rollup/rollup-freebsd-arm64': 4.38.0 + '@rollup/rollup-freebsd-x64': 4.38.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.38.0 + '@rollup/rollup-linux-arm-musleabihf': 4.38.0 + '@rollup/rollup-linux-arm64-gnu': 4.38.0 + '@rollup/rollup-linux-arm64-musl': 4.38.0 + '@rollup/rollup-linux-loongarch64-gnu': 4.38.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.38.0 + '@rollup/rollup-linux-riscv64-gnu': 4.38.0 + '@rollup/rollup-linux-riscv64-musl': 4.38.0 + '@rollup/rollup-linux-s390x-gnu': 4.38.0 + '@rollup/rollup-linux-x64-gnu': 4.38.0 + '@rollup/rollup-linux-x64-musl': 4.38.0 + '@rollup/rollup-win32-arm64-msvc': 4.38.0 + '@rollup/rollup-win32-ia32-msvc': 4.38.0 + '@rollup/rollup-win32-x64-msvc': 4.38.0 fsevents: 2.3.3 rrweb-cssom@0.7.1: {} @@ -23256,7 +22064,7 @@ snapshots: dependencies: lru-cache: 6.0.0 - semver@7.7.0: {} + semver@7.7.1: {} send@0.19.0: dependencies: @@ -23365,7 +22173,7 @@ snapshots: dependencies: '@kwsites/file-exists': 1.1.1 '@kwsites/promise-deferred': 1.1.1 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -23434,7 +22242,7 @@ snapshots: spdy-transport@3.0.0: dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -23445,7 +22253,7 @@ snapshots: spdy@4.0.2: dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -23469,7 +22277,7 @@ snapshots: statuses@2.0.1: {} - std-env@3.8.0: {} + std-env@3.8.1: {} streamx@2.22.0: dependencies: @@ -23522,7 +22330,7 @@ snapshots: strip-json-comments@3.1.1: {} - strip-literal@2.1.1: + strip-literal@3.0.0: dependencies: js-tokens: 9.0.1 @@ -23542,9 +22350,7 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 - superjson@2.2.2: - dependencies: - copy-anything: 3.0.5 + supports-color@10.0.0: {} supports-color@7.2.0: dependencies: @@ -23554,8 +22360,6 @@ snapshots: dependencies: has-flag: 4.0.0 - supports-color@9.4.0: {} - supports-hyperlinks@3.1.0: dependencies: has-flag: 4.0.0 @@ -23567,7 +22371,7 @@ snapshots: dependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) '@swc/counter': 0.1.3 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) swr@2.3.0(react@19.0.0): dependencies: @@ -23626,15 +22430,6 @@ snapshots: fast-fifo: 1.3.2 streamx: 2.22.0 - tar@6.2.1: - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - tar@7.4.3: dependencies: '@isaacs/fs-minipass': 4.0.1 @@ -23644,34 +22439,34 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) - esbuild: 0.25.0 + esbuild: 0.25.2 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) - esbuild: 0.25.0 + esbuild: 0.25.2 terser@5.37.0: dependencies: '@jridgewell/source-map': 0.3.6 - acorn: 8.14.0 + acorn: 8.14.1 commander: 2.20.3 source-map-support: 0.5.21 @@ -23793,8 +22588,6 @@ snapshots: type-fest@0.21.3: {} - type-fest@2.19.0: {} - type-fest@4.33.0: {} type-is@1.6.18: @@ -23852,51 +22645,61 @@ snapshots: ufo@1.5.4: {} + ultrahtml@1.5.3: {} + unc-path-regex@0.1.2: {} uncrypto@0.1.3: {} unctx@2.4.1: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 estree-walker: 3.0.3 magic-string: 0.30.17 - unplugin: 2.1.2 - - undici-types@5.28.4: {} + unplugin: 2.2.2 undici-types@6.20.0: {} + undici@6.21.2: {} + + undici@7.8.0: {} + unenv@1.10.0: dependencies: - consola: 3.4.0 + consola: 3.4.2 defu: 6.1.4 mime: 3.0.0 node-fetch-native: 1.6.6 pathe: 1.1.2 + unenv@2.0.0-rc.15: + dependencies: + defu: 6.1.4 + exsolve: 1.0.4 + ohash: 2.0.11 + pathe: 2.0.3 + ufo: 1.5.4 + unicode-emoji-modifier-base@1.0.0: {} - unicorn-magic@0.1.0: {} + unicorn-magic@0.3.0: {} - unimport@3.14.6(rollup@4.39.0): + unimport@4.1.3: dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) - acorn: 8.14.0 + acorn: 8.14.1 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 - fast-glob: 3.3.3 - local-pkg: 1.0.0 + local-pkg: 1.1.1 magic-string: 0.30.17 mlly: 1.7.4 pathe: 2.0.3 picomatch: 4.0.2 - pkg-types: 1.3.1 + pkg-types: 2.1.0 scule: 1.3.0 - strip-literal: 2.1.1 - unplugin: 1.16.1 - transitivePeerDependencies: - - rollup + strip-literal: 3.0.0 + tinyglobby: 0.2.12 + unplugin: 2.2.2 + unplugin-utils: 0.2.4 universalify@0.1.2: {} @@ -23906,55 +22709,55 @@ snapshots: unpipe@1.0.0: {} + unplugin-utils@0.2.4: + dependencies: + pathe: 2.0.3 + picomatch: 4.0.2 + unplugin@1.0.1: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 chokidar: 3.6.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.5.0 unplugin@1.16.1: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 webpack-virtual-modules: 0.6.2 - unplugin@2.1.2: + unplugin@2.2.2: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 webpack-virtual-modules: 0.6.2 - unstorage@1.14.4(db0@0.2.3)(ioredis@5.4.2): + unstorage@1.15.0(db0@0.3.1)(ioredis@5.6.0): dependencies: anymatch: 3.1.3 - chokidar: 3.6.0 + chokidar: 4.0.3 destr: 2.0.3 - h3: 1.13.0 + h3: 1.15.1 lru-cache: 10.4.3 node-fetch-native: 1.6.6 ofetch: 1.4.1 ufo: 1.5.4 optionalDependencies: - db0: 0.2.3 - ioredis: 5.4.2 + db0: 0.3.1 + ioredis: 5.6.0 untun@0.1.3: dependencies: citty: 0.1.6 - consola: 3.4.0 + consola: 3.4.2 pathe: 1.1.2 - untyped@1.5.2: + untyped@2.0.0: dependencies: - '@babel/core': 7.26.8 - '@babel/standalone': 7.26.7 - '@babel/types': 7.26.8 citty: 0.1.6 defu: 6.1.4 jiti: 2.4.2 knitwork: 1.2.0 scule: 1.3.0 - transitivePeerDependencies: - - supports-color unwasm@0.3.9: dependencies: @@ -23975,8 +22778,6 @@ snapshots: uqr@0.1.2: {} - uri-js-replace@1.0.1: {} - uri-js@4.4.1: dependencies: punycode: 2.3.1 @@ -23986,8 +22787,6 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 - urlpattern-polyfill@8.0.2: {} - use-callback-ref@1.3.3(@types/react@19.0.8)(react@19.0.0): dependencies: react: 19.0.0 @@ -24027,168 +22826,10 @@ snapshots: vary@1.1.2: {} - vinxi@0.5.1(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0): - dependencies: - '@babel/core': 7.26.8 - '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.8) - '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.8) - '@types/micromatch': 4.0.9 - '@vinxi/listhen': 1.5.6 - boxen: 7.1.1 - chokidar: 3.6.0 - citty: 0.1.6 - consola: 3.4.0 - crossws: 0.3.3 - dax-sh: 0.39.2 - defu: 6.1.4 - es-module-lexer: 1.6.0 - esbuild: 0.20.2 - fast-glob: 3.3.3 - get-port-please: 3.1.2 - h3: 1.13.0 - hookable: 5.5.3 - http-proxy: 1.18.1 - micromatch: 4.0.8 - nitropack: 2.10.4(typescript@5.8.2) - node-fetch-native: 1.6.6 - path-to-regexp: 6.3.0 - pathe: 1.1.2 - radix3: 1.1.2 - resolve: 1.22.10 - serve-placeholder: 2.0.2 - serve-static: 1.16.2 - ufo: 1.5.4 - unctx: 2.4.1 - unenv: 1.10.0 - unstorage: 1.14.4(db0@0.2.3)(ioredis@5.4.2) - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - zod: 3.24.2 - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@types/node' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - db0 - - debug - - drizzle-orm - - encoding - - idb-keyval - - ioredis - - jiti - - less - - lightningcss - - mysql2 - - rolldown - - sass - - sass-embedded - - sqlite3 - - stylus - - sugarss - - supports-color - - terser - - tsx - - typescript - - uploadthing - - xml2js - - yaml - - vinxi@0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0): - dependencies: - '@babel/core': 7.26.8 - '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.8) - '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.8) - '@types/micromatch': 4.0.9 - '@vinxi/listhen': 1.5.6 - boxen: 7.1.1 - chokidar: 3.6.0 - citty: 0.1.6 - consola: 3.4.0 - crossws: 0.3.3 - dax-sh: 0.39.2 - defu: 6.1.4 - es-module-lexer: 1.6.0 - esbuild: 0.20.2 - fast-glob: 3.3.3 - get-port-please: 3.1.2 - h3: 1.13.0 - hookable: 5.5.3 - http-proxy: 1.18.1 - micromatch: 4.0.8 - nitropack: 2.10.4(typescript@5.8.2) - node-fetch-native: 1.6.6 - path-to-regexp: 6.3.0 - pathe: 1.1.2 - radix3: 1.1.2 - resolve: 1.22.10 - serve-placeholder: 2.0.2 - serve-static: 1.16.2 - ufo: 1.5.4 - unctx: 2.4.1 - unenv: 1.10.0 - unstorage: 1.14.4(db0@0.2.3)(ioredis@5.4.2) - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - zod: 3.24.2 - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@types/node' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/kv' - - aws4fetch - - better-sqlite3 - - db0 - - debug - - drizzle-orm - - encoding - - idb-keyval - - ioredis - - jiti - - less - - lightningcss - - mysql2 - - rolldown - - sass - - sass-embedded - - sqlite3 - - stylus - - sugarss - - supports-color - - terser - - tsx - - typescript - - uploadthing - - xml2js - - yaml - vite-node@3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: cac: 6.7.14 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -24206,14 +22847,14 @@ snapshots: - tsx - yaml - vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@22.13.4) - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) '@volar/typescript': 2.4.11 '@vue/language-core': 2.0.29(typescript@5.8.2) compare-versions: 6.1.1 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 kolorist: 1.8.0 local-pkg: 0.5.1 magic-string: 0.30.17 @@ -24226,14 +22867,14 @@ snapshots: - rollup - supports-color - vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.39.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.49.2(@types/node@22.13.4) - '@rollup/pluginutils': 5.1.4(rollup@4.39.0) + '@rollup/pluginutils': 5.1.4(rollup@4.38.0) '@volar/typescript': 2.4.11 '@vue/language-core': 2.2.0(typescript@5.8.2) compare-versions: 6.1.1 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 kolorist: 1.8.0 local-pkg: 0.5.1 magic-string: 0.30.17 @@ -24266,7 +22907,7 @@ snapshots: vite-tsconfig-paths@5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.8.2) optionalDependencies: @@ -24279,7 +22920,7 @@ snapshots: dependencies: esbuild: 0.24.2 postcss: 8.5.3 - rollup: 4.39.0 + rollup: 4.38.0 optionalDependencies: '@types/node': 22.13.4 fsevents: 2.3.3 @@ -24303,11 +22944,11 @@ snapshots: '@vitest/spy': 3.0.6 '@vitest/utils': 3.0.6 chai: 5.2.0 - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 expect-type: 1.1.0 magic-string: 0.30.17 pathe: 2.0.3 - std-env: 3.8.0 + std-env: 3.8.1 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 @@ -24338,14 +22979,14 @@ snapshots: vue-eslint-parser@9.4.3(eslint@9.22.0(jiti@2.4.2)): dependencies: - debug: 4.4.0(supports-color@9.4.0) + debug: 4.4.0 eslint: 9.22.0(jiti@2.4.2) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 esquery: 1.6.0 lodash: 4.17.21 - semver: 7.7.0 + semver: 7.7.1 transitivePeerDependencies: - supports-color @@ -24353,7 +22994,7 @@ snapshots: dependencies: '@volar/typescript': 2.4.11 '@vue/language-core': 2.0.29(typescript@5.8.2) - semver: 7.7.0 + semver: 7.7.1 typescript: 5.8.2 w3c-xmlserializer@5.0.0: @@ -24373,8 +23014,6 @@ snapshots: dependencies: defaults: 1.0.4 - web-streams-polyfill@3.3.3: {} - web-vitals@4.2.4: {} webcrypto-core@1.8.1: @@ -24403,7 +23042,7 @@ snapshots: import-local: 3.2.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) @@ -24417,7 +23056,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.0 optionalDependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1): dependencies: @@ -24449,7 +23088,7 @@ snapshots: webpack-dev-middleware: 7.4.2(webpack@5.97.1) ws: 8.18.0 optionalDependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) transitivePeerDependencies: - bufferutil @@ -24469,14 +23108,14 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0): + webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.14.0 + acorn: 8.14.1 browserslist: 4.24.4 chrome-trace-event: 1.0.4 enhanced-resolve: 5.18.1 @@ -24491,7 +23130,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)) watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -24499,14 +23138,14 @@ snapshots: - esbuild - uglify-js - webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack-cli@5.1.4): + webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.14.0 + acorn: 8.14.1 browserslist: 4.24.4 chrome-trace-event: 1.0.4 enhanced-resolve: 5.18.1 @@ -24521,7 +23160,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: @@ -24563,19 +23202,11 @@ snapshots: dependencies: isexe: 2.0.0 - which@4.0.0: - dependencies: - isexe: 3.1.1 - why-is-node-running@2.3.0: dependencies: siginfo: 2.0.0 stackback: 0.0.2 - widest-line@4.0.1: - dependencies: - string-width: 5.1.2 - wildcard@2.0.1: {} word-wrap@1.2.5: {} @@ -24604,6 +23235,13 @@ snapshots: xml-name-validator@5.0.0: {} + xmlbuilder2@3.1.1: + dependencies: + '@oozcitak/dom': 1.15.10 + '@oozcitak/infra': 1.0.8 + '@oozcitak/util': 8.3.8 + js-yaml: 3.14.1 + xmlchars@2.2.0: {} y18n@5.0.8: {} @@ -24614,8 +23252,6 @@ snapshots: yallist@5.0.0: {} - yaml-ast-parser@0.0.43: {} - yaml@1.10.2: {} yaml@2.7.0: {} @@ -24648,6 +23284,18 @@ snapshots: yoctocolors-cjs@2.1.2: {} + youch-core@0.3.2: + dependencies: + '@poppinss/exception': 1.2.1 + error-stack-parser-es: 1.0.5 + + youch@4.1.0-beta.7: + dependencies: + '@poppinss/dumper': 0.6.3 + '@speed-highlight/core': 1.2.7 + cookie: 1.0.2 + youch-core: 0.3.2 + zip-stream@6.0.1: dependencies: archiver-utils: 5.0.2 diff --git a/scripts/generateLabelerConfig.mjs b/scripts/generateLabelerConfig.mjs index 6b02b962fc..e38ef6e323 100644 --- a/scripts/generateLabelerConfig.mjs +++ b/scripts/generateLabelerConfig.mjs @@ -8,7 +8,7 @@ function generateLabelerConfig() { * Pairs of package labels and their corresponding paths * @type {Array<[string, string]>} **/ - const pairs = [] + let pairs = [] // Add subfolders in the packages folder, i.e. packages/** fs.readdirSync(path.resolve('packages')) @@ -28,6 +28,9 @@ function generateLabelerConfig() { } }) + // Sort by package name in alphabetical order + pairs.sort((a, b) => a[0].localeCompare(b[0])) + // Always add the docs folder pairs.push(['documentation', 'docs/**/*']) diff --git a/scripts/publish.js b/scripts/publish.js index 430c3a3c41..0f8c7d0e98 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -92,21 +92,13 @@ await publish({ name: '@tanstack/solid-start', packageDir: 'packages/solid-start', }, - { - name: '@tanstack/solid-start-client', - packageDir: 'packages/solid-start-client', - }, - { - name: '@tanstack/solid-start-config', - packageDir: 'packages/solid-start-config', - }, { name: '@tanstack/solid-start-plugin', packageDir: 'packages/solid-start-plugin', }, { - name: '@tanstack/solid-start-router-manifest', - packageDir: 'packages/solid-start-router-manifest', + name: '@tanstack/solid-start-client', + packageDir: 'packages/solid-start-client', }, { name: '@tanstack/solid-start-server', @@ -136,45 +128,21 @@ await publish({ name: '@tanstack/react-start-server', packageDir: 'packages/react-start-server', }, - { - name: '@tanstack/start-config', - packageDir: 'packages/start-config', - }, - { - name: '@tanstack/react-start-config', - packageDir: 'packages/react-start-config', - }, - { - name: '@tanstack/start-api-routes', - packageDir: 'packages/start-api-routes', - }, { name: '@tanstack/start-server-functions-fetcher', packageDir: 'packages/start-server-functions-fetcher', }, - { - name: '@tanstack/start-server-functions-handler', - packageDir: 'packages/start-server-functions-handler', - }, { name: '@tanstack/start-server-functions-client', packageDir: 'packages/start-server-functions-client', }, - { - name: '@tanstack/start-server-functions-ssr', - packageDir: 'packages/start-server-functions-ssr', - }, { name: '@tanstack/start-server-functions-server', packageDir: 'packages/start-server-functions-server', }, { - name: '@tanstack/react-start-router-manifest', - packageDir: 'packages/react-start-router-manifest', - }, - { - name: '@tanstack/start', - packageDir: 'packages/start', + name: '@tanstack/start-plugin-core', + packageDir: 'packages/start-plugin-core', }, { name: '@tanstack/router-utils', From 6e5b7a34eb8d182a1d938a1005f79e2031c8b760 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 10 May 2025 14:57:04 +0200 Subject: [PATCH 002/126] fix: RELEASE_ALL RELEASE_ALL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4dc5f701b1..21fb108471 100644 --- a/README.md +++ b/README.md @@ -87,4 +87,4 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer To run example React projects with Tanstack Router, see [CONTRIBUTING.md](./CONTRIBUTING.md) - + From 1ceda304ef8db2a923f1a530ec6d8c85c90591e0 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 10 May 2025 12:58:56 +0000 Subject: [PATCH 003/126] release: v1.20.3-alpha.1 --- .../package.json | 6 +++--- .../react/authenticated-routes/package.json | 6 +++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 +++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 8 ++++---- .../package.json | 8 ++++---- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../package.json | 6 +++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 +++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 +++--- .../react/quickstart-file-based/package.json | 6 +++--- .../quickstart-rspack-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../router-monorepo-simple-lazy/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../react/router-monorepo-simple/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++------ examples/react/start-bare/package.json | 6 +++--- examples/react/start-basic-auth/package.json | 6 +++--- .../start-basic-react-query/package.json | 8 ++++---- examples/react/start-basic-rsc/package.json | 6 +++--- .../react/start-basic-static/package.json | 6 +++--- examples/react/start-basic/package.json | 6 +++--- examples/react/start-clerk-basic/package.json | 6 +++--- .../react/start-convex-trellaux/package.json | 8 ++++---- examples/react/start-counter/package.json | 6 +++--- examples/react/start-large/package.json | 6 +++--- examples/react/start-material-ui/package.json | 6 +++--- .../react/start-supabase-basic/package.json | 6 +++--- examples/react/start-trellaux/package.json | 8 ++++---- examples/react/start-workos/package.json | 6 +++--- examples/react/view-transitions/package.json | 6 +++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 ++++---- examples/react/with-trpc/package.json | 8 ++++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 +++--- examples/solid/basic-solid-query/package.json | 6 +++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../solid/quickstart-file-based/package.json | 6 +++--- examples/solid/start-bare/package.json | 6 +++--- examples/solid/start-basic/package.json | 6 +++--- packages/arktype-adapter/package.json | 2 +- .../directive-functions-plugin/package.json | 2 +- packages/eslint-plugin-router/package.json | 2 +- packages/history/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-utils/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/virtual-file-routes/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 99 files changed, 222 insertions(+), 222 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index ac20a7fa3c..11ea5b3d16 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 5bedf2de76..24ea24fd60 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 4ac49178e6..72138d7f62 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 6925019d18..979f47fcc9 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 53e01ca07c..b1deffec12 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 2b45e427a8..383903b07b 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 0376b204be..ee4d6c50a9 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 8cdbbd949c..05c4819bd4 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index ff649aeac9..876a8302a7 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/virtual-file-routes": "^1.115.0", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/virtual-file-routes": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index b8b045f74c..e9bffce49b 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/virtual-file-routes": "^1.115.0", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/virtual-file-routes": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 2f2c75d4b0..5fabea1b20 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 07d7ca2b8c..9a3dcb2ec1 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 6fbb0f6ae3..fa3f1bd65a 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 01c44d2c42..ada76eac93 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 24629dc4d7..0154ae26c8 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index fcda245ccc..fc2dcd2ec3 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index b028ce0f14..a838c035f2 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 76974a7fd6..28dd33ffd5 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index a02bbd11c7..a6f6ea928c 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index a70374a87d..0a1353ea04 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index f5ee2a99ee..534b1c2c7c 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 950bfd7b4f..dd0bfa6201 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 6dec44454f..eae769001b 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 68ee7d2a5d..cfc2cfcc01 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index d63d9c1272..796ce0a73e 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index f108f10e39..269d0996ce 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 87e0b53e46..7a3134559d 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.115.0", + "@tanstack/history": "^1.20.3-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 8805fcadee..5d193f77db 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 6e8e6a773b..82a23ba299 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 4ab5a93131..48ad3feb94 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.115.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/history": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 35e73aefb1..5005677bb3 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 3b1f2e4cb1..3ffdd74a29 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "vite": "^6.1.0", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 8f110580a1..d9c654518a 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.115.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/history": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 8e07cf2589..6d0057ca4e 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index af25aedde5..a06f1f3e41 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.3", + "@tanstack/arktype-adapter": "^1.20.3-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/valibot-adapter": "^1.120.3", - "@tanstack/zod-adapter": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/valibot-adapter": "^1.20.3-alpha.1", + "@tanstack/zod-adapter": "^1.20.3-alpha.1", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 9874aa3d3c..83b0712741 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index a419d8845a..8d6c47b141 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 0330ad793b..bc547b6aef 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-with-query": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-with-query": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 48e4b6b5b8..0428980e90 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 52b94fa281..5af5d92918 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ee8b44b416..6f3e33211a 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index c3a9a49fa5..7c8c672116 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 57539d28f8..78195f55bb 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-with-query": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-with-query": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index cd7bbbb50b..c0e795d1f9 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index fc01526099..7735ecb1ff 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index ac52782139..8fd8c32100 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-start": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 89e81f46c0..f635782e69 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index d3db08d319..5d0aeef8eb 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-with-query": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-with-query": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 97f0798993..530edb408f 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 3b99a514bc..5a77b6aaee 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 3bdb7d217c..a394d3a4d7 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 4900f5621d..b38279f0c2 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 708a214c3b..78f73b3de0 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-start": "^1.20.3-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index ecc30cd748..cb77777777 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 2c97989801..cbd5550ffc 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 9f0ae1d786..8e53579077 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index f074c64838..b5d09ea0d4 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 72aa31853b..b999b45206 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index c602e83393..a89d175cf5 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 190dd6540c..84a39c6fee 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index e22354139e..82b7fd6a20 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.3", + "@tanstack/router-plugin": "^1.20.3-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index d5b05f1bed..35531e2395 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", - "@tanstack/solid-start": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-start": "^1.20.3-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index eb253dfe8d..7d49275bd3 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.3", - "@tanstack/solid-router-devtools": "^1.120.3", - "@tanstack/solid-start": "^1.120.3", + "@tanstack/solid-router": "^1.20.3-alpha.1", + "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-start": "^1.20.3-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index ebe26da7e3..2c15e5f8f0 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 7b07f0e0d4..9cdb5ad33a 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.119.2", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/eslint-plugin-router/package.json b/packages/eslint-plugin-router/package.json index 39c59420bd..2191e3b66d 100644 --- a/packages/eslint-plugin-router/package.json +++ b/packages/eslint-plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/eslint-plugin-router", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "ESLint plugin for TanStack Router", "author": "Manuel Schiller", "license": "MIT", diff --git a/packages/history/package.json b/packages/history/package.json index 2943dc0247..e1379f5a42 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 940def08b5..313dd0d6df 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index fbfa01431f..d5b07502e7 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index caac296dc9..2e95daad81 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index c242f42005..e6a6681754 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index a7ae54fd97..d572155b65 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 0a04a3c2b4..79ef995af5 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 0c10b3a616..5776587079 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 3d620859f8..3375c40f43 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index ce60e3f821..520ae2e73d 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 59cc80782b..30c3a0a2f0 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 82405a50bb..fe9de58a47 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 6a86263abf..992fd8d955 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 1b0e9ebefc..252b428b76 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-utils/package.json b/packages/router-utils/package.json index 85f49510cf..69e14ea869 100644 --- a/packages/router-utils/package.json +++ b/packages/router-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-utils", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index d3768c86fd..29aa8d5db3 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 289b909ea6..4029b10c38 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.119.2", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 2970a3554a..6c961487ed 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 931c967fcc..672f2ce55c 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 6fdd87d524..3a4f3064bf 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index b8f98a114b..8c5afef28a 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 4aea00c279..056991fad4 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 23422af30c..c80ae179d7 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index e4ce1dbd0d..f22ac929af 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 74d4f84b75..514b49dace 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.114.12", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 09f7b9a02b..7e44d73332 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 8878f1ea62..1864f21e16 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 781de68e42..4cb16559ae 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index dfc8ca60ff..f25829dee1 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.119.2", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index ce55411e1e..fb1598aeba 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/virtual-file-routes/package.json b/packages/virtual-file-routes/package.json index 70df4fa31f..93b6971c39 100644 --- a/packages/virtual-file-routes/package.json +++ b/packages/virtual-file-routes/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/virtual-file-routes", - "version": "1.115.0", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 93af7a8aa8..b9a507cb0f 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.3", + "version": "1.20.3-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1d471b7f1..65b035c81e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4981,7 +4981,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5021,7 +5021,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5055,7 +5055,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5095,7 +5095,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5141,7 +5141,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5184,7 +5184,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5224,7 +5224,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5267,7 +5267,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5307,7 +5307,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5356,7 +5356,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.3 + specifier: ^1.20.3-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 0b7aefdc3ceeedb84c351a221c877fcdcfe9b4b3 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 10 May 2025 16:19:13 +0200 Subject: [PATCH 004/126] fix: RELEASE_ALL RELEASE_ALL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21fb108471..4dc5f701b1 100644 --- a/README.md +++ b/README.md @@ -87,4 +87,4 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer To run example React projects with Tanstack Router, see [CONTRIBUTING.md](./CONTRIBUTING.md) - + From bc2dfa1210efa4910647264ba763568d774aaf9f Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 10 May 2025 14:39:52 +0000 Subject: [PATCH 005/126] release: v1.120.4-alpha.1 --- .../package.json | 6 +++--- .../react/authenticated-routes/package.json | 6 +++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 +++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 8 ++++---- .../package.json | 8 ++++---- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../package.json | 6 +++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 +++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 +++--- .../react/quickstart-file-based/package.json | 6 +++--- .../quickstart-rspack-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../router-monorepo-simple-lazy/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../react/router-monorepo-simple/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 +++--- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++------ examples/react/start-bare/package.json | 6 +++--- examples/react/start-basic-auth/package.json | 6 +++--- .../start-basic-react-query/package.json | 8 ++++---- examples/react/start-basic-rsc/package.json | 6 +++--- .../react/start-basic-static/package.json | 6 +++--- examples/react/start-basic/package.json | 6 +++--- examples/react/start-clerk-basic/package.json | 6 +++--- .../react/start-convex-trellaux/package.json | 8 ++++---- examples/react/start-counter/package.json | 6 +++--- examples/react/start-large/package.json | 6 +++--- examples/react/start-material-ui/package.json | 6 +++--- .../react/start-supabase-basic/package.json | 6 +++--- examples/react/start-trellaux/package.json | 8 ++++---- examples/react/start-workos/package.json | 6 +++--- examples/react/view-transitions/package.json | 6 +++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 ++++---- examples/react/with-trpc/package.json | 8 ++++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 +++--- examples/solid/basic-solid-query/package.json | 6 +++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../solid/quickstart-file-based/package.json | 6 +++--- examples/solid/start-bare/package.json | 6 +++--- examples/solid/start-basic/package.json | 6 +++--- packages/arktype-adapter/package.json | 2 +- .../directive-functions-plugin/package.json | 2 +- packages/eslint-plugin-router/package.json | 2 +- packages/history/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-utils/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/virtual-file-routes/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 99 files changed, 222 insertions(+), 222 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 11ea5b3d16..0497d9ee63 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 24ea24fd60..dc8274b1b3 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 72138d7f62..91b3aaeee4 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 979f47fcc9..cf00d4c63a 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index b1deffec12..6dcf73781c 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 383903b07b..47fd175de8 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index ee4d6c50a9..67506a3dba 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 05c4819bd4..56f2681253 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 876a8302a7..a34cdfe70b 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", - "@tanstack/virtual-file-routes": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index e9bffce49b..37d16298c1 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", - "@tanstack/virtual-file-routes": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 5fabea1b20..403959ab01 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 9a3dcb2ec1..ee2bf831fd 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index fa3f1bd65a..e9a5777bd5 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index ada76eac93..fc36f988f4 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 0154ae26c8..67c60c4c38 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index fc2dcd2ec3..5335ca710b 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index a838c035f2..3a1fe1e444 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 28dd33ffd5..3780cb20ce 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index a6f6ea928c..0fefdb0f44 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 0a1353ea04..b983c4cba9 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 534b1c2c7c..171ace0c72 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index dd0bfa6201..4edabf8e30 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index eae769001b..fe2de68105 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index cfc2cfcc01..a1a2bdd119 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 796ce0a73e..d0beb4391a 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 269d0996ce..39171b4043 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 7a3134559d..dad07747c1 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.20.3-alpha.1", + "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 5d193f77db..514732f20e 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 82a23ba299..72e1e2c9d4 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 48ad3feb94..aceab58dbe 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.20.3-alpha.1", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/history": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 5005677bb3..46df25a447 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 3ffdd74a29..4b793571c1 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "vite": "^6.1.0", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index d9c654518a..99000b3275 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.20.3-alpha.1", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/history": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 6d0057ca4e..124a67e145 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index a06f1f3e41..a501541b90 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.20.3-alpha.1", + "@tanstack/arktype-adapter": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", - "@tanstack/valibot-adapter": "^1.20.3-alpha.1", - "@tanstack/zod-adapter": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/valibot-adapter": "^1.120.4-alpha.1", + "@tanstack/zod-adapter": "^1.120.4-alpha.1", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 83b0712741..6ad6c13a07 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 8d6c47b141..94259aba2e 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index bc547b6aef..aaa78ed5e1 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-with-query": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-with-query": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 0428980e90..17d0a6a371 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 5af5d92918..c550d0b85d 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 6f3e33211a..ddb7db1051 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 7c8c672116..50fa9cfdc0 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 78195f55bb..af28d4ed6d 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-with-query": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-with-query": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index c0e795d1f9..00e7219802 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 7735ecb1ff..5d13ee6e03 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 8fd8c32100..984d3591c5 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index f635782e69..130739127f 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 5d0aeef8eb..200422a080 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-with-query": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-with-query": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 530edb408f..c6ddadc351 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 5a77b6aaee..975d2daa34 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index a394d3a4d7..3fdee1d249 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index b38279f0c2..429dcdce2f 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 78f73b3de0..104d9c9b8f 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.20.3-alpha.1", - "@tanstack/react-router-devtools": "^1.20.3-alpha.1", - "@tanstack/router-plugin": "^1.20.3-alpha.1", - "@tanstack/react-start": "^1.20.3-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index cb77777777..4e460759ac 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index cbd5550ffc..c6a9b860bf 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 8e53579077..2c86f4d29b 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index b5d09ea0d4..185634f90e 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index b999b45206..f8745f58fe 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index a89d175cf5..3d7114d5da 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 84a39c6fee..7055deb11c 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 82b7fd6a20..08d7728346 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.20.3-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", "vite": "^6.1.0", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 35531e2395..3e001d408c 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", - "@tanstack/solid-start": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-start": "^1.120.4-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 7d49275bd3..b6b808cd70 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.20.3-alpha.1", - "@tanstack/solid-router-devtools": "^1.20.3-alpha.1", - "@tanstack/solid-start": "^1.20.3-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.1", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-start": "^1.120.4-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 2c15e5f8f0..0ac9f4df74 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 9cdb5ad33a..4ab18ac695 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/eslint-plugin-router/package.json b/packages/eslint-plugin-router/package.json index 2191e3b66d..d399104411 100644 --- a/packages/eslint-plugin-router/package.json +++ b/packages/eslint-plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/eslint-plugin-router", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "ESLint plugin for TanStack Router", "author": "Manuel Schiller", "license": "MIT", diff --git a/packages/history/package.json b/packages/history/package.json index e1379f5a42..c20e3b6592 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 313dd0d6df..40b555cde1 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index d5b07502e7..6dc7e5bae9 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 2e95daad81..c4b35f7928 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index e6a6681754..1cbbca4a87 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index d572155b65..ae2102a12c 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 79ef995af5..d37be20f88 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 5776587079..d4b11ebaeb 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 3375c40f43..239743d611 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 520ae2e73d..45b06e5dc1 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 30c3a0a2f0..0d3ecca290 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index fe9de58a47..37b923d3e1 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 992fd8d955..0eb023b881 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 252b428b76..34e1fc2e13 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-utils/package.json b/packages/router-utils/package.json index 69e14ea869..780cfc89c0 100644 --- a/packages/router-utils/package.json +++ b/packages/router-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-utils", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 29aa8d5db3..8e17d5c41b 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 4029b10c38..8ce27c3731 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 6c961487ed..41fc1bff85 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 672f2ce55c..ea535937bc 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 3a4f3064bf..87fc87fc75 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 8c5afef28a..7a04b0c9c5 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 056991fad4..64db37b609 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index c80ae179d7..60b6453128 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index f22ac929af..8838c4a5e6 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 514b49dace..11c6dff1fa 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 7e44d73332..e47cc7509d 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 1864f21e16..4f2b3af813 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 4cb16559ae..fe0fdd0269 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index f25829dee1..8b85fa88a6 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index fb1598aeba..99ae410780 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/virtual-file-routes/package.json b/packages/virtual-file-routes/package.json index 93b6971c39..665070eb60 100644 --- a/packages/virtual-file-routes/package.json +++ b/packages/virtual-file-routes/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/virtual-file-routes", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index b9a507cb0f..3daf7810ca 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.20.3-alpha.1", + "version": "1.120.4-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65b035c81e..8156b72fe8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4981,7 +4981,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5021,7 +5021,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5055,7 +5055,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5095,7 +5095,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5141,7 +5141,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5184,7 +5184,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5224,7 +5224,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5267,7 +5267,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5307,7 +5307,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5356,7 +5356,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.20.3-alpha.1 + specifier: ^1.120.4-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From e3fd36bbcee5b190f6da58d4b4d9d03f900f8fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iha=20Shin=20=28=EC=8B=A0=EC=9D=98=ED=95=98=29?= Date: Sun, 11 May 2025 02:19:33 +0900 Subject: [PATCH 006/126] fix: clean up Vite versions (#4130) --- .../package.json | 2 +- .../basic-file-based/package.json | 2 +- .../basic-react-query-file-based/package.json | 2 +- .../basic-react-query/package.json | 2 +- .../basic-scroll-restoration/package.json | 2 +- .../basic-virtual-file-based/package.json | 2 +- .../package.json | 2 +- e2e/react-router/basic/package.json | 2 +- .../generator-cli-only/package.json | 2 +- .../js-only-file-based/package.json | 2 +- .../package.json | 2 +- .../sentry-integration/package.json | 2 +- e2e/react-start/basic-auth/package.json | 2 +- .../basic-react-query/package.json | 2 +- e2e/react-start/basic-rsc/package.json | 2 +- e2e/react-start/basic-tsr-config/package.json | 2 +- .../clerk-basic/package.disabled.json | 2 +- .../scroll-restoration/package.json | 2 +- e2e/react-start/server-functions/package.json | 2 +- e2e/react-start/website/package.json | 2 +- .../package.json | 2 +- .../basic-file-based/package.json | 2 +- .../basic-scroll-restoration/package.json | 2 +- .../basic-solid-query-file-based/package.json | 2 +- .../basic-solid-query/package.json | 2 +- .../basic-virtual-file-based/package.json | 2 +- .../package.json | 2 +- e2e/solid-router/basic/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../react/authenticated-routes/package.json | 2 +- .../basic-default-search-params/package.json | 2 +- .../react/basic-devtools-panel/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-react-query-file-based/package.json | 2 +- examples/react/basic-react-query/package.json | 2 +- .../package.disabled.json | 2 +- .../package.disabled.json | 2 +- .../basic-virtual-file-based/package.json | 2 +- .../package.json | 2 +- examples/react/basic/package.json | 2 +- examples/react/deferred-data/package.json | 2 +- .../kitchen-sink-file-based/package.json | 2 +- .../package.json | 2 +- .../kitchen-sink-react-query/package.json | 2 +- examples/react/kitchen-sink/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/location-masking/package.json | 2 +- .../react/navigation-blocking/package.json | 2 +- .../react/quickstart-file-based/package.json | 2 +- examples/react/quickstart/package.json | 2 +- .../router-monorepo-react-query/package.json | 2 +- .../packages/app/package.json | 2 +- .../packages/post-feature/package.json | 2 +- .../packages/post-query/package.json | 2 +- .../packages/router/package.json | 2 +- .../router-monorepo-simple-lazy/package.json | 2 +- .../packages/app/package.json | 2 +- .../packages/post-feature/package.json | 2 +- .../packages/router/package.json | 2 +- .../react/router-monorepo-simple/package.json | 2 +- .../packages/app/package.json | 2 +- .../packages/post-feature/package.json | 2 +- .../packages/router/package.json | 2 +- .../react/scroll-restoration/package.json | 2 +- .../search-validator-adapters/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/view-transitions/package.json | 2 +- .../react/with-framer-motion/package.json | 2 +- .../solid/basic-devtools-panel/package.json | 2 +- examples/solid/basic-file-based/package.json | 2 +- .../basic-non-nested-devtools/package.json | 2 +- .../basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- examples/solid/basic/package.json | 2 +- .../kitchen-sink-file-based/package.json | 2 +- .../solid/quickstart-file-based/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- package.json | 2 +- .../directive-functions-plugin/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- pnpm-lock.yaml | 1004 +++++++---------- 91 files changed, 475 insertions(+), 709 deletions(-) diff --git a/e2e/react-router/basic-file-based-code-splitting/package.json b/e2e/react-router/basic-file-based-code-splitting/package.json index d3cd1e2425..38efb81ef7 100644 --- a/e2e/react-router/basic-file-based-code-splitting/package.json +++ b/e2e/react-router/basic-file-based-code-splitting/package.json @@ -27,6 +27,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-file-based/package.json b/e2e/react-router/basic-file-based/package.json index 33c69421d1..8d61ceed9a 100644 --- a/e2e/react-router/basic-file-based/package.json +++ b/e2e/react-router/basic-file-based/package.json @@ -30,6 +30,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "combinate": "^1.1.11", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-react-query-file-based/package.json b/e2e/react-router/basic-react-query-file-based/package.json index 444b508488..e7c7d75f4d 100644 --- a/e2e/react-router/basic-react-query-file-based/package.json +++ b/e2e/react-router/basic-react-query-file-based/package.json @@ -30,6 +30,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-react-query/package.json b/e2e/react-router/basic-react-query/package.json index cabb1a5fd0..998c71bf16 100644 --- a/e2e/react-router/basic-react-query/package.json +++ b/e2e/react-router/basic-react-query/package.json @@ -28,6 +28,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-scroll-restoration/package.json b/e2e/react-router/basic-scroll-restoration/package.json index ca4a82c5b0..e57df26a06 100644 --- a/e2e/react-router/basic-scroll-restoration/package.json +++ b/e2e/react-router/basic-scroll-restoration/package.json @@ -27,6 +27,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-virtual-file-based/package.json b/e2e/react-router/basic-virtual-file-based/package.json index 5d881fc0a4..86b1081710 100644 --- a/e2e/react-router/basic-virtual-file-based/package.json +++ b/e2e/react-router/basic-virtual-file-based/package.json @@ -29,6 +29,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json index e8548b0db3..ebf75bc3b7 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json @@ -29,6 +29,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/basic/package.json b/e2e/react-router/basic/package.json index 74d93cc3b2..33cfccc9d8 100644 --- a/e2e/react-router/basic/package.json +++ b/e2e/react-router/basic/package.json @@ -26,6 +26,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/generator-cli-only/package.json b/e2e/react-router/generator-cli-only/package.json index b2877d0483..2a6a1359fb 100644 --- a/e2e/react-router/generator-cli-only/package.json +++ b/e2e/react-router/generator-cli-only/package.json @@ -27,6 +27,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/js-only-file-based/package.json b/e2e/react-router/js-only-file-based/package.json index bd2286b5bb..e53f0521d1 100644 --- a/e2e/react-router/js-only-file-based/package.json +++ b/e2e/react-router/js-only-file-based/package.json @@ -27,6 +27,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/package.json b/e2e/react-router/scroll-restoration-sandbox-vite/package.json index 9382a05e28..86a029d6f0 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/package.json @@ -32,6 +32,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-router/sentry-integration/package.json b/e2e/react-router/sentry-integration/package.json index 9842315379..75298bba90 100644 --- a/e2e/react-router/sentry-integration/package.json +++ b/e2e/react-router/sentry-integration/package.json @@ -29,6 +29,6 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json index 9a711281a1..cc62ecd7ff 100644 --- a/e2e/react-start/basic-auth/package.json +++ b/e2e/react-start/basic-auth/package.json @@ -21,7 +21,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@playwright/test": "^1.50.1", diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json index ff79fb9cf3..e8e60685eb 100644 --- a/e2e/react-start/basic-react-query/package.json +++ b/e2e/react-start/basic-react-query/package.json @@ -21,7 +21,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@playwright/test": "^1.50.1", diff --git a/e2e/react-start/basic-rsc/package.json b/e2e/react-start/basic-rsc/package.json index 1c53ef7a42..9c820c9ccd 100644 --- a/e2e/react-start/basic-rsc/package.json +++ b/e2e/react-start/basic-rsc/package.json @@ -17,7 +17,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@types/react": "^19.0.8", diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json index f05595eecf..aaeb94882e 100644 --- a/e2e/react-start/basic-tsr-config/package.json +++ b/e2e/react-start/basic-tsr-config/package.json @@ -15,7 +15,7 @@ "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/react-start/clerk-basic/package.disabled.json b/e2e/react-start/clerk-basic/package.disabled.json index 583f7ab6ec..27e0387949 100644 --- a/e2e/react-start/clerk-basic/package.disabled.json +++ b/e2e/react-start/clerk-basic/package.disabled.json @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@playwright/test": "^1.50.1", diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json index 79e062b75a..d4673b5392 100644 --- a/e2e/react-start/scroll-restoration/package.json +++ b/e2e/react-start/scroll-restoration/package.json @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4", + "vite": "^6.3.5", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/react-start/server-functions/package.json b/e2e/react-start/server-functions/package.json index 33c03db7e6..075734b7ce 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -19,7 +19,7 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4", + "vite": "^6.3.5", "zod": "^3.24.2" }, "devDependencies": { diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json index 98ca661a1b..f86fe1693d 100644 --- a/e2e/react-start/website/package.json +++ b/e2e/react-start/website/package.json @@ -31,7 +31,7 @@ "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", - "vite": "6.1.4", + "vite": "^6.3.5", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/solid-router/basic-file-based-code-splitting/package.json b/e2e/solid-router/basic-file-based-code-splitting/package.json index ba4a9e2940..9f65ec5d04 100644 --- a/e2e/solid-router/basic-file-based-code-splitting/package.json +++ b/e2e/solid-router/basic-file-based-code-splitting/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/e2e/solid-router/basic-file-based/package.json b/e2e/solid-router/basic-file-based/package.json index 9bfd059a6d..47fd6a1a73 100644 --- a/e2e/solid-router/basic-file-based/package.json +++ b/e2e/solid-router/basic-file-based/package.json @@ -27,6 +27,6 @@ "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", "combinate": "^1.1.11", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic-scroll-restoration/package.json b/e2e/solid-router/basic-scroll-restoration/package.json index f488bb854d..3907e98194 100644 --- a/e2e/solid-router/basic-scroll-restoration/package.json +++ b/e2e/solid-router/basic-scroll-restoration/package.json @@ -24,6 +24,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic-solid-query-file-based/package.json b/e2e/solid-router/basic-solid-query-file-based/package.json index 6ff1893b5d..886d34868e 100644 --- a/e2e/solid-router/basic-solid-query-file-based/package.json +++ b/e2e/solid-router/basic-solid-query-file-based/package.json @@ -27,6 +27,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic-solid-query/package.json b/e2e/solid-router/basic-solid-query/package.json index db2fa275fa..c9ed84942d 100644 --- a/e2e/solid-router/basic-solid-query/package.json +++ b/e2e/solid-router/basic-solid-query/package.json @@ -25,6 +25,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic-virtual-file-based/package.json b/e2e/solid-router/basic-virtual-file-based/package.json index 3d302dee67..53ce56d459 100644 --- a/e2e/solid-router/basic-virtual-file-based/package.json +++ b/e2e/solid-router/basic-virtual-file-based/package.json @@ -26,6 +26,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json index b79d571fb7..5103593208 100644 --- a/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/solid-router/basic-virtual-named-export-config-file-based/package.json @@ -26,6 +26,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/basic/package.json b/e2e/solid-router/basic/package.json index a3316c5ec2..1f557d00c3 100644 --- a/e2e/solid-router/basic/package.json +++ b/e2e/solid-router/basic/package.json @@ -23,6 +23,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json index 936a4a3214..acbbd56681 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/package.json @@ -29,6 +29,6 @@ "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "vite-plugin-solid": "^2.11.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 0497d9ee63..ab3d5ebcd0 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -27,6 +27,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index dc8274b1b3..1bba587efb 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 91b3aaeee4..38d7a43a99 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index cf00d4c63a..6c212c8d8d 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -24,6 +24,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 6dcf73781c..db77337908 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 47fd175de8..36d60a2c7a 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -23,6 +23,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 67506a3dba..e6d320caf7 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -27,6 +27,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 56f2681253..8e94f141e7 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-ssr-file-based/package.disabled.json b/examples/react/basic-ssr-file-based/package.disabled.json index 74062d8926..64b96d1ff4 100644 --- a/examples/react/basic-ssr-file-based/package.disabled.json +++ b/examples/react/basic-ssr-file-based/package.disabled.json @@ -32,7 +32,7 @@ "isbot": "^5.1.22", "node-fetch": "^3.3.2", "serve-static": "^1.16.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1" } diff --git a/examples/react/basic-ssr-streaming-file-based/package.disabled.json b/examples/react/basic-ssr-streaming-file-based/package.disabled.json index a29711ecc0..7bfb79e1f3 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.disabled.json +++ b/examples/react/basic-ssr-streaming-file-based/package.disabled.json @@ -33,7 +33,7 @@ "isbot": "^5.1.22", "node-fetch": "^3.3.2", "serve-static": "^1.16.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1" } diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index a34cdfe70b..f753b9c3eb 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -26,6 +26,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 37d16298c1..4e7546bd5d 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -26,6 +26,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 403959ab01..6f861b744e 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -23,6 +23,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index ee2bf831fd..9b3f07c61e 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -24,6 +24,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index e9a5777bd5..7f45c00048 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -26,6 +26,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index fc36f988f4..a32a073f67 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -28,6 +28,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 67c60c4c38..f1d48bf0b4 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -27,6 +27,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 5335ca710b..24af5ffcb5 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 3a1fe1e444..435f3b87da 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -28,6 +28,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 3780cb20ce..b6340e4270 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 0fefdb0f44..612d77e05c 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -24,6 +24,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 171ace0c72..946099d197 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index a1a2bdd119..dc3945c274 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -22,6 +22,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index d0beb4391a..5113cf523a 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -25,7 +25,7 @@ "@types/react-dom": "^19.0.3", "typescript": "^5.7.2", "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" }, "keywords": [], diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 39171b4043..ad9c2b49a9 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -24,7 +24,7 @@ "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" }, "nx": { diff --git a/examples/react/router-monorepo-react-query/packages/post-feature/package.json b/examples/react/router-monorepo-react-query/packages/post-feature/package.json index 8fd1b7da4f..ef4700d04f 100644 --- a/examples/react/router-monorepo-react-query/packages/post-feature/package.json +++ b/examples/react/router-monorepo-react-query/packages/post-feature/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/router-monorepo-react-query/packages/post-query/package.json b/examples/react/router-monorepo-react-query/packages/post-query/package.json index 1ea8a36e06..6f856efc89 100644 --- a/examples/react/router-monorepo-react-query/packages/post-query/package.json +++ b/examples/react/router-monorepo-react-query/packages/post-query/package.json @@ -15,6 +15,6 @@ "devDependencies": { "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index dad07747c1..a77cb5ef58 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -23,7 +23,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 514732f20e..6ea34e049f 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -21,7 +21,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" }, "keywords": [], diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 72e1e2c9d4..f92ec1e3ea 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -23,7 +23,7 @@ "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" }, "nx": { diff --git a/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json b/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json index 9efcefe894..324c49737a 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/post-feature/package.json @@ -26,7 +26,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index aceab58dbe..4b08eac8c5 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -21,7 +21,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 46df25a447..53df2ae741 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -21,7 +21,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" }, "keywords": [], diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 4b793571c1..f1cf5e4cdd 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -20,7 +20,7 @@ "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "vite": "^6.1.0", + "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple/packages/post-feature/package.json b/examples/react/router-monorepo-simple/packages/post-feature/package.json index fec8618c23..2a5ff9288e 100644 --- a/examples/react/router-monorepo-simple/packages/post-feature/package.json +++ b/examples/react/router-monorepo-simple/packages/post-feature/package.json @@ -17,7 +17,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 99000b3275..b2b7dddcec 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -21,7 +21,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-dts": "^4.5.0" } } diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 124a67e145..c3a1b0fb27 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -23,6 +23,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index a501541b90..ac8b9d137d 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -33,6 +33,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ddb7db1051..25e8b3dbbc 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -15,7 +15,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", - "vite": "6.1.0", + "vite": "^6.3.5", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 5d13ee6e03..cf5be54b4e 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -29,7 +29,7 @@ "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", - "vite": "6.1.4", + "vite": "^6.3.5", "vite-tsconfig-paths": "^5.1.4" }, "keywords": [], diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index c6ddadc351..15907b9496 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -22,7 +22,7 @@ "jose": "^6.0.10", "react": "^19.0.0", "react-dom": "^19.0.0", - "vite": "6.1.0" + "vite": "^6.3.5" }, "devDependencies": { "@types/react": "^19.0.8", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 975d2daa34..368368080c 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 3fdee1d249..669cfa3475 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -25,6 +25,6 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 4e460759ac..2ebbb6892b 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -20,6 +20,6 @@ "devDependencies": { "vite-plugin-solid": "^2.11.6", "typescript": "^5.7.2", - "vite": "^6.1.0" + "vite": "^6.3.5" } } diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index c6a9b860bf..192b82ed5a 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 2c86f4d29b..70319c9792 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -21,7 +21,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 185634f90e..a167a3e6f9 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -24,7 +24,7 @@ "devDependencies": { "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index f8745f58fe..6657818098 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 3d7114d5da..ff93c47b93 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -21,7 +21,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 7055deb11c..59ec28c251 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 08d7728346..9dffa11d11 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@tanstack/router-plugin": "^1.120.4-alpha.1", "typescript": "^5.7.2", - "vite": "^6.1.0", + "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" } } diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 3e001d408c..a76c4598c7 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -15,7 +15,7 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.0", + "vite": "^6.3.5", "zod": "^3.24.2" }, "devDependencies": { diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index b6b808cd70..9729ba02fe 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -15,7 +15,7 @@ "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", - "vite": "6.1.4" + "vite": "^6.3.5" }, "devDependencies": { "@types/node": "^22.5.4", diff --git a/package.json b/package.json index c74f5974b4..9798cfeaba 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "rimraf": "^6.0.1", "tinyglobby": "^0.2.12", "typescript": "^5.8.2", - "vite": "6.1.4", + "vite": "6.3.5", "vitest": "^3.0.6", "typescript53": "npm:typescript@5.3", "typescript54": "npm:typescript@5.4", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 4ab18ac695..097e76124d 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -76,7 +76,7 @@ "babel-dead-code-elimination": "^1.0.10", "dedent": "^1.5.3", "tiny-invariant": "^1.3.3", - "vite": "6.1.4" + "vite": "^6.0.0" }, "devDependencies": { "@types/babel__code-frame": "^7.0.6", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index ae2102a12c..113fe75e08 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -70,7 +70,7 @@ "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", "@vitejs/plugin-react": "^4.3.4", - "vite": "6.1.4", + "vite": "^6.0.0", "zod": "^3.24.2" } } diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 7a04b0c9c5..ee44cea337 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -69,7 +69,7 @@ "@tanstack/router-utils": "workspace:^", "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", - "vite": "6.1.4", + "vite": "^6.0.0", "vite-plugin-solid": "^2.11.6", "zod": "^3.24.2" } diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 11c6dff1fa..88cb470a54 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -80,7 +80,7 @@ "nitropack": "^2.11.8", "pathe": "^2.0.3", "ufo": "^1.5.4", - "vite": "6.1.0", + "vite": "^6.0.0", "xmlbuilder2": "^3.1.1", "zod": "^3.24.2" } diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index e47cc7509d..e138f96d49 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -77,6 +77,6 @@ "@types/jsesc": "^3.0.3", "esbuild": "^0.25.0", "typescript": "^5.7.2", - "vite": "6.1.4" + "vite": "^6.3.5" } } diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index fe0fdd0269..84c9ffa02a 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -67,6 +67,6 @@ }, "devDependencies": { "typescript": "^5.7.2", - "vite": "6.1.4" + "vite": "^6.3.5" } } diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 8b85fa88a6..1ee5575001 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -64,7 +64,7 @@ "dependencies": { "@tanstack/server-functions-plugin": "workspace:^", "tiny-invariant": "^1.3.3", - "vite": "6.1.0" + "vite": "^6.0.0" }, "devDependencies": { "typescript": "^5.7.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8156b72fe8..52b856a4a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,7 +11,7 @@ overrides: '@types/react': ^19.0.8 '@types/react-dom': ^19.0.3 eslint: ^9.22.0 - vite: 6.1.4 + vite: 6.3.5 '@playwright/test': ^1.52.0 '@tanstack/react-query': 5.66.0 '@tanstack/history': workspace:* @@ -68,7 +68,7 @@ importers: version: 1.52.0 '@tanstack/config': specifier: ^0.16.1 - version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@tanstack/react-query': specifier: 5.66.0 version: 5.66.0(react@19.0.0) @@ -83,7 +83,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitest/browser': specifier: ^3.0.6 - version: 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) + version: 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) '@vitest/ui': specifier: ^3.0.6 version: 3.0.6(vitest@3.0.6) @@ -142,8 +142,8 @@ importers: specifier: npm:typescript@5.7 version: typescript@5.7.3 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: ^3.0.6 version: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -191,10 +191,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-esbuild-file-based: dependencies: @@ -289,13 +289,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) combinate: specifier: ^1.1.11 version: 1.1.11 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-file-based-code-splitting: dependencies: @@ -341,10 +341,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-react-query: dependencies: @@ -393,10 +393,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-react-query-file-based: dependencies: @@ -451,10 +451,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-scroll-restoration: dependencies: @@ -500,10 +500,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-virtual-file-based: dependencies: @@ -555,10 +555,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-virtual-named-export-config-file-based: dependencies: @@ -610,10 +610,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/generator-cli-only: dependencies: @@ -659,10 +659,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/js-only-file-based: dependencies: @@ -708,10 +708,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/rspack-basic-file-based: dependencies: @@ -870,10 +870,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/sentry-integration: dependencies: @@ -925,10 +925,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-start/basic: dependencies: @@ -974,7 +974,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -992,7 +992,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-auth: dependencies: @@ -1024,8 +1024,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1044,7 +1044,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1059,7 +1059,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-react-query: dependencies: @@ -1094,8 +1094,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1114,7 +1114,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1129,7 +1129,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-rsc: dependencies: @@ -1158,8 +1158,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -1169,7 +1169,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1184,7 +1184,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-tsr-config: dependencies: @@ -1201,8 +1201,8 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -1247,8 +1247,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1270,7 +1270,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1288,7 +1288,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/server-functions: dependencies: @@ -1317,8 +1317,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1343,7 +1343,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1361,7 +1361,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/website: dependencies: @@ -1407,7 +1407,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1421,11 +1421,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic: dependencies: @@ -1458,11 +1458,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -1544,11 +1544,11 @@ importers: specifier: ^1.1.11 version: 1.1.11 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-file-based-code-splitting: dependencies: @@ -1584,11 +1584,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-scroll-restoration: dependencies: @@ -1624,11 +1624,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-solid-query: dependencies: @@ -1667,11 +1667,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-solid-query-file-based: dependencies: @@ -1716,11 +1716,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-virtual-file-based: dependencies: @@ -1762,11 +1762,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: @@ -1808,11 +1808,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -1949,11 +1949,11 @@ importers: specifier: workspace:^ version: link:../../e2e-utils vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/basic: dependencies: @@ -2005,10 +2005,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/basic-tsr-config: dependencies: @@ -2036,7 +2036,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/scroll-restoration: dependencies: @@ -2091,10 +2091,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/server-functions: dependencies: @@ -2152,10 +2152,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/website: dependencies: @@ -2204,10 +2204,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/authenticated-routes: dependencies: @@ -2250,13 +2250,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/authenticated-routes-firebase: dependencies: @@ -2305,13 +2305,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic: dependencies: @@ -2348,13 +2348,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-default-search-params: dependencies: @@ -2397,13 +2397,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-devtools-panel: dependencies: @@ -2443,13 +2443,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-file-based: dependencies: @@ -2492,13 +2492,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-non-nested-devtools: dependencies: @@ -2535,13 +2535,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-react-query: dependencies: @@ -2584,13 +2584,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-react-query-file-based: dependencies: @@ -2639,13 +2639,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-virtual-file-based: dependencies: @@ -2691,13 +2691,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-virtual-inside-file-based: dependencies: @@ -2743,13 +2743,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/deferred-data: dependencies: @@ -2789,13 +2789,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink: dependencies: @@ -2838,13 +2838,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-file-based: dependencies: @@ -2890,13 +2890,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-react-query: dependencies: @@ -2945,13 +2945,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-react-query-file-based: dependencies: @@ -3003,13 +3003,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/large-file-based: dependencies: @@ -3055,13 +3055,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/location-masking: dependencies: @@ -3104,13 +3104,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/navigation-blocking: dependencies: @@ -3150,13 +3150,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart: dependencies: @@ -3190,13 +3190,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart-esbuild-file-based: dependencies: @@ -3273,13 +3273,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart-rspack-file-based: dependencies: @@ -3408,16 +3408,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -3448,7 +3448,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3462,11 +3462,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -3494,16 +3494,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: @@ -3519,13 +3519,13 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/router-monorepo-react-query/packages/router: dependencies: @@ -3565,16 +3565,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple: dependencies: @@ -3608,16 +3608,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -3651,16 +3651,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -3688,7 +3688,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3702,11 +3702,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -3731,16 +3731,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -3774,16 +3774,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -3811,7 +3811,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3825,11 +3825,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -3851,16 +3851,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -3894,16 +3894,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/scroll-restoration: dependencies: @@ -3940,13 +3940,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/search-validator-adapters: dependencies: @@ -4010,13 +4010,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/start-bare: dependencies: @@ -4041,7 +4041,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.5.4 version: 22.13.4 @@ -4059,7 +4059,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic: dependencies: @@ -4082,8 +4082,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4111,7 +4111,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-auth: dependencies: @@ -4166,7 +4166,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-react-query: dependencies: @@ -4224,7 +4224,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-rsc: dependencies: @@ -4273,7 +4273,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-static: dependencies: @@ -4322,7 +4322,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.3 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-clerk-basic: dependencies: @@ -4374,7 +4374,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-convex-trellaux: dependencies: @@ -4453,7 +4453,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-counter: dependencies: @@ -4538,11 +4538,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-material-ui: dependencies: @@ -4594,7 +4594,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-supabase-basic: dependencies: @@ -4640,7 +4640,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-trellaux: dependencies: @@ -4710,7 +4710,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-workos: dependencies: @@ -4742,8 +4742,8 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -4765,7 +4765,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/view-transitions: dependencies: @@ -4808,13 +4808,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/with-framer-motion: dependencies: @@ -4857,13 +4857,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/with-trpc: dependencies: @@ -4915,7 +4915,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/with-trpc-react-query: dependencies: @@ -4976,7 +4976,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic: dependencies: @@ -5012,11 +5012,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-devtools-panel: dependencies: @@ -5046,11 +5046,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-file-based: dependencies: @@ -5086,11 +5086,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-non-nested-devtools: dependencies: @@ -5126,11 +5126,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-solid-query: dependencies: @@ -5169,11 +5169,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-solid-query-file-based: dependencies: @@ -5215,11 +5215,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/kitchen-sink-file-based: dependencies: @@ -5258,11 +5258,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/quickstart-file-based: dependencies: @@ -5298,11 +5298,11 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/start-bare: dependencies: @@ -5325,15 +5325,15 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.10.2 version: 22.13.4 @@ -5348,10 +5348,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/start-basic: dependencies: @@ -5374,8 +5374,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -5394,7 +5394,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/arktype-adapter: devDependencies: @@ -5453,8 +5453,8 @@ importers: specifier: ^1.3.3 version: 1.3.3 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/babel__code-frame': specifier: ^7.0.6 @@ -5519,7 +5519,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -5547,7 +5547,7 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5568,7 +5568,7 @@ importers: version: link:../router-core '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5600,8 +5600,8 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: esbuild: specifier: ^0.25.0 @@ -5645,7 +5645,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/react-start-plugin: dependencies: @@ -5663,10 +5663,10 @@ importers: version: link:../start-plugin-core '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -5712,7 +5712,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) esbuild: specifier: ^0.25.0 version: 0.25.2 @@ -5774,7 +5774,7 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5805,7 +5805,7 @@ importers: version: 1.9.5 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/router-generator: dependencies: @@ -5882,11 +5882,11 @@ importers: specifier: ^2.1.2 version: 2.2.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) webpack: specifier: '>=5.92.0' version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) @@ -6024,7 +6024,7 @@ importers: version: 1.9.5 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) zod: specifier: ^3.23.8 version: 3.24.2 @@ -6043,7 +6043,7 @@ importers: devDependencies: vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/solid-start: dependencies: @@ -6066,8 +6066,8 @@ importers: specifier: '>=1.0.0' version: 1.9.5 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: esbuild: specifier: ^0.25.0 @@ -6111,7 +6111,7 @@ importers: version: 3.0.3 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/solid-start-plugin: dependencies: @@ -6128,11 +6128,11 @@ importers: specifier: workspace:* version: link:../start-plugin-core vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) zod: specifier: ^3.24.2 version: 3.24.2 @@ -6187,7 +6187,7 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/start-client-core: dependencies: @@ -6249,8 +6249,8 @@ importers: specifier: ^1.5.4 version: 1.5.4 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) xmlbuilder2: specifier: ^3.1.1 version: 3.1.1 @@ -6301,8 +6301,8 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-client: dependencies: @@ -6330,8 +6330,8 @@ importers: specifier: ^5.7.2 version: 5.8.2 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-server: dependencies: @@ -6342,8 +6342,8 @@ importers: specifier: ^1.3.3 version: 1.3.3 vite: - specifier: 6.1.4 - version: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: typescript: specifier: ^5.7.2 @@ -6764,12 +6764,6 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.24.2': - resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [aix] - '@esbuild/aix-ppc64@0.25.2': resolution: {integrity: sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==} engines: {node: '>=18'} @@ -6788,12 +6782,6 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.24.2': - resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm64@0.25.2': resolution: {integrity: sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==} engines: {node: '>=18'} @@ -6812,12 +6800,6 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.24.2': - resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - '@esbuild/android-arm@0.25.2': resolution: {integrity: sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==} engines: {node: '>=18'} @@ -6836,12 +6818,6 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.24.2': - resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - '@esbuild/android-x64@0.25.2': resolution: {integrity: sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==} engines: {node: '>=18'} @@ -6860,12 +6836,6 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.24.2': - resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-arm64@0.25.2': resolution: {integrity: sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==} engines: {node: '>=18'} @@ -6884,12 +6854,6 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.24.2': - resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - '@esbuild/darwin-x64@0.25.2': resolution: {integrity: sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==} engines: {node: '>=18'} @@ -6908,12 +6872,6 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.24.2': - resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-arm64@0.25.2': resolution: {integrity: sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==} engines: {node: '>=18'} @@ -6932,12 +6890,6 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.24.2': - resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - '@esbuild/freebsd-x64@0.25.2': resolution: {integrity: sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==} engines: {node: '>=18'} @@ -6956,12 +6908,6 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.24.2': - resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm64@0.25.2': resolution: {integrity: sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==} engines: {node: '>=18'} @@ -6980,12 +6926,6 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.24.2': - resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - '@esbuild/linux-arm@0.25.2': resolution: {integrity: sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==} engines: {node: '>=18'} @@ -7004,12 +6944,6 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.24.2': - resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-ia32@0.25.2': resolution: {integrity: sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==} engines: {node: '>=18'} @@ -7028,12 +6962,6 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.24.2': - resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-loong64@0.25.2': resolution: {integrity: sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==} engines: {node: '>=18'} @@ -7052,12 +6980,6 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.24.2': - resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==} - engines: {node: '>=18'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-mips64el@0.25.2': resolution: {integrity: sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==} engines: {node: '>=18'} @@ -7076,12 +6998,6 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.24.2': - resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-ppc64@0.25.2': resolution: {integrity: sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==} engines: {node: '>=18'} @@ -7100,12 +7016,6 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.24.2': - resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-riscv64@0.25.2': resolution: {integrity: sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==} engines: {node: '>=18'} @@ -7124,12 +7034,6 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.24.2': - resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-s390x@0.25.2': resolution: {integrity: sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==} engines: {node: '>=18'} @@ -7148,24 +7052,12 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.24.2': - resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - '@esbuild/linux-x64@0.25.2': resolution: {integrity: sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.24.2': - resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [netbsd] - '@esbuild/netbsd-arm64@0.25.2': resolution: {integrity: sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==} engines: {node: '>=18'} @@ -7184,12 +7076,6 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.24.2': - resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - '@esbuild/netbsd-x64@0.25.2': resolution: {integrity: sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==} engines: {node: '>=18'} @@ -7208,12 +7094,6 @@ packages: cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.24.2': - resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openbsd] - '@esbuild/openbsd-arm64@0.25.2': resolution: {integrity: sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==} engines: {node: '>=18'} @@ -7232,12 +7112,6 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.24.2': - resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - '@esbuild/openbsd-x64@0.25.2': resolution: {integrity: sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==} engines: {node: '>=18'} @@ -7256,12 +7130,6 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.24.2': - resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - '@esbuild/sunos-x64@0.25.2': resolution: {integrity: sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==} engines: {node: '>=18'} @@ -7280,12 +7148,6 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.24.2': - resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-arm64@0.25.2': resolution: {integrity: sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==} engines: {node: '>=18'} @@ -7304,12 +7166,6 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.24.2': - resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-ia32@0.25.2': resolution: {integrity: sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==} engines: {node: '>=18'} @@ -7328,12 +7184,6 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.24.2': - resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==} - engines: {node: '>=18'} - cpu: [x64] - os: [win32] - '@esbuild/win32-x64@0.25.2': resolution: {integrity: sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==} engines: {node: '>=18'} @@ -9565,7 +9415,7 @@ packages: '@tailwindcss/vite@4.0.8': resolution: {integrity: sha512-+SAq44yLzYlzyrb7QTcFCdU8Xa7FOA0jp+Xby7fPMUie+MY9HhJysM7Vp+vL8qIp8ceQJfLD+FjgJuJ4lL6nyg==} peerDependencies: - vite: 6.1.4 + vite: 6.3.5 '@tanstack/config@0.16.1': resolution: {integrity: sha512-GLt1xyQCGRty58N2jv0ONouv8OU46FjkbcSSTiAKwydcX+JycZ7FCLWt05lefrvuV8Eay0eNuN0sYUemObZLEA==} @@ -9968,7 +9818,7 @@ packages: resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: 6.1.4 + vite: 6.3.5 '@vitest/browser@3.0.6': resolution: {integrity: sha512-FqKwCAkALZfNzGNx4YvRJa6HCWM2USWTjOdNO2egI/s6+3WkIl4xAlYISOARLJLDAI3yCXcpTtuUUF39K8TQgw==} @@ -9992,7 +9842,7 @@ packages: resolution: {integrity: sha512-KPztr4/tn7qDGZfqlSPQoF2VgJcKxnDNhmfR3VgZ6Fy1bO8T9Fc1stUiTXtqz0yG24VpD00pZP5f8EOFknjNuQ==} peerDependencies: msw: ^2.4.9 - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: msw: optional: true @@ -11132,11 +10982,6 @@ packages: engines: {node: '>=18'} hasBin: true - esbuild@0.24.2: - resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==} - engines: {node: '>=18'} - hasBin: true - esbuild@0.25.2: resolution: {integrity: sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==} engines: {node: '>=18'} @@ -11417,6 +11262,14 @@ packages: picomatch: optional: true + fdir@6.4.4: + resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + fflate@0.8.2: resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} @@ -13744,6 +13597,10 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} + tinyglobby@0.2.13: + resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} + engines: {node: '>=12.0.0'} + tinypool@1.0.2: resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==} engines: {node: ^18.0.0 || >=20.0.0} @@ -14169,7 +14026,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: typescript: '*' - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: vite: optional: true @@ -14178,7 +14035,7 @@ packages: resolution: {integrity: sha512-M1lrPTdi7gilLYRZoLmGYnl4fbPryVYsehPN9JgaxjJKTs8/f7tuAlvCCvOLB5gRDQTTKnptBcB0ACsaw2wNLw==} peerDependencies: typescript: '*' - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: vite: optional: true @@ -14186,14 +14043,14 @@ packages: vite-plugin-externalize-deps@0.9.0: resolution: {integrity: sha512-wg3qb5gCy2d1KpPKyD9wkXMcYJ84yjgziHrStq9/8R7chhUC73mhQz+tVtvhFiICQHsBn1pnkY4IBbPqF9JHNw==} peerDependencies: - vite: 6.1.4 + vite: 6.3.5 vite-plugin-solid@2.11.6: resolution: {integrity: sha512-Sl5CTqJTGyEeOsmdH6BOgalIZlwH3t4/y0RQuFLMGnvWMBvxb4+lq7x3BSiAw6etf0QexfNJW7HSOO/Qf7pigg==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: ^1.7.2 - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -14201,13 +14058,13 @@ packages: vite-tsconfig-paths@5.1.4: resolution: {integrity: sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==} peerDependencies: - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: vite: optional: true - vite@6.1.4: - resolution: {integrity: sha512-VzONrF/qqEg/JBwHXBJdVSmBZBhwiPGinyUb0SQLByqQwi6o8UvX5TWLkpvkq3tvN8Cr273ieZDt36CGwWRMvA==} + vite@6.3.5: + resolution: {integrity: sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -14249,7 +14106,7 @@ packages: vitefu@1.0.5: resolution: {integrity: sha512-h4Vflt9gxODPFNGPwp4zAMZRpZR7eslzwH2c5hn5kNZ5rhnKyRJ50U+yGCdc2IRaBs8O4haIgLNGrV5CrpMsCA==} peerDependencies: - vite: 6.1.4 + vite: 6.3.5 peerDependenciesMeta: vite: optional: true @@ -15010,9 +14867,6 @@ snapshots: '@esbuild/aix-ppc64@0.23.1': optional: true - '@esbuild/aix-ppc64@0.24.2': - optional: true - '@esbuild/aix-ppc64@0.25.2': optional: true @@ -15022,9 +14876,6 @@ snapshots: '@esbuild/android-arm64@0.23.1': optional: true - '@esbuild/android-arm64@0.24.2': - optional: true - '@esbuild/android-arm64@0.25.2': optional: true @@ -15034,9 +14885,6 @@ snapshots: '@esbuild/android-arm@0.23.1': optional: true - '@esbuild/android-arm@0.24.2': - optional: true - '@esbuild/android-arm@0.25.2': optional: true @@ -15046,9 +14894,6 @@ snapshots: '@esbuild/android-x64@0.23.1': optional: true - '@esbuild/android-x64@0.24.2': - optional: true - '@esbuild/android-x64@0.25.2': optional: true @@ -15058,9 +14903,6 @@ snapshots: '@esbuild/darwin-arm64@0.23.1': optional: true - '@esbuild/darwin-arm64@0.24.2': - optional: true - '@esbuild/darwin-arm64@0.25.2': optional: true @@ -15070,9 +14912,6 @@ snapshots: '@esbuild/darwin-x64@0.23.1': optional: true - '@esbuild/darwin-x64@0.24.2': - optional: true - '@esbuild/darwin-x64@0.25.2': optional: true @@ -15082,9 +14921,6 @@ snapshots: '@esbuild/freebsd-arm64@0.23.1': optional: true - '@esbuild/freebsd-arm64@0.24.2': - optional: true - '@esbuild/freebsd-arm64@0.25.2': optional: true @@ -15094,9 +14930,6 @@ snapshots: '@esbuild/freebsd-x64@0.23.1': optional: true - '@esbuild/freebsd-x64@0.24.2': - optional: true - '@esbuild/freebsd-x64@0.25.2': optional: true @@ -15106,9 +14939,6 @@ snapshots: '@esbuild/linux-arm64@0.23.1': optional: true - '@esbuild/linux-arm64@0.24.2': - optional: true - '@esbuild/linux-arm64@0.25.2': optional: true @@ -15118,9 +14948,6 @@ snapshots: '@esbuild/linux-arm@0.23.1': optional: true - '@esbuild/linux-arm@0.24.2': - optional: true - '@esbuild/linux-arm@0.25.2': optional: true @@ -15130,9 +14957,6 @@ snapshots: '@esbuild/linux-ia32@0.23.1': optional: true - '@esbuild/linux-ia32@0.24.2': - optional: true - '@esbuild/linux-ia32@0.25.2': optional: true @@ -15142,9 +14966,6 @@ snapshots: '@esbuild/linux-loong64@0.23.1': optional: true - '@esbuild/linux-loong64@0.24.2': - optional: true - '@esbuild/linux-loong64@0.25.2': optional: true @@ -15154,9 +14975,6 @@ snapshots: '@esbuild/linux-mips64el@0.23.1': optional: true - '@esbuild/linux-mips64el@0.24.2': - optional: true - '@esbuild/linux-mips64el@0.25.2': optional: true @@ -15166,9 +14984,6 @@ snapshots: '@esbuild/linux-ppc64@0.23.1': optional: true - '@esbuild/linux-ppc64@0.24.2': - optional: true - '@esbuild/linux-ppc64@0.25.2': optional: true @@ -15178,9 +14993,6 @@ snapshots: '@esbuild/linux-riscv64@0.23.1': optional: true - '@esbuild/linux-riscv64@0.24.2': - optional: true - '@esbuild/linux-riscv64@0.25.2': optional: true @@ -15190,9 +15002,6 @@ snapshots: '@esbuild/linux-s390x@0.23.1': optional: true - '@esbuild/linux-s390x@0.24.2': - optional: true - '@esbuild/linux-s390x@0.25.2': optional: true @@ -15202,15 +15011,9 @@ snapshots: '@esbuild/linux-x64@0.23.1': optional: true - '@esbuild/linux-x64@0.24.2': - optional: true - '@esbuild/linux-x64@0.25.2': optional: true - '@esbuild/netbsd-arm64@0.24.2': - optional: true - '@esbuild/netbsd-arm64@0.25.2': optional: true @@ -15220,9 +15023,6 @@ snapshots: '@esbuild/netbsd-x64@0.23.1': optional: true - '@esbuild/netbsd-x64@0.24.2': - optional: true - '@esbuild/netbsd-x64@0.25.2': optional: true @@ -15232,9 +15032,6 @@ snapshots: '@esbuild/openbsd-arm64@0.23.1': optional: true - '@esbuild/openbsd-arm64@0.24.2': - optional: true - '@esbuild/openbsd-arm64@0.25.2': optional: true @@ -15244,9 +15041,6 @@ snapshots: '@esbuild/openbsd-x64@0.23.1': optional: true - '@esbuild/openbsd-x64@0.24.2': - optional: true - '@esbuild/openbsd-x64@0.25.2': optional: true @@ -15256,9 +15050,6 @@ snapshots: '@esbuild/sunos-x64@0.23.1': optional: true - '@esbuild/sunos-x64@0.24.2': - optional: true - '@esbuild/sunos-x64@0.25.2': optional: true @@ -15268,9 +15059,6 @@ snapshots: '@esbuild/win32-arm64@0.23.1': optional: true - '@esbuild/win32-arm64@0.24.2': - optional: true - '@esbuild/win32-arm64@0.25.2': optional: true @@ -15280,9 +15068,6 @@ snapshots: '@esbuild/win32-ia32@0.23.1': optional: true - '@esbuild/win32-ia32@0.24.2': - optional: true - '@esbuild/win32-ia32@0.25.2': optional: true @@ -15292,9 +15077,6 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@esbuild/win32-x64@0.24.2': - optional: true - '@esbuild/win32-x64@0.25.2': optional: true @@ -17736,15 +17518,15 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.0.8 '@tailwindcss/oxide-win32-x64-msvc': 4.0.8 - '@tailwindcss/vite@4.0.8(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tailwindcss/vite@4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@tailwindcss/node': 4.0.8 '@tailwindcss/oxide': 4.0.8 lightningcss: 1.29.1 tailwindcss: 4.0.8 - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@commitlint/parse': 19.5.0 '@eslint/js': 9.22.0 @@ -17766,9 +17548,9 @@ snapshots: typedoc-plugin-markdown: 4.4.1(typedoc@0.27.6(typescript@5.8.2)) typescript-eslint: 8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) v8flags: 4.0.1 - vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - vite-plugin-externalize-deps: 0.9.0(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-externalize-deps: 0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vue-eslint-parser: 9.4.3(eslint@9.22.0(jiti@2.4.2)) transitivePeerDependencies: - '@types/node' @@ -18265,22 +18047,22 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-react@4.3.4(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@vitejs/plugin-react@4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@babel/core': 7.26.8 '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.8) '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.8) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color - '@vitest/browser@3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6)': + '@vitest/browser@3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6)': dependencies: '@testing-library/dom': 10.4.0 '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.0) - '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@vitest/utils': 3.0.6 magic-string: 0.30.17 msw: 2.7.0(@types/node@22.13.4)(typescript@5.8.2) @@ -18304,14 +18086,14 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@vitest/mocker@3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@vitest/spy': 3.0.6 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@22.13.4)(typescript@5.8.2) - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) '@vitest/pretty-format@3.0.6': dependencies: @@ -19509,34 +19291,6 @@ snapshots: '@esbuild/win32-ia32': 0.23.1 '@esbuild/win32-x64': 0.23.1 - esbuild@0.24.2: - optionalDependencies: - '@esbuild/aix-ppc64': 0.24.2 - '@esbuild/android-arm': 0.24.2 - '@esbuild/android-arm64': 0.24.2 - '@esbuild/android-x64': 0.24.2 - '@esbuild/darwin-arm64': 0.24.2 - '@esbuild/darwin-x64': 0.24.2 - '@esbuild/freebsd-arm64': 0.24.2 - '@esbuild/freebsd-x64': 0.24.2 - '@esbuild/linux-arm': 0.24.2 - '@esbuild/linux-arm64': 0.24.2 - '@esbuild/linux-ia32': 0.24.2 - '@esbuild/linux-loong64': 0.24.2 - '@esbuild/linux-mips64el': 0.24.2 - '@esbuild/linux-ppc64': 0.24.2 - '@esbuild/linux-riscv64': 0.24.2 - '@esbuild/linux-s390x': 0.24.2 - '@esbuild/linux-x64': 0.24.2 - '@esbuild/netbsd-arm64': 0.24.2 - '@esbuild/netbsd-x64': 0.24.2 - '@esbuild/openbsd-arm64': 0.24.2 - '@esbuild/openbsd-x64': 0.24.2 - '@esbuild/sunos-x64': 0.24.2 - '@esbuild/win32-arm64': 0.24.2 - '@esbuild/win32-ia32': 0.24.2 - '@esbuild/win32-x64': 0.24.2 - esbuild@0.25.2: optionalDependencies: '@esbuild/aix-ppc64': 0.25.2 @@ -19964,6 +19718,10 @@ snapshots: optionalDependencies: picomatch: 4.0.2 + fdir@6.4.4(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 + fflate@0.8.2: {} figures@3.2.0: @@ -22505,6 +22263,11 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 + tinyglobby@0.2.13: + dependencies: + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 + tinypool@1.0.2: {} tinyrainbow@2.0.0: {} @@ -22832,7 +22595,7 @@ snapshots: debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - jiti @@ -22847,7 +22610,7 @@ snapshots: - tsx - yaml - vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@22.13.4) '@rollup/pluginutils': 5.1.4(rollup@4.38.0) @@ -22861,13 +22624,13 @@ snapshots: typescript: 5.8.2 vue-tsc: 2.0.29(typescript@5.8.2) optionalDependencies: - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.49.2(@types/node@22.13.4) '@rollup/pluginutils': 5.1.4(rollup@4.38.0) @@ -22880,17 +22643,17 @@ snapshots: magic-string: 0.30.17 typescript: 5.8.2 optionalDependencies: - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-externalize-deps@0.9.0(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-externalize-deps@0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@babel/core': 7.26.8 '@types/babel__core': 7.20.5 @@ -22898,29 +22661,32 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.5 solid-refresh: 0.6.3(solid-js@1.9.5) - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vitefu: 1.0.5(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vitefu: 1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-tsconfig-paths@5.1.4(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-tsconfig-paths@5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.8.2) optionalDependencies: - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color - typescript - vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): + vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: - esbuild: 0.24.2 + esbuild: 0.25.2 + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 postcss: 8.5.3 rollup: 4.38.0 + tinyglobby: 0.2.13 optionalDependencies: '@types/node': 22.13.4 fsevents: 2.3.3 @@ -22930,14 +22696,14 @@ snapshots: tsx: 4.19.2 yaml: 2.7.0 - vitefu@1.0.5(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vitefu@1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): optionalDependencies: - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vitest@3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: '@vitest/expect': 3.0.6 - '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@vitest/pretty-format': 3.0.6 '@vitest/runner': 3.0.6 '@vitest/snapshot': 3.0.6 @@ -22953,12 +22719,12 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-node: 3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.13.4 - '@vitest/browser': 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.1.4(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) + '@vitest/browser': 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) '@vitest/ui': 3.0.6(vitest@3.0.6) jsdom: 25.0.1 transitivePeerDependencies: From 82d14bda9544f99f1f9ff5b81ef1849b7c3b0667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iha=20Shin=20=28=EC=8B=A0=EC=9D=98=ED=95=98=29?= Date: Sun, 11 May 2025 02:32:09 +0900 Subject: [PATCH 007/126] docs(start): Fix contents outdated by Devinxi (#4125) --- docs/start/framework/react/build-from-scratch.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/start/framework/react/build-from-scratch.md b/docs/start/framework/react/build-from-scratch.md index d17357e486..d8436d71a1 100644 --- a/docs/start/framework/react/build-from-scratch.md +++ b/docs/start/framework/react/build-from-scratch.md @@ -47,7 +47,7 @@ We highly recommend using TypeScript with TanStack Start. Create a `tsconfig.jso ## Install Dependencies -TanStack Start is (currently\*) powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. +TanStack Start is powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. To install them, run: @@ -111,13 +111,13 @@ Once configuration is done, we'll have a file tree that looks like the following ``` . -├── app/ +├── src/ │ ├── routes/ │ │ └── `__root.tsx` │ ├── `router.tsx` │ ├── `routeTree.gen.ts` ├── `.gitignore` -├── `app.config.ts` +├── `vite.config.ts` ├── `package.json` └── `tsconfig.json` ``` @@ -131,7 +131,7 @@ from the default [preloading functionality](/router/latest/docs/framework/react/ > You won't have a `routeTree.gen.ts` file yet. This file will be generated when you run TanStack Start for the first time. ```tsx -// app/router.tsx +// src/router.tsx import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' @@ -156,7 +156,7 @@ declare module '@tanstack/react-router' { Finally, we need to create the root of our application. This is the entry point for all other routes. The code in this file will wrap all other routes in the application. ```tsx -// app/routes/__root.tsx +// src/routes/__root.tsx import type { ReactNode } from 'react' import { Outlet, @@ -208,10 +208,10 @@ function RootDocument({ children }: Readonly<{ children: ReactNode }>) { ## Writing Your First Route -Now that we have the basic templating setup, we can write our first route. This is done by creating a new file in the `app/routes` directory. +Now that we have the basic templating setup, we can write our first route. This is done by creating a new file in the `src/routes` directory. ```tsx -// app/routes/index.tsx +// src/routes/index.tsx import * as fs from 'node:fs' import { useRouter } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' From c997f90c1563ae58c2925d0c1988356941e502c6 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 10 May 2025 17:35:23 +0000 Subject: [PATCH 008/126] release: v1.120.4-alpha.2 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/directive-functions-plugin/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-fetcher/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 6ad6c13a07..6e22194ee0 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 94259aba2e..c4e5808ef6 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index aaa78ed5e1..268bd95474 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 17d0a6a371..aba3d169d1 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index c550d0b85d..dba3be6b5d 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 25e8b3dbbc..f1584066d0 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 50fa9cfdc0..74a08033b6 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index af28d4ed6d..ea0287a522 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 00e7219802..57c9cacf52 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index cf5be54b4e..050bf8d234 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 984d3591c5..ca8a6ca61f 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 130739127f..745e5d83df 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 200422a080..580febd135 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 15907b9496..3265f7f965 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 429dcdce2f..b4b54f7b20 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 104d9c9b8f..8516d7ca5e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.1", + "@tanstack/react-start": "^1.120.4-alpha.2", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index a76c4598c7..42c02cc000 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.1", + "@tanstack/solid-start": "^1.120.4-alpha.2", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 9729ba02fe..3fcd70cc1a 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.1", + "@tanstack/solid-start": "^1.120.4-alpha.2", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 097e76124d..c0f2c7ed36 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 113fe75e08..98a1139091 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index d37be20f88..c3fb2d5a70 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d4b11ebaeb..34f71f38b0 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 8ce27c3731..f6859fc292 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index ee44cea337..fc1d24a38c 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 64db37b609..51b42de1ae 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 60b6453128..a2d618f615 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 88cb470a54..382db53087 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index e138f96d49..3953accc4f 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 4f2b3af813..bdb809c2ad 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 84c9ffa02a..6f1289c068 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 1ee5575001..e159810a83 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 736a572cc7041edafb0e698a06d55b1c4c601f9d Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sun, 11 May 2025 11:44:17 +1200 Subject: [PATCH 009/126] fix: declare `vite` as a `peerDependency` (#4135) Currently, none of the packages (i.e `packages/*`) need `vite` bundled as a `dependency`. So its been moved to the `devDependencies` and had the version opened using `"peerDependencies": { "vite": ">=6.0.0" }`. Additionally, `vite` has been added as a `dependency` to the Start end-to-end sandboxes. In a later PR, `vite` will need to be added to all the TanStack Start examples (i.e. `examples/**/start-*`). --- e2e/react-start/basic/package.json | 5 +- e2e/solid-start/basic-tsr-config/package.json | 3 +- e2e/solid-start/basic/package.json | 9 ++- .../scroll-restoration/package.json | 5 +- e2e/solid-start/server-functions/package.json | 5 +- e2e/solid-start/website/package.json | 7 +- .../directive-functions-plugin/package.json | 10 ++- packages/react-start-plugin/package.json | 10 ++- packages/react-start/package.json | 3 +- packages/server-functions-plugin/package.json | 1 - packages/solid-start-plugin/package.json | 10 ++- packages/solid-start/package.json | 3 +- packages/start-plugin-core/package.json | 7 +- .../package.json | 3 +- .../package.json | 3 +- pnpm-lock.yaml | 75 ++++++++++--------- 16 files changed, 93 insertions(+), 66 deletions(-) diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index fa77d55739..db3ff39cf2 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -18,18 +18,19 @@ "react-dom": "^19.0.0", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", + "vite": "6.3.5", "zod": "^3.24.2" }, "devDependencies": { "@playwright/test": "^1.50.1", + "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-react": "^4.3.4", + "autoprefixer": "^10.4.20", "combinate": "^1.1.11", "postcss": "^8.5.1", - "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", "vite-tsconfig-paths": "^5.1.4" diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json index 635a898525..5ad3489cac 100644 --- a/e2e/solid-start/basic-tsr-config/package.json +++ b/e2e/solid-start/basic-tsr-config/package.json @@ -14,7 +14,8 @@ "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", - "solid-js": "^1.9.5" + "solid-js": "^1.9.5", + "vite": "6.3.5" }, "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index 01167c343d..791b179916 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -14,21 +14,22 @@ "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", - "solid-js": "^1.9.5", "redaxios": "^0.5.1", + "solid-js": "^1.9.5", "tailwind-merge": "^2.6.0", + "vite": "6.3.5", "zod": "^3.24.2" }, "devDependencies": { "@playwright/test": "^1.50.1", - "@types/node": "^22.10.2", "@tanstack/router-e2e-utils": "workspace:^", - "vite-plugin-solid": "^2.11.2", + "@types/node": "^22.10.2", + "autoprefixer": "^10.4.20", "combinate": "^1.1.11", "postcss": "^8.5.1", - "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", + "vite-plugin-solid": "^2.11.2", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json index e42cb920ab..e72dbb657c 100644 --- a/e2e/solid-start/scroll-restoration/package.json +++ b/e2e/solid-start/scroll-restoration/package.json @@ -15,21 +15,22 @@ "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", "@tanstack/zod-adapter": "workspace:^", - "solid-js": "^1.9.5", "redaxios": "^0.5.1", + "solid-js": "^1.9.5", "tailwind-merge": "^2.6.0", + "vite": "6.3.5", "zod": "^3.24.2" }, "devDependencies": { "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "vite-plugin-solid": "^2.11.6", "autoprefixer": "^10.4.20", "combinate": "^1.1.11", "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", + "vite-plugin-solid": "^2.11.6", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json index dc7d00752b..c3e457b6f2 100644 --- a/e2e/solid-start/server-functions/package.json +++ b/e2e/solid-start/server-functions/package.json @@ -15,9 +15,10 @@ "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", "js-cookie": "^3.0.5", - "solid-js": "^1.9.5", "redaxios": "^0.5.1", + "solid-js": "^1.9.5", "tailwind-merge": "^2.6.0", + "vite": "6.3.5", "zod": "^3.24.2" }, "devDependencies": { @@ -25,12 +26,12 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", - "vite-plugin-solid": "^2.11.6", "autoprefixer": "^10.4.20", "combinate": "^1.1.11", "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", + "vite-plugin-solid": "^2.11.6", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json index 5b6f4bd55f..8c6538a220 100644 --- a/e2e/solid-start/website/package.json +++ b/e2e/solid-start/website/package.json @@ -14,20 +14,21 @@ "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", - "solid-js": "^1.9.5", "redaxios": "^0.5.1", + "solid-js": "^1.9.5", "tailwind-merge": "^2.6.0", + "vite": "6.3.5", "zod": "^3.24.2" }, "devDependencies": { "@playwright/test": "^1.50.1", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "vite-plugin-solid": "^2.11.6", - "postcss": "^8.5.1", "autoprefixer": "^10.4.20", + "postcss": "^8.5.1", "tailwindcss": "^3.4.17", "typescript": "^5.7.2", + "vite-plugin-solid": "^2.11.6", "vite-tsconfig-paths": "^5.1.4" } } diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index c0f2c7ed36..67cab253fa 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -74,14 +74,16 @@ "@babel/types": "^7.26.8", "@tanstack/router-utils": "workspace:^", "babel-dead-code-elimination": "^1.0.10", - "dedent": "^1.5.3", - "tiny-invariant": "^1.3.3", - "vite": "^6.0.0" + "tiny-invariant": "^1.3.3" }, "devDependencies": { "@types/babel__code-frame": "^7.0.6", "@types/babel__core": "^7.20.5", "@types/babel__template": "^7.4.4", - "@types/babel__traverse": "^7.20.6" + "@types/babel__traverse": "^7.20.6", + "vite": "^6.0.0" + }, + "peerDependencies": { + "vite": ">=6.0.0" } } diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 98a1139091..c3d7ec2205 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -69,8 +69,14 @@ "@tanstack/router-utils": "workspace:^", "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", - "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.0.0", "zod": "^3.24.2" + }, + "devDependencies": { + "@vitejs/plugin-react": "^4.3.4", + "vite": "^6.0.0" + }, + "peerDependencies": { + "@vitejs/plugin-react": ">=4.3.4", + "vite": ">=6.0.0" } } diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 34f71f38b0..30d42a462a 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -110,9 +110,10 @@ "@tanstack/start-server-functions-server": "workspace:^" }, "peerDependencies": { + "@vitejs/plugin-react": ">=4.3.4", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "vite": "^6.0.0" + "vite": ">=6.0.0" }, "devDependencies": { "esbuild": "^0.25.0" diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index f6859fc292..7a2fb7f11c 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -74,7 +74,6 @@ "@babel/traverse": "^7.26.8", "@babel/types": "^7.26.8", "babel-dead-code-elimination": "^1.0.9", - "dedent": "^1.5.3", "tiny-invariant": "^1.3.3" }, "devDependencies": { diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index fc1d24a38c..865e9181ed 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -69,8 +69,14 @@ "@tanstack/router-utils": "workspace:^", "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", - "vite": "^6.0.0", - "vite-plugin-solid": "^2.11.6", "zod": "^3.24.2" + }, + "devDependencies": { + "vite": "^6.0.0", + "vite-plugin-solid": "^2.11.6" + }, + "peerDependencies": { + "vite": ">=6.0.0", + "vite-plugin-solid": ">=2.11.6" } } diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a2d618f615..bfe17bc39c 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -111,7 +111,8 @@ }, "peerDependencies": { "solid-js": ">=1.0.0", - "vite": "^6.0.0" + "vite": ">=6.0.0", + "vite-plugin-solid": ">=2.11.6" }, "devDependencies": { "esbuild": "^0.25.0" diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 382db53087..15abfbc0c3 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -80,8 +80,13 @@ "nitropack": "^2.11.8", "pathe": "^2.0.3", "ufo": "^1.5.4", - "vite": "^6.0.0", "xmlbuilder2": "^3.1.1", "zod": "^3.24.2" + }, + "devDependencies": { + "vite": "^6.0.0" + }, + "peerDependencies": { + "vite": ">=6.0.0" } } diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 6f1289c068..434754b9ae 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -66,7 +66,6 @@ "@tanstack/start-client-core": "workspace:^" }, "devDependencies": { - "typescript": "^5.7.2", - "vite": "^6.3.5" + "typescript": "^5.7.2" } } diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index e159810a83..66de9d181d 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -63,8 +63,7 @@ }, "dependencies": { "@tanstack/server-functions-plugin": "workspace:^", - "tiny-invariant": "^1.3.3", - "vite": "^6.0.0" + "tiny-invariant": "^1.3.3" }, "devDependencies": { "typescript": "^5.7.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52b856a4a4..6d252b03d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -953,6 +953,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1975,6 +1978,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2024,6 +2030,9 @@ importers: solid-js: specifier: ^1.9.5 version: 1.9.5 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -2061,6 +2070,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2119,6 +2131,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2177,6 +2192,9 @@ importers: tailwind-merge: specifier: ^2.6.0 version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -5446,15 +5464,9 @@ importers: babel-dead-code-elimination: specifier: ^1.0.10 version: 1.0.10 - dedent: - specifier: ^1.5.3 - version: 1.5.3(babel-plugin-macros@3.1.0) tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - vite: - specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/babel__code-frame': specifier: ^7.0.6 @@ -5468,6 +5480,9 @@ importers: '@types/babel__traverse': specifier: ^7.20.6 version: 7.20.6 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/eslint-plugin-router: dependencies: @@ -5593,6 +5608,9 @@ importers: '@tanstack/start-server-functions-server': specifier: workspace:* version: link:../start-server-functions-server + '@vitejs/plugin-react': + specifier: '>=4.3.4' + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5661,15 +5679,16 @@ importers: '@tanstack/start-plugin-core': specifier: workspace:* version: link:../start-plugin-core + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - zod: - specifier: ^3.24.2 - version: 3.24.2 packages/react-start-server: dependencies: @@ -5954,9 +5973,6 @@ importers: babel-dead-code-elimination: specifier: ^1.0.9 version: 1.0.10 - dedent: - specifier: ^1.5.3 - version: 1.5.3(babel-plugin-macros@3.1.0) tiny-invariant: specifier: ^1.3.3 version: 1.3.3 @@ -6068,6 +6084,9 @@ importers: vite: specifier: 6.3.5 version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite-plugin-solid: + specifier: '>=2.11.6' + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) devDependencies: esbuild: specifier: ^0.25.0 @@ -6127,15 +6146,16 @@ importers: '@tanstack/start-plugin-core': specifier: workspace:* version: link:../start-plugin-core + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: vite: specifier: 6.3.5 version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.6 version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - zod: - specifier: ^3.24.2 - version: 3.24.2 packages/solid-start-server: dependencies: @@ -6248,15 +6268,16 @@ importers: ufo: specifier: ^1.5.4 version: 1.5.4 - vite: - specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) xmlbuilder2: specifier: ^3.1.1 version: 3.1.1 zod: specifier: ^3.24.2 version: 3.24.2 + devDependencies: + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-core: dependencies: @@ -6329,9 +6350,6 @@ importers: typescript: specifier: ^5.7.2 version: 5.8.2 - vite: - specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-server: dependencies: @@ -6341,9 +6359,6 @@ importers: tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - vite: - specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: typescript: specifier: ^5.7.2 @@ -10707,14 +10722,6 @@ packages: decimal.js@10.5.0: resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==} - dedent@1.5.3: - resolution: {integrity: sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==} - peerDependencies: - babel-plugin-macros: ^3.1.0 - peerDependenciesMeta: - babel-plugin-macros: - optional: true - deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -19015,10 +19022,6 @@ snapshots: decimal.js@10.5.0: {} - dedent@1.5.3(babel-plugin-macros@3.1.0): - optionalDependencies: - babel-plugin-macros: 3.1.0 - deep-eql@5.0.2: {} deep-is@0.1.4: {} From 99a944b797133ecb71c16a49f9e3a4238cfb5d5a Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 10 May 2025 23:45:42 +0000 Subject: [PATCH 010/126] release: v1.120.4-alpha.3 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/directive-functions-plugin/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-fetcher/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 6e22194ee0..332a23a980 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index c4e5808ef6..ab2c5dd216 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 268bd95474..fef23ffbf7 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index aba3d169d1..e777b3e6e5 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index dba3be6b5d..b49ba84ada 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index f1584066d0..acf5d3b9b7 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 74a08033b6..6a4ae0e140 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index ea0287a522..90c237e9d1 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 57c9cacf52..4e7b2ef7ac 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 050bf8d234..f57edcff54 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index ca8a6ca61f..6a2bec69b9 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 745e5d83df..402041fe65 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 580febd135..9699f3d040 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 3265f7f965..c1fa3363f4 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index b4b54f7b20..1b91b797c4 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 8516d7ca5e..bcda62305e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.2", + "@tanstack/react-start": "^1.120.4-alpha.3", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 42c02cc000..41f90477f4 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.2", + "@tanstack/solid-start": "^1.120.4-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 3fcd70cc1a..74897c5fc3 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.2", + "@tanstack/solid-start": "^1.120.4-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 67cab253fa..65fce9c2f9 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index c3d7ec2205..d4d574baf5 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 30d42a462a..2fa40b2ba3 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 7a2fb7f11c..132bdc7f89 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 865e9181ed..8b75b00712 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index bfe17bc39c..79ebbfc5ed 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 15abfbc0c3..4f9239030c 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index bdb809c2ad..f7189faecc 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 434754b9ae..603996291d 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 66de9d181d..d5839555fd 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 35f6520eb2e946644963d88ca4fae10da10f5bfd Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sun, 11 May 2025 12:12:54 +1200 Subject: [PATCH 011/126] fix(router-generator): exit conditions when using `verboseFileRoutes` (#4136) --- packages/router-generator/src/generator.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index 48b1f600a4..83b4c1fbdf 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -310,6 +310,16 @@ export async function generator(config: Config, root: string) { `${node._fsRouteType === 'lazy' ? 'createLazyFileRoute' : 'createFileRoute'}`, ) } else { + // Check if the route file has a Route export + if ( + !routeCode + .split('\n') + .some((line) => line.trim().startsWith('export const Route')) + ) { + return + } + + // Update the existing route file replaced = routeCode // fix wrong ids .replace( From ef337e70b2cae195b0a7cfc70f0fc0f72c229bbd Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 00:14:02 +0000 Subject: [PATCH 012/126] release: v1.120.4-alpha.4 --- examples/react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- examples/react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../react/kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- examples/react/quickstart-rspack-file-based/package.json | 2 +- examples/react/quickstart-webpack-file-based/package.json | 2 +- examples/react/router-monorepo-react-query/package.json | 2 +- .../router-monorepo-react-query/packages/router/package.json | 2 +- examples/react/router-monorepo-simple-lazy/package.json | 2 +- .../router-monorepo-simple-lazy/packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../react/router-monorepo-simple/packages/router/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/view-transitions/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 4 ++-- examples/react/with-trpc/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 2 +- examples/solid/basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- examples/solid/kitchen-sink-file-based/package.json | 2 +- examples/solid/quickstart-file-based/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 53 files changed, 55 insertions(+), 55 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index ab3d5ebcd0..fe5443b2dc 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 1bba587efb..bc6d02d16b 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index db77337908..50b1a3dc81 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index e6d320caf7..47b0b0057a 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index f753b9c3eb..b92b1e69df 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 4e7546bd5d..b640eb8538 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 7f45c00048..c0822bdf58 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index a32a073f67..b76b80f4b1 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 435f3b87da..3f2b016072 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index b983c4cba9..2ecbfb0093 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 946099d197..504b7b1339 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 4edabf8e30..87ece13e02 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index fe2de68105..85a90349de 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 5113cf523a..fce0dc6d11 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index a77cb5ef58..df05a63fd1 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,7 +11,7 @@ "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 6ea34e049f..7a393fa20c 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 4b08eac8c5..46fcef0028 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 53df2ae741..fe21ee0866 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index b2b7dddcec..67413e6e45 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index ac8b9d137d..5a51334597 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "@tanstack/valibot-adapter": "^1.120.4-alpha.1", "@tanstack/zod-adapter": "^1.120.4-alpha.1", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 332a23a980..21a2a8f419 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index ab2c5dd216..243af7c332 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index fef23ffbf7..e83ff60a58 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index e777b3e6e5..0332315181 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index b49ba84ada..606fa51218 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index acf5d3b9b7..c2520b4a4c 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 6a4ae0e140..40337499c8 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 90c237e9d1..7027fe546d 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 4e7b2ef7ac..a55fbd6ac1 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index f57edcff54..5d6a1053b8 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 6a2bec69b9..bc39217556 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 402041fe65..ff0838ad27 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 9699f3d040..9d14840645 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index c1fa3363f4..ce04c05c5a 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/react-start": "^1.120.4-alpha.4", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 368368080c..a67a4bd11d 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 1b91b797c4..387f5c9e67 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -12,8 +12,8 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.4", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index bcda62305e..4c2fcc2886 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.3", + "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.4", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 192b82ed5a..51a26c21c5 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index a167a3e6f9..7c5b641f51 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 6657818098..dd24feeb48 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 59ec28c251..83a153446e 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 9dffa11d11..f3e6624224 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.1", + "@tanstack/router-plugin": "^1.120.4-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 41f90477f4..2bc3252e72 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.3", + "@tanstack/solid-start": "^1.120.4-alpha.4", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 74897c5fc3..99e5e54c59 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.3", + "@tanstack/solid-start": "^1.120.4-alpha.4", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index d4d574baf5..3787767c20 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 2fa40b2ba3..b30960a488 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 239743d611..0ddd9cdc92 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 0eb023b881..59dcf8f5a3 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 34e1fc2e13..d7f77bc03a 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 8e17d5c41b..4417e7f29e 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 8b75b00712..1051f51c0d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 79ebbfc5ed..b78248b540 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 4f9239030c..2422654736 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 94400a2a5db4d6ae2b8a0d28bf16afd156526470 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sun, 11 May 2025 13:39:56 +1200 Subject: [PATCH 013/126] fix(start-plugin-core): patches for Virtual Routes in Server Routes (#4137) Only import `routeCode` if `node.fullPath` is available. --- e2e/react-start/virtual-routes/.gitignore | 20 + .../virtual-routes/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 70 +++ e2e/react-start/virtual-routes/package.json | 39 ++ .../virtual-routes/playwright.config.ts | 35 ++ .../virtual-routes/postcss.config.mjs | 6 + .../public/android-chrome-192x192.png | Bin 0 -> 29964 bytes .../public/android-chrome-512x512.png | Bin 0 -> 109271 bytes .../public/apple-touch-icon.png | Bin 0 -> 27246 bytes .../virtual-routes/public/favicon-16x16.png | Bin 0 -> 832 bytes .../virtual-routes/public/favicon-32x32.png | Bin 0 -> 2115 bytes .../virtual-routes/public/favicon.ico | Bin 0 -> 15406 bytes .../virtual-routes/public/favicon.png | Bin 0 -> 1507 bytes .../virtual-routes/public/script.js | 2 + .../virtual-routes/public/script2.js | 2 + .../virtual-routes/public/site.webmanifest | 19 + e2e/react-start/virtual-routes/routes.ts | 24 + e2e/react-start/virtual-routes/src/posts.tsx | 32 + .../virtual-routes/src/routeTree.gen.ts | 584 ++++++++++++++++++ e2e/react-start/virtual-routes/src/router.tsx | 19 + .../virtual-routes/src/routes/a.tsx | 7 + .../virtual-routes/src/routes/b.tsx | 7 + .../routes/file-based-subtree/hello/index.tsx | 3 + .../routes/file-based-subtree/hello/route.tsx | 27 + .../file-based-subtree/hello/universe.tsx | 3 + .../routes/file-based-subtree/hello/world.tsx | 3 + .../virtual-routes/src/routes/home.tsx | 13 + .../src/routes/layout/first-layout.tsx | 16 + .../src/routes/layout/second-layout.tsx | 34 + .../src/routes/posts/posts-detail.tsx | 28 + .../src/routes/posts/posts-home.tsx | 9 + .../virtual-routes/src/routes/posts/posts.tsx | 39 ++ .../virtual-routes/src/routes/root.tsx | 96 +++ .../virtual-routes/src/styles/app.css | 22 + .../virtual-routes/src/tanstack-start.d.ts | 1 + .../virtual-routes/src/utils/posts.tsx | 36 ++ .../virtual-routes/src/utils/seo.ts | 33 + .../virtual-routes/src/utils/users.tsx | 9 + .../virtual-routes/tailwind.config.mjs | 4 + .../virtual-routes/tests/app.spec.ts | 33 + e2e/react-start/virtual-routes/tsconfig.json | 22 + e2e/react-start/virtual-routes/vite.config.ts | 19 + .../src/start-server-routes-plugin/plugin.ts | 4 +- pnpm-lock.yaml | 70 +++ 44 files changed, 1393 insertions(+), 1 deletion(-) create mode 100644 e2e/react-start/virtual-routes/.gitignore create mode 100644 e2e/react-start/virtual-routes/.prettierignore create mode 100644 e2e/react-start/virtual-routes/.tanstack-start/server-routes/routeTree.gen.ts create mode 100644 e2e/react-start/virtual-routes/package.json create mode 100644 e2e/react-start/virtual-routes/playwright.config.ts create mode 100644 e2e/react-start/virtual-routes/postcss.config.mjs create mode 100644 e2e/react-start/virtual-routes/public/android-chrome-192x192.png create mode 100644 e2e/react-start/virtual-routes/public/android-chrome-512x512.png create mode 100644 e2e/react-start/virtual-routes/public/apple-touch-icon.png create mode 100644 e2e/react-start/virtual-routes/public/favicon-16x16.png create mode 100644 e2e/react-start/virtual-routes/public/favicon-32x32.png create mode 100644 e2e/react-start/virtual-routes/public/favicon.ico create mode 100644 e2e/react-start/virtual-routes/public/favicon.png create mode 100644 e2e/react-start/virtual-routes/public/script.js create mode 100644 e2e/react-start/virtual-routes/public/script2.js create mode 100644 e2e/react-start/virtual-routes/public/site.webmanifest create mode 100644 e2e/react-start/virtual-routes/routes.ts create mode 100644 e2e/react-start/virtual-routes/src/posts.tsx create mode 100644 e2e/react-start/virtual-routes/src/routeTree.gen.ts create mode 100644 e2e/react-start/virtual-routes/src/router.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/a.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/b.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/index.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/route.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/universe.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/world.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/home.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/layout/first-layout.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/layout/second-layout.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/posts/posts-detail.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/posts/posts-home.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/posts/posts.tsx create mode 100644 e2e/react-start/virtual-routes/src/routes/root.tsx create mode 100644 e2e/react-start/virtual-routes/src/styles/app.css create mode 100644 e2e/react-start/virtual-routes/src/tanstack-start.d.ts create mode 100644 e2e/react-start/virtual-routes/src/utils/posts.tsx create mode 100644 e2e/react-start/virtual-routes/src/utils/seo.ts create mode 100644 e2e/react-start/virtual-routes/src/utils/users.tsx create mode 100644 e2e/react-start/virtual-routes/tailwind.config.mjs create mode 100644 e2e/react-start/virtual-routes/tests/app.spec.ts create mode 100644 e2e/react-start/virtual-routes/tsconfig.json create mode 100644 e2e/react-start/virtual-routes/vite.config.ts diff --git a/e2e/react-start/virtual-routes/.gitignore b/e2e/react-start/virtual-routes/.gitignore new file mode 100644 index 0000000000..a79d5cf129 --- /dev/null +++ b/e2e/react-start/virtual-routes/.gitignore @@ -0,0 +1,20 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output + +/build/ +/api/ +/server/build +/public/build +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/e2e/react-start/virtual-routes/.prettierignore b/e2e/react-start/virtual-routes/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/e2e/react-start/virtual-routes/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/e2e/react-start/virtual-routes/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/virtual-routes/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..1ff2bf304c --- /dev/null +++ b/e2e/react-start/virtual-routes/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json new file mode 100644 index 0000000000..b5f66f2287 --- /dev/null +++ b/e2e/react-start/virtual-routes/package.json @@ -0,0 +1,39 @@ +{ + "name": "tanstack-react-start-e2e-virtual-routes", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", + "test:e2e": "playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/react-router-devtools": "workspace:^", + "@tanstack/react-start": "workspace:^", + "@tanstack/virtual-file-routes": "workspace:^", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "redaxios": "^0.5.1", + "tailwind-merge": "^2.6.0", + "vite": "^6.3.5", + "zod": "^3.24.2" + }, + "devDependencies": { + "@playwright/test": "^1.50.1", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^4.3.4", + "autoprefixer": "^10.4.20", + "combinate": "^1.1.11", + "postcss": "^8.5.1", + "tailwindcss": "^3.4.17", + "typescript": "^5.7.2", + "vite-tsconfig-paths": "^5.1.4" + } +} diff --git a/e2e/react-start/virtual-routes/playwright.config.ts b/e2e/react-start/virtual-routes/playwright.config.ts new file mode 100644 index 0000000000..e834d88cf4 --- /dev/null +++ b/e2e/react-start/virtual-routes/playwright.config.ts @@ -0,0 +1,35 @@ +import { defineConfig, devices } from '@playwright/test' +import { derivePort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const PORT = derivePort(packageJson.name) +const baseURL = `http://localhost:${PORT}` + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + workers: 1, + + reporter: [['line']], + + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL, + }, + + webServer: { + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/virtual-routes/postcss.config.mjs b/e2e/react-start/virtual-routes/postcss.config.mjs new file mode 100644 index 0000000000..2e7af2b7f1 --- /dev/null +++ b/e2e/react-start/virtual-routes/postcss.config.mjs @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +} diff --git a/e2e/react-start/virtual-routes/public/android-chrome-192x192.png b/e2e/react-start/virtual-routes/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..09c8324f8c6781bc90fcf5dd38e0702bd5f171f3 GIT binary patch literal 29964 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 b=FG literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/android-chrome-512x512.png b/e2e/react-start/virtual-routes/public/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..11d626ea3d00fddd52861bf0af5554a92fc30d69 GIT binary patch literal 109271 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 Ef@mE(_W%F@ literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/apple-touch-icon.png b/e2e/react-start/virtual-routes/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9423cc02c40ea066d2a061cdcdf621c0718cb1 GIT binary patch literal 27246 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⪼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 N002ovPDHLkV1k;v<;Va4 literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/favicon-16x16.png b/e2e/react-start/virtual-routes/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..e3389b00443d602a249b48ae0e21e333971c9c1e GIT binary patch literal 832 zcmV-G1Hb%Px%`bk7VR5(v%lW%BSRTRK~=OuZ4FYhI3vvy^4t8t~UDHGBS#44K%hSiDal!9Nj zeb^RZ;3&cb72F3w6s4;uUA7>Cf>1=Z56;a$8wZ=NKHtq z33GDV=_|V0E(QPTEB1=edhG{{=-+C??RQi7*e9J7YBnZR+PppIKjA8EV+}Yt`zH<7 zGR%O5D3|Ef)99hUXu19=Cxaki@6toZIe&u-X0(oDFRl|x6P7Bwc^mB(i9|gOY)Jh6DaPkmt z8Wr!@TP1|RPlYRlJe^eRB0K(gn91{(=zi{HrkpHIflw8&q%;+U!V&dFPYDQAWJh@< zwcklN9VEX?vG;}75GqCepKC25M^xV%BcR%A8c!)S5k4P0$g}HS#lA6zy`~K@9&EX4 zOrvr%_1U2dp~gg6G*;&`Jag*?jZTJv+$S`*#)zme_SFWOCm*F4U&hJihqxAu;8z}x zWv7!u>YKRa3PUJQs55wC)i4QvFOAV0jW$?1cnUJJ7Vl?z_ge{9q!zpfCJxd8vJ>-ql@0&`Bttn1~4;s>8tax%hr(^q#A_*wqAv( zh(T&>hJD?OhiP$sxAzkd1W1^EHV1WL3xM&6$*HhG@|8}OjPpG{+!;GC>w;ha0000< KMNUMnLSTZGXp5cz literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/favicon-32x32.png b/e2e/react-start/virtual-routes/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..900c77d444c9b31e6144b6ac0bb1ab7bb7ca767f GIT binary patch literal 2115 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 literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/favicon.ico b/e2e/react-start/virtual-routes/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a1751676f7e22811b1070572093996c93c87617 GIT binary patch literal 15406 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 literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/favicon.png b/e2e/react-start/virtual-routes/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e77bc06091ade4496525a09d8900675afcf03f0 GIT binary patch literal 1507 zcmV<91swW`P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$^O-V#SR9Fd>S3Qp$MHK9ro!#4$ zEP@L_hX|b@f=!*_42h6mKu7{)4)_U*>1>0bCkUj;Z1X!7 zHe(Ew^Oi(|bW3J~xu+)XbtFF?4>!7TH$>(D_atUQVEj(8fGvYu2NF33#JZX>)(Vj8 zIi@z>Glt?6t~;Lf(|C8F>;WF^8F<^s7Scr!sZc01uB?HMHoL5+FZ>B(g+r-)?Sn)#3Zal#?G@GAwO5U27MpGOlC2+_saA)rl zP-<@-n~;PQOlm|Hi<+W;NdR;5+=zADzM&?!+CPD36=cGwHy6!D^vPEHG?rO`K>G|M z3FposX{yT132wuw1OR3Um_5JoKB#6?!QgBupIT;?YIr;WcpmuCE>S75mZid+ens#E zGPuYjiG0UNNVWu=f!Id^?9)34)eIpu-`j_~W0iAQzK(}XYc_!;87Tk~?4tq|h=2(! zuq0HCiNK)@+ocCKR3q1REdUju>HdYxd>JX@%oOibg+J~D+}rhz54D!NfC{h-OYk{M zkzmFtdrL@nL0bm8nF@pob1CeLC>12ef#in-Bzv2!wi)Iuwq24)`AH}|0QNQ^f$KHv z?5PBPo1*#GAuAk+Poe`?UJ>mP`@~d4a(103j0lwUx@_+$#B&VC%7r>#2$HIiD`KO8L|s3Yp%M}BT0;NJDzZtPnx=4%enhU zhW*pNN0t`^4%5MKAR+}=^Q?QeqQ`>bbK zf+-ji$Uz8V0?LpX@kh`k%DL)GCA2=@SJNKg56Wh>>pr=7{1PmHqG|~=AdLV3002ov JPDHLkV1ivgp)>#h literal 0 HcmV?d00001 diff --git a/e2e/react-start/virtual-routes/public/script.js b/e2e/react-start/virtual-routes/public/script.js new file mode 100644 index 0000000000..897477e7d0 --- /dev/null +++ b/e2e/react-start/virtual-routes/public/script.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_1 loaded') +window.SCRIPT_1 = true diff --git a/e2e/react-start/virtual-routes/public/script2.js b/e2e/react-start/virtual-routes/public/script2.js new file mode 100644 index 0000000000..819af30daf --- /dev/null +++ b/e2e/react-start/virtual-routes/public/script2.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_2 loaded') +window.SCRIPT_2 = true diff --git a/e2e/react-start/virtual-routes/public/site.webmanifest b/e2e/react-start/virtual-routes/public/site.webmanifest new file mode 100644 index 0000000000..fa99de77db --- /dev/null +++ b/e2e/react-start/virtual-routes/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/e2e/react-start/virtual-routes/routes.ts b/e2e/react-start/virtual-routes/routes.ts new file mode 100644 index 0000000000..ab17b8f58b --- /dev/null +++ b/e2e/react-start/virtual-routes/routes.ts @@ -0,0 +1,24 @@ +import { + index, + layout, + physical, + rootRoute, + route, +} from '@tanstack/virtual-file-routes' + +export const routes = rootRoute('root.tsx', [ + index('home.tsx'), + route('/posts', 'posts/posts.tsx', [ + index('posts/posts-home.tsx'), + route('$postId', 'posts/posts-detail.tsx'), + ]), + layout('first', 'layout/first-layout.tsx', [ + layout('layout/second-layout.tsx', [ + route('route-without-file', [ + route('/layout-a', 'a.tsx'), + route('/layout-b', 'b.tsx'), + ]), + ]), + ]), + physical('/classic', 'file-based-subtree'), +]) diff --git a/e2e/react-start/virtual-routes/src/posts.tsx b/e2e/react-start/virtual-routes/src/posts.tsx new file mode 100644 index 0000000000..3ccf1ff421 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/posts.tsx @@ -0,0 +1,32 @@ +import { notFound } from '@tanstack/react-router' +import axios from 'redaxios' + +export type PostType = { + id: string + title: string + body: string +} + +export const fetchPost = async (postId: string) => { + console.info(`Fetching post with id ${postId}...`) + await new Promise((r) => setTimeout(r, 500)) + const post = await axios + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .then((r) => r.data) + .catch((err) => { + if (err.status === 404) { + throw notFound() + } + throw err + }) + + return post +} + +export const fetchPosts = async () => { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) +} diff --git a/e2e/react-start/virtual-routes/src/routeTree.gen.ts b/e2e/react-start/virtual-routes/src/routeTree.gen.ts new file mode 100644 index 0000000000..c6ef800c5a --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routeTree.gen.ts @@ -0,0 +1,584 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { createFileRoute } from '@tanstack/react-router' +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + +// Import Routes + +import { Route as rootRoute } from './routes/root' +import { Route as postsPostsRouteImport } from './routes/posts/posts' +import { Route as layoutFirstLayoutRouteImport } from './routes/layout/first-layout' +import { Route as homeRouteImport } from './routes/home' +import { Route as postsPostsDetailRouteImport } from './routes/posts/posts-detail' +import { Route as layoutSecondLayoutRouteImport } from './routes/layout/second-layout' +import { Route as postsPostsHomeRouteImport } from './routes/posts/posts-home' +import { Route as ClassicHelloRouteRouteImport } from './routes/file-based-subtree/hello/route' +import { Route as ClassicHelloIndexRouteImport } from './routes/file-based-subtree/hello/index' +import { Route as ClassicHelloWorldRouteImport } from './routes/file-based-subtree/hello/world' +import { Route as ClassicHelloUniverseRouteImport } from './routes/file-based-subtree/hello/universe' +import { Route as bRouteImport } from './routes/b' +import { Route as aRouteImport } from './routes/a' + +// Create Virtual Routes + +const FirstSecondLayoutRouteWithoutFileRouteImport = createFileRoute( + '/_first/_second-layout/route-without-file', +)() + +// Create/Update Routes + +const postsPostsRoute = postsPostsRouteImport.update({ + id: '/posts', + path: '/posts', + getParentRoute: () => rootRoute, +} as any) + +const layoutFirstLayoutRoute = layoutFirstLayoutRouteImport.update({ + id: '/_first', + getParentRoute: () => rootRoute, +} as any) + +const homeRoute = homeRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRoute, +} as any) + +const postsPostsDetailRoute = postsPostsDetailRouteImport.update({ + id: '/$postId', + path: '/$postId', + getParentRoute: () => postsPostsRoute, +} as any) + +const layoutSecondLayoutRoute = layoutSecondLayoutRouteImport.update({ + id: '/_second-layout', + getParentRoute: () => layoutFirstLayoutRoute, +} as any) + +const postsPostsHomeRoute = postsPostsHomeRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => postsPostsRoute, +} as any) + +const ClassicHelloRouteRoute = ClassicHelloRouteRouteImport.update({ + id: '/classic/hello', + path: '/classic/hello', + getParentRoute: () => rootRoute, +} as any) + +const ClassicHelloIndexRoute = ClassicHelloIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => ClassicHelloRouteRoute, +} as any) + +const ClassicHelloWorldRoute = ClassicHelloWorldRouteImport.update({ + id: '/world', + path: '/world', + getParentRoute: () => ClassicHelloRouteRoute, +} as any) + +const ClassicHelloUniverseRoute = ClassicHelloUniverseRouteImport.update({ + id: '/universe', + path: '/universe', + getParentRoute: () => ClassicHelloRouteRoute, +} as any) + +const FirstSecondLayoutRouteWithoutFileRoute = + FirstSecondLayoutRouteWithoutFileRouteImport.update({ + id: '/route-without-file', + path: '/route-without-file', + getParentRoute: () => layoutSecondLayoutRoute, + } as any) + +const bRoute = bRouteImport.update({ + id: '/layout-b', + path: '/layout-b', + getParentRoute: () => FirstSecondLayoutRouteWithoutFileRoute, +} as any) + +const aRoute = aRouteImport.update({ + id: '/layout-a', + path: '/layout-a', + getParentRoute: () => FirstSecondLayoutRouteWithoutFileRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof homeRouteImport + parentRoute: typeof rootRoute + } + '/_first': { + id: '/_first' + path: '' + fullPath: '' + preLoaderRoute: typeof layoutFirstLayoutRouteImport + parentRoute: typeof rootRoute + } + '/posts': { + id: '/posts' + path: '/posts' + fullPath: '/posts' + preLoaderRoute: typeof postsPostsRouteImport + parentRoute: typeof rootRoute + } + '/classic/hello': { + id: '/classic/hello' + path: '/classic/hello' + fullPath: '/classic/hello' + preLoaderRoute: typeof ClassicHelloRouteRouteImport + parentRoute: typeof rootRoute + } + '/posts/': { + id: '/posts/' + path: '/' + fullPath: '/posts/' + preLoaderRoute: typeof postsPostsHomeRouteImport + parentRoute: typeof postsPostsRouteImport + } + '/_first/_second-layout': { + id: '/_first/_second-layout' + path: '' + fullPath: '' + preLoaderRoute: typeof layoutSecondLayoutRouteImport + parentRoute: typeof layoutFirstLayoutRouteImport + } + '/posts/$postId': { + id: '/posts/$postId' + path: '/$postId' + fullPath: '/posts/$postId' + preLoaderRoute: typeof postsPostsDetailRouteImport + parentRoute: typeof postsPostsRouteImport + } + '/_first/_second-layout/route-without-file': { + id: '/_first/_second-layout/route-without-file' + path: '/route-without-file' + fullPath: '/route-without-file' + preLoaderRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport + parentRoute: typeof layoutSecondLayoutRouteImport + } + '/classic/hello/universe': { + id: '/classic/hello/universe' + path: '/universe' + fullPath: '/classic/hello/universe' + preLoaderRoute: typeof ClassicHelloUniverseRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport + } + '/classic/hello/world': { + id: '/classic/hello/world' + path: '/world' + fullPath: '/classic/hello/world' + preLoaderRoute: typeof ClassicHelloWorldRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport + } + '/classic/hello/': { + id: '/classic/hello/' + path: '/' + fullPath: '/classic/hello/' + preLoaderRoute: typeof ClassicHelloIndexRouteImport + parentRoute: typeof ClassicHelloRouteRouteImport + } + '/_first/_second-layout/route-without-file/layout-a': { + id: '/_first/_second-layout/route-without-file/layout-a' + path: '/layout-a' + fullPath: '/route-without-file/layout-a' + preLoaderRoute: typeof aRouteImport + parentRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport + } + '/_first/_second-layout/route-without-file/layout-b': { + id: '/_first/_second-layout/route-without-file/layout-b' + path: '/layout-b' + fullPath: '/route-without-file/layout-b' + preLoaderRoute: typeof bRouteImport + parentRoute: typeof FirstSecondLayoutRouteWithoutFileRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/home' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/layout/first-layout' { + const createFileRoute: CreateFileRoute< + '/_first', + FileRoutesByPath['/_first']['parentRoute'], + FileRoutesByPath['/_first']['id'], + FileRoutesByPath['/_first']['path'], + FileRoutesByPath['/_first']['fullPath'] + > +} +declare module './routes/posts/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/route' { + const createFileRoute: CreateFileRoute< + '/classic/hello', + FileRoutesByPath['/classic/hello']['parentRoute'], + FileRoutesByPath['/classic/hello']['id'], + FileRoutesByPath['/classic/hello']['path'], + FileRoutesByPath['/classic/hello']['fullPath'] + > +} +declare module './routes/posts/posts-home' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/layout/second-layout' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout', + FileRoutesByPath['/_first/_second-layout']['parentRoute'], + FileRoutesByPath['/_first/_second-layout']['id'], + FileRoutesByPath['/_first/_second-layout']['path'], + FileRoutesByPath['/_first/_second-layout']['fullPath'] + > +} +declare module './routes/posts/posts-detail' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} + +declare module './routes/file-based-subtree/hello/universe' { + const createFileRoute: CreateFileRoute< + '/classic/hello/universe', + FileRoutesByPath['/classic/hello/universe']['parentRoute'], + FileRoutesByPath['/classic/hello/universe']['id'], + FileRoutesByPath['/classic/hello/universe']['path'], + FileRoutesByPath['/classic/hello/universe']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/world' { + const createFileRoute: CreateFileRoute< + '/classic/hello/world', + FileRoutesByPath['/classic/hello/world']['parentRoute'], + FileRoutesByPath['/classic/hello/world']['id'], + FileRoutesByPath['/classic/hello/world']['path'], + FileRoutesByPath['/classic/hello/world']['fullPath'] + > +} +declare module './routes/file-based-subtree/hello/index' { + const createFileRoute: CreateFileRoute< + '/classic/hello/', + FileRoutesByPath['/classic/hello/']['parentRoute'], + FileRoutesByPath['/classic/hello/']['id'], + FileRoutesByPath['/classic/hello/']['path'], + FileRoutesByPath['/classic/hello/']['fullPath'] + > +} +declare module './routes/a' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout/route-without-file/layout-a', + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['parentRoute'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['id'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['path'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-a']['fullPath'] + > +} +declare module './routes/b' { + const createFileRoute: CreateFileRoute< + '/_first/_second-layout/route-without-file/layout-b', + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['parentRoute'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['id'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['path'], + FileRoutesByPath['/_first/_second-layout/route-without-file/layout-b']['fullPath'] + > +} + +// Create and export the route tree + +interface FirstSecondLayoutRouteWithoutFileRouteChildren { + aRoute: typeof aRoute + bRoute: typeof bRoute +} + +const FirstSecondLayoutRouteWithoutFileRouteChildren: FirstSecondLayoutRouteWithoutFileRouteChildren = + { + aRoute: aRoute, + bRoute: bRoute, + } + +const FirstSecondLayoutRouteWithoutFileRouteWithChildren = + FirstSecondLayoutRouteWithoutFileRoute._addFileChildren( + FirstSecondLayoutRouteWithoutFileRouteChildren, + ) + +interface layoutSecondLayoutRouteChildren { + FirstSecondLayoutRouteWithoutFileRoute: typeof FirstSecondLayoutRouteWithoutFileRouteWithChildren +} + +const layoutSecondLayoutRouteChildren: layoutSecondLayoutRouteChildren = { + FirstSecondLayoutRouteWithoutFileRoute: + FirstSecondLayoutRouteWithoutFileRouteWithChildren, +} + +const layoutSecondLayoutRouteWithChildren = + layoutSecondLayoutRoute._addFileChildren(layoutSecondLayoutRouteChildren) + +interface layoutFirstLayoutRouteChildren { + layoutSecondLayoutRoute: typeof layoutSecondLayoutRouteWithChildren +} + +const layoutFirstLayoutRouteChildren: layoutFirstLayoutRouteChildren = { + layoutSecondLayoutRoute: layoutSecondLayoutRouteWithChildren, +} + +const layoutFirstLayoutRouteWithChildren = + layoutFirstLayoutRoute._addFileChildren(layoutFirstLayoutRouteChildren) + +interface postsPostsRouteChildren { + postsPostsHomeRoute: typeof postsPostsHomeRoute + postsPostsDetailRoute: typeof postsPostsDetailRoute +} + +const postsPostsRouteChildren: postsPostsRouteChildren = { + postsPostsHomeRoute: postsPostsHomeRoute, + postsPostsDetailRoute: postsPostsDetailRoute, +} + +const postsPostsRouteWithChildren = postsPostsRoute._addFileChildren( + postsPostsRouteChildren, +) + +interface ClassicHelloRouteRouteChildren { + ClassicHelloUniverseRoute: typeof ClassicHelloUniverseRoute + ClassicHelloWorldRoute: typeof ClassicHelloWorldRoute + ClassicHelloIndexRoute: typeof ClassicHelloIndexRoute +} + +const ClassicHelloRouteRouteChildren: ClassicHelloRouteRouteChildren = { + ClassicHelloUniverseRoute: ClassicHelloUniverseRoute, + ClassicHelloWorldRoute: ClassicHelloWorldRoute, + ClassicHelloIndexRoute: ClassicHelloIndexRoute, +} + +const ClassicHelloRouteRouteWithChildren = + ClassicHelloRouteRoute._addFileChildren(ClassicHelloRouteRouteChildren) + +export interface FileRoutesByFullPath { + '/': typeof homeRoute + '': typeof layoutSecondLayoutRouteWithChildren + '/posts': typeof postsPostsRouteWithChildren + '/classic/hello': typeof ClassicHelloRouteRouteWithChildren + '/posts/': typeof postsPostsHomeRoute + '/posts/$postId': typeof postsPostsDetailRoute + '/route-without-file': typeof FirstSecondLayoutRouteWithoutFileRouteWithChildren + '/classic/hello/universe': typeof ClassicHelloUniverseRoute + '/classic/hello/world': typeof ClassicHelloWorldRoute + '/classic/hello/': typeof ClassicHelloIndexRoute + '/route-without-file/layout-a': typeof aRoute + '/route-without-file/layout-b': typeof bRoute +} + +export interface FileRoutesByTo { + '/': typeof homeRoute + '': typeof layoutSecondLayoutRouteWithChildren + '/posts': typeof postsPostsHomeRoute + '/posts/$postId': typeof postsPostsDetailRoute + '/route-without-file': typeof FirstSecondLayoutRouteWithoutFileRouteWithChildren + '/classic/hello/universe': typeof ClassicHelloUniverseRoute + '/classic/hello/world': typeof ClassicHelloWorldRoute + '/classic/hello': typeof ClassicHelloIndexRoute + '/route-without-file/layout-a': typeof aRoute + '/route-without-file/layout-b': typeof bRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof homeRoute + '/_first': typeof layoutFirstLayoutRouteWithChildren + '/posts': typeof postsPostsRouteWithChildren + '/classic/hello': typeof ClassicHelloRouteRouteWithChildren + '/posts/': typeof postsPostsHomeRoute + '/_first/_second-layout': typeof layoutSecondLayoutRouteWithChildren + '/posts/$postId': typeof postsPostsDetailRoute + '/_first/_second-layout/route-without-file': typeof FirstSecondLayoutRouteWithoutFileRouteWithChildren + '/classic/hello/universe': typeof ClassicHelloUniverseRoute + '/classic/hello/world': typeof ClassicHelloWorldRoute + '/classic/hello/': typeof ClassicHelloIndexRoute + '/_first/_second-layout/route-without-file/layout-a': typeof aRoute + '/_first/_second-layout/route-without-file/layout-b': typeof bRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '' + | '/posts' + | '/classic/hello' + | '/posts/' + | '/posts/$postId' + | '/route-without-file' + | '/classic/hello/universe' + | '/classic/hello/world' + | '/classic/hello/' + | '/route-without-file/layout-a' + | '/route-without-file/layout-b' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '' + | '/posts' + | '/posts/$postId' + | '/route-without-file' + | '/classic/hello/universe' + | '/classic/hello/world' + | '/classic/hello' + | '/route-without-file/layout-a' + | '/route-without-file/layout-b' + id: + | '__root__' + | '/' + | '/_first' + | '/posts' + | '/classic/hello' + | '/posts/' + | '/_first/_second-layout' + | '/posts/$postId' + | '/_first/_second-layout/route-without-file' + | '/classic/hello/universe' + | '/classic/hello/world' + | '/classic/hello/' + | '/_first/_second-layout/route-without-file/layout-a' + | '/_first/_second-layout/route-without-file/layout-b' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + homeRoute: typeof homeRoute + layoutFirstLayoutRoute: typeof layoutFirstLayoutRouteWithChildren + postsPostsRoute: typeof postsPostsRouteWithChildren + ClassicHelloRouteRoute: typeof ClassicHelloRouteRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + homeRoute: homeRoute, + layoutFirstLayoutRoute: layoutFirstLayoutRouteWithChildren, + postsPostsRoute: postsPostsRouteWithChildren, + ClassicHelloRouteRoute: ClassicHelloRouteRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "root.tsx", + "children": [ + "/", + "/_first", + "/posts", + "/classic/hello" + ] + }, + "/": { + "filePath": "home.tsx" + }, + "/_first": { + "filePath": "layout/first-layout.tsx", + "children": [ + "/_first/_second-layout" + ] + }, + "/posts": { + "filePath": "posts/posts.tsx", + "children": [ + "/posts/", + "/posts/$postId" + ] + }, + "/classic/hello": { + "filePath": "file-based-subtree/hello/route.tsx", + "children": [ + "/classic/hello/universe", + "/classic/hello/world", + "/classic/hello/" + ] + }, + "/posts/": { + "filePath": "posts/posts-home.tsx", + "parent": "/posts" + }, + "/_first/_second-layout": { + "filePath": "layout/second-layout.tsx", + "parent": "/_first", + "children": [ + "/_first/_second-layout/route-without-file" + ] + }, + "/posts/$postId": { + "filePath": "posts/posts-detail.tsx", + "parent": "/posts" + }, + "/_first/_second-layout/route-without-file": { + "filePath": "", + "parent": "/_first/_second-layout", + "children": [ + "/_first/_second-layout/route-without-file/layout-a", + "/_first/_second-layout/route-without-file/layout-b" + ] + }, + "/classic/hello/universe": { + "filePath": "file-based-subtree/hello/universe.tsx", + "parent": "/classic/hello" + }, + "/classic/hello/world": { + "filePath": "file-based-subtree/hello/world.tsx", + "parent": "/classic/hello" + }, + "/classic/hello/": { + "filePath": "file-based-subtree/hello/index.tsx", + "parent": "/classic/hello" + }, + "/_first/_second-layout/route-without-file/layout-a": { + "filePath": "a.tsx", + "parent": "/_first/_second-layout/route-without-file" + }, + "/_first/_second-layout/route-without-file/layout-b": { + "filePath": "b.tsx", + "parent": "/_first/_second-layout/route-without-file" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/virtual-routes/src/router.tsx b/e2e/react-start/virtual-routes/src/router.tsx new file mode 100644 index 0000000000..97c0e3d666 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/router.tsx @@ -0,0 +1,19 @@ +/// +import { createRouter as createTanStackRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' + +export function createRouter() { + const router = createTanStackRouter({ + routeTree, + defaultPreload: 'intent', + scrollRestoration: true, + }) + + return router +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} diff --git a/e2e/react-start/virtual-routes/src/routes/a.tsx b/e2e/react-start/virtual-routes/src/routes/a.tsx new file mode 100644 index 0000000000..a190b24202 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/a.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: LayoutAComponent, +}) + +function LayoutAComponent() { + return
I'm layout A!
+} diff --git a/e2e/react-start/virtual-routes/src/routes/b.tsx b/e2e/react-start/virtual-routes/src/routes/b.tsx new file mode 100644 index 0000000000..505f8f6fbf --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/b.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: LayoutBComponent, +}) + +function LayoutBComponent() { + return
I'm layout B!
+} diff --git a/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/index.tsx b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/index.tsx new file mode 100644 index 0000000000..f86335e291 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/index.tsx @@ -0,0 +1,3 @@ +export const Route = createFileRoute({ + component: () =>
This is the index
, +}) diff --git a/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/route.tsx b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/route.tsx new file mode 100644 index 0000000000..620dd2b76b --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/route.tsx @@ -0,0 +1,27 @@ +import { Link, Outlet } from '@tanstack/react-router' + +export const Route = createFileRoute({ + component: () => ( +
+ Hello! +
{' '} + + say hello to the universe + {' '} + + say hello to the world + + +
+ ), +}) diff --git a/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/universe.tsx b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/universe.tsx new file mode 100644 index 0000000000..20b07c41cc --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/universe.tsx @@ -0,0 +1,3 @@ +export const Route = createFileRoute({ + component: () =>
Hello /classic/hello/universe!
, +}) diff --git a/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/world.tsx b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/world.tsx new file mode 100644 index 0000000000..4af11357a2 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/file-based-subtree/hello/world.tsx @@ -0,0 +1,3 @@ +export const Route = createFileRoute({ + component: () =>
Hello /classic/hello/world!
, +}) diff --git a/e2e/react-start/virtual-routes/src/routes/home.tsx b/e2e/react-start/virtual-routes/src/routes/home.tsx new file mode 100644 index 0000000000..b23956ae17 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/home.tsx @@ -0,0 +1,13 @@ +import * as React from 'react' + +export const Route = createFileRoute({ + component: Home, +}) + +function Home() { + return ( +
+

Welcome Home!

+
+ ) +} diff --git a/e2e/react-start/virtual-routes/src/routes/layout/first-layout.tsx b/e2e/react-start/virtual-routes/src/routes/layout/first-layout.tsx new file mode 100644 index 0000000000..5c4a461d8d --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/layout/first-layout.tsx @@ -0,0 +1,16 @@ +import { Outlet } from '@tanstack/react-router' + +export const Route = createFileRoute({ + component: LayoutComponent, +}) + +function LayoutComponent() { + return ( +
+
I'm a layout
+
+ +
+
+ ) +} diff --git a/e2e/react-start/virtual-routes/src/routes/layout/second-layout.tsx b/e2e/react-start/virtual-routes/src/routes/layout/second-layout.tsx new file mode 100644 index 0000000000..478d9afbec --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/layout/second-layout.tsx @@ -0,0 +1,34 @@ +import { Link, Outlet } from '@tanstack/react-router' + +export const Route = createFileRoute({ + component: LayoutComponent, +}) + +function LayoutComponent() { + return ( +
+
I'm a nested layout
+
+ + Layout A + + + Layout B + +
+
+ +
+
+ ) +} diff --git a/e2e/react-start/virtual-routes/src/routes/posts/posts-detail.tsx b/e2e/react-start/virtual-routes/src/routes/posts/posts-detail.tsx new file mode 100644 index 0000000000..654f3cfd18 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/posts/posts-detail.tsx @@ -0,0 +1,28 @@ +import * as React from 'react' +import { ErrorComponent } from '@tanstack/react-router' +import { fetchPost } from '../../posts' +import type { ErrorComponentProps } from '@tanstack/react-router' + +export const Route = createFileRoute({ + loader: async ({ params: { postId } }) => fetchPost(postId), + errorComponent: PostErrorComponent as any, + notFoundComponent: () => { + return

Post not found

+ }, + component: PostComponent, +}) + +export function PostErrorComponent({ error }: ErrorComponentProps) { + return +} + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.title}

+
{post.body}
+
+ ) +} diff --git a/e2e/react-start/virtual-routes/src/routes/posts/posts-home.tsx b/e2e/react-start/virtual-routes/src/routes/posts/posts-home.tsx new file mode 100644 index 0000000000..fdbe5865e5 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/posts/posts-home.tsx @@ -0,0 +1,9 @@ +import * as React from 'react' + +export const Route = createFileRoute({ + component: PostsIndexComponent, +}) + +function PostsIndexComponent() { + return
Select a post.
+} diff --git a/e2e/react-start/virtual-routes/src/routes/posts/posts.tsx b/e2e/react-start/virtual-routes/src/routes/posts/posts.tsx new file mode 100644 index 0000000000..f92c37f537 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/posts/posts.tsx @@ -0,0 +1,39 @@ +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { fetchPosts } from '../../posts' + +export const Route = createFileRoute({ + loader: fetchPosts, + component: PostsComponent, +}) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }].map( + (post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
    • + ) + }, + )} +
+
+ +
+ ) +} diff --git a/e2e/react-start/virtual-routes/src/routes/root.tsx b/e2e/react-start/virtual-routes/src/routes/root.tsx new file mode 100644 index 0000000000..9f0018dcaa --- /dev/null +++ b/e2e/react-start/virtual-routes/src/routes/root.tsx @@ -0,0 +1,96 @@ +import * as React from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' +import appCss from '~/styles/app.css?url' + +export const Route = createRootRoute({ + component: RootComponent, + notFoundComponent: () => { + return ( +
+

This is the notFoundComponent configured on root route

+ Start Over +
+ ) + }, + head: () => { + return { + links: [{ rel: 'stylesheet', href: appCss }], + } + }, +}) + +function RootComponent() { + return ( + + + + ) +} + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + +
+ + Home + {' '} + + Posts + {' '} + + Layout + {' '} + + Subtree + {' '} + + This Route Does Not Exist + +
+
+ {children} + {/* Start rendering router matches */} + + + + + ) +} diff --git a/e2e/react-start/virtual-routes/src/styles/app.css b/e2e/react-start/virtual-routes/src/styles/app.css new file mode 100644 index 0000000000..c53c870665 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/styles/app.css @@ -0,0 +1,22 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + html { + color-scheme: light dark; + } + + * { + @apply border-gray-200 dark:border-gray-800; + } + + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/e2e/react-start/virtual-routes/src/tanstack-start.d.ts b/e2e/react-start/virtual-routes/src/tanstack-start.d.ts new file mode 100644 index 0000000000..7f91a4813b --- /dev/null +++ b/e2e/react-start/virtual-routes/src/tanstack-start.d.ts @@ -0,0 +1 @@ +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/virtual-routes/src/utils/posts.tsx b/e2e/react-start/virtual-routes/src/utils/posts.tsx new file mode 100644 index 0000000000..9fdff27673 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/utils/posts.tsx @@ -0,0 +1,36 @@ +import { notFound } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import axios from 'redaxios' + +export type PostType = { + id: string + title: string + body: string +} + +export const fetchPost = createServerFn({ method: 'GET' }) + .validator((postId: string) => postId) + .handler(async ({ data: postId }) => { + console.info(`Fetching post with id ${postId}...`) + const post = await axios + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .then((r) => r.data) + .catch((err) => { + console.error(err) + if (err.status === 404) { + throw notFound() + } + throw err + }) + + return post + }) + +export const fetchPosts = createServerFn({ method: 'GET' }).handler( + async () => { + console.info('Fetching posts...') + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) diff --git a/e2e/react-start/virtual-routes/src/utils/seo.ts b/e2e/react-start/virtual-routes/src/utils/seo.ts new file mode 100644 index 0000000000..d18ad84b74 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/utils/seo.ts @@ -0,0 +1,33 @@ +export const seo = ({ + title, + description, + keywords, + image, +}: { + title: string + description?: string + image?: string + keywords?: string +}) => { + const tags = [ + { title }, + { name: 'description', content: description }, + { name: 'keywords', content: keywords }, + { name: 'twitter:title', content: title }, + { name: 'twitter:description', content: description }, + { name: 'twitter:creator', content: '@tannerlinsley' }, + { name: 'twitter:site', content: '@tannerlinsley' }, + { name: 'og:type', content: 'website' }, + { name: 'og:title', content: title }, + { name: 'og:description', content: description }, + ...(image + ? [ + { name: 'twitter:image', content: image }, + { name: 'twitter:card', content: 'summary_large_image' }, + { name: 'og:image', content: image }, + ] + : []), + ] + + return tags +} diff --git a/e2e/react-start/virtual-routes/src/utils/users.tsx b/e2e/react-start/virtual-routes/src/utils/users.tsx new file mode 100644 index 0000000000..46be4b1580 --- /dev/null +++ b/e2e/react-start/virtual-routes/src/utils/users.tsx @@ -0,0 +1,9 @@ +export type User = { + id: number + name: string + email: string +} + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/virtual-routes/tailwind.config.mjs b/e2e/react-start/virtual-routes/tailwind.config.mjs new file mode 100644 index 0000000000..e49f4eb776 --- /dev/null +++ b/e2e/react-start/virtual-routes/tailwind.config.mjs @@ -0,0 +1,4 @@ +/** @type {import('tailwindcss').Config} */ +export default { + content: ['./src/**/*.{js,jsx,ts,tsx}'], +} diff --git a/e2e/react-start/virtual-routes/tests/app.spec.ts b/e2e/react-start/virtual-routes/tests/app.spec.ts new file mode 100644 index 0000000000..3182febfa0 --- /dev/null +++ b/e2e/react-start/virtual-routes/tests/app.spec.ts @@ -0,0 +1,33 @@ +import { expect, test } from '@playwright/test' + +test.beforeEach(async ({ page }) => { + await page.goto('/') +}) + +test('Navigating to a post page', async ({ page }) => { + await page.getByRole('link', { name: 'Posts' }).click() + await page.getByRole('link', { name: 'sunt aut facere repe' }).click() + await expect(page.getByRole('heading')).toContainText('sunt aut facere') +}) + +test('Navigating nested layouts', async ({ page }) => { + await page.getByRole('link', { name: 'Layout', exact: true }).click() + + await expect(page.locator('body')).toContainText("I'm a layout") + await expect(page.locator('body')).toContainText("I'm a nested layout") + + await page.getByRole('link', { name: 'Layout A' }).click() + await expect(page.locator('body')).toContainText("I'm layout A!") + + await page.getByRole('link', { name: 'Layout B' }).click() + await expect(page.locator('body')).toContainText("I'm layout B!") +}) + +test('Navigating to a not-found route', async ({ page }) => { + await page.getByRole('link', { name: 'This Route Does Not Exist' }).click() + await expect(page.getByRole('paragraph')).toContainText( + 'This is the notFoundComponent configured on root route', + ) + await page.getByRole('link', { name: 'Start Over' }).click() + await expect(page.getByRole('heading')).toContainText('Welcome Home!') +}) diff --git a/e2e/react-start/virtual-routes/tsconfig.json b/e2e/react-start/virtual-routes/tsconfig.json new file mode 100644 index 0000000000..b3a2d67dfa --- /dev/null +++ b/e2e/react-start/virtual-routes/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx", "public/script*.js"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "baseUrl": ".", + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true + } +} diff --git a/e2e/react-start/virtual-routes/vite.config.ts b/e2e/react-start/virtual-routes/vite.config.ts new file mode 100644 index 0000000000..21ff4c2940 --- /dev/null +++ b/e2e/react-start/virtual-routes/vite.config.ts @@ -0,0 +1,19 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({ + tsr: { + virtualRouteConfig: './routes.ts', + }, + }), + ], +}) diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts index 92b19e9523..a7f86b82ed 100644 --- a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts +++ b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts @@ -244,7 +244,9 @@ async function generator(config: Config, root: string) { removeUnderscores(removeLayoutSegments(node.path)) ?? '', ) - const routeCode = fs.readFileSync(node.fullPath, 'utf-8') + const routeCode = node.fullPath + ? fs.readFileSync(node.fullPath, 'utf-8') + : '' // Ensure the boilerplate for the route exists, which can be skipped for virtual parent routes and virtual routes if (!node.isVirtualParentRoute && !node.isVirtual) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6d252b03d3..2b48c3108a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1366,6 +1366,76 @@ importers: specifier: ^5.1.4 version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + e2e/react-start/virtual-routes: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-router-devtools': + specifier: workspace:^ + version: link:../../../packages/react-router-devtools + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + '@tanstack/virtual-file-routes': + specifier: workspace:* + version: link:../../../packages/virtual-file-routes + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + redaxios: + specifier: ^0.5.1 + version: 0.5.1 + tailwind-merge: + specifier: ^2.6.0 + version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: + '@playwright/test': + specifier: ^1.52.0 + version: 1.52.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: ^22.10.2 + version: 22.13.4 + '@types/react': + specifier: ^19.0.8 + version: 19.0.8 + '@types/react-dom': + specifier: ^19.0.3 + version: 19.0.3(@types/react@19.0.8) + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + autoprefixer: + specifier: ^10.4.20 + version: 10.4.20(postcss@8.5.3) + combinate: + specifier: ^1.1.11 + version: 1.1.11 + postcss: + specifier: ^8.5.1 + version: 8.5.3 + tailwindcss: + specifier: ^3.4.17 + version: 3.4.17 + typescript: + specifier: ^5.7.2 + version: 5.8.2 + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + e2e/react-start/website: dependencies: '@tanstack/react-router': From 016e5f0089d697371ba4d01ead392c934094b263 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 01:41:27 +0000 Subject: [PATCH 014/126] release: v1.120.4-alpha.5 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 21a2a8f419..fad24099a0 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 243af7c332..d46794af69 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index e83ff60a58..592df70d37 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 0332315181..823b66e6fe 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 606fa51218..fd0878f7b6 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index c2520b4a4c..cc430a5aaf 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 40337499c8..9ad39d43d2 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 7027fe546d..534752b0ca 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index a55fbd6ac1..973d40327c 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 5d6a1053b8..5423ea92ef 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index bc39217556..b269d1aae4 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index ff0838ad27..4bd1f1a8da 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 9d14840645..124bc1ad72 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index ce04c05c5a..59a55e34c9 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 387f5c9e67..5d527ddd99 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 4c2fcc2886..8ed9edcd58 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.4", + "@tanstack/react-start": "^1.120.4-alpha.5", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 2bc3252e72..accb8817ce 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.4", + "@tanstack/solid-start": "^1.120.4-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 99e5e54c59..0794b0beb1 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.4", + "@tanstack/solid-start": "^1.120.4-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 3787767c20..a684bb71b9 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index b30960a488..1d0a8c37f0 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 1051f51c0d..9235c8e8d3 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index b78248b540..b622b583c8 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 2422654736..a1e78d971f 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 20937af4ac8c1f47ec2020a69cd6dc83342b7c37 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sun, 11 May 2025 14:20:16 +1200 Subject: [PATCH 015/126] fix(start-plugin-core): include "vite/client" types (#4139) --- .../basic-file-based/src/routeTree.gen.ts | 343 - .../(another-group)/onlyrouteinside.tsx | 3 +- .../routes/(group)/_layout.insidelayout.tsx | 3 +- .../src/routes/(group)/_layout.tsx | 3 +- .../src/routes/(group)/inside.tsx | 3 +- .../src/routes/(group)/lazyinside.lazy.tsx | 3 +- .../src/routes/(group)/lazyinside.tsx | 3 +- .../src/routes/(group)/subfolder/inside.tsx | 3 +- .../basic-file-based/src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../basic-file-based/src/routes/anchor.tsx | 3 +- .../basic-file-based/src/routes/editing-a.tsx | 3 +- .../basic-file-based/src/routes/editing-b.tsx | 3 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/params-ps/index.tsx | 3 +- .../src/routes/params-ps/named/$foo.tsx | 3 +- .../src/routes/params-ps/named/index.tsx | 3 +- .../routes/params-ps/named/prefix{$foo}.tsx | 3 +- .../routes/params-ps/named/{$foo}suffix.tsx | 3 +- .../src/routes/params-ps/wildcard/$.tsx | 3 +- .../src/routes/params-ps/wildcard/index.tsx | 3 +- .../routes/params-ps/wildcard/prefix{$}.tsx | 3 +- .../routes/params-ps/wildcard/{$}suffix.tsx | 3 +- .../src/routes/params.single.$value.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../basic-file-based/src/routes/posts.tsx | 3 +- .../src/routes/posts_.$postId.edit.tsx | 3 +- .../src/routes/redirect/$target.tsx | 3 +- .../src/routes/redirect/$target/index.tsx | 3 +- .../redirect/$target/via-beforeLoad.tsx | 3 +- .../routes/redirect/$target/via-loader.tsx | 3 +- .../src/routes/redirect/index.tsx | 3 +- .../src/routes/redirect/preload/first.tsx | 3 +- .../src/routes/redirect/preload/second.tsx | 3 +- .../src/routes/redirect/preload/third.tsx | 3 +- .../routes/structural-sharing.$enabled.tsx | 3 +- .../src/routeTree.gen.ts | 77 - .../src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 3 +- .../src/routes/_pathlessLayout.jsx | 3 +- .../routes/_pathlessLayout/_nested-layout.jsx | 3 +- .../_nested-layout/route-a.jsx | 9 +- .../_nested-layout/route-b.jsx | 9 +- .../js-only-file-based/src/routes/index.jsx | 3 +- .../src/routes/posts.$postId.jsx | 3 +- .../src/routes/posts.index.jsx | 3 +- .../src/routes/posts.route.jsx | 3 +- .../src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 3 +- .../src/routes/a.tsx | 3 +- .../src/routes/b.tsx | 3 +- .../routes/file-based-subtree/hello/index.tsx | 3 +- .../routes/file-based-subtree/hello/route.tsx | 3 +- .../file-based-subtree/hello/universe.tsx | 3 +- .../routes/file-based-subtree/hello/world.tsx | 3 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 3 +- .../src/routes/layout/second-layout.tsx | 3 +- .../src/routes/posts/posts-detail.tsx | 3 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 3 +- .../src/routeTree.gen.ts | 64 - .../src/routes/(tests)/lazy-page.lazy.tsx | 3 +- .../src/routes/(tests)/lazy-page.tsx | 3 +- .../(tests)/lazy-with-loader-page.lazy.tsx | 3 +- .../routes/(tests)/lazy-with-loader-page.tsx | 3 +- .../src/routes/(tests)/normal-page.tsx | 3 +- .../src/routes/(tests)/page-with-search.tsx | 3 +- .../src/routes/(tests)/virtual-page.lazy.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../basic-auth/src/tanstack-start.d.ts | 1 + .../basic-react-query/src/tanstack-start.d.ts | 1 + .../basic-react-query/tsconfig.json | 1 - .../basic-rsc/src/tanstack-start.d.ts | 1 + e2e/react-start/basic-rsc/tsconfig.json | 3 +- .../src/app/tanstack-start.d.ts | 1 + e2e/react-start/basic/src/routes/scripts.tsx | 2 - e2e/react-start/basic/src/tanstack-start.d.ts | 1 + e2e/react-start/clerk-basic/src/router.tsx | 1 - .../src/tanstack-start.d.ts | 1 + .../server-functions/src/tanstack-start.d.ts | 1 + e2e/react-start/virtual-routes/src/router.tsx | 1 - .../virtual-routes/src/tanstack-start.d.ts | 1 + e2e/react-start/website/src/router.tsx | 1 - .../website/src/tanstack-start.d.ts | 1 + .../basic-file-based/src/routeTree.gen.ts | 257 - .../(another-group)/onlyrouteinside.tsx | 3 +- .../routes/(group)/_layout.insidelayout.tsx | 3 +- .../src/routes/(group)/_layout.tsx | 3 +- .../src/routes/(group)/inside.tsx | 3 +- .../src/routes/(group)/lazyinside.lazy.tsx | 3 +- .../src/routes/(group)/lazyinside.tsx | 3 +- .../src/routes/(group)/subfolder/inside.tsx | 3 +- .../basic-file-based/src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../basic-file-based/src/routes/anchor.tsx | 3 +- .../basic-file-based/src/routes/editing-a.tsx | 3 +- .../basic-file-based/src/routes/editing-b.tsx | 3 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/params.single.$value.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../basic-file-based/src/routes/posts.tsx | 3 +- .../src/routes/posts_.$postId.edit.tsx | 3 +- .../src/routes/redirect/$target.tsx | 3 +- .../src/routes/redirect/$target/index.tsx | 3 +- .../redirect/$target/via-beforeLoad.tsx | 3 +- .../routes/redirect/$target/via-loader.tsx | 3 +- .../src/routes/redirect/index.tsx | 3 +- .../src/routes/redirect/preload/first.tsx | 3 +- .../src/routes/redirect/preload/second.tsx | 3 +- .../src/routes/redirect/preload/third.tsx | 3 +- .../src/routeTree.gen.ts | 77 - .../src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 3 +- .../src/routes/_layout.tsx | 3 +- .../src/routes/_layout/_layout-2.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-a.tsx | 3 +- .../src/routes/_layout/_layout-2/layout-b.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 3 +- .../src/routes/a.tsx | 3 +- .../src/routes/b.tsx | 3 +- .../routes/file-based-subtree/hello/index.tsx | 3 +- .../routes/file-based-subtree/hello/route.tsx | 3 +- .../file-based-subtree/hello/universe.tsx | 3 +- .../routes/file-based-subtree/hello/world.tsx | 3 +- .../src/routes/home.tsx | 3 +- .../src/routes/layout/first-layout.tsx | 3 +- .../src/routes/layout/second-layout.tsx | 3 +- .../src/routes/posts/posts-detail.tsx | 3 +- .../src/routes/posts/posts-home.tsx | 3 +- .../src/routes/posts/posts.tsx | 3 +- .../src/routeTree.gen.ts | 64 - .../src/routes/(tests)/lazy-page.lazy.tsx | 3 +- .../src/routes/(tests)/lazy-page.tsx | 3 +- .../(tests)/lazy-with-loader-page.lazy.tsx | 3 +- .../routes/(tests)/lazy-with-loader-page.tsx | 3 +- .../src/routes/(tests)/normal-page.tsx | 3 +- .../src/routes/(tests)/page-with-search.tsx | 3 +- .../src/routes/(tests)/virtual-page.lazy.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/app/tanstack-start.d.ts | 1 + e2e/solid-start/basic/src/routes/scripts.tsx | 2 - e2e/solid-start/basic/src/tanstack-start.d.ts | 1 + .../src/tanstack-start.d.ts | 1 + .../server-functions/src/tanstack-start.d.ts | 1 + .../website/src/tanstack-start.d.ts | 1 + .../src/routeTree.gen.ts | 68 - .../src/routes/_auth.dashboard.tsx | 3 +- .../src/routes/_auth.invoices.$invoiceId.tsx | 3 +- .../src/routes/_auth.invoices.index.tsx | 3 +- .../src/routes/_auth.invoices.tsx | 3 +- .../src/routes/_auth.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/login.tsx | 3 +- .../authenticated-routes/src/routeTree.gen.ts | 68 - .../src/routes/_auth.dashboard.tsx | 3 +- .../src/routes/_auth.invoices.$invoiceId.tsx | 3 +- .../src/routes/_auth.invoices.index.tsx | 3 +- .../src/routes/_auth.invoices.tsx | 3 +- .../authenticated-routes/src/routes/_auth.tsx | 3 +- .../authenticated-routes/src/routes/index.tsx | 3 +- .../authenticated-routes/src/routes/login.tsx | 3 +- .../basic-file-based/src/routeTree.gen.ts | 86 - .../src/routes/_pathlessLayout.tsx | 3 +- .../routes/_pathlessLayout/_nested-layout.tsx | 3 +- .../_nested-layout/route-a.tsx | 9 +- .../_nested-layout/route-b.tsx | 9 +- .../basic-file-based/src/routes/anchor.tsx | 3 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 3 +- .../src/routeTree.gen.ts | 77 - .../src/routes/_pathlessLayout.tsx | 3 +- .../routes/_pathlessLayout/_nested-layout.tsx | 3 +- .../_nested-layout/route-a.tsx | 9 +- .../_nested-layout/route-b.tsx | 9 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 3 +- .../src/routeTree.gen.ts | 158 - .../route-group.tsx | 5 +- .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 3 +- .../src/routes/_pathlessLayout.route-a.tsx | 3 +- .../src/routes/_pathlessLayout.route-b.tsx | 3 +- .../src/routes/_pathlessLayout.tsx | 3 +- .../src/routes/dashboard.index.tsx | 3 +- .../routes/dashboard.invoices.$invoiceId.tsx | 3 +- .../src/routes/dashboard.invoices.index.tsx | 3 +- .../src/routes/dashboard.invoices.route.tsx | 3 +- .../src/routes/dashboard.route.tsx | 3 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 3 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/login.tsx | 3 +- .../src/routeTree.gen.ts | 158 - .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 3 +- .../src/routes/_pathlessLayout.route-a.tsx | 3 +- .../src/routes/_pathlessLayout.route-b.tsx | 3 +- .../src/routes/_pathlessLayout.tsx | 3 +- .../src/routes/dashboard.index.tsx | 3 +- .../routes/dashboard.invoices.$invoiceId.tsx | 3 +- .../src/routes/dashboard.invoices.index.tsx | 3 +- .../src/routes/dashboard.invoices.route.tsx | 3 +- .../src/routes/dashboard.route.tsx | 3 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 3 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/foo/bar.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/login.tsx | 3 +- .../large-file-based/src/routeTree.gen.ts | 77 - .../large-file-based/src/routes/absolute.tsx | 3 +- .../large-file-based/src/routes/index.tsx | 3 +- .../large-file-based/src/routes/linkProps.tsx | 3 +- .../src/routes/params/$paramsPlaceholder.tsx | 3 +- .../src/routes/params/route.tsx | 3 +- .../large-file-based/src/routes/relative.tsx | 3 +- .../src/routes/search/route.tsx | 3 +- .../src/routes/search/searchPlaceholder.tsx | 3 +- .../src/routeTree.gen.ts | 23 - .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routeTree.gen.ts | 23 - .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routeTree.gen.ts | 23 - .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../packages/router/src/routeTree.gen.ts | 23 - .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../packages/router/src/routeTree.gen.ts | 23 - .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../packages/router/src/routeTree.gen.ts | 23 - .../packages/router/src/routes/$postId.ts | 3 +- .../packages/router/src/routes/index.ts | 3 +- .../react/start-bare/src/tanstack-start.d.ts | 1 + .../start-basic-auth/src/tanstack-start.d.ts | 1 + .../src/tanstack-start.d.ts | 1 + .../start-basic-rsc/src/tanstack-start.d.ts | 1 + .../src/tanstack-start.d.ts | 1 + .../react/start-basic/src/tanstack-start.d.ts | 1 + .../start-clerk-basic/src/routes/__root.tsx | 1 - .../start-clerk-basic/src/tanstack-start.d.ts | 1 + .../src/tanstack-start.d.ts | 1 + .../start-counter/src/tanstack-start.d.ts | 1 + .../server-routes/routeTree.gen.ts | 3552 +--- .../react/start-large/src/routeTree.gen.ts | 14826 +--------------- .../react/start-large/src/tanstack-start.d.ts | 1 + .../start-material-ui/src/tanstack-start.d.ts | 1 + .../src/tanstack-start.d.ts | 1 + .../start-trellaux/src/tanstack-start.d.ts | 1 + .../start-workos/src/tanstack-start.d.ts | 1 + .../view-transitions/src/routeTree.gen.ts | 59 - .../view-transitions/src/routes/explore.tsx | 3 +- .../src/routes/how-it-works.tsx | 3 +- .../view-transitions/src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.route.tsx | 3 +- .../basic-file-based/src/routeTree.gen.ts | 77 - .../src/routes/_pathlessLayout.tsx | 3 +- .../routes/_pathlessLayout/_nested-layout.tsx | 3 +- .../_nested-layout/route-a.tsx | 9 +- .../_nested-layout/route-b.tsx | 9 +- .../basic-file-based/src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../basic-file-based/src/routes/posts.tsx | 3 +- .../src/routeTree.gen.ts | 77 - .../src/routes/_pathlessLayout.tsx | 3 +- .../routes/_pathlessLayout/_nested-layout.tsx | 3 +- .../_nested-layout/route-a.tsx | 9 +- .../_nested-layout/route-b.tsx | 9 +- .../src/routes/index.tsx | 3 +- .../src/routes/posts.$postId.tsx | 3 +- .../src/routes/posts.index.tsx | 3 +- .../src/routes/posts.tsx | 3 +- .../src/routeTree.gen.ts | 158 - .../route-group.tsx | 5 +- .../src/routes/_auth.profile.tsx | 3 +- .../src/routes/_auth.tsx | 3 +- .../src/routes/_pathlessLayout.route-a.tsx | 3 +- .../src/routes/_pathlessLayout.route-b.tsx | 3 +- .../src/routes/_pathlessLayout.tsx | 3 +- .../src/routes/dashboard.index.tsx | 3 +- .../routes/dashboard.invoices.$invoiceId.tsx | 3 +- .../src/routes/dashboard.invoices.index.tsx | 3 +- .../src/routes/dashboard.invoices.route.tsx | 3 +- .../src/routes/dashboard.route.tsx | 3 +- .../src/routes/dashboard.users.index.tsx | 3 +- .../src/routes/dashboard.users.route.tsx | 3 +- .../src/routes/dashboard.users.user.tsx | 3 +- .../src/routes/expensive/index.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../src/routes/login.tsx | 3 +- .../src/routeTree.gen.ts | 23 - .../src/routes/about.tsx | 3 +- .../src/routes/index.tsx | 3 +- .../solid/start-bare/src/tanstack-start.d.ts | 1 + .../solid/start-basic/src/tanstack-start.d.ts | 1 + .../src/start-server-routes-plugin/plugin.ts | 7 +- 337 files changed, 919 insertions(+), 20494 deletions(-) diff --git a/e2e/react-router/basic-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-file-based/src/routeTree.gen.ts index 7263a2c8b1..ace129c465 100644 --- a/e2e/react-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/react-router/basic-file-based/src/routeTree.gen.ts @@ -9,7 +9,6 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes @@ -564,348 +563,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_layout' { - const createFileRoute: CreateFileRoute< - '/_layout', - FileRoutesByPath['/_layout']['parentRoute'], - FileRoutesByPath['/_layout']['id'], - FileRoutesByPath['/_layout']['path'], - FileRoutesByPath['/_layout']['fullPath'] - > -} -declare module './routes/anchor' { - const createFileRoute: CreateFileRoute< - '/anchor', - FileRoutesByPath['/anchor']['parentRoute'], - FileRoutesByPath['/anchor']['id'], - FileRoutesByPath['/anchor']['path'], - FileRoutesByPath['/anchor']['fullPath'] - > -} -declare module './routes/editing-a' { - const createFileRoute: CreateFileRoute< - '/editing-a', - FileRoutesByPath['/editing-a']['parentRoute'], - FileRoutesByPath['/editing-a']['id'], - FileRoutesByPath['/editing-a']['path'], - FileRoutesByPath['/editing-a']['fullPath'] - > -} -declare module './routes/editing-b' { - const createFileRoute: CreateFileRoute< - '/editing-b', - FileRoutesByPath['/editing-b']['parentRoute'], - FileRoutesByPath['/editing-b']['id'], - FileRoutesByPath['/editing-b']['path'], - FileRoutesByPath['/editing-b']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/(another-group)/onlyrouteinside' { - const createFileRoute: CreateFileRoute< - '/(another-group)/onlyrouteinside', - FileRoutesByPath['/(another-group)/onlyrouteinside']['parentRoute'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['id'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['path'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['fullPath'] - > -} - -declare module './routes/(group)/_layout' { - const createFileRoute: CreateFileRoute< - '/(group)/_layout', - FileRoutesByPath['/(group)/_layout']['parentRoute'], - FileRoutesByPath['/(group)/_layout']['id'], - FileRoutesByPath['/(group)/_layout']['path'], - FileRoutesByPath['/(group)/_layout']['fullPath'] - > -} -declare module './routes/(group)/inside' { - const createFileRoute: CreateFileRoute< - '/(group)/inside', - FileRoutesByPath['/(group)/inside']['parentRoute'], - FileRoutesByPath['/(group)/inside']['id'], - FileRoutesByPath['/(group)/inside']['path'], - FileRoutesByPath['/(group)/inside']['fullPath'] - > -} -declare module './routes/(group)/lazyinside' { - const createFileRoute: CreateFileRoute< - '/(group)/lazyinside', - FileRoutesByPath['/(group)/lazyinside']['parentRoute'], - FileRoutesByPath['/(group)/lazyinside']['id'], - FileRoutesByPath['/(group)/lazyinside']['path'], - FileRoutesByPath['/(group)/lazyinside']['fullPath'] - > -} -declare module './routes/(group)/lazyinside.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(group)/lazyinside']['preLoaderRoute'] - > -} -declare module './routes/_layout/_layout-2' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2', - FileRoutesByPath['/_layout/_layout-2']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2']['id'], - FileRoutesByPath['/_layout/_layout-2']['path'], - FileRoutesByPath['/_layout/_layout-2']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/redirect/$target' { - const createFileRoute: CreateFileRoute< - '/redirect/$target', - FileRoutesByPath['/redirect/$target']['parentRoute'], - FileRoutesByPath['/redirect/$target']['id'], - FileRoutesByPath['/redirect/$target']['path'], - FileRoutesByPath['/redirect/$target']['fullPath'] - > -} -declare module './routes/structural-sharing.$enabled' { - const createFileRoute: CreateFileRoute< - '/structural-sharing/$enabled', - FileRoutesByPath['/structural-sharing/$enabled']['parentRoute'], - FileRoutesByPath['/structural-sharing/$enabled']['id'], - FileRoutesByPath['/structural-sharing/$enabled']['path'], - FileRoutesByPath['/structural-sharing/$enabled']['fullPath'] - > -} -declare module './routes/params-ps/index' { - const createFileRoute: CreateFileRoute< - '/params-ps/', - FileRoutesByPath['/params-ps/']['parentRoute'], - FileRoutesByPath['/params-ps/']['id'], - FileRoutesByPath['/params-ps/']['path'], - FileRoutesByPath['/params-ps/']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/redirect/index' { - const createFileRoute: CreateFileRoute< - '/redirect/', - FileRoutesByPath['/redirect/']['parentRoute'], - FileRoutesByPath['/redirect/']['id'], - FileRoutesByPath['/redirect/']['path'], - FileRoutesByPath['/redirect/']['fullPath'] - > -} -declare module './routes/(group)/_layout.insidelayout' { - const createFileRoute: CreateFileRoute< - '/(group)/_layout/insidelayout', - FileRoutesByPath['/(group)/_layout/insidelayout']['parentRoute'], - FileRoutesByPath['/(group)/_layout/insidelayout']['id'], - FileRoutesByPath['/(group)/_layout/insidelayout']['path'], - FileRoutesByPath['/(group)/_layout/insidelayout']['fullPath'] - > -} -declare module './routes/(group)/subfolder/inside' { - const createFileRoute: CreateFileRoute< - '/(group)/subfolder/inside', - FileRoutesByPath['/(group)/subfolder/inside']['parentRoute'], - FileRoutesByPath['/(group)/subfolder/inside']['id'], - FileRoutesByPath['/(group)/subfolder/inside']['path'], - FileRoutesByPath['/(group)/subfolder/inside']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-a' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-a', - FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-b' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-b', - FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] - > -} -declare module './routes/params-ps/named/$foo' { - const createFileRoute: CreateFileRoute< - '/params-ps/named/$foo', - FileRoutesByPath['/params-ps/named/$foo']['parentRoute'], - FileRoutesByPath['/params-ps/named/$foo']['id'], - FileRoutesByPath['/params-ps/named/$foo']['path'], - FileRoutesByPath['/params-ps/named/$foo']['fullPath'] - > -} -declare module './routes/params-ps/named/prefix{$foo}' { - const createFileRoute: CreateFileRoute< - '/params-ps/named/prefix{$foo}', - FileRoutesByPath['/params-ps/named/prefix{$foo}']['parentRoute'], - FileRoutesByPath['/params-ps/named/prefix{$foo}']['id'], - FileRoutesByPath['/params-ps/named/prefix{$foo}']['path'], - FileRoutesByPath['/params-ps/named/prefix{$foo}']['fullPath'] - > -} -declare module './routes/params-ps/named/{$foo}suffix' { - const createFileRoute: CreateFileRoute< - '/params-ps/named/{$foo}suffix', - FileRoutesByPath['/params-ps/named/{$foo}suffix']['parentRoute'], - FileRoutesByPath['/params-ps/named/{$foo}suffix']['id'], - FileRoutesByPath['/params-ps/named/{$foo}suffix']['path'], - FileRoutesByPath['/params-ps/named/{$foo}suffix']['fullPath'] - > -} -declare module './routes/params-ps/wildcard/$' { - const createFileRoute: CreateFileRoute< - '/params-ps/wildcard/$', - FileRoutesByPath['/params-ps/wildcard/$']['parentRoute'], - FileRoutesByPath['/params-ps/wildcard/$']['id'], - FileRoutesByPath['/params-ps/wildcard/$']['path'], - FileRoutesByPath['/params-ps/wildcard/$']['fullPath'] - > -} -declare module './routes/params-ps/wildcard/prefix{$}' { - const createFileRoute: CreateFileRoute< - '/params-ps/wildcard/prefix{$}', - FileRoutesByPath['/params-ps/wildcard/prefix{$}']['parentRoute'], - FileRoutesByPath['/params-ps/wildcard/prefix{$}']['id'], - FileRoutesByPath['/params-ps/wildcard/prefix{$}']['path'], - FileRoutesByPath['/params-ps/wildcard/prefix{$}']['fullPath'] - > -} -declare module './routes/params-ps/wildcard/{$}suffix' { - const createFileRoute: CreateFileRoute< - '/params-ps/wildcard/{$}suffix', - FileRoutesByPath['/params-ps/wildcard/{$}suffix']['parentRoute'], - FileRoutesByPath['/params-ps/wildcard/{$}suffix']['id'], - FileRoutesByPath['/params-ps/wildcard/{$}suffix']['path'], - FileRoutesByPath['/params-ps/wildcard/{$}suffix']['fullPath'] - > -} -declare module './routes/params.single.$value' { - const createFileRoute: CreateFileRoute< - '/params/single/$value', - FileRoutesByPath['/params/single/$value']['parentRoute'], - FileRoutesByPath['/params/single/$value']['id'], - FileRoutesByPath['/params/single/$value']['path'], - FileRoutesByPath['/params/single/$value']['fullPath'] - > -} -declare module './routes/posts_.$postId.edit' { - const createFileRoute: CreateFileRoute< - '/posts_/$postId/edit', - FileRoutesByPath['/posts_/$postId/edit']['parentRoute'], - FileRoutesByPath['/posts_/$postId/edit']['id'], - FileRoutesByPath['/posts_/$postId/edit']['path'], - FileRoutesByPath['/posts_/$postId/edit']['fullPath'] - > -} -declare module './routes/redirect/$target/via-beforeLoad' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/via-beforeLoad', - FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] - > -} -declare module './routes/redirect/$target/via-loader' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/via-loader', - FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], - FileRoutesByPath['/redirect/$target/via-loader']['id'], - FileRoutesByPath['/redirect/$target/via-loader']['path'], - FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] - > -} -declare module './routes/redirect/preload/first' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/first', - FileRoutesByPath['/redirect/preload/first']['parentRoute'], - FileRoutesByPath['/redirect/preload/first']['id'], - FileRoutesByPath['/redirect/preload/first']['path'], - FileRoutesByPath['/redirect/preload/first']['fullPath'] - > -} -declare module './routes/redirect/preload/second' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/second', - FileRoutesByPath['/redirect/preload/second']['parentRoute'], - FileRoutesByPath['/redirect/preload/second']['id'], - FileRoutesByPath['/redirect/preload/second']['path'], - FileRoutesByPath['/redirect/preload/second']['fullPath'] - > -} -declare module './routes/redirect/preload/third' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/third', - FileRoutesByPath['/redirect/preload/third']['parentRoute'], - FileRoutesByPath['/redirect/preload/third']['id'], - FileRoutesByPath['/redirect/preload/third']['path'], - FileRoutesByPath['/redirect/preload/third']['fullPath'] - > -} -declare module './routes/params-ps/named/index' { - const createFileRoute: CreateFileRoute< - '/params-ps/named/', - FileRoutesByPath['/params-ps/named/']['parentRoute'], - FileRoutesByPath['/params-ps/named/']['id'], - FileRoutesByPath['/params-ps/named/']['path'], - FileRoutesByPath['/params-ps/named/']['fullPath'] - > -} -declare module './routes/params-ps/wildcard/index' { - const createFileRoute: CreateFileRoute< - '/params-ps/wildcard/', - FileRoutesByPath['/params-ps/wildcard/']['parentRoute'], - FileRoutesByPath['/params-ps/wildcard/']['id'], - FileRoutesByPath['/params-ps/wildcard/']['path'], - FileRoutesByPath['/params-ps/wildcard/']['fullPath'] - > -} -declare module './routes/redirect/$target/index' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/', - FileRoutesByPath['/redirect/$target/']['parentRoute'], - FileRoutesByPath['/redirect/$target/']['id'], - FileRoutesByPath['/redirect/$target/']['path'], - FileRoutesByPath['/redirect/$target/']['fullPath'] - > -} - // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx index 62a41d2cf2..07794d4fe0 100644 --- a/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(another-group)/onlyrouteinside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx index 0672b308e9..f2c70bb248 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/_layout/insidelayout') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/_layout/insidelayout')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx index 7806ad35db..c8b874997b 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/_layout')({ component: () => ( <>
/(group)/_layout!
diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx index 146dfb8c01..429967fd33 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/inside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/inside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/inside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/inside' }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx index dc10d92fae..7112ca410e 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx @@ -1,8 +1,9 @@ +import { createLazyFileRoute } from '@tanstack/react-router' import { getRouteApi, useSearch } from '@tanstack/react-router' const routeApi = getRouteApi('/(group)/lazyinside') -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(group)/lazyinside')({ component: () => { const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) const searchViaRouteHook = Route.useSearch() diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx index c11aef8fd1..0f52a40d98 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/lazyinside.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/lazyinside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), }) diff --git a/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx b/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx index 31830d399e..456aaa006d 100644 --- a/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/react-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import { getRouteApi, useSearch } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/subfolder/inside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/subfolder/inside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout.tsx b/e2e/react-router/basic-file-based/src/routes/_layout.tsx index 5c4a461d8d..0fcaac3a52 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx index 483b910862..388d0b3b87 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..ed2dea8800 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..4799d403e9 100644 --- a/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/anchor.tsx b/e2e/react-router/basic-file-based/src/routes/anchor.tsx index 26d02d6b2c..d674230db4 100644 --- a/e2e/react-router/basic-file-based/src/routes/anchor.tsx +++ b/e2e/react-router/basic-file-based/src/routes/anchor.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import { useLayoutEffect, useRef, useState } from 'react' import { Link, useLocation, useNavigate } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/anchor')({ component: AnchorComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/editing-a.tsx b/e2e/react-router/basic-file-based/src/routes/editing-a.tsx index 62a2dadeb4..bf98108848 100644 --- a/e2e/react-router/basic-file-based/src/routes/editing-a.tsx +++ b/e2e/react-router/basic-file-based/src/routes/editing-a.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useBlocker } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/editing-a')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/editing-b.tsx b/e2e/react-router/basic-file-based/src/routes/editing-b.tsx index 5afd5c8863..1f3c2f1f2a 100644 --- a/e2e/react-router/basic-file-based/src/routes/editing-b.tsx +++ b/e2e/react-router/basic-file-based/src/routes/editing-b.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useBlocker } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/editing-b')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/index.tsx b/e2e/react-router/basic-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/e2e/react-router/basic-file-based/src/routes/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx index 8bfb406f4f..c5f4b6c5c3 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params-ps/')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx index 59186ab217..dae4251e29 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/$foo.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/named/$foo')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx index 114137f3b4..f9a9a7ac06 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params-ps/named/')({ beforeLoad: () => { throw redirect({ to: '/params-ps' }) }, diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx index 8febd60160..69f6163299 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/prefix{$foo}.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/named/prefix{$foo}')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx index c5598bffcf..f98b9cc57a 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/named/{$foo}suffix.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/named/{$foo}suffix')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx index d82806aef2..603dff0d59 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/$.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/wildcard/$')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx index 114137f3b4..62415d5ac4 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params-ps/wildcard/')({ beforeLoad: () => { throw redirect({ to: '/params-ps' }) }, diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx index 42865fafc1..dc994cb8ec 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/prefix{$}.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/wildcard/prefix{$}')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx index db9ecbbbca..a7a2995771 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/wildcard/{$}suffix.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/params-ps/wildcard/{$}suffix')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx b/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx index b7d7ed81db..7ee38c0db8 100644 --- a/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params.single.$value.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params/single/$value')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx index 13708e04a2..3466bd9d9d 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/basic-file-based/src/routes/posts.index.tsx b/e2e/react-router/basic-file-based/src/routes/posts.index.tsx index ab5f3c2ff3..90a8777a52 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/posts.tsx b/e2e/react-router/basic-file-based/src/routes/posts.tsx index 839bf039d6..39b3328366 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ { diff --git a/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx b/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx index 827d546135..7ddf02cc21 100644 --- a/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx +++ b/e2e/react-router/basic-file-based/src/routes/posts_.$postId.edit.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { getRouteApi, useParams } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts_/$postId/edit')({ component: PostEditPage, }) diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx index 099a7ab0be..37e4729107 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import { retainSearchParams } from '@tanstack/react-router' import z from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target')({ params: { parse: (p) => z diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx index 29df874863..65d3a1d827 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/')({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx index e5192d1cd7..1f4a1a9e50 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx index 022d5c1f8c..4b111c62de 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { redirect } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/via-loader')({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx index a400e552ab..816065decd 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/')({ component: () => ( }> +

{data}

} + /> + +
Count: {count()}
+
+ +
+
{ await new Promise((r) => setTimeout(r, 1000)) throw redirect({ from: Route.fullPath, to: '../third' }) diff --git a/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx b/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx index cc162b05d9..5d429a67d3 100644 --- a/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx +++ b/e2e/react-router/basic-file-based/src/routes/redirect/preload/third.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/redirect/preload/third')({ component: RouteComponent, }) diff --git a/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx b/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx index da4ff770a1..1aa8a1e5b4 100644 --- a/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx +++ b/e2e/react-router/basic-file-based/src/routes/structural-sharing.$enabled.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, getRouteApi, useSearch } from '@tanstack/react-router' import React from 'react' import { z } from 'zod' @@ -12,7 +13,7 @@ const enabledSchema = { }, z.boolean()), } -export const Route = createFileRoute({ +export const Route = createFileRoute('/structural-sharing/$enabled')({ component: RouteComponent, params: { parse: (p) => z.object(enabledSchema).parse(p), diff --git a/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts b/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts index c829a6d688..6d8fa1bd79 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts +++ b/e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -133,81 +131,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_layout' { - const createFileRoute: CreateFileRoute< - '/_layout', - FileRoutesByPath['/_layout']['parentRoute'], - FileRoutesByPath['/_layout']['id'], - FileRoutesByPath['/_layout']['path'], - FileRoutesByPath['/_layout']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_layout/_layout-2' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2', - FileRoutesByPath['/_layout/_layout-2']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2']['id'], - FileRoutesByPath['/_layout/_layout-2']['path'], - FileRoutesByPath['/_layout/_layout-2']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-a' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-a', - FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-b' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-b', - FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] - > -} - // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx index 5c4a461d8d..0fcaac3a52 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx index 483b910862..388d0b3b87 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..ed2dea8800 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..4799d403e9 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx index c3ae5dc441..9c7e89fbce 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent, useRouter } from '@tanstack/react-router' import { @@ -8,7 +9,7 @@ import { PostNotFoundError } from '../posts' import { postQueryOptions } from '../postQueryOptions' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx index fdbe5865e5..c6b65f1892 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx b/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx index f74a7d923f..eed69e28aa 100644 --- a/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/routes/posts.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx index fd83a0eaa0..1e1ef2ebe1 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout.jsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx index abd82a2bf6..9c345694ab 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout.jsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: LayoutComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx index a190b24202..6b59dbc46f 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.jsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutAComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( + { + component: LayoutAComponent, + }, +) function LayoutAComponent() { return
I'm layout A!
diff --git a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx index 505f8f6fbf..50f864f617 100644 --- a/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.jsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutBComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( + { + component: LayoutBComponent, + }, +) function LayoutBComponent() { return
I'm layout B!
diff --git a/e2e/react-router/js-only-file-based/src/routes/index.jsx b/e2e/react-router/js-only-file-based/src/routes/index.jsx index b23956ae17..0a5b7572ba 100644 --- a/e2e/react-router/js-only-file-based/src/routes/index.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/index.jsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx index c010a465e6..0d4b989053 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.$postId.jsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx index fdbe5865e5..c6b65f1892 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.index.jsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx b/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx index 0aca21ad57..ab5c2ac99f 100644 --- a/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx +++ b/e2e/react-router/js-only-file-based/src/routes/posts.route.jsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx index 5c4a461d8d..0fcaac3a52 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx index 483b910862..388d0b3b87 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..ed2dea8800 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..4799d403e9 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx index 0578182ecb..956ca50ecd 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx index fdbe5865e5..c6b65f1892 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx index 4469b2216a..295205ac1c 100644 --- a/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/routes/posts.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx index a190b24202..b36784f0de 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_first/_second/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx index 505f8f6fbf..eb440b9eb3 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_first/_second/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index f86335e291..0cc76f4a69 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/classic/hello/')({ component: () =>
This is the index
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index 620dd2b76b..9485ec5954 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/classic/hello')({ component: () => (
Hello! diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index 20b07c41cc..5aaa7d4fa0 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/classic/hello/universe')({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 4af11357a2..790d33a838 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/classic/hello/world')({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx index b23956ae17..0a5b7572ba 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index 5c4a461d8d..b9551e996d 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_first')({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index 483b910862..7c058919b1 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_first/_second')({ component: LayoutComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 654f3cfd18..d955b379fb 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index fdbe5865e5..c6b65f1892 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index f92c37f537..3ebc75f079 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts b/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts index 6b76b8cb25..f2c2f4f72f 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts @@ -9,7 +9,6 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/react-router' -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' // Import Routes @@ -121,69 +120,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/(tests)/lazy-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/lazy-page', - FileRoutesByPath['/(tests)/lazy-page']['parentRoute'], - FileRoutesByPath['/(tests)/lazy-page']['id'], - FileRoutesByPath['/(tests)/lazy-page']['path'], - FileRoutesByPath['/(tests)/lazy-page']['fullPath'] - > -} -declare module './routes/(tests)/lazy-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/lazy-page']['preLoaderRoute'] - > -} -declare module './routes/(tests)/lazy-with-loader-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/lazy-with-loader-page', - FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath'] - > -} -declare module './routes/(tests)/lazy-with-loader-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/lazy-with-loader-page']['preLoaderRoute'] - > -} -declare module './routes/(tests)/normal-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/normal-page', - FileRoutesByPath['/(tests)/normal-page']['parentRoute'], - FileRoutesByPath['/(tests)/normal-page']['id'], - FileRoutesByPath['/(tests)/normal-page']['path'], - FileRoutesByPath['/(tests)/normal-page']['fullPath'] - > -} -declare module './routes/(tests)/page-with-search' { - const createFileRoute: CreateFileRoute< - '/(tests)/page-with-search', - FileRoutesByPath['/(tests)/page-with-search']['parentRoute'], - FileRoutesByPath['/(tests)/page-with-search']['id'], - FileRoutesByPath['/(tests)/page-with-search']['path'], - FileRoutesByPath['/(tests)/page-with-search']['fullPath'] - > -} -declare module './routes/(tests)/virtual-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/virtual-page']['preLoaderRoute'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx index dfe060ac82..e3125409c0 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx @@ -1,8 +1,9 @@ +import { createLazyFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/lazy-page')({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx index 79405e27e7..29e40169bb 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx @@ -1 +1,2 @@ -export const Route = createFileRoute({}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/(tests)/lazy-page')({}) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx index c56fefa910..8311f36f45 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx @@ -1,6 +1,7 @@ +import { createLazyFileRoute } from '@tanstack/react-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/lazy-with-loader-page')({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx index 5463a153af..3fdc078569 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { sleep } from '../../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/lazy-with-loader-page')({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx index 1d897c8e5d..e8fc66cad9 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/normal-page')({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx index 21e7635e29..d9591671f5 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/page-with-search')({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx index ca3bf045e9..ae144463e8 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx @@ -1,8 +1,9 @@ +import { createLazyFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/virtual-page')({ component: Component, }) diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx index 843919d994..9b0474a02f 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/e2e/react-start/basic-auth/src/tanstack-start.d.ts b/e2e/react-start/basic-auth/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/basic-auth/src/tanstack-start.d.ts +++ b/e2e/react-start/basic-auth/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-react-query/src/tanstack-start.d.ts b/e2e/react-start/basic-react-query/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/basic-react-query/src/tanstack-start.d.ts +++ b/e2e/react-start/basic-react-query/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-react-query/tsconfig.json b/e2e/react-start/basic-react-query/tsconfig.json index bb7f28fe27..3a9fb7cd71 100644 --- a/e2e/react-start/basic-react-query/tsconfig.json +++ b/e2e/react-start/basic-react-query/tsconfig.json @@ -17,7 +17,6 @@ "paths": { "~/*": ["./src/*"] }, - "types": ["vite/client"], "noEmit": true } } diff --git a/e2e/react-start/basic-rsc/src/tanstack-start.d.ts b/e2e/react-start/basic-rsc/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/basic-rsc/src/tanstack-start.d.ts +++ b/e2e/react-start/basic-rsc/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic-rsc/tsconfig.json b/e2e/react-start/basic-rsc/tsconfig.json index a07911fe5f..3a9fb7cd71 100644 --- a/e2e/react-start/basic-rsc/tsconfig.json +++ b/e2e/react-start/basic-rsc/tsconfig.json @@ -17,7 +17,6 @@ "paths": { "~/*": ["./src/*"] }, - "noEmit": true, - "types": ["vite/client"] + "noEmit": true } } diff --git a/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts b/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts index 6b848b9bb7..df36e6de73 100644 --- a/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts +++ b/e2e/react-start/basic-tsr-config/src/app/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/basic/src/routes/scripts.tsx b/e2e/react-start/basic/src/routes/scripts.tsx index 5d3bc3fc0b..7ae5be0552 100644 --- a/e2e/react-start/basic/src/routes/scripts.tsx +++ b/e2e/react-start/basic/src/routes/scripts.tsx @@ -1,5 +1,3 @@ -/// - const isProd = import.meta.env.PROD export const Route = createFileRoute({ diff --git a/e2e/react-start/basic/src/tanstack-start.d.ts b/e2e/react-start/basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/basic/src/tanstack-start.d.ts +++ b/e2e/react-start/basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/clerk-basic/src/router.tsx b/e2e/react-start/clerk-basic/src/router.tsx index 63444559c1..5a1c0ad410 100644 --- a/e2e/react-start/clerk-basic/src/router.tsx +++ b/e2e/react-start/clerk-basic/src/router.tsx @@ -1,4 +1,3 @@ -/// import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' diff --git a/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts b/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts +++ b/e2e/react-start/scroll-restoration/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/server-functions/src/tanstack-start.d.ts b/e2e/react-start/server-functions/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/server-functions/src/tanstack-start.d.ts +++ b/e2e/react-start/server-functions/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/virtual-routes/src/router.tsx b/e2e/react-start/virtual-routes/src/router.tsx index 97c0e3d666..b8744cb41f 100644 --- a/e2e/react-start/virtual-routes/src/router.tsx +++ b/e2e/react-start/virtual-routes/src/router.tsx @@ -1,4 +1,3 @@ -/// import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' diff --git a/e2e/react-start/virtual-routes/src/tanstack-start.d.ts b/e2e/react-start/virtual-routes/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/virtual-routes/src/tanstack-start.d.ts +++ b/e2e/react-start/virtual-routes/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/website/src/router.tsx b/e2e/react-start/website/src/router.tsx index 7228520066..28304cb690 100644 --- a/e2e/react-start/website/src/router.tsx +++ b/e2e/react-start/website/src/router.tsx @@ -1,4 +1,3 @@ -/// import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' diff --git a/e2e/react-start/website/src/tanstack-start.d.ts b/e2e/react-start/website/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/react-start/website/src/tanstack-start.d.ts +++ b/e2e/react-start/website/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts index 5d1f7b9af6..8da46dd71d 100644 --- a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts @@ -9,11 +9,6 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/solid-router' -import type { - CreateFileRoute, - CreateLazyFileRoute, - FileRoutesByPath, -} from '@tanstack/solid-router' // Import Routes @@ -423,258 +418,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_layout' { - const createFileRoute: CreateFileRoute< - '/_layout', - FileRoutesByPath['/_layout']['parentRoute'], - FileRoutesByPath['/_layout']['id'], - FileRoutesByPath['/_layout']['path'], - FileRoutesByPath['/_layout']['fullPath'] - > -} -declare module './routes/anchor' { - const createFileRoute: CreateFileRoute< - '/anchor', - FileRoutesByPath['/anchor']['parentRoute'], - FileRoutesByPath['/anchor']['id'], - FileRoutesByPath['/anchor']['path'], - FileRoutesByPath['/anchor']['fullPath'] - > -} -declare module './routes/editing-a' { - const createFileRoute: CreateFileRoute< - '/editing-a', - FileRoutesByPath['/editing-a']['parentRoute'], - FileRoutesByPath['/editing-a']['id'], - FileRoutesByPath['/editing-a']['path'], - FileRoutesByPath['/editing-a']['fullPath'] - > -} -declare module './routes/editing-b' { - const createFileRoute: CreateFileRoute< - '/editing-b', - FileRoutesByPath['/editing-b']['parentRoute'], - FileRoutesByPath['/editing-b']['id'], - FileRoutesByPath['/editing-b']['path'], - FileRoutesByPath['/editing-b']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/(another-group)/onlyrouteinside' { - const createFileRoute: CreateFileRoute< - '/(another-group)/onlyrouteinside', - FileRoutesByPath['/(another-group)/onlyrouteinside']['parentRoute'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['id'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['path'], - FileRoutesByPath['/(another-group)/onlyrouteinside']['fullPath'] - > -} - -declare module './routes/(group)/_layout' { - const createFileRoute: CreateFileRoute< - '/(group)/_layout', - FileRoutesByPath['/(group)/_layout']['parentRoute'], - FileRoutesByPath['/(group)/_layout']['id'], - FileRoutesByPath['/(group)/_layout']['path'], - FileRoutesByPath['/(group)/_layout']['fullPath'] - > -} -declare module './routes/(group)/inside' { - const createFileRoute: CreateFileRoute< - '/(group)/inside', - FileRoutesByPath['/(group)/inside']['parentRoute'], - FileRoutesByPath['/(group)/inside']['id'], - FileRoutesByPath['/(group)/inside']['path'], - FileRoutesByPath['/(group)/inside']['fullPath'] - > -} -declare module './routes/(group)/lazyinside' { - const createFileRoute: CreateFileRoute< - '/(group)/lazyinside', - FileRoutesByPath['/(group)/lazyinside']['parentRoute'], - FileRoutesByPath['/(group)/lazyinside']['id'], - FileRoutesByPath['/(group)/lazyinside']['path'], - FileRoutesByPath['/(group)/lazyinside']['fullPath'] - > -} -declare module './routes/(group)/lazyinside.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(group)/lazyinside']['preLoaderRoute'] - > -} -declare module './routes/_layout/_layout-2' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2', - FileRoutesByPath['/_layout/_layout-2']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2']['id'], - FileRoutesByPath['/_layout/_layout-2']['path'], - FileRoutesByPath['/_layout/_layout-2']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/redirect/$target' { - const createFileRoute: CreateFileRoute< - '/redirect/$target', - FileRoutesByPath['/redirect/$target']['parentRoute'], - FileRoutesByPath['/redirect/$target']['id'], - FileRoutesByPath['/redirect/$target']['path'], - FileRoutesByPath['/redirect/$target']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/redirect/index' { - const createFileRoute: CreateFileRoute< - '/redirect/', - FileRoutesByPath['/redirect/']['parentRoute'], - FileRoutesByPath['/redirect/']['id'], - FileRoutesByPath['/redirect/']['path'], - FileRoutesByPath['/redirect/']['fullPath'] - > -} -declare module './routes/(group)/_layout.insidelayout' { - const createFileRoute: CreateFileRoute< - '/(group)/_layout/insidelayout', - FileRoutesByPath['/(group)/_layout/insidelayout']['parentRoute'], - FileRoutesByPath['/(group)/_layout/insidelayout']['id'], - FileRoutesByPath['/(group)/_layout/insidelayout']['path'], - FileRoutesByPath['/(group)/_layout/insidelayout']['fullPath'] - > -} -declare module './routes/(group)/subfolder/inside' { - const createFileRoute: CreateFileRoute< - '/(group)/subfolder/inside', - FileRoutesByPath['/(group)/subfolder/inside']['parentRoute'], - FileRoutesByPath['/(group)/subfolder/inside']['id'], - FileRoutesByPath['/(group)/subfolder/inside']['path'], - FileRoutesByPath['/(group)/subfolder/inside']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-a' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-a', - FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-b' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-b', - FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] - > -} -declare module './routes/params.single.$value' { - const createFileRoute: CreateFileRoute< - '/params/single/$value', - FileRoutesByPath['/params/single/$value']['parentRoute'], - FileRoutesByPath['/params/single/$value']['id'], - FileRoutesByPath['/params/single/$value']['path'], - FileRoutesByPath['/params/single/$value']['fullPath'] - > -} -declare module './routes/posts_.$postId.edit' { - const createFileRoute: CreateFileRoute< - '/posts_/$postId/edit', - FileRoutesByPath['/posts_/$postId/edit']['parentRoute'], - FileRoutesByPath['/posts_/$postId/edit']['id'], - FileRoutesByPath['/posts_/$postId/edit']['path'], - FileRoutesByPath['/posts_/$postId/edit']['fullPath'] - > -} -declare module './routes/redirect/$target/via-beforeLoad' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/via-beforeLoad', - FileRoutesByPath['/redirect/$target/via-beforeLoad']['parentRoute'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['id'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['path'], - FileRoutesByPath['/redirect/$target/via-beforeLoad']['fullPath'] - > -} -declare module './routes/redirect/$target/via-loader' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/via-loader', - FileRoutesByPath['/redirect/$target/via-loader']['parentRoute'], - FileRoutesByPath['/redirect/$target/via-loader']['id'], - FileRoutesByPath['/redirect/$target/via-loader']['path'], - FileRoutesByPath['/redirect/$target/via-loader']['fullPath'] - > -} -declare module './routes/redirect/preload/first' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/first', - FileRoutesByPath['/redirect/preload/first']['parentRoute'], - FileRoutesByPath['/redirect/preload/first']['id'], - FileRoutesByPath['/redirect/preload/first']['path'], - FileRoutesByPath['/redirect/preload/first']['fullPath'] - > -} -declare module './routes/redirect/preload/second' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/second', - FileRoutesByPath['/redirect/preload/second']['parentRoute'], - FileRoutesByPath['/redirect/preload/second']['id'], - FileRoutesByPath['/redirect/preload/second']['path'], - FileRoutesByPath['/redirect/preload/second']['fullPath'] - > -} -declare module './routes/redirect/preload/third' { - const createFileRoute: CreateFileRoute< - '/redirect/preload/third', - FileRoutesByPath['/redirect/preload/third']['parentRoute'], - FileRoutesByPath['/redirect/preload/third']['id'], - FileRoutesByPath['/redirect/preload/third']['path'], - FileRoutesByPath['/redirect/preload/third']['fullPath'] - > -} -declare module './routes/redirect/$target/index' { - const createFileRoute: CreateFileRoute< - '/redirect/$target/', - FileRoutesByPath['/redirect/$target/']['parentRoute'], - FileRoutesByPath['/redirect/$target/']['id'], - FileRoutesByPath['/redirect/$target/']['path'], - FileRoutesByPath['/redirect/$target/']['fullPath'] - > -} - // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx index 02541fcca3..d935e88ed6 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/solid-router' import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(another-group)/onlyrouteinside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx index b38b7f742f..6ad8947caa 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.insidelayout.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/solid-router' import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/_layout/insidelayout') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/_layout/insidelayout')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx index f4559572c2..f403f766aa 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/_layout')({ component: () => ( <>
/(group)/_layout!
diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx index eb1d28c1a0..fbb420e112 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/inside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/solid-router' import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/inside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/inside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/inside' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx index e4671a84ea..ed9b6acb5a 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.lazy.tsx @@ -1,8 +1,9 @@ +import { createLazyFileRoute } from '@tanstack/solid-router' import { getRouteApi, useSearch } from '@tanstack/solid-router' const routeApi = getRouteApi('/(group)/lazyinside') -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(group)/lazyinside')({ component: () => { const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) const searchViaRouteHook = Route.useSearch() diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx index c11aef8fd1..dcaf7b0727 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/lazyinside.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/lazyinside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), }) diff --git a/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx b/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx index 48b9e1c517..4f91b5a4f2 100644 --- a/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/(group)/subfolder/inside.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/solid-router' import { getRouteApi, useSearch } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' const routeApi = getRouteApi('/(group)/subfolder/inside') -export const Route = createFileRoute({ +export const Route = createFileRoute('/(group)/subfolder/inside')({ validateSearch: zodValidator(z.object({ hello: z.string().optional() })), component: () => { const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout.tsx index c549175638..5525c0c297 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx index efeca5ce86..000a19e988 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..997e6caf80 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..70135c5809 100644 --- a/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/anchor.tsx b/e2e/solid-router/basic-file-based/src/routes/anchor.tsx index b14122d179..944182db7a 100644 --- a/e2e/solid-router/basic-file-based/src/routes/anchor.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/anchor.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, useLocation, useNavigate } from '@tanstack/solid-router' import { createEffect, @@ -6,7 +7,7 @@ import { onCleanup, } from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/anchor')({ component: AnchorComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx b/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx index 85b10caafe..ad7b579f33 100644 --- a/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/editing-a.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { useBlocker } from '@tanstack/solid-router' import { createSignal } from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/editing-a')({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx b/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx index 1d3e27339d..660c8fd63b 100644 --- a/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/editing-b.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { useBlocker } from '@tanstack/solid-router' import { createEffect, createSignal, createMemo } from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/editing-b')({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/index.tsx b/e2e/solid-router/basic-file-based/src/routes/index.tsx index 510db79b73..3f905db60c 100644 --- a/e2e/solid-router/basic-file-based/src/routes/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx b/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx index e370dd594c..b16c4b47b5 100644 --- a/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/params.single.$value.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as React from 'react' import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params/single/$value')({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx index f6445ae3ea..a112484f11 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +7,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx index 07e41d1b0b..ac7c378e60 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/posts.tsx b/e2e/solid-router/basic-file-based/src/routes/posts.tsx index 7f56ca2292..5a31160395 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ { diff --git a/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx b/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx index 9e4c81d0f6..a1a0cc0b7a 100644 --- a/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/posts_.$postId.edit.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { getRouteApi, useParams } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts_/$postId/edit')({ component: PostEditPage, }) diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx index c4c78070d3..1672e7ac3a 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { retainSearchParams } from '@tanstack/solid-router' import z from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target')({ params: { parse: (p) => z diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx index 7f4c505a93..0454fe0a7f 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/')({ component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) return ( diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx index bac534bfc5..bc36059052 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-beforeLoad.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/via-beforeLoad')({ beforeLoad: ({ params: { target }, search: { reloadDocument, externalHost }, diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx index 686c0d8971..0878aaea49 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/$target/via-loader.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { redirect } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/$target/via-loader')({ loaderDeps: ({ search: { reloadDocument, externalHost } }) => ({ reloadDocument, externalHost, diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx index 26aefc154c..a49aa819ce 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/redirect/')({ component: () => (
{ await new Promise((r) => setTimeout(r, 1000)) throw redirect({ from: Route.fullPath, to: '../third' }) diff --git a/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx b/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx index cc162b05d9..35cacf7934 100644 --- a/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx +++ b/e2e/solid-router/basic-file-based/src/routes/redirect/preload/third.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/redirect/preload/third')({ component: RouteComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts index 5220b5f816..c61533fa24 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-solid-query-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -133,81 +131,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_layout' { - const createFileRoute: CreateFileRoute< - '/_layout', - FileRoutesByPath['/_layout']['parentRoute'], - FileRoutesByPath['/_layout']['id'], - FileRoutesByPath['/_layout']['path'], - FileRoutesByPath['/_layout']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_layout/_layout-2' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2', - FileRoutesByPath['/_layout/_layout-2']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2']['id'], - FileRoutesByPath['/_layout/_layout-2']['path'], - FileRoutesByPath['/_layout/_layout-2']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-a' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-a', - FileRoutesByPath['/_layout/_layout-2/layout-a']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-a']['fullPath'] - > -} -declare module './routes/_layout/_layout-2/layout-b' { - const createFileRoute: CreateFileRoute< - '/_layout/_layout-2/layout-b', - FileRoutesByPath['/_layout/_layout-2/layout-b']['parentRoute'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['id'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['path'], - FileRoutesByPath['/_layout/_layout-2/layout-b']['fullPath'] - > -} - // Create and export the route tree interface LayoutLayout2RouteChildren { diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx index c549175638..5525c0c297 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx index efeca5ce86..000a19e988 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..997e6caf80 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..70135c5809 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx index 510db79b73..3f905db60c 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx index 38ae2af8bd..f771b7be7e 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ErrorComponent, useRouter } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createEffect, createMemo } from 'solid-js' @@ -31,7 +32,7 @@ export function PostErrorComponent({ error, reset }: ErrorComponentProps) { ) } -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx index 13529228bb..812b581e0a 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx index 8dbecad08e..d194367647 100644 --- a/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/basic-solid-query-file-based/src/routes/posts.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createMemo } from 'solid-js' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx index c549175638..5525c0c297 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx index efeca5ce86..000a19e988 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_layout/_layout-2')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx index a190b24202..997e6caf80 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx index 505f8f6fbf..70135c5809 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/_layout/_layout-2/layout-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_layout/_layout-2/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx index 510db79b73..3f905db60c 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx index 12f48f498d..7a74c9adec 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +7,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx index 13529228bb..812b581e0a 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx index 2e28f9beb3..86fb7a1841 100644 --- a/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx +++ b/e2e/solid-router/rspack-basic-file-based/src/routes/posts.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx index a190b24202..be88a87cbe 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_first/_second/layout-a')({ component: LayoutAComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx index 505f8f6fbf..c26087837b 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_first/_second/layout-b')({ component: LayoutBComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx index f86335e291..6cc8bb1a6f 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/index.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/classic/hello/')({ component: () =>
This is the index
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx index 5b95eea555..3808e5346d 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/route.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/classic/hello')({ component: () => (
Hello! diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx index 20b07c41cc..f250de10c1 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/universe.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/classic/hello/universe')({ component: () =>
Hello /classic/hello/universe!
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx index 4af11357a2..d207a49114 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/file-based-subtree/hello/world.tsx @@ -1,3 +1,4 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/classic/hello/world')({ component: () =>
Hello /classic/hello/world!
, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx index 510db79b73..3f905db60c 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/home.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx index c549175638..79135e7727 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/first-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_first')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx index efeca5ce86..8d843581a0 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/layout/second-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_first/_second')({ component: LayoutComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index ef413c1be0..05383bbade 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ErrorComponent } from '@tanstack/solid-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/solid-router' @@ -6,7 +7,7 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, notFoundComponent: () => { diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx index 13529228bb..812b581e0a 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-home.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index 46203594d1..228fab45f1 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts index 74b4fe341d..17dd854433 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routeTree.gen.ts @@ -9,7 +9,6 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { createFileRoute } from '@tanstack/solid-router' -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' // Import Routes @@ -121,69 +120,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/(tests)/lazy-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/lazy-page', - FileRoutesByPath['/(tests)/lazy-page']['parentRoute'], - FileRoutesByPath['/(tests)/lazy-page']['id'], - FileRoutesByPath['/(tests)/lazy-page']['path'], - FileRoutesByPath['/(tests)/lazy-page']['fullPath'] - > -} -declare module './routes/(tests)/lazy-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/lazy-page']['preLoaderRoute'] - > -} -declare module './routes/(tests)/lazy-with-loader-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/lazy-with-loader-page', - FileRoutesByPath['/(tests)/lazy-with-loader-page']['parentRoute'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['id'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['path'], - FileRoutesByPath['/(tests)/lazy-with-loader-page']['fullPath'] - > -} -declare module './routes/(tests)/lazy-with-loader-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/lazy-with-loader-page']['preLoaderRoute'] - > -} -declare module './routes/(tests)/normal-page' { - const createFileRoute: CreateFileRoute< - '/(tests)/normal-page', - FileRoutesByPath['/(tests)/normal-page']['parentRoute'], - FileRoutesByPath['/(tests)/normal-page']['id'], - FileRoutesByPath['/(tests)/normal-page']['path'], - FileRoutesByPath['/(tests)/normal-page']['fullPath'] - > -} -declare module './routes/(tests)/page-with-search' { - const createFileRoute: CreateFileRoute< - '/(tests)/page-with-search', - FileRoutesByPath['/(tests)/page-with-search']['parentRoute'], - FileRoutesByPath['/(tests)/page-with-search']['id'], - FileRoutesByPath['/(tests)/page-with-search']['path'], - FileRoutesByPath['/(tests)/page-with-search']['fullPath'] - > -} -declare module './routes/(tests)/virtual-page.lazy' { - const createLazyFileRoute: CreateLazyFileRoute< - FileRoutesByPath['/(tests)/virtual-page']['preLoaderRoute'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx index ff772de0f5..2e7b3306d2 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.lazy.tsx @@ -1,6 +1,7 @@ +import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/lazy-page')({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx index 79405e27e7..bec395f32c 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-page.tsx @@ -1 +1,2 @@ -export const Route = createFileRoute({}) +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/(tests)/lazy-page')({}) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx index 7f5f91be43..2079777df0 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.lazy.tsx @@ -1,6 +1,7 @@ +import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/lazy-with-loader-page')({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx index 5463a153af..6f2cf280a4 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/lazy-with-loader-page.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { sleep } from '../../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/lazy-with-loader-page')({ loader: async () => { await sleep(1000) return { foo: 'bar' } diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx index af14b9d095..6151049c35 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/normal-page.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/normal-page')({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx index 073dd2501c..4d5953ed67 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/page-with-search.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/solid-router' import { z } from 'zod' import { zodValidator } from '@tanstack/zod-adapter' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createFileRoute({ +export const Route = createFileRoute('/(tests)/page-with-search')({ validateSearch: zodValidator(z.object({ where: z.string() })), component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx index 4e79a19cd9..8c6c8ef353 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/(tests)/virtual-page.lazy.tsx @@ -1,6 +1,7 @@ +import { createLazyFileRoute } from '@tanstack/solid-router' import { ScrollBlock } from '../-components/scroll-block' -export const Route = createLazyFileRoute({ +export const Route = createLazyFileRoute('/(tests)/virtual-page')({ component: Component, }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx index da8f31fe34..ddb3755915 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, linkOptions } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts b/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts index 6b848b9bb7..df36e6de73 100644 --- a/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts +++ b/e2e/solid-start/basic-tsr-config/src/app/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/basic/src/routes/scripts.tsx b/e2e/solid-start/basic/src/routes/scripts.tsx index 07b4df2368..bc89fae666 100644 --- a/e2e/solid-start/basic/src/routes/scripts.tsx +++ b/e2e/solid-start/basic/src/routes/scripts.tsx @@ -1,5 +1,3 @@ -/// - const isProd = import.meta.env.PROD export const Route = createFileRoute({ diff --git a/e2e/solid-start/basic/src/tanstack-start.d.ts b/e2e/solid-start/basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/solid-start/basic/src/tanstack-start.d.ts +++ b/e2e/solid-start/basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts b/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts +++ b/e2e/solid-start/scroll-restoration/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/server-functions/src/tanstack-start.d.ts b/e2e/solid-start/server-functions/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/solid-start/server-functions/src/tanstack-start.d.ts +++ b/e2e/solid-start/server-functions/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/website/src/tanstack-start.d.ts b/e2e/solid-start/website/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/e2e/solid-start/website/src/tanstack-start.d.ts +++ b/e2e/solid-start/website/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts b/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts index 75c929ae89..f1b2133f5f 100644 --- a/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts +++ b/examples/react/authenticated-routes-firebase/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -120,72 +118,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_auth' { - const createFileRoute: CreateFileRoute< - '/_auth', - FileRoutesByPath['/_auth']['parentRoute'], - FileRoutesByPath['/_auth']['id'], - FileRoutesByPath['/_auth']['path'], - FileRoutesByPath['/_auth']['fullPath'] - > -} -declare module './routes/login' { - const createFileRoute: CreateFileRoute< - '/login', - FileRoutesByPath['/login']['parentRoute'], - FileRoutesByPath['/login']['id'], - FileRoutesByPath['/login']['path'], - FileRoutesByPath['/login']['fullPath'] - > -} -declare module './routes/_auth.dashboard' { - const createFileRoute: CreateFileRoute< - '/_auth/dashboard', - FileRoutesByPath['/_auth/dashboard']['parentRoute'], - FileRoutesByPath['/_auth/dashboard']['id'], - FileRoutesByPath['/_auth/dashboard']['path'], - FileRoutesByPath['/_auth/dashboard']['fullPath'] - > -} -declare module './routes/_auth.invoices' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices', - FileRoutesByPath['/_auth/invoices']['parentRoute'], - FileRoutesByPath['/_auth/invoices']['id'], - FileRoutesByPath['/_auth/invoices']['path'], - FileRoutesByPath['/_auth/invoices']['fullPath'] - > -} -declare module './routes/_auth.invoices.$invoiceId' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices/$invoiceId', - FileRoutesByPath['/_auth/invoices/$invoiceId']['parentRoute'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['id'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['path'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['fullPath'] - > -} -declare module './routes/_auth.invoices.index' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices/', - FileRoutesByPath['/_auth/invoices/']['parentRoute'], - FileRoutesByPath['/_auth/invoices/']['id'], - FileRoutesByPath['/_auth/invoices/']['path'], - FileRoutesByPath['/_auth/invoices/']['fullPath'] - > -} - // Create and export the route tree interface AuthInvoicesRouteChildren { diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx index 68231e780c..2de930e45f 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.dashboard.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useAuth } from '../auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/dashboard')({ component: DashboardPage, }) diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx index fa727b8e49..09fdda218d 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.$invoiceId.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { fetchInvoiceById } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices/$invoiceId')({ loader: async ({ params: { invoiceId } }) => { return { invoice: await fetchInvoiceById(Number.parseInt(invoiceId)), diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx index d0bd95b152..3bb65e5688 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.index.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices/')({ component: () =>
Select an invoice to view it!
, }) diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx index 5b4c97ee86..d7b13eaebb 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.invoices.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchInvoices } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices')({ loader: async () => ({ invoices: await fetchInvoices(), }), diff --git a/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx b/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx index 3bceaa2d6f..09c5b1560d 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/_auth.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet, redirect, useRouter } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth')({ beforeLoad: ({ context, location }) => { // Check if user is authenticated if (!context.auth.isAuthenticated) { diff --git a/examples/react/authenticated-routes-firebase/src/routes/index.tsx b/examples/react/authenticated-routes-firebase/src/routes/index.tsx index fc88a8cbfb..fa127b12f7 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/index.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, redirect } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ beforeLoad: ({ context }) => { // Log for debugging console.log('Checking context on index.tsx:', context) // Check if user is authenticated diff --git a/examples/react/authenticated-routes-firebase/src/routes/login.tsx b/examples/react/authenticated-routes-firebase/src/routes/login.tsx index b46186e353..6bdecc4747 100644 --- a/examples/react/authenticated-routes-firebase/src/routes/login.tsx +++ b/examples/react/authenticated-routes-firebase/src/routes/login.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { redirect, useRouter, useRouterState } from '@tanstack/react-router' import { z } from 'zod' @@ -15,7 +16,7 @@ import { // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion const fallback = '/dashboard' as const -export const Route = createFileRoute({ +export const Route = createFileRoute('/login')({ validateSearch: z.object({ redirect: z.string().optional().catch(''), }), diff --git a/examples/react/authenticated-routes/src/routeTree.gen.ts b/examples/react/authenticated-routes/src/routeTree.gen.ts index 75c929ae89..f1b2133f5f 100644 --- a/examples/react/authenticated-routes/src/routeTree.gen.ts +++ b/examples/react/authenticated-routes/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -120,72 +118,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_auth' { - const createFileRoute: CreateFileRoute< - '/_auth', - FileRoutesByPath['/_auth']['parentRoute'], - FileRoutesByPath['/_auth']['id'], - FileRoutesByPath['/_auth']['path'], - FileRoutesByPath['/_auth']['fullPath'] - > -} -declare module './routes/login' { - const createFileRoute: CreateFileRoute< - '/login', - FileRoutesByPath['/login']['parentRoute'], - FileRoutesByPath['/login']['id'], - FileRoutesByPath['/login']['path'], - FileRoutesByPath['/login']['fullPath'] - > -} -declare module './routes/_auth.dashboard' { - const createFileRoute: CreateFileRoute< - '/_auth/dashboard', - FileRoutesByPath['/_auth/dashboard']['parentRoute'], - FileRoutesByPath['/_auth/dashboard']['id'], - FileRoutesByPath['/_auth/dashboard']['path'], - FileRoutesByPath['/_auth/dashboard']['fullPath'] - > -} -declare module './routes/_auth.invoices' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices', - FileRoutesByPath['/_auth/invoices']['parentRoute'], - FileRoutesByPath['/_auth/invoices']['id'], - FileRoutesByPath['/_auth/invoices']['path'], - FileRoutesByPath['/_auth/invoices']['fullPath'] - > -} -declare module './routes/_auth.invoices.$invoiceId' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices/$invoiceId', - FileRoutesByPath['/_auth/invoices/$invoiceId']['parentRoute'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['id'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['path'], - FileRoutesByPath['/_auth/invoices/$invoiceId']['fullPath'] - > -} -declare module './routes/_auth.invoices.index' { - const createFileRoute: CreateFileRoute< - '/_auth/invoices/', - FileRoutesByPath['/_auth/invoices/']['parentRoute'], - FileRoutesByPath['/_auth/invoices/']['id'], - FileRoutesByPath['/_auth/invoices/']['path'], - FileRoutesByPath['/_auth/invoices/']['fullPath'] - > -} - // Create and export the route tree interface AuthInvoicesRouteChildren { diff --git a/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx b/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx index 4a37b7ffd2..2ac2da579a 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.dashboard.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useAuth } from '../auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/dashboard')({ component: DashboardPage, }) diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx index 754de7c3d8..2ac086c10a 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.$invoiceId.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { fetchInvoiceById } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices/$invoiceId')({ loader: async ({ params: { invoiceId } }) => { return { invoice: await fetchInvoiceById(parseInt(invoiceId)), diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx index d0bd95b152..3bb65e5688 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.index.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices/')({ component: () =>
Select an invoice to view it!
, }) diff --git a/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx b/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx index 5b4c97ee86..d7b13eaebb 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.invoices.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchInvoices } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/invoices')({ loader: async () => ({ invoices: await fetchInvoices(), }), diff --git a/examples/react/authenticated-routes/src/routes/_auth.tsx b/examples/react/authenticated-routes/src/routes/_auth.tsx index b69fcef29b..8d2ff0c145 100644 --- a/examples/react/authenticated-routes/src/routes/_auth.tsx +++ b/examples/react/authenticated-routes/src/routes/_auth.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet, redirect, useRouter } from '@tanstack/react-router' import { useAuth } from '../auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth')({ beforeLoad: ({ context, location }) => { if (!context.auth.isAuthenticated) { throw redirect({ diff --git a/examples/react/authenticated-routes/src/routes/index.tsx b/examples/react/authenticated-routes/src/routes/index.tsx index cf5cf40e2f..b4d88a793f 100644 --- a/examples/react/authenticated-routes/src/routes/index.tsx +++ b/examples/react/authenticated-routes/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/examples/react/authenticated-routes/src/routes/login.tsx b/examples/react/authenticated-routes/src/routes/login.tsx index 71360e9661..fdaba7cc11 100644 --- a/examples/react/authenticated-routes/src/routes/login.tsx +++ b/examples/react/authenticated-routes/src/routes/login.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { redirect, useRouter, useRouterState } from '@tanstack/react-router' import { z } from 'zod' @@ -8,7 +9,7 @@ import { sleep } from '../utils' // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion const fallback = '/dashboard' as const -export const Route = createFileRoute({ +export const Route = createFileRoute('/login')({ validateSearch: z.object({ redirect: z.string().optional().catch(''), }), diff --git a/examples/react/basic-file-based/src/routeTree.gen.ts b/examples/react/basic-file-based/src/routeTree.gen.ts index cb8f883420..b2e40e20c7 100644 --- a/examples/react/basic-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -150,90 +148,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/posts.route' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/anchor' { - const createFileRoute: CreateFileRoute< - '/anchor', - FileRoutesByPath['/anchor']['parentRoute'], - FileRoutesByPath['/anchor']['id'], - FileRoutesByPath['/anchor']['path'], - FileRoutesByPath['/anchor']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout', - FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-a', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-b', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] - > -} - // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx index fd83a0eaa0..1e1ef2ebe1 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index abd82a2bf6..9c345694ab 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: LayoutComponent, }) diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a190b24202..6b59dbc46f 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutAComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( + { + component: LayoutAComponent, + }, +) function LayoutAComponent() { return
I'm layout A!
diff --git a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 505f8f6fbf..50f864f617 100644 --- a/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutBComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( + { + component: LayoutBComponent, + }, +) function LayoutBComponent() { return
I'm layout B!
diff --git a/examples/react/basic-file-based/src/routes/anchor.tsx b/examples/react/basic-file-based/src/routes/anchor.tsx index 21dce23c39..b865343adc 100644 --- a/examples/react/basic-file-based/src/routes/anchor.tsx +++ b/examples/react/basic-file-based/src/routes/anchor.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import { useLayoutEffect, useRef, useState } from 'react' import { Link, useLocation, useNavigate } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/anchor')({ component: AnchorComponent, }) diff --git a/examples/react/basic-file-based/src/routes/index.tsx b/examples/react/basic-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/examples/react/basic-file-based/src/routes/index.tsx +++ b/examples/react/basic-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/react/basic-file-based/src/routes/posts.$postId.tsx b/examples/react/basic-file-based/src/routes/posts.$postId.tsx index 0578182ecb..956ca50ecd 100644 --- a/examples/react/basic-file-based/src/routes/posts.$postId.tsx +++ b/examples/react/basic-file-based/src/routes/posts.$postId.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/react/basic-file-based/src/routes/posts.index.tsx b/examples/react/basic-file-based/src/routes/posts.index.tsx index fdbe5865e5..c6b65f1892 100644 --- a/examples/react/basic-file-based/src/routes/posts.index.tsx +++ b/examples/react/basic-file-based/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-file-based/src/routes/posts.route.tsx b/examples/react/basic-file-based/src/routes/posts.route.tsx index 0aca21ad57..ab5c2ac99f 100644 --- a/examples/react/basic-file-based/src/routes/posts.route.tsx +++ b/examples/react/basic-file-based/src/routes/posts.route.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routeTree.gen.ts b/examples/react/basic-react-query-file-based/src/routeTree.gen.ts index 5529781e33..7f257ecb1c 100644 --- a/examples/react/basic-react-query-file-based/src/routeTree.gen.ts +++ b/examples/react/basic-react-query-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -136,81 +134,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/posts.route' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout', - FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-a', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-b', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] - > -} - // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx index 5c4a461d8d..29a66a7611 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index 1e1400f5a7..3175f0a80e 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: LayoutComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a190b24202..6b59dbc46f 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutAComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( + { + component: LayoutAComponent, + }, +) function LayoutAComponent() { return
I'm layout A!
diff --git a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 505f8f6fbf..50f864f617 100644 --- a/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutBComponent, -}) +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( + { + component: LayoutBComponent, + }, +) function LayoutBComponent() { return
I'm layout B!
diff --git a/examples/react/basic-react-query-file-based/src/routes/index.tsx b/examples/react/basic-react-query-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/examples/react/basic-react-query-file-based/src/routes/index.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx index c3ae5dc441..9c7e89fbce 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent, useRouter } from '@tanstack/react-router' import { @@ -8,7 +9,7 @@ import { PostNotFoundError } from '../posts' import { postQueryOptions } from '../postQueryOptions' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx index fdbe5865e5..c6b65f1892 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx b/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx index dc6dcaf036..220cccd027 100644 --- a/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx +++ b/examples/react/basic-react-query-file-based/src/routes/posts.route.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { postsQueryOptions } from '../postsQueryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsLayoutComponent, diff --git a/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts b/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts index dbe0e74c42..f3accfa48e 100644 --- a/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts +++ b/examples/react/kitchen-sink-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -261,162 +259,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/dashboard.route' { - const createFileRoute: CreateFileRoute< - '/dashboard', - FileRoutesByPath['/dashboard']['parentRoute'], - FileRoutesByPath['/dashboard']['id'], - FileRoutesByPath['/dashboard']['path'], - FileRoutesByPath['/dashboard']['fullPath'] - > -} -declare module './routes/_auth' { - const createFileRoute: CreateFileRoute< - '/_auth', - FileRoutesByPath['/_auth']['parentRoute'], - FileRoutesByPath['/_auth']['id'], - FileRoutesByPath['/_auth']['path'], - FileRoutesByPath['/_auth']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/login' { - const createFileRoute: CreateFileRoute< - '/login', - FileRoutesByPath['/login']['parentRoute'], - FileRoutesByPath['/login']['id'], - FileRoutesByPath['/login']['path'], - FileRoutesByPath['/login']['fullPath'] - > -} -declare module './routes/dashboard.invoices.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices', - FileRoutesByPath['/dashboard/invoices']['parentRoute'], - FileRoutesByPath['/dashboard/invoices']['id'], - FileRoutesByPath['/dashboard/invoices']['path'], - FileRoutesByPath['/dashboard/invoices']['fullPath'] - > -} -declare module './routes/dashboard.users.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/users', - FileRoutesByPath['/dashboard/users']['parentRoute'], - FileRoutesByPath['/dashboard/users']['id'], - FileRoutesByPath['/dashboard/users']['path'], - FileRoutesByPath['/dashboard/users']['fullPath'] - > -} -declare module './routes/(this-folder-is-not-in-the-url)/route-group' { - const createFileRoute: CreateFileRoute< - '/(this-folder-is-not-in-the-url)/route-group', - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['parentRoute'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['id'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['path'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['fullPath'] - > -} -declare module './routes/_auth.profile' { - const createFileRoute: CreateFileRoute< - '/_auth/profile', - FileRoutesByPath['/_auth/profile']['parentRoute'], - FileRoutesByPath['/_auth/profile']['id'], - FileRoutesByPath['/_auth/profile']['path'], - FileRoutesByPath['/_auth/profile']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-a', - FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-b', - FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] - > -} -declare module './routes/dashboard.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/', - FileRoutesByPath['/dashboard/']['parentRoute'], - FileRoutesByPath['/dashboard/']['id'], - FileRoutesByPath['/dashboard/']['path'], - FileRoutesByPath['/dashboard/']['fullPath'] - > -} -declare module './routes/expensive/index' { - const createFileRoute: CreateFileRoute< - '/expensive/', - FileRoutesByPath['/expensive/']['parentRoute'], - FileRoutesByPath['/expensive/']['id'], - FileRoutesByPath['/expensive/']['path'], - FileRoutesByPath['/expensive/']['fullPath'] - > -} -declare module './routes/dashboard.invoices.$invoiceId' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/$invoiceId', - FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] - > -} -declare module './routes/dashboard.users.user' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/user', - FileRoutesByPath['/dashboard/users/user']['parentRoute'], - FileRoutesByPath['/dashboard/users/user']['id'], - FileRoutesByPath['/dashboard/users/user']['path'], - FileRoutesByPath['/dashboard/users/user']['fullPath'] - > -} -declare module './routes/dashboard.invoices.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/', - FileRoutesByPath['/dashboard/invoices/']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/']['id'], - FileRoutesByPath['/dashboard/invoices/']['path'], - FileRoutesByPath['/dashboard/invoices/']['fullPath'] - > -} -declare module './routes/dashboard.users.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/', - FileRoutesByPath['/dashboard/users/']['parentRoute'], - FileRoutesByPath['/dashboard/users/']['id'], - FileRoutesByPath['/dashboard/users/']['path'], - FileRoutesByPath['/dashboard/users/']['fullPath'] - > -} - // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx b/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx index c2e8814a2d..5083ff1803 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx @@ -1,6 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute( + '/(this-folder-is-not-in-the-url)/route-group', +)({ component: RouteGroupExample, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx b/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx index 7b3d690e6e..5fb32c03cf 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_auth.profile.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/profile')({ component: ProfileComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx b/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx index 60945fd245..19bbb2b33b 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_auth.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import { redirect } from '@tanstack/react-router' import { auth } from '../utils/auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth')({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx index f81e516bd8..61167164f7 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/route-a')({ component: LayoutAComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx index c7ff7c5d74..ed4fbcf142 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/route-b')({ component: LayoutBComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx index 6202a8b2db..b9afe4d9e7 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: PathlessLayoutComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx index 9798188424..1666ad41ec 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.index.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/')({ loader: () => fetchInvoices(), component: DashboardIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index a04c00532c..d7938e72c5 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, useNavigate, useRouter } from '@tanstack/react-router' import { z } from 'zod' @@ -5,7 +6,7 @@ import { InvoiceFields } from '../components/InvoiceFields' import { useMutation } from '../hooks/useMutation' import { fetchInvoiceById, patchInvoice } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx index c36ab63e2f..845308e983 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useRouter } from '@tanstack/react-router' import { InvoiceFields } from '../components/InvoiceFields' @@ -6,7 +7,7 @@ import { useMutation } from '../hooks/useMutation' import { postInvoice } from '../utils/mockTodos' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/')({ component: InvoicesIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx index a784671c81..d3192d300f 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, MatchRoute, Outlet } from '@tanstack/react-router' import { Spinner } from '../components/Spinner' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices')({ loader: () => fetchInvoices(), component: InvoicesComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx index 78f697adbc..5e053e164f 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.route.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard')({ component: DashboardComponent, loader: () => ({ crumb: 'Dashboard', diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx index 2793568c42..8b9e85b6bd 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/')({ component: UsersIndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx index 31be72e784..287f4ff0ec 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, @@ -12,7 +13,7 @@ import { fetchUsers } from '../utils/mockTodos' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users')({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx index 08ab031105..6d26dfe83f 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { z } from 'zod' import { fetchUserById } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/user')({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx b/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx index 5066d67ac5..42e1b4c0e8 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/expensive/index.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute({ +export const Route = createFileRoute('/expensive/')({ component: Expensive, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/index.tsx b/examples/react/kitchen-sink-file-based/src/routes/index.tsx index b0d05ea341..d1ed6b5141 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/index.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: IndexComponent, }) diff --git a/examples/react/kitchen-sink-file-based/src/routes/login.tsx b/examples/react/kitchen-sink-file-based/src/routes/login.tsx index 4d577af794..d4574d1461 100644 --- a/examples/react/kitchen-sink-file-based/src/routes/login.tsx +++ b/examples/react/kitchen-sink-file-based/src/routes/login.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useRouter } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/login')({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts b/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts index 48d30adc2a..2795fea650 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts +++ b/examples/react/kitchen-sink-react-query-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -260,162 +258,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/dashboard.route' { - const createFileRoute: CreateFileRoute< - '/dashboard', - FileRoutesByPath['/dashboard']['parentRoute'], - FileRoutesByPath['/dashboard']['id'], - FileRoutesByPath['/dashboard']['path'], - FileRoutesByPath['/dashboard']['fullPath'] - > -} -declare module './routes/_auth' { - const createFileRoute: CreateFileRoute< - '/_auth', - FileRoutesByPath['/_auth']['parentRoute'], - FileRoutesByPath['/_auth']['id'], - FileRoutesByPath['/_auth']['path'], - FileRoutesByPath['/_auth']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/login' { - const createFileRoute: CreateFileRoute< - '/login', - FileRoutesByPath['/login']['parentRoute'], - FileRoutesByPath['/login']['id'], - FileRoutesByPath['/login']['path'], - FileRoutesByPath['/login']['fullPath'] - > -} -declare module './routes/dashboard.invoices.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices', - FileRoutesByPath['/dashboard/invoices']['parentRoute'], - FileRoutesByPath['/dashboard/invoices']['id'], - FileRoutesByPath['/dashboard/invoices']['path'], - FileRoutesByPath['/dashboard/invoices']['fullPath'] - > -} -declare module './routes/dashboard.users.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/users', - FileRoutesByPath['/dashboard/users']['parentRoute'], - FileRoutesByPath['/dashboard/users']['id'], - FileRoutesByPath['/dashboard/users']['path'], - FileRoutesByPath['/dashboard/users']['fullPath'] - > -} -declare module './routes/_auth.profile' { - const createFileRoute: CreateFileRoute< - '/_auth/profile', - FileRoutesByPath['/_auth/profile']['parentRoute'], - FileRoutesByPath['/_auth/profile']['id'], - FileRoutesByPath['/_auth/profile']['path'], - FileRoutesByPath['/_auth/profile']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-a', - FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-b', - FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] - > -} -declare module './routes/foo/bar' { - const createFileRoute: CreateFileRoute< - '/foo/bar', - FileRoutesByPath['/foo/bar']['parentRoute'], - FileRoutesByPath['/foo/bar']['id'], - FileRoutesByPath['/foo/bar']['path'], - FileRoutesByPath['/foo/bar']['fullPath'] - > -} -declare module './routes/dashboard.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/', - FileRoutesByPath['/dashboard/']['parentRoute'], - FileRoutesByPath['/dashboard/']['id'], - FileRoutesByPath['/dashboard/']['path'], - FileRoutesByPath['/dashboard/']['fullPath'] - > -} -declare module './routes/expensive/index' { - const createFileRoute: CreateFileRoute< - '/expensive/', - FileRoutesByPath['/expensive/']['parentRoute'], - FileRoutesByPath['/expensive/']['id'], - FileRoutesByPath['/expensive/']['path'], - FileRoutesByPath['/expensive/']['fullPath'] - > -} -declare module './routes/dashboard.invoices.$invoiceId' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/$invoiceId', - FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] - > -} -declare module './routes/dashboard.users.user' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/user', - FileRoutesByPath['/dashboard/users/user']['parentRoute'], - FileRoutesByPath['/dashboard/users/user']['id'], - FileRoutesByPath['/dashboard/users/user']['path'], - FileRoutesByPath['/dashboard/users/user']['fullPath'] - > -} -declare module './routes/dashboard.invoices.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/', - FileRoutesByPath['/dashboard/invoices/']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/']['id'], - FileRoutesByPath['/dashboard/invoices/']['path'], - FileRoutesByPath['/dashboard/invoices/']['fullPath'] - > -} -declare module './routes/dashboard.users.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/', - FileRoutesByPath['/dashboard/users/']['parentRoute'], - FileRoutesByPath['/dashboard/users/']['id'], - FileRoutesByPath['/dashboard/users/']['path'], - FileRoutesByPath['/dashboard/users/']['fullPath'] - > -} - // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx index 7b3d690e6e..5fb32c03cf 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.profile.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/profile')({ component: ProfileComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx index 2d93a859c8..ed046d2046 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_auth.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { redirect } from '@tanstack/react-router' import { auth } from '../utils/auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth')({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx index f81e516bd8..61167164f7 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/route-a')({ component: LayoutAComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx index c7ff7c5d74..ed4fbcf142 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/route-b')({ component: LayoutBComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx index e596f802b0..88dccf6e6f 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx index e1a97c0d00..80bfdadb79 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.index.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useSuspenseQuery } from '@tanstack/react-query' import { invoicesQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/')({ loader: (opts) => opts.context.queryClient.ensureQueryData(invoicesQueryOptions()), component: DashboardIndexComponent, diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index a2df18d5ea..94bcda4130 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, useNavigate } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' @@ -8,7 +9,7 @@ import { useUpdateInvoiceMutation, } from '../utils/queryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx index 7a8978b599..87288b034a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { InvoiceFields } from '../components/InvoiceFields' @@ -5,7 +6,7 @@ import { Spinner } from '../components/Spinner' import { useCreateInvoiceMutation } from '../utils/queryOptions' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/')({ component: InvoicesIndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx index 7e0dfb11b3..54a03c9af4 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, MatchRoute, Outlet } from '@tanstack/react-router' import { useSuspenseQuery } from '@tanstack/react-query' import { Spinner } from '../components/Spinner' import { invoicesQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices')({ loader: (opts) => opts.context.queryClient.ensureQueryData(invoicesQueryOptions()), component: InvoicesComponent, diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx index 25dadabf53..dd28d4d8be 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.route.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard')({ component: DashboardComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx index 2793568c42..8b9e85b6bd 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/')({ component: UsersIndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx index 0457ed137c..d18c515975 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.route.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' /* eslint-disable @typescript-eslint/no-unnecessary-condition */ import * as React from 'react' import { @@ -14,7 +15,7 @@ import { usersQueryOptions } from '../utils/queryOptions' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users')({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx index 87eeae270c..e820f946f9 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/dashboard.users.user.tsx @@ -1,10 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useSuspenseQuery } from '@tanstack/react-query' import { z } from 'zod' import { userQueryOptions } from '../utils/queryOptions' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/user')({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx index 5066d67ac5..42e1b4c0e8 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/expensive/index.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute({ +export const Route = createFileRoute('/expensive/')({ component: Expensive, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx index c91111016b..aa5920563e 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/foo/bar.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/foo/bar')({ component: () =>
{JSON.stringify(Route.useSearch())}
, validateSearch: z.object({ asdf: z.string() }), }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx index b0d05ea341..d1ed6b5141 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: IndexComponent, }) diff --git a/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx b/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx index 1fdb01084a..03f439d65d 100644 --- a/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx +++ b/examples/react/kitchen-sink-react-query-file-based/src/routes/login.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { useRouter } from '@tanstack/react-router' import { z } from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/login')({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/react/large-file-based/src/routeTree.gen.ts b/examples/react/large-file-based/src/routeTree.gen.ts index 44cc9055f8..414c09c1e9 100644 --- a/examples/react/large-file-based/src/routeTree.gen.ts +++ b/examples/react/large-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -135,81 +133,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/params/route' { - const createFileRoute: CreateFileRoute< - '/params', - FileRoutesByPath['/params']['parentRoute'], - FileRoutesByPath['/params']['id'], - FileRoutesByPath['/params']['path'], - FileRoutesByPath['/params']['fullPath'] - > -} -declare module './routes/search/route' { - const createFileRoute: CreateFileRoute< - '/search', - FileRoutesByPath['/search']['parentRoute'], - FileRoutesByPath['/search']['id'], - FileRoutesByPath['/search']['path'], - FileRoutesByPath['/search']['fullPath'] - > -} -declare module './routes/absolute' { - const createFileRoute: CreateFileRoute< - '/absolute', - FileRoutesByPath['/absolute']['parentRoute'], - FileRoutesByPath['/absolute']['id'], - FileRoutesByPath['/absolute']['path'], - FileRoutesByPath['/absolute']['fullPath'] - > -} -declare module './routes/linkProps' { - const createFileRoute: CreateFileRoute< - '/linkProps', - FileRoutesByPath['/linkProps']['parentRoute'], - FileRoutesByPath['/linkProps']['id'], - FileRoutesByPath['/linkProps']['path'], - FileRoutesByPath['/linkProps']['fullPath'] - > -} -declare module './routes/relative' { - const createFileRoute: CreateFileRoute< - '/relative', - FileRoutesByPath['/relative']['parentRoute'], - FileRoutesByPath['/relative']['id'], - FileRoutesByPath['/relative']['path'], - FileRoutesByPath['/relative']['fullPath'] - > -} -declare module './routes/params/$paramsPlaceholder' { - const createFileRoute: CreateFileRoute< - '/params/$paramsPlaceholder', - FileRoutesByPath['/params/$paramsPlaceholder']['parentRoute'], - FileRoutesByPath['/params/$paramsPlaceholder']['id'], - FileRoutesByPath['/params/$paramsPlaceholder']['path'], - FileRoutesByPath['/params/$paramsPlaceholder']['fullPath'] - > -} -declare module './routes/search/searchPlaceholder' { - const createFileRoute: CreateFileRoute< - '/search/searchPlaceholder', - FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], - FileRoutesByPath['/search/searchPlaceholder']['id'], - FileRoutesByPath['/search/searchPlaceholder']['path'], - FileRoutesByPath['/search/searchPlaceholder']['fullPath'] - > -} - // Create and export the route tree interface ParamsRouteRouteChildren { diff --git a/examples/react/large-file-based/src/routes/absolute.tsx b/examples/react/large-file-based/src/routes/absolute.tsx index 857515fa10..0dc5578842 100644 --- a/examples/react/large-file-based/src/routes/absolute.tsx +++ b/examples/react/large-file-based/src/routes/absolute.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/absolute')({ component: AbsoluteComponent, }) diff --git a/examples/react/large-file-based/src/routes/index.tsx b/examples/react/large-file-based/src/routes/index.tsx index b23956ae17..0a5b7572ba 100644 --- a/examples/react/large-file-based/src/routes/index.tsx +++ b/examples/react/large-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/react/large-file-based/src/routes/linkProps.tsx b/examples/react/large-file-based/src/routes/linkProps.tsx index 83cee49160..d520cf0f96 100644 --- a/examples/react/large-file-based/src/routes/linkProps.tsx +++ b/examples/react/large-file-based/src/routes/linkProps.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, linkOptions } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/linkProps')({ component: LinkPropsPage, }) diff --git a/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx b/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx index 8e45ed1eba..1442464a1c 100644 --- a/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx +++ b/examples/react/large-file-based/src/routes/params/$paramsPlaceholder.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' import { z } from 'zod' @@ -20,7 +21,7 @@ const paramsQueryOptions = queryOptions({ }, }) -export const Route = createFileRoute({ +export const Route = createFileRoute('/params/$paramsPlaceholder')({ component: ParamsComponent, loader: (opts) => opts.context.queryClient.ensureQueryData(paramsQueryOptions), diff --git a/examples/react/large-file-based/src/routes/params/route.tsx b/examples/react/large-file-based/src/routes/params/route.tsx index a37f312161..0e29ec1e1e 100644 --- a/examples/react/large-file-based/src/routes/params/route.tsx +++ b/examples/react/large-file-based/src/routes/params/route.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/params')({ component: () =>
Hello /params!
, }) diff --git a/examples/react/large-file-based/src/routes/relative.tsx b/examples/react/large-file-based/src/routes/relative.tsx index cf25ec6f9f..b2e8c7a10a 100644 --- a/examples/react/large-file-based/src/routes/relative.tsx +++ b/examples/react/large-file-based/src/routes/relative.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/relative')({ component: RelativeComponent, }) diff --git a/examples/react/large-file-based/src/routes/search/route.tsx b/examples/react/large-file-based/src/routes/search/route.tsx index 13eaab8d40..33447e4c80 100644 --- a/examples/react/large-file-based/src/routes/search/route.tsx +++ b/examples/react/large-file-based/src/routes/search/route.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { z } from 'zod' @@ -6,7 +7,7 @@ const search = z.object({ rootSearch: z.number(), }) -export const Route = createFileRoute({ +export const Route = createFileRoute('/search')({ component: () =>
Hello /search!
, validateSearch: search, }) diff --git a/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx b/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx index c8249a3728..8938899d13 100644 --- a/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx +++ b/examples/react/large-file-based/src/routes/search/searchPlaceholder.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' @@ -26,7 +27,7 @@ const searchQueryOptions = queryOptions({ }, }) -export const Route = createFileRoute({ +export const Route = createFileRoute('/search/searchPlaceholder')({ component: SearchComponent, validateSearch: search, loader: (opts) => diff --git a/examples/react/quickstart-file-based/src/routeTree.gen.ts b/examples/react/quickstart-file-based/src/routeTree.gen.ts index 3f5c19883b..e758a6c2fe 100644 --- a/examples/react/quickstart-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/about' { - const createFileRoute: CreateFileRoute< - '/about', - FileRoutesByPath['/about']['parentRoute'], - FileRoutesByPath['/about']['id'], - FileRoutesByPath['/about']['path'], - FileRoutesByPath['/about']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-file-based/src/routes/about.tsx b/examples/react/quickstart-file-based/src/routes/about.tsx index 6ac3e560c5..02394cba28 100644 --- a/examples/react/quickstart-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-file-based/src/routes/about.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/about')({ component: AboutComponent, }) diff --git a/examples/react/quickstart-file-based/src/routes/index.tsx b/examples/react/quickstart-file-based/src/routes/index.tsx index acb0446745..978c498f1b 100644 --- a/examples/react/quickstart-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts b/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts index 3f5c19883b..e758a6c2fe 100644 --- a/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-rspack-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/about' { - const createFileRoute: CreateFileRoute< - '/about', - FileRoutesByPath['/about']['parentRoute'], - FileRoutesByPath['/about']['id'], - FileRoutesByPath['/about']['path'], - FileRoutesByPath['/about']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-rspack-file-based/src/routes/about.tsx b/examples/react/quickstart-rspack-file-based/src/routes/about.tsx index 6ac3e560c5..02394cba28 100644 --- a/examples/react/quickstart-rspack-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-rspack-file-based/src/routes/about.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/about')({ component: AboutComponent, }) diff --git a/examples/react/quickstart-rspack-file-based/src/routes/index.tsx b/examples/react/quickstart-rspack-file-based/src/routes/index.tsx index acb0446745..978c498f1b 100644 --- a/examples/react/quickstart-rspack-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-rspack-file-based/src/routes/index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts b/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts index 3f5c19883b..e758a6c2fe 100644 --- a/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts +++ b/examples/react/quickstart-webpack-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/about' { - const createFileRoute: CreateFileRoute< - '/about', - FileRoutesByPath['/about']['parentRoute'], - FileRoutesByPath['/about']['id'], - FileRoutesByPath['/about']['path'], - FileRoutesByPath['/about']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/quickstart-webpack-file-based/src/routes/about.tsx b/examples/react/quickstart-webpack-file-based/src/routes/about.tsx index d57890bd6c..be940040b3 100644 --- a/examples/react/quickstart-webpack-file-based/src/routes/about.tsx +++ b/examples/react/quickstart-webpack-file-based/src/routes/about.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/about')({ component: AboutComponent, }) diff --git a/examples/react/quickstart-webpack-file-based/src/routes/index.tsx b/examples/react/quickstart-webpack-file-based/src/routes/index.tsx index 3254ca4186..67fb33a03e 100644 --- a/examples/react/quickstart-webpack-file-based/src/routes/index.tsx +++ b/examples/react/quickstart-webpack-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts index 480c6da472..166cab84ad 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/$postId' { - const createFileRoute: CreateFileRoute< - '/$postId', - FileRoutesByPath['/$postId']['parentRoute'], - FileRoutesByPath['/$postId']['id'], - FileRoutesByPath['/$postId']['path'], - FileRoutesByPath['/$postId']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts index 35540eeb42..0e85860a5b 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routes/$postId.ts @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { postQueryOptions } from '@router-mono-react-query/post-query' -export const Route = createFileRoute({ +export const Route = createFileRoute('/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts b/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts index b1a99aecbb..880ec469fe 100644 --- a/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-react-query/packages/router/src/routes/index.ts @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { postsQueryOptions } from '@router-mono-react-query/post-query' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ loader: ({ context: { queryClient } }) => { return queryClient.ensureQueryData(postsQueryOptions) }, diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts index 480c6da472..166cab84ad 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/$postId' { - const createFileRoute: CreateFileRoute< - '/$postId', - FileRoutesByPath['/$postId']['parentRoute'], - FileRoutesByPath['/$postId']['id'], - FileRoutesByPath['/$postId']['path'], - FileRoutesByPath['/$postId']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts index 14110f613f..670d4cc883 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/$postId.ts @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import { fetchPost } from '../fetch/posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/$postId')({ loader: ({ params }) => fetchPost(params.postId), }) diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts index 2e8127f3f6..2dc2272d1f 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-simple-lazy/packages/router/src/routes/index.ts @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { fetchPosts } from '../fetch/posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ loader: () => { return fetchPosts() }, diff --git a/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts b/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts index 480c6da472..166cab84ad 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/$postId' { - const createFileRoute: CreateFileRoute< - '/$postId', - FileRoutesByPath['/$postId']['parentRoute'], - FileRoutesByPath['/$postId']['id'], - FileRoutesByPath['/$postId']['path'], - FileRoutesByPath['/$postId']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts b/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts index 14110f613f..670d4cc883 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routes/$postId.ts @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/react-router' import { fetchPost } from '../fetch/posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/$postId')({ loader: ({ params }) => fetchPost(params.postId), }) diff --git a/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts b/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts index 2e8127f3f6..2dc2272d1f 100644 --- a/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts +++ b/examples/react/router-monorepo-simple/packages/router/src/routes/index.ts @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { fetchPosts } from '../fetch/posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ loader: () => { return fetchPosts() }, diff --git a/examples/react/start-bare/src/tanstack-start.d.ts b/examples/react/start-bare/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-bare/src/tanstack-start.d.ts +++ b/examples/react/start-bare/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-auth/src/tanstack-start.d.ts b/examples/react/start-basic-auth/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-basic-auth/src/tanstack-start.d.ts +++ b/examples/react/start-basic-auth/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-react-query/src/tanstack-start.d.ts b/examples/react/start-basic-react-query/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-basic-react-query/src/tanstack-start.d.ts +++ b/examples/react/start-basic-react-query/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-rsc/src/tanstack-start.d.ts b/examples/react/start-basic-rsc/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-basic-rsc/src/tanstack-start.d.ts +++ b/examples/react/start-basic-rsc/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic-static/src/tanstack-start.d.ts b/examples/react/start-basic-static/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-basic-static/src/tanstack-start.d.ts +++ b/examples/react/start-basic-static/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-basic/src/tanstack-start.d.ts b/examples/react/start-basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-basic/src/tanstack-start.d.ts +++ b/examples/react/start-basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-clerk-basic/src/routes/__root.tsx b/examples/react/start-clerk-basic/src/routes/__root.tsx index 99eaa2c24a..2cd503f80a 100644 --- a/examples/react/start-clerk-basic/src/routes/__root.tsx +++ b/examples/react/start-clerk-basic/src/routes/__root.tsx @@ -1,4 +1,3 @@ -/// import { HeadContent, Link, diff --git a/examples/react/start-clerk-basic/src/tanstack-start.d.ts b/examples/react/start-clerk-basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-clerk-basic/src/tanstack-start.d.ts +++ b/examples/react/start-clerk-basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-convex-trellaux/src/tanstack-start.d.ts b/examples/react/start-convex-trellaux/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-convex-trellaux/src/tanstack-start.d.ts +++ b/examples/react/start-convex-trellaux/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-counter/src/tanstack-start.d.ts b/examples/react/start-counter/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-counter/src/tanstack-start.d.ts +++ b/examples/react/start-counter/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts index 280045c302..75f8bd4d20 100644 --- a/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts +++ b/examples/react/start-large/.tanstack-start/server-routes/routeTree.gen.ts @@ -20,106 +20,6 @@ import { } from '@tanstack/react-start/server' import { ServerRoute as SearchSearchPlaceholderRouteImport } from './../../src/routes/search/searchPlaceholder' -import { ServerRoute as genSearchSearch99RouteImport } from './../../src/routes/(gen)/search/search99' -import { ServerRoute as genSearchSearch98RouteImport } from './../../src/routes/(gen)/search/search98' -import { ServerRoute as genSearchSearch97RouteImport } from './../../src/routes/(gen)/search/search97' -import { ServerRoute as genSearchSearch96RouteImport } from './../../src/routes/(gen)/search/search96' -import { ServerRoute as genSearchSearch95RouteImport } from './../../src/routes/(gen)/search/search95' -import { ServerRoute as genSearchSearch94RouteImport } from './../../src/routes/(gen)/search/search94' -import { ServerRoute as genSearchSearch93RouteImport } from './../../src/routes/(gen)/search/search93' -import { ServerRoute as genSearchSearch92RouteImport } from './../../src/routes/(gen)/search/search92' -import { ServerRoute as genSearchSearch91RouteImport } from './../../src/routes/(gen)/search/search91' -import { ServerRoute as genSearchSearch90RouteImport } from './../../src/routes/(gen)/search/search90' -import { ServerRoute as genSearchSearch9RouteImport } from './../../src/routes/(gen)/search/search9' -import { ServerRoute as genSearchSearch89RouteImport } from './../../src/routes/(gen)/search/search89' -import { ServerRoute as genSearchSearch88RouteImport } from './../../src/routes/(gen)/search/search88' -import { ServerRoute as genSearchSearch87RouteImport } from './../../src/routes/(gen)/search/search87' -import { ServerRoute as genSearchSearch86RouteImport } from './../../src/routes/(gen)/search/search86' -import { ServerRoute as genSearchSearch85RouteImport } from './../../src/routes/(gen)/search/search85' -import { ServerRoute as genSearchSearch84RouteImport } from './../../src/routes/(gen)/search/search84' -import { ServerRoute as genSearchSearch83RouteImport } from './../../src/routes/(gen)/search/search83' -import { ServerRoute as genSearchSearch82RouteImport } from './../../src/routes/(gen)/search/search82' -import { ServerRoute as genSearchSearch81RouteImport } from './../../src/routes/(gen)/search/search81' -import { ServerRoute as genSearchSearch80RouteImport } from './../../src/routes/(gen)/search/search80' -import { ServerRoute as genSearchSearch8RouteImport } from './../../src/routes/(gen)/search/search8' -import { ServerRoute as genSearchSearch79RouteImport } from './../../src/routes/(gen)/search/search79' -import { ServerRoute as genSearchSearch78RouteImport } from './../../src/routes/(gen)/search/search78' -import { ServerRoute as genSearchSearch77RouteImport } from './../../src/routes/(gen)/search/search77' -import { ServerRoute as genSearchSearch76RouteImport } from './../../src/routes/(gen)/search/search76' -import { ServerRoute as genSearchSearch75RouteImport } from './../../src/routes/(gen)/search/search75' -import { ServerRoute as genSearchSearch74RouteImport } from './../../src/routes/(gen)/search/search74' -import { ServerRoute as genSearchSearch73RouteImport } from './../../src/routes/(gen)/search/search73' -import { ServerRoute as genSearchSearch72RouteImport } from './../../src/routes/(gen)/search/search72' -import { ServerRoute as genSearchSearch71RouteImport } from './../../src/routes/(gen)/search/search71' -import { ServerRoute as genSearchSearch70RouteImport } from './../../src/routes/(gen)/search/search70' -import { ServerRoute as genSearchSearch7RouteImport } from './../../src/routes/(gen)/search/search7' -import { ServerRoute as genSearchSearch69RouteImport } from './../../src/routes/(gen)/search/search69' -import { ServerRoute as genSearchSearch68RouteImport } from './../../src/routes/(gen)/search/search68' -import { ServerRoute as genSearchSearch67RouteImport } from './../../src/routes/(gen)/search/search67' -import { ServerRoute as genSearchSearch66RouteImport } from './../../src/routes/(gen)/search/search66' -import { ServerRoute as genSearchSearch65RouteImport } from './../../src/routes/(gen)/search/search65' -import { ServerRoute as genSearchSearch64RouteImport } from './../../src/routes/(gen)/search/search64' -import { ServerRoute as genSearchSearch63RouteImport } from './../../src/routes/(gen)/search/search63' -import { ServerRoute as genSearchSearch62RouteImport } from './../../src/routes/(gen)/search/search62' -import { ServerRoute as genSearchSearch61RouteImport } from './../../src/routes/(gen)/search/search61' -import { ServerRoute as genSearchSearch60RouteImport } from './../../src/routes/(gen)/search/search60' -import { ServerRoute as genSearchSearch6RouteImport } from './../../src/routes/(gen)/search/search6' -import { ServerRoute as genSearchSearch59RouteImport } from './../../src/routes/(gen)/search/search59' -import { ServerRoute as genSearchSearch58RouteImport } from './../../src/routes/(gen)/search/search58' -import { ServerRoute as genSearchSearch57RouteImport } from './../../src/routes/(gen)/search/search57' -import { ServerRoute as genSearchSearch56RouteImport } from './../../src/routes/(gen)/search/search56' -import { ServerRoute as genSearchSearch55RouteImport } from './../../src/routes/(gen)/search/search55' -import { ServerRoute as genSearchSearch54RouteImport } from './../../src/routes/(gen)/search/search54' -import { ServerRoute as genSearchSearch53RouteImport } from './../../src/routes/(gen)/search/search53' -import { ServerRoute as genSearchSearch52RouteImport } from './../../src/routes/(gen)/search/search52' -import { ServerRoute as genSearchSearch51RouteImport } from './../../src/routes/(gen)/search/search51' -import { ServerRoute as genSearchSearch50RouteImport } from './../../src/routes/(gen)/search/search50' -import { ServerRoute as genSearchSearch5RouteImport } from './../../src/routes/(gen)/search/search5' -import { ServerRoute as genSearchSearch49RouteImport } from './../../src/routes/(gen)/search/search49' -import { ServerRoute as genSearchSearch48RouteImport } from './../../src/routes/(gen)/search/search48' -import { ServerRoute as genSearchSearch47RouteImport } from './../../src/routes/(gen)/search/search47' -import { ServerRoute as genSearchSearch46RouteImport } from './../../src/routes/(gen)/search/search46' -import { ServerRoute as genSearchSearch45RouteImport } from './../../src/routes/(gen)/search/search45' -import { ServerRoute as genSearchSearch44RouteImport } from './../../src/routes/(gen)/search/search44' -import { ServerRoute as genSearchSearch43RouteImport } from './../../src/routes/(gen)/search/search43' -import { ServerRoute as genSearchSearch42RouteImport } from './../../src/routes/(gen)/search/search42' -import { ServerRoute as genSearchSearch41RouteImport } from './../../src/routes/(gen)/search/search41' -import { ServerRoute as genSearchSearch40RouteImport } from './../../src/routes/(gen)/search/search40' -import { ServerRoute as genSearchSearch4RouteImport } from './../../src/routes/(gen)/search/search4' -import { ServerRoute as genSearchSearch39RouteImport } from './../../src/routes/(gen)/search/search39' -import { ServerRoute as genSearchSearch38RouteImport } from './../../src/routes/(gen)/search/search38' -import { ServerRoute as genSearchSearch37RouteImport } from './../../src/routes/(gen)/search/search37' -import { ServerRoute as genSearchSearch36RouteImport } from './../../src/routes/(gen)/search/search36' -import { ServerRoute as genSearchSearch35RouteImport } from './../../src/routes/(gen)/search/search35' -import { ServerRoute as genSearchSearch34RouteImport } from './../../src/routes/(gen)/search/search34' -import { ServerRoute as genSearchSearch33RouteImport } from './../../src/routes/(gen)/search/search33' -import { ServerRoute as genSearchSearch32RouteImport } from './../../src/routes/(gen)/search/search32' -import { ServerRoute as genSearchSearch31RouteImport } from './../../src/routes/(gen)/search/search31' -import { ServerRoute as genSearchSearch30RouteImport } from './../../src/routes/(gen)/search/search30' -import { ServerRoute as genSearchSearch3RouteImport } from './../../src/routes/(gen)/search/search3' -import { ServerRoute as genSearchSearch29RouteImport } from './../../src/routes/(gen)/search/search29' -import { ServerRoute as genSearchSearch28RouteImport } from './../../src/routes/(gen)/search/search28' -import { ServerRoute as genSearchSearch27RouteImport } from './../../src/routes/(gen)/search/search27' -import { ServerRoute as genSearchSearch26RouteImport } from './../../src/routes/(gen)/search/search26' -import { ServerRoute as genSearchSearch25RouteImport } from './../../src/routes/(gen)/search/search25' -import { ServerRoute as genSearchSearch24RouteImport } from './../../src/routes/(gen)/search/search24' -import { ServerRoute as genSearchSearch23RouteImport } from './../../src/routes/(gen)/search/search23' -import { ServerRoute as genSearchSearch22RouteImport } from './../../src/routes/(gen)/search/search22' -import { ServerRoute as genSearchSearch21RouteImport } from './../../src/routes/(gen)/search/search21' -import { ServerRoute as genSearchSearch20RouteImport } from './../../src/routes/(gen)/search/search20' -import { ServerRoute as genSearchSearch2RouteImport } from './../../src/routes/(gen)/search/search2' -import { ServerRoute as genSearchSearch19RouteImport } from './../../src/routes/(gen)/search/search19' -import { ServerRoute as genSearchSearch18RouteImport } from './../../src/routes/(gen)/search/search18' -import { ServerRoute as genSearchSearch17RouteImport } from './../../src/routes/(gen)/search/search17' -import { ServerRoute as genSearchSearch16RouteImport } from './../../src/routes/(gen)/search/search16' -import { ServerRoute as genSearchSearch15RouteImport } from './../../src/routes/(gen)/search/search15' -import { ServerRoute as genSearchSearch14RouteImport } from './../../src/routes/(gen)/search/search14' -import { ServerRoute as genSearchSearch13RouteImport } from './../../src/routes/(gen)/search/search13' -import { ServerRoute as genSearchSearch12RouteImport } from './../../src/routes/(gen)/search/search12' -import { ServerRoute as genSearchSearch11RouteImport } from './../../src/routes/(gen)/search/search11' -import { ServerRoute as genSearchSearch10RouteImport } from './../../src/routes/(gen)/search/search10' -import { ServerRoute as genSearchSearch1RouteImport } from './../../src/routes/(gen)/search/search1' -import { ServerRoute as genSearchSearch0RouteImport } from './../../src/routes/(gen)/search/search0' // Create/Update Routes @@ -131,2228 +31,28 @@ const SearchSearchPlaceholderRoute = SearchSearchPlaceholderRouteImport.update({ getParentRoute: () => rootRoute, } as any) -const genSearchSearch99Route = genSearchSearch99RouteImport.update({ - id: '/(gen)/search/search99', - path: '/search/search99', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch98Route = genSearchSearch98RouteImport.update({ - id: '/(gen)/search/search98', - path: '/search/search98', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch97Route = genSearchSearch97RouteImport.update({ - id: '/(gen)/search/search97', - path: '/search/search97', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch96Route = genSearchSearch96RouteImport.update({ - id: '/(gen)/search/search96', - path: '/search/search96', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch95Route = genSearchSearch95RouteImport.update({ - id: '/(gen)/search/search95', - path: '/search/search95', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch94Route = genSearchSearch94RouteImport.update({ - id: '/(gen)/search/search94', - path: '/search/search94', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch93Route = genSearchSearch93RouteImport.update({ - id: '/(gen)/search/search93', - path: '/search/search93', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch92Route = genSearchSearch92RouteImport.update({ - id: '/(gen)/search/search92', - path: '/search/search92', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch91Route = genSearchSearch91RouteImport.update({ - id: '/(gen)/search/search91', - path: '/search/search91', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch90Route = genSearchSearch90RouteImport.update({ - id: '/(gen)/search/search90', - path: '/search/search90', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch9Route = genSearchSearch9RouteImport.update({ - id: '/(gen)/search/search9', - path: '/search/search9', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch89Route = genSearchSearch89RouteImport.update({ - id: '/(gen)/search/search89', - path: '/search/search89', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch88Route = genSearchSearch88RouteImport.update({ - id: '/(gen)/search/search88', - path: '/search/search88', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch87Route = genSearchSearch87RouteImport.update({ - id: '/(gen)/search/search87', - path: '/search/search87', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch86Route = genSearchSearch86RouteImport.update({ - id: '/(gen)/search/search86', - path: '/search/search86', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch85Route = genSearchSearch85RouteImport.update({ - id: '/(gen)/search/search85', - path: '/search/search85', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch84Route = genSearchSearch84RouteImport.update({ - id: '/(gen)/search/search84', - path: '/search/search84', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch83Route = genSearchSearch83RouteImport.update({ - id: '/(gen)/search/search83', - path: '/search/search83', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch82Route = genSearchSearch82RouteImport.update({ - id: '/(gen)/search/search82', - path: '/search/search82', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch81Route = genSearchSearch81RouteImport.update({ - id: '/(gen)/search/search81', - path: '/search/search81', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch80Route = genSearchSearch80RouteImport.update({ - id: '/(gen)/search/search80', - path: '/search/search80', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch8Route = genSearchSearch8RouteImport.update({ - id: '/(gen)/search/search8', - path: '/search/search8', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch79Route = genSearchSearch79RouteImport.update({ - id: '/(gen)/search/search79', - path: '/search/search79', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch78Route = genSearchSearch78RouteImport.update({ - id: '/(gen)/search/search78', - path: '/search/search78', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch77Route = genSearchSearch77RouteImport.update({ - id: '/(gen)/search/search77', - path: '/search/search77', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch76Route = genSearchSearch76RouteImport.update({ - id: '/(gen)/search/search76', - path: '/search/search76', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch75Route = genSearchSearch75RouteImport.update({ - id: '/(gen)/search/search75', - path: '/search/search75', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch74Route = genSearchSearch74RouteImport.update({ - id: '/(gen)/search/search74', - path: '/search/search74', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch73Route = genSearchSearch73RouteImport.update({ - id: '/(gen)/search/search73', - path: '/search/search73', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch72Route = genSearchSearch72RouteImport.update({ - id: '/(gen)/search/search72', - path: '/search/search72', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch71Route = genSearchSearch71RouteImport.update({ - id: '/(gen)/search/search71', - path: '/search/search71', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch70Route = genSearchSearch70RouteImport.update({ - id: '/(gen)/search/search70', - path: '/search/search70', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch7Route = genSearchSearch7RouteImport.update({ - id: '/(gen)/search/search7', - path: '/search/search7', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch69Route = genSearchSearch69RouteImport.update({ - id: '/(gen)/search/search69', - path: '/search/search69', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch68Route = genSearchSearch68RouteImport.update({ - id: '/(gen)/search/search68', - path: '/search/search68', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch67Route = genSearchSearch67RouteImport.update({ - id: '/(gen)/search/search67', - path: '/search/search67', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch66Route = genSearchSearch66RouteImport.update({ - id: '/(gen)/search/search66', - path: '/search/search66', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch65Route = genSearchSearch65RouteImport.update({ - id: '/(gen)/search/search65', - path: '/search/search65', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch64Route = genSearchSearch64RouteImport.update({ - id: '/(gen)/search/search64', - path: '/search/search64', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch63Route = genSearchSearch63RouteImport.update({ - id: '/(gen)/search/search63', - path: '/search/search63', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch62Route = genSearchSearch62RouteImport.update({ - id: '/(gen)/search/search62', - path: '/search/search62', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch61Route = genSearchSearch61RouteImport.update({ - id: '/(gen)/search/search61', - path: '/search/search61', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch60Route = genSearchSearch60RouteImport.update({ - id: '/(gen)/search/search60', - path: '/search/search60', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch6Route = genSearchSearch6RouteImport.update({ - id: '/(gen)/search/search6', - path: '/search/search6', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch59Route = genSearchSearch59RouteImport.update({ - id: '/(gen)/search/search59', - path: '/search/search59', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch58Route = genSearchSearch58RouteImport.update({ - id: '/(gen)/search/search58', - path: '/search/search58', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch57Route = genSearchSearch57RouteImport.update({ - id: '/(gen)/search/search57', - path: '/search/search57', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch56Route = genSearchSearch56RouteImport.update({ - id: '/(gen)/search/search56', - path: '/search/search56', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch55Route = genSearchSearch55RouteImport.update({ - id: '/(gen)/search/search55', - path: '/search/search55', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch54Route = genSearchSearch54RouteImport.update({ - id: '/(gen)/search/search54', - path: '/search/search54', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch53Route = genSearchSearch53RouteImport.update({ - id: '/(gen)/search/search53', - path: '/search/search53', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch52Route = genSearchSearch52RouteImport.update({ - id: '/(gen)/search/search52', - path: '/search/search52', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch51Route = genSearchSearch51RouteImport.update({ - id: '/(gen)/search/search51', - path: '/search/search51', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch50Route = genSearchSearch50RouteImport.update({ - id: '/(gen)/search/search50', - path: '/search/search50', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch5Route = genSearchSearch5RouteImport.update({ - id: '/(gen)/search/search5', - path: '/search/search5', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch49Route = genSearchSearch49RouteImport.update({ - id: '/(gen)/search/search49', - path: '/search/search49', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch48Route = genSearchSearch48RouteImport.update({ - id: '/(gen)/search/search48', - path: '/search/search48', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch47Route = genSearchSearch47RouteImport.update({ - id: '/(gen)/search/search47', - path: '/search/search47', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch46Route = genSearchSearch46RouteImport.update({ - id: '/(gen)/search/search46', - path: '/search/search46', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch45Route = genSearchSearch45RouteImport.update({ - id: '/(gen)/search/search45', - path: '/search/search45', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch44Route = genSearchSearch44RouteImport.update({ - id: '/(gen)/search/search44', - path: '/search/search44', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch43Route = genSearchSearch43RouteImport.update({ - id: '/(gen)/search/search43', - path: '/search/search43', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch42Route = genSearchSearch42RouteImport.update({ - id: '/(gen)/search/search42', - path: '/search/search42', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch41Route = genSearchSearch41RouteImport.update({ - id: '/(gen)/search/search41', - path: '/search/search41', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch40Route = genSearchSearch40RouteImport.update({ - id: '/(gen)/search/search40', - path: '/search/search40', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch4Route = genSearchSearch4RouteImport.update({ - id: '/(gen)/search/search4', - path: '/search/search4', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch39Route = genSearchSearch39RouteImport.update({ - id: '/(gen)/search/search39', - path: '/search/search39', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch38Route = genSearchSearch38RouteImport.update({ - id: '/(gen)/search/search38', - path: '/search/search38', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch37Route = genSearchSearch37RouteImport.update({ - id: '/(gen)/search/search37', - path: '/search/search37', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch36Route = genSearchSearch36RouteImport.update({ - id: '/(gen)/search/search36', - path: '/search/search36', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch35Route = genSearchSearch35RouteImport.update({ - id: '/(gen)/search/search35', - path: '/search/search35', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch34Route = genSearchSearch34RouteImport.update({ - id: '/(gen)/search/search34', - path: '/search/search34', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch33Route = genSearchSearch33RouteImport.update({ - id: '/(gen)/search/search33', - path: '/search/search33', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch32Route = genSearchSearch32RouteImport.update({ - id: '/(gen)/search/search32', - path: '/search/search32', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch31Route = genSearchSearch31RouteImport.update({ - id: '/(gen)/search/search31', - path: '/search/search31', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch30Route = genSearchSearch30RouteImport.update({ - id: '/(gen)/search/search30', - path: '/search/search30', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch3Route = genSearchSearch3RouteImport.update({ - id: '/(gen)/search/search3', - path: '/search/search3', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch29Route = genSearchSearch29RouteImport.update({ - id: '/(gen)/search/search29', - path: '/search/search29', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch28Route = genSearchSearch28RouteImport.update({ - id: '/(gen)/search/search28', - path: '/search/search28', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch27Route = genSearchSearch27RouteImport.update({ - id: '/(gen)/search/search27', - path: '/search/search27', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch26Route = genSearchSearch26RouteImport.update({ - id: '/(gen)/search/search26', - path: '/search/search26', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch25Route = genSearchSearch25RouteImport.update({ - id: '/(gen)/search/search25', - path: '/search/search25', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch24Route = genSearchSearch24RouteImport.update({ - id: '/(gen)/search/search24', - path: '/search/search24', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch23Route = genSearchSearch23RouteImport.update({ - id: '/(gen)/search/search23', - path: '/search/search23', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch22Route = genSearchSearch22RouteImport.update({ - id: '/(gen)/search/search22', - path: '/search/search22', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch21Route = genSearchSearch21RouteImport.update({ - id: '/(gen)/search/search21', - path: '/search/search21', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch20Route = genSearchSearch20RouteImport.update({ - id: '/(gen)/search/search20', - path: '/search/search20', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch2Route = genSearchSearch2RouteImport.update({ - id: '/(gen)/search/search2', - path: '/search/search2', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch19Route = genSearchSearch19RouteImport.update({ - id: '/(gen)/search/search19', - path: '/search/search19', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch18Route = genSearchSearch18RouteImport.update({ - id: '/(gen)/search/search18', - path: '/search/search18', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch17Route = genSearchSearch17RouteImport.update({ - id: '/(gen)/search/search17', - path: '/search/search17', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch16Route = genSearchSearch16RouteImport.update({ - id: '/(gen)/search/search16', - path: '/search/search16', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch15Route = genSearchSearch15RouteImport.update({ - id: '/(gen)/search/search15', - path: '/search/search15', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch14Route = genSearchSearch14RouteImport.update({ - id: '/(gen)/search/search14', - path: '/search/search14', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch13Route = genSearchSearch13RouteImport.update({ - id: '/(gen)/search/search13', - path: '/search/search13', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch12Route = genSearchSearch12RouteImport.update({ - id: '/(gen)/search/search12', - path: '/search/search12', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch11Route = genSearchSearch11RouteImport.update({ - id: '/(gen)/search/search11', - path: '/search/search11', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch10Route = genSearchSearch10RouteImport.update({ - id: '/(gen)/search/search10', - path: '/search/search10', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch1Route = genSearchSearch1RouteImport.update({ - id: '/(gen)/search/search1', - path: '/search/search1', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch0Route = genSearchSearch0RouteImport.update({ - id: '/(gen)/search/search0', - path: '/search/search0', - getParentRoute: () => rootRoute, -} as any) - -// Populate the FileRoutesByPath interface - -declare module '@tanstack/react-start/server' { - interface FileRoutesByPath { - '/search/searchPlaceholder': { - id: '/search/searchPlaceholder' - path: '/search/searchPlaceholder' - fullPath: '/search/searchPlaceholder' - preLoaderRoute: typeof SearchSearchPlaceholderRouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search0': { - id: '/(gen)/search/search0' - path: '/search/search0' - fullPath: '/search/search0' - preLoaderRoute: typeof genSearchSearch0RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search1': { - id: '/(gen)/search/search1' - path: '/search/search1' - fullPath: '/search/search1' - preLoaderRoute: typeof genSearchSearch1RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search10': { - id: '/(gen)/search/search10' - path: '/search/search10' - fullPath: '/search/search10' - preLoaderRoute: typeof genSearchSearch10RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search11': { - id: '/(gen)/search/search11' - path: '/search/search11' - fullPath: '/search/search11' - preLoaderRoute: typeof genSearchSearch11RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search12': { - id: '/(gen)/search/search12' - path: '/search/search12' - fullPath: '/search/search12' - preLoaderRoute: typeof genSearchSearch12RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search13': { - id: '/(gen)/search/search13' - path: '/search/search13' - fullPath: '/search/search13' - preLoaderRoute: typeof genSearchSearch13RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search14': { - id: '/(gen)/search/search14' - path: '/search/search14' - fullPath: '/search/search14' - preLoaderRoute: typeof genSearchSearch14RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search15': { - id: '/(gen)/search/search15' - path: '/search/search15' - fullPath: '/search/search15' - preLoaderRoute: typeof genSearchSearch15RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search16': { - id: '/(gen)/search/search16' - path: '/search/search16' - fullPath: '/search/search16' - preLoaderRoute: typeof genSearchSearch16RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search17': { - id: '/(gen)/search/search17' - path: '/search/search17' - fullPath: '/search/search17' - preLoaderRoute: typeof genSearchSearch17RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search18': { - id: '/(gen)/search/search18' - path: '/search/search18' - fullPath: '/search/search18' - preLoaderRoute: typeof genSearchSearch18RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search19': { - id: '/(gen)/search/search19' - path: '/search/search19' - fullPath: '/search/search19' - preLoaderRoute: typeof genSearchSearch19RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search2': { - id: '/(gen)/search/search2' - path: '/search/search2' - fullPath: '/search/search2' - preLoaderRoute: typeof genSearchSearch2RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search20': { - id: '/(gen)/search/search20' - path: '/search/search20' - fullPath: '/search/search20' - preLoaderRoute: typeof genSearchSearch20RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search21': { - id: '/(gen)/search/search21' - path: '/search/search21' - fullPath: '/search/search21' - preLoaderRoute: typeof genSearchSearch21RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search22': { - id: '/(gen)/search/search22' - path: '/search/search22' - fullPath: '/search/search22' - preLoaderRoute: typeof genSearchSearch22RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search23': { - id: '/(gen)/search/search23' - path: '/search/search23' - fullPath: '/search/search23' - preLoaderRoute: typeof genSearchSearch23RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search24': { - id: '/(gen)/search/search24' - path: '/search/search24' - fullPath: '/search/search24' - preLoaderRoute: typeof genSearchSearch24RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search25': { - id: '/(gen)/search/search25' - path: '/search/search25' - fullPath: '/search/search25' - preLoaderRoute: typeof genSearchSearch25RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search26': { - id: '/(gen)/search/search26' - path: '/search/search26' - fullPath: '/search/search26' - preLoaderRoute: typeof genSearchSearch26RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search27': { - id: '/(gen)/search/search27' - path: '/search/search27' - fullPath: '/search/search27' - preLoaderRoute: typeof genSearchSearch27RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search28': { - id: '/(gen)/search/search28' - path: '/search/search28' - fullPath: '/search/search28' - preLoaderRoute: typeof genSearchSearch28RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search29': { - id: '/(gen)/search/search29' - path: '/search/search29' - fullPath: '/search/search29' - preLoaderRoute: typeof genSearchSearch29RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search3': { - id: '/(gen)/search/search3' - path: '/search/search3' - fullPath: '/search/search3' - preLoaderRoute: typeof genSearchSearch3RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search30': { - id: '/(gen)/search/search30' - path: '/search/search30' - fullPath: '/search/search30' - preLoaderRoute: typeof genSearchSearch30RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search31': { - id: '/(gen)/search/search31' - path: '/search/search31' - fullPath: '/search/search31' - preLoaderRoute: typeof genSearchSearch31RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search32': { - id: '/(gen)/search/search32' - path: '/search/search32' - fullPath: '/search/search32' - preLoaderRoute: typeof genSearchSearch32RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search33': { - id: '/(gen)/search/search33' - path: '/search/search33' - fullPath: '/search/search33' - preLoaderRoute: typeof genSearchSearch33RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search34': { - id: '/(gen)/search/search34' - path: '/search/search34' - fullPath: '/search/search34' - preLoaderRoute: typeof genSearchSearch34RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search35': { - id: '/(gen)/search/search35' - path: '/search/search35' - fullPath: '/search/search35' - preLoaderRoute: typeof genSearchSearch35RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search36': { - id: '/(gen)/search/search36' - path: '/search/search36' - fullPath: '/search/search36' - preLoaderRoute: typeof genSearchSearch36RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search37': { - id: '/(gen)/search/search37' - path: '/search/search37' - fullPath: '/search/search37' - preLoaderRoute: typeof genSearchSearch37RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search38': { - id: '/(gen)/search/search38' - path: '/search/search38' - fullPath: '/search/search38' - preLoaderRoute: typeof genSearchSearch38RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search39': { - id: '/(gen)/search/search39' - path: '/search/search39' - fullPath: '/search/search39' - preLoaderRoute: typeof genSearchSearch39RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search4': { - id: '/(gen)/search/search4' - path: '/search/search4' - fullPath: '/search/search4' - preLoaderRoute: typeof genSearchSearch4RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search40': { - id: '/(gen)/search/search40' - path: '/search/search40' - fullPath: '/search/search40' - preLoaderRoute: typeof genSearchSearch40RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search41': { - id: '/(gen)/search/search41' - path: '/search/search41' - fullPath: '/search/search41' - preLoaderRoute: typeof genSearchSearch41RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search42': { - id: '/(gen)/search/search42' - path: '/search/search42' - fullPath: '/search/search42' - preLoaderRoute: typeof genSearchSearch42RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search43': { - id: '/(gen)/search/search43' - path: '/search/search43' - fullPath: '/search/search43' - preLoaderRoute: typeof genSearchSearch43RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search44': { - id: '/(gen)/search/search44' - path: '/search/search44' - fullPath: '/search/search44' - preLoaderRoute: typeof genSearchSearch44RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search45': { - id: '/(gen)/search/search45' - path: '/search/search45' - fullPath: '/search/search45' - preLoaderRoute: typeof genSearchSearch45RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search46': { - id: '/(gen)/search/search46' - path: '/search/search46' - fullPath: '/search/search46' - preLoaderRoute: typeof genSearchSearch46RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search47': { - id: '/(gen)/search/search47' - path: '/search/search47' - fullPath: '/search/search47' - preLoaderRoute: typeof genSearchSearch47RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search48': { - id: '/(gen)/search/search48' - path: '/search/search48' - fullPath: '/search/search48' - preLoaderRoute: typeof genSearchSearch48RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search49': { - id: '/(gen)/search/search49' - path: '/search/search49' - fullPath: '/search/search49' - preLoaderRoute: typeof genSearchSearch49RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search5': { - id: '/(gen)/search/search5' - path: '/search/search5' - fullPath: '/search/search5' - preLoaderRoute: typeof genSearchSearch5RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search50': { - id: '/(gen)/search/search50' - path: '/search/search50' - fullPath: '/search/search50' - preLoaderRoute: typeof genSearchSearch50RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search51': { - id: '/(gen)/search/search51' - path: '/search/search51' - fullPath: '/search/search51' - preLoaderRoute: typeof genSearchSearch51RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search52': { - id: '/(gen)/search/search52' - path: '/search/search52' - fullPath: '/search/search52' - preLoaderRoute: typeof genSearchSearch52RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search53': { - id: '/(gen)/search/search53' - path: '/search/search53' - fullPath: '/search/search53' - preLoaderRoute: typeof genSearchSearch53RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search54': { - id: '/(gen)/search/search54' - path: '/search/search54' - fullPath: '/search/search54' - preLoaderRoute: typeof genSearchSearch54RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search55': { - id: '/(gen)/search/search55' - path: '/search/search55' - fullPath: '/search/search55' - preLoaderRoute: typeof genSearchSearch55RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search56': { - id: '/(gen)/search/search56' - path: '/search/search56' - fullPath: '/search/search56' - preLoaderRoute: typeof genSearchSearch56RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search57': { - id: '/(gen)/search/search57' - path: '/search/search57' - fullPath: '/search/search57' - preLoaderRoute: typeof genSearchSearch57RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search58': { - id: '/(gen)/search/search58' - path: '/search/search58' - fullPath: '/search/search58' - preLoaderRoute: typeof genSearchSearch58RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search59': { - id: '/(gen)/search/search59' - path: '/search/search59' - fullPath: '/search/search59' - preLoaderRoute: typeof genSearchSearch59RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search6': { - id: '/(gen)/search/search6' - path: '/search/search6' - fullPath: '/search/search6' - preLoaderRoute: typeof genSearchSearch6RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search60': { - id: '/(gen)/search/search60' - path: '/search/search60' - fullPath: '/search/search60' - preLoaderRoute: typeof genSearchSearch60RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search61': { - id: '/(gen)/search/search61' - path: '/search/search61' - fullPath: '/search/search61' - preLoaderRoute: typeof genSearchSearch61RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search62': { - id: '/(gen)/search/search62' - path: '/search/search62' - fullPath: '/search/search62' - preLoaderRoute: typeof genSearchSearch62RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search63': { - id: '/(gen)/search/search63' - path: '/search/search63' - fullPath: '/search/search63' - preLoaderRoute: typeof genSearchSearch63RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search64': { - id: '/(gen)/search/search64' - path: '/search/search64' - fullPath: '/search/search64' - preLoaderRoute: typeof genSearchSearch64RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search65': { - id: '/(gen)/search/search65' - path: '/search/search65' - fullPath: '/search/search65' - preLoaderRoute: typeof genSearchSearch65RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search66': { - id: '/(gen)/search/search66' - path: '/search/search66' - fullPath: '/search/search66' - preLoaderRoute: typeof genSearchSearch66RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search67': { - id: '/(gen)/search/search67' - path: '/search/search67' - fullPath: '/search/search67' - preLoaderRoute: typeof genSearchSearch67RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search68': { - id: '/(gen)/search/search68' - path: '/search/search68' - fullPath: '/search/search68' - preLoaderRoute: typeof genSearchSearch68RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search69': { - id: '/(gen)/search/search69' - path: '/search/search69' - fullPath: '/search/search69' - preLoaderRoute: typeof genSearchSearch69RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search7': { - id: '/(gen)/search/search7' - path: '/search/search7' - fullPath: '/search/search7' - preLoaderRoute: typeof genSearchSearch7RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search70': { - id: '/(gen)/search/search70' - path: '/search/search70' - fullPath: '/search/search70' - preLoaderRoute: typeof genSearchSearch70RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search71': { - id: '/(gen)/search/search71' - path: '/search/search71' - fullPath: '/search/search71' - preLoaderRoute: typeof genSearchSearch71RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search72': { - id: '/(gen)/search/search72' - path: '/search/search72' - fullPath: '/search/search72' - preLoaderRoute: typeof genSearchSearch72RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search73': { - id: '/(gen)/search/search73' - path: '/search/search73' - fullPath: '/search/search73' - preLoaderRoute: typeof genSearchSearch73RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search74': { - id: '/(gen)/search/search74' - path: '/search/search74' - fullPath: '/search/search74' - preLoaderRoute: typeof genSearchSearch74RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search75': { - id: '/(gen)/search/search75' - path: '/search/search75' - fullPath: '/search/search75' - preLoaderRoute: typeof genSearchSearch75RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search76': { - id: '/(gen)/search/search76' - path: '/search/search76' - fullPath: '/search/search76' - preLoaderRoute: typeof genSearchSearch76RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search77': { - id: '/(gen)/search/search77' - path: '/search/search77' - fullPath: '/search/search77' - preLoaderRoute: typeof genSearchSearch77RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search78': { - id: '/(gen)/search/search78' - path: '/search/search78' - fullPath: '/search/search78' - preLoaderRoute: typeof genSearchSearch78RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search79': { - id: '/(gen)/search/search79' - path: '/search/search79' - fullPath: '/search/search79' - preLoaderRoute: typeof genSearchSearch79RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search8': { - id: '/(gen)/search/search8' - path: '/search/search8' - fullPath: '/search/search8' - preLoaderRoute: typeof genSearchSearch8RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search80': { - id: '/(gen)/search/search80' - path: '/search/search80' - fullPath: '/search/search80' - preLoaderRoute: typeof genSearchSearch80RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search81': { - id: '/(gen)/search/search81' - path: '/search/search81' - fullPath: '/search/search81' - preLoaderRoute: typeof genSearchSearch81RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search82': { - id: '/(gen)/search/search82' - path: '/search/search82' - fullPath: '/search/search82' - preLoaderRoute: typeof genSearchSearch82RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search83': { - id: '/(gen)/search/search83' - path: '/search/search83' - fullPath: '/search/search83' - preLoaderRoute: typeof genSearchSearch83RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search84': { - id: '/(gen)/search/search84' - path: '/search/search84' - fullPath: '/search/search84' - preLoaderRoute: typeof genSearchSearch84RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search85': { - id: '/(gen)/search/search85' - path: '/search/search85' - fullPath: '/search/search85' - preLoaderRoute: typeof genSearchSearch85RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search86': { - id: '/(gen)/search/search86' - path: '/search/search86' - fullPath: '/search/search86' - preLoaderRoute: typeof genSearchSearch86RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search87': { - id: '/(gen)/search/search87' - path: '/search/search87' - fullPath: '/search/search87' - preLoaderRoute: typeof genSearchSearch87RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search88': { - id: '/(gen)/search/search88' - path: '/search/search88' - fullPath: '/search/search88' - preLoaderRoute: typeof genSearchSearch88RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search89': { - id: '/(gen)/search/search89' - path: '/search/search89' - fullPath: '/search/search89' - preLoaderRoute: typeof genSearchSearch89RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search9': { - id: '/(gen)/search/search9' - path: '/search/search9' - fullPath: '/search/search9' - preLoaderRoute: typeof genSearchSearch9RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search90': { - id: '/(gen)/search/search90' - path: '/search/search90' - fullPath: '/search/search90' - preLoaderRoute: typeof genSearchSearch90RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search91': { - id: '/(gen)/search/search91' - path: '/search/search91' - fullPath: '/search/search91' - preLoaderRoute: typeof genSearchSearch91RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search92': { - id: '/(gen)/search/search92' - path: '/search/search92' - fullPath: '/search/search92' - preLoaderRoute: typeof genSearchSearch92RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search93': { - id: '/(gen)/search/search93' - path: '/search/search93' - fullPath: '/search/search93' - preLoaderRoute: typeof genSearchSearch93RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search94': { - id: '/(gen)/search/search94' - path: '/search/search94' - fullPath: '/search/search94' - preLoaderRoute: typeof genSearchSearch94RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search95': { - id: '/(gen)/search/search95' - path: '/search/search95' - fullPath: '/search/search95' - preLoaderRoute: typeof genSearchSearch95RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search96': { - id: '/(gen)/search/search96' - path: '/search/search96' - fullPath: '/search/search96' - preLoaderRoute: typeof genSearchSearch96RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search97': { - id: '/(gen)/search/search97' - path: '/search/search97' - fullPath: '/search/search97' - preLoaderRoute: typeof genSearchSearch97RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search98': { - id: '/(gen)/search/search98' - path: '/search/search98' - fullPath: '/search/search98' - preLoaderRoute: typeof genSearchSearch98RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search/search99': { - id: '/(gen)/search/search99' - path: '/search/search99' - fullPath: '/search/search99' - preLoaderRoute: typeof genSearchSearch99RouteImport - parentRoute: typeof rootRoute - } - } -} - -// Add type-safety to the createFileRoute function across the route tree - -declare module './../../src/routes/search/searchPlaceholder' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], - FileRoutesByPath['/search/searchPlaceholder']['id'], - FileRoutesByPath['/search/searchPlaceholder']['path'], - FileRoutesByPath['/search/searchPlaceholder']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search0' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search0']['parentRoute'], - FileRoutesByPath['/(gen)/search/search0']['id'], - FileRoutesByPath['/(gen)/search/search0']['path'], - FileRoutesByPath['/(gen)/search/search0']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search1' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search1']['parentRoute'], - FileRoutesByPath['/(gen)/search/search1']['id'], - FileRoutesByPath['/(gen)/search/search1']['path'], - FileRoutesByPath['/(gen)/search/search1']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search10' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search10']['parentRoute'], - FileRoutesByPath['/(gen)/search/search10']['id'], - FileRoutesByPath['/(gen)/search/search10']['path'], - FileRoutesByPath['/(gen)/search/search10']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search11' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search11']['parentRoute'], - FileRoutesByPath['/(gen)/search/search11']['id'], - FileRoutesByPath['/(gen)/search/search11']['path'], - FileRoutesByPath['/(gen)/search/search11']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search12' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search12']['parentRoute'], - FileRoutesByPath['/(gen)/search/search12']['id'], - FileRoutesByPath['/(gen)/search/search12']['path'], - FileRoutesByPath['/(gen)/search/search12']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search13' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search13']['parentRoute'], - FileRoutesByPath['/(gen)/search/search13']['id'], - FileRoutesByPath['/(gen)/search/search13']['path'], - FileRoutesByPath['/(gen)/search/search13']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search14' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search14']['parentRoute'], - FileRoutesByPath['/(gen)/search/search14']['id'], - FileRoutesByPath['/(gen)/search/search14']['path'], - FileRoutesByPath['/(gen)/search/search14']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search15' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search15']['parentRoute'], - FileRoutesByPath['/(gen)/search/search15']['id'], - FileRoutesByPath['/(gen)/search/search15']['path'], - FileRoutesByPath['/(gen)/search/search15']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search16' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search16']['parentRoute'], - FileRoutesByPath['/(gen)/search/search16']['id'], - FileRoutesByPath['/(gen)/search/search16']['path'], - FileRoutesByPath['/(gen)/search/search16']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search17' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search17']['parentRoute'], - FileRoutesByPath['/(gen)/search/search17']['id'], - FileRoutesByPath['/(gen)/search/search17']['path'], - FileRoutesByPath['/(gen)/search/search17']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search18' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search18']['parentRoute'], - FileRoutesByPath['/(gen)/search/search18']['id'], - FileRoutesByPath['/(gen)/search/search18']['path'], - FileRoutesByPath['/(gen)/search/search18']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search19' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search19']['parentRoute'], - FileRoutesByPath['/(gen)/search/search19']['id'], - FileRoutesByPath['/(gen)/search/search19']['path'], - FileRoutesByPath['/(gen)/search/search19']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search2' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search2']['parentRoute'], - FileRoutesByPath['/(gen)/search/search2']['id'], - FileRoutesByPath['/(gen)/search/search2']['path'], - FileRoutesByPath['/(gen)/search/search2']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search20' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search20']['parentRoute'], - FileRoutesByPath['/(gen)/search/search20']['id'], - FileRoutesByPath['/(gen)/search/search20']['path'], - FileRoutesByPath['/(gen)/search/search20']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search21' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search21']['parentRoute'], - FileRoutesByPath['/(gen)/search/search21']['id'], - FileRoutesByPath['/(gen)/search/search21']['path'], - FileRoutesByPath['/(gen)/search/search21']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search22' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search22']['parentRoute'], - FileRoutesByPath['/(gen)/search/search22']['id'], - FileRoutesByPath['/(gen)/search/search22']['path'], - FileRoutesByPath['/(gen)/search/search22']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search23' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search23']['parentRoute'], - FileRoutesByPath['/(gen)/search/search23']['id'], - FileRoutesByPath['/(gen)/search/search23']['path'], - FileRoutesByPath['/(gen)/search/search23']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search24' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search24']['parentRoute'], - FileRoutesByPath['/(gen)/search/search24']['id'], - FileRoutesByPath['/(gen)/search/search24']['path'], - FileRoutesByPath['/(gen)/search/search24']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search25' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search25']['parentRoute'], - FileRoutesByPath['/(gen)/search/search25']['id'], - FileRoutesByPath['/(gen)/search/search25']['path'], - FileRoutesByPath['/(gen)/search/search25']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search26' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search26']['parentRoute'], - FileRoutesByPath['/(gen)/search/search26']['id'], - FileRoutesByPath['/(gen)/search/search26']['path'], - FileRoutesByPath['/(gen)/search/search26']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search27' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search27']['parentRoute'], - FileRoutesByPath['/(gen)/search/search27']['id'], - FileRoutesByPath['/(gen)/search/search27']['path'], - FileRoutesByPath['/(gen)/search/search27']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search28' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search28']['parentRoute'], - FileRoutesByPath['/(gen)/search/search28']['id'], - FileRoutesByPath['/(gen)/search/search28']['path'], - FileRoutesByPath['/(gen)/search/search28']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search29' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search29']['parentRoute'], - FileRoutesByPath['/(gen)/search/search29']['id'], - FileRoutesByPath['/(gen)/search/search29']['path'], - FileRoutesByPath['/(gen)/search/search29']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search3' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search3']['parentRoute'], - FileRoutesByPath['/(gen)/search/search3']['id'], - FileRoutesByPath['/(gen)/search/search3']['path'], - FileRoutesByPath['/(gen)/search/search3']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search30' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search30']['parentRoute'], - FileRoutesByPath['/(gen)/search/search30']['id'], - FileRoutesByPath['/(gen)/search/search30']['path'], - FileRoutesByPath['/(gen)/search/search30']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search31' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search31']['parentRoute'], - FileRoutesByPath['/(gen)/search/search31']['id'], - FileRoutesByPath['/(gen)/search/search31']['path'], - FileRoutesByPath['/(gen)/search/search31']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search32' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search32']['parentRoute'], - FileRoutesByPath['/(gen)/search/search32']['id'], - FileRoutesByPath['/(gen)/search/search32']['path'], - FileRoutesByPath['/(gen)/search/search32']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search33' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search33']['parentRoute'], - FileRoutesByPath['/(gen)/search/search33']['id'], - FileRoutesByPath['/(gen)/search/search33']['path'], - FileRoutesByPath['/(gen)/search/search33']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search34' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search34']['parentRoute'], - FileRoutesByPath['/(gen)/search/search34']['id'], - FileRoutesByPath['/(gen)/search/search34']['path'], - FileRoutesByPath['/(gen)/search/search34']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search35' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search35']['parentRoute'], - FileRoutesByPath['/(gen)/search/search35']['id'], - FileRoutesByPath['/(gen)/search/search35']['path'], - FileRoutesByPath['/(gen)/search/search35']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search36' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search36']['parentRoute'], - FileRoutesByPath['/(gen)/search/search36']['id'], - FileRoutesByPath['/(gen)/search/search36']['path'], - FileRoutesByPath['/(gen)/search/search36']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search37' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search37']['parentRoute'], - FileRoutesByPath['/(gen)/search/search37']['id'], - FileRoutesByPath['/(gen)/search/search37']['path'], - FileRoutesByPath['/(gen)/search/search37']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search38' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search38']['parentRoute'], - FileRoutesByPath['/(gen)/search/search38']['id'], - FileRoutesByPath['/(gen)/search/search38']['path'], - FileRoutesByPath['/(gen)/search/search38']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search39' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search39']['parentRoute'], - FileRoutesByPath['/(gen)/search/search39']['id'], - FileRoutesByPath['/(gen)/search/search39']['path'], - FileRoutesByPath['/(gen)/search/search39']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search4' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search4']['parentRoute'], - FileRoutesByPath['/(gen)/search/search4']['id'], - FileRoutesByPath['/(gen)/search/search4']['path'], - FileRoutesByPath['/(gen)/search/search4']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search40' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search40']['parentRoute'], - FileRoutesByPath['/(gen)/search/search40']['id'], - FileRoutesByPath['/(gen)/search/search40']['path'], - FileRoutesByPath['/(gen)/search/search40']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search41' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search41']['parentRoute'], - FileRoutesByPath['/(gen)/search/search41']['id'], - FileRoutesByPath['/(gen)/search/search41']['path'], - FileRoutesByPath['/(gen)/search/search41']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search42' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search42']['parentRoute'], - FileRoutesByPath['/(gen)/search/search42']['id'], - FileRoutesByPath['/(gen)/search/search42']['path'], - FileRoutesByPath['/(gen)/search/search42']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search43' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search43']['parentRoute'], - FileRoutesByPath['/(gen)/search/search43']['id'], - FileRoutesByPath['/(gen)/search/search43']['path'], - FileRoutesByPath['/(gen)/search/search43']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search44' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search44']['parentRoute'], - FileRoutesByPath['/(gen)/search/search44']['id'], - FileRoutesByPath['/(gen)/search/search44']['path'], - FileRoutesByPath['/(gen)/search/search44']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search45' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search45']['parentRoute'], - FileRoutesByPath['/(gen)/search/search45']['id'], - FileRoutesByPath['/(gen)/search/search45']['path'], - FileRoutesByPath['/(gen)/search/search45']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search46' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search46']['parentRoute'], - FileRoutesByPath['/(gen)/search/search46']['id'], - FileRoutesByPath['/(gen)/search/search46']['path'], - FileRoutesByPath['/(gen)/search/search46']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search47' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search47']['parentRoute'], - FileRoutesByPath['/(gen)/search/search47']['id'], - FileRoutesByPath['/(gen)/search/search47']['path'], - FileRoutesByPath['/(gen)/search/search47']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search48' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search48']['parentRoute'], - FileRoutesByPath['/(gen)/search/search48']['id'], - FileRoutesByPath['/(gen)/search/search48']['path'], - FileRoutesByPath['/(gen)/search/search48']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search49' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search49']['parentRoute'], - FileRoutesByPath['/(gen)/search/search49']['id'], - FileRoutesByPath['/(gen)/search/search49']['path'], - FileRoutesByPath['/(gen)/search/search49']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search5' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search5']['parentRoute'], - FileRoutesByPath['/(gen)/search/search5']['id'], - FileRoutesByPath['/(gen)/search/search5']['path'], - FileRoutesByPath['/(gen)/search/search5']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search50' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search50']['parentRoute'], - FileRoutesByPath['/(gen)/search/search50']['id'], - FileRoutesByPath['/(gen)/search/search50']['path'], - FileRoutesByPath['/(gen)/search/search50']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search51' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search51']['parentRoute'], - FileRoutesByPath['/(gen)/search/search51']['id'], - FileRoutesByPath['/(gen)/search/search51']['path'], - FileRoutesByPath['/(gen)/search/search51']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search52' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search52']['parentRoute'], - FileRoutesByPath['/(gen)/search/search52']['id'], - FileRoutesByPath['/(gen)/search/search52']['path'], - FileRoutesByPath['/(gen)/search/search52']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search53' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search53']['parentRoute'], - FileRoutesByPath['/(gen)/search/search53']['id'], - FileRoutesByPath['/(gen)/search/search53']['path'], - FileRoutesByPath['/(gen)/search/search53']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search54' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search54']['parentRoute'], - FileRoutesByPath['/(gen)/search/search54']['id'], - FileRoutesByPath['/(gen)/search/search54']['path'], - FileRoutesByPath['/(gen)/search/search54']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search55' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search55']['parentRoute'], - FileRoutesByPath['/(gen)/search/search55']['id'], - FileRoutesByPath['/(gen)/search/search55']['path'], - FileRoutesByPath['/(gen)/search/search55']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search56' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search56']['parentRoute'], - FileRoutesByPath['/(gen)/search/search56']['id'], - FileRoutesByPath['/(gen)/search/search56']['path'], - FileRoutesByPath['/(gen)/search/search56']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search57' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search57']['parentRoute'], - FileRoutesByPath['/(gen)/search/search57']['id'], - FileRoutesByPath['/(gen)/search/search57']['path'], - FileRoutesByPath['/(gen)/search/search57']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search58' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search58']['parentRoute'], - FileRoutesByPath['/(gen)/search/search58']['id'], - FileRoutesByPath['/(gen)/search/search58']['path'], - FileRoutesByPath['/(gen)/search/search58']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search59' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search59']['parentRoute'], - FileRoutesByPath['/(gen)/search/search59']['id'], - FileRoutesByPath['/(gen)/search/search59']['path'], - FileRoutesByPath['/(gen)/search/search59']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search6' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search6']['parentRoute'], - FileRoutesByPath['/(gen)/search/search6']['id'], - FileRoutesByPath['/(gen)/search/search6']['path'], - FileRoutesByPath['/(gen)/search/search6']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search60' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search60']['parentRoute'], - FileRoutesByPath['/(gen)/search/search60']['id'], - FileRoutesByPath['/(gen)/search/search60']['path'], - FileRoutesByPath['/(gen)/search/search60']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search61' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search61']['parentRoute'], - FileRoutesByPath['/(gen)/search/search61']['id'], - FileRoutesByPath['/(gen)/search/search61']['path'], - FileRoutesByPath['/(gen)/search/search61']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search62' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search62']['parentRoute'], - FileRoutesByPath['/(gen)/search/search62']['id'], - FileRoutesByPath['/(gen)/search/search62']['path'], - FileRoutesByPath['/(gen)/search/search62']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search63' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search63']['parentRoute'], - FileRoutesByPath['/(gen)/search/search63']['id'], - FileRoutesByPath['/(gen)/search/search63']['path'], - FileRoutesByPath['/(gen)/search/search63']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search64' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search64']['parentRoute'], - FileRoutesByPath['/(gen)/search/search64']['id'], - FileRoutesByPath['/(gen)/search/search64']['path'], - FileRoutesByPath['/(gen)/search/search64']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search65' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search65']['parentRoute'], - FileRoutesByPath['/(gen)/search/search65']['id'], - FileRoutesByPath['/(gen)/search/search65']['path'], - FileRoutesByPath['/(gen)/search/search65']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search66' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search66']['parentRoute'], - FileRoutesByPath['/(gen)/search/search66']['id'], - FileRoutesByPath['/(gen)/search/search66']['path'], - FileRoutesByPath['/(gen)/search/search66']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search67' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search67']['parentRoute'], - FileRoutesByPath['/(gen)/search/search67']['id'], - FileRoutesByPath['/(gen)/search/search67']['path'], - FileRoutesByPath['/(gen)/search/search67']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search68' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search68']['parentRoute'], - FileRoutesByPath['/(gen)/search/search68']['id'], - FileRoutesByPath['/(gen)/search/search68']['path'], - FileRoutesByPath['/(gen)/search/search68']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search69' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search69']['parentRoute'], - FileRoutesByPath['/(gen)/search/search69']['id'], - FileRoutesByPath['/(gen)/search/search69']['path'], - FileRoutesByPath['/(gen)/search/search69']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search7' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search7']['parentRoute'], - FileRoutesByPath['/(gen)/search/search7']['id'], - FileRoutesByPath['/(gen)/search/search7']['path'], - FileRoutesByPath['/(gen)/search/search7']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search70' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search70']['parentRoute'], - FileRoutesByPath['/(gen)/search/search70']['id'], - FileRoutesByPath['/(gen)/search/search70']['path'], - FileRoutesByPath['/(gen)/search/search70']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search71' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search71']['parentRoute'], - FileRoutesByPath['/(gen)/search/search71']['id'], - FileRoutesByPath['/(gen)/search/search71']['path'], - FileRoutesByPath['/(gen)/search/search71']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search72' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search72']['parentRoute'], - FileRoutesByPath['/(gen)/search/search72']['id'], - FileRoutesByPath['/(gen)/search/search72']['path'], - FileRoutesByPath['/(gen)/search/search72']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search73' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search73']['parentRoute'], - FileRoutesByPath['/(gen)/search/search73']['id'], - FileRoutesByPath['/(gen)/search/search73']['path'], - FileRoutesByPath['/(gen)/search/search73']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search74' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search74']['parentRoute'], - FileRoutesByPath['/(gen)/search/search74']['id'], - FileRoutesByPath['/(gen)/search/search74']['path'], - FileRoutesByPath['/(gen)/search/search74']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search75' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search75']['parentRoute'], - FileRoutesByPath['/(gen)/search/search75']['id'], - FileRoutesByPath['/(gen)/search/search75']['path'], - FileRoutesByPath['/(gen)/search/search75']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search76' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search76']['parentRoute'], - FileRoutesByPath['/(gen)/search/search76']['id'], - FileRoutesByPath['/(gen)/search/search76']['path'], - FileRoutesByPath['/(gen)/search/search76']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search77' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search77']['parentRoute'], - FileRoutesByPath['/(gen)/search/search77']['id'], - FileRoutesByPath['/(gen)/search/search77']['path'], - FileRoutesByPath['/(gen)/search/search77']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search78' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search78']['parentRoute'], - FileRoutesByPath['/(gen)/search/search78']['id'], - FileRoutesByPath['/(gen)/search/search78']['path'], - FileRoutesByPath['/(gen)/search/search78']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search79' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search79']['parentRoute'], - FileRoutesByPath['/(gen)/search/search79']['id'], - FileRoutesByPath['/(gen)/search/search79']['path'], - FileRoutesByPath['/(gen)/search/search79']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search8' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search8']['parentRoute'], - FileRoutesByPath['/(gen)/search/search8']['id'], - FileRoutesByPath['/(gen)/search/search8']['path'], - FileRoutesByPath['/(gen)/search/search8']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search80' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search80']['parentRoute'], - FileRoutesByPath['/(gen)/search/search80']['id'], - FileRoutesByPath['/(gen)/search/search80']['path'], - FileRoutesByPath['/(gen)/search/search80']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search81' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search81']['parentRoute'], - FileRoutesByPath['/(gen)/search/search81']['id'], - FileRoutesByPath['/(gen)/search/search81']['path'], - FileRoutesByPath['/(gen)/search/search81']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search82' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search82']['parentRoute'], - FileRoutesByPath['/(gen)/search/search82']['id'], - FileRoutesByPath['/(gen)/search/search82']['path'], - FileRoutesByPath['/(gen)/search/search82']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search83' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search83']['parentRoute'], - FileRoutesByPath['/(gen)/search/search83']['id'], - FileRoutesByPath['/(gen)/search/search83']['path'], - FileRoutesByPath['/(gen)/search/search83']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search84' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search84']['parentRoute'], - FileRoutesByPath['/(gen)/search/search84']['id'], - FileRoutesByPath['/(gen)/search/search84']['path'], - FileRoutesByPath['/(gen)/search/search84']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search85' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search85']['parentRoute'], - FileRoutesByPath['/(gen)/search/search85']['id'], - FileRoutesByPath['/(gen)/search/search85']['path'], - FileRoutesByPath['/(gen)/search/search85']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search86' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search86']['parentRoute'], - FileRoutesByPath['/(gen)/search/search86']['id'], - FileRoutesByPath['/(gen)/search/search86']['path'], - FileRoutesByPath['/(gen)/search/search86']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search87' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search87']['parentRoute'], - FileRoutesByPath['/(gen)/search/search87']['id'], - FileRoutesByPath['/(gen)/search/search87']['path'], - FileRoutesByPath['/(gen)/search/search87']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search88' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search88']['parentRoute'], - FileRoutesByPath['/(gen)/search/search88']['id'], - FileRoutesByPath['/(gen)/search/search88']['path'], - FileRoutesByPath['/(gen)/search/search88']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search89' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search89']['parentRoute'], - FileRoutesByPath['/(gen)/search/search89']['id'], - FileRoutesByPath['/(gen)/search/search89']['path'], - FileRoutesByPath['/(gen)/search/search89']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search9' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search9']['parentRoute'], - FileRoutesByPath['/(gen)/search/search9']['id'], - FileRoutesByPath['/(gen)/search/search9']['path'], - FileRoutesByPath['/(gen)/search/search9']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search90' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search90']['parentRoute'], - FileRoutesByPath['/(gen)/search/search90']['id'], - FileRoutesByPath['/(gen)/search/search90']['path'], - FileRoutesByPath['/(gen)/search/search90']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search91' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search91']['parentRoute'], - FileRoutesByPath['/(gen)/search/search91']['id'], - FileRoutesByPath['/(gen)/search/search91']['path'], - FileRoutesByPath['/(gen)/search/search91']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search92' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search92']['parentRoute'], - FileRoutesByPath['/(gen)/search/search92']['id'], - FileRoutesByPath['/(gen)/search/search92']['path'], - FileRoutesByPath['/(gen)/search/search92']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search93' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search93']['parentRoute'], - FileRoutesByPath['/(gen)/search/search93']['id'], - FileRoutesByPath['/(gen)/search/search93']['path'], - FileRoutesByPath['/(gen)/search/search93']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search94' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search94']['parentRoute'], - FileRoutesByPath['/(gen)/search/search94']['id'], - FileRoutesByPath['/(gen)/search/search94']['path'], - FileRoutesByPath['/(gen)/search/search94']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search95' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search95']['parentRoute'], - FileRoutesByPath['/(gen)/search/search95']['id'], - FileRoutesByPath['/(gen)/search/search95']['path'], - FileRoutesByPath['/(gen)/search/search95']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search96' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search96']['parentRoute'], - FileRoutesByPath['/(gen)/search/search96']['id'], - FileRoutesByPath['/(gen)/search/search96']['path'], - FileRoutesByPath['/(gen)/search/search96']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search97' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search97']['parentRoute'], - FileRoutesByPath['/(gen)/search/search97']['id'], - FileRoutesByPath['/(gen)/search/search97']['path'], - FileRoutesByPath['/(gen)/search/search97']['fullPath'], - unknown - > -} -declare module './../../src/routes/(gen)/search/search98' { - const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search98']['parentRoute'], - FileRoutesByPath['/(gen)/search/search98']['id'], - FileRoutesByPath['/(gen)/search/search98']['path'], - FileRoutesByPath['/(gen)/search/search98']['fullPath'], - unknown - > +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/search/searchPlaceholder': { + id: '/search/searchPlaceholder' + path: '/search/searchPlaceholder' + fullPath: '/search/searchPlaceholder' + preLoaderRoute: typeof SearchSearchPlaceholderRouteImport + parentRoute: typeof rootRoute + } + } } -declare module './../../src/routes/(gen)/search/search99' { + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/search/searchPlaceholder' { const createServerFileRoute: CreateServerFileRoute< - FileRoutesByPath['/(gen)/search/search99']['parentRoute'], - FileRoutesByPath['/(gen)/search/search99']['id'], - FileRoutesByPath['/(gen)/search/search99']['path'], - FileRoutesByPath['/(gen)/search/search99']['fullPath'], + FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], + FileRoutesByPath['/search/searchPlaceholder']['id'], + FileRoutesByPath['/search/searchPlaceholder']['path'], + FileRoutesByPath['/search/searchPlaceholder']['fullPath'], unknown > } @@ -2361,836 +61,32 @@ declare module './../../src/routes/(gen)/search/search99' { export interface FileRoutesByFullPath { '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/search/search0': typeof genSearchSearch0Route - '/search/search1': typeof genSearchSearch1Route - '/search/search10': typeof genSearchSearch10Route - '/search/search11': typeof genSearchSearch11Route - '/search/search12': typeof genSearchSearch12Route - '/search/search13': typeof genSearchSearch13Route - '/search/search14': typeof genSearchSearch14Route - '/search/search15': typeof genSearchSearch15Route - '/search/search16': typeof genSearchSearch16Route - '/search/search17': typeof genSearchSearch17Route - '/search/search18': typeof genSearchSearch18Route - '/search/search19': typeof genSearchSearch19Route - '/search/search2': typeof genSearchSearch2Route - '/search/search20': typeof genSearchSearch20Route - '/search/search21': typeof genSearchSearch21Route - '/search/search22': typeof genSearchSearch22Route - '/search/search23': typeof genSearchSearch23Route - '/search/search24': typeof genSearchSearch24Route - '/search/search25': typeof genSearchSearch25Route - '/search/search26': typeof genSearchSearch26Route - '/search/search27': typeof genSearchSearch27Route - '/search/search28': typeof genSearchSearch28Route - '/search/search29': typeof genSearchSearch29Route - '/search/search3': typeof genSearchSearch3Route - '/search/search30': typeof genSearchSearch30Route - '/search/search31': typeof genSearchSearch31Route - '/search/search32': typeof genSearchSearch32Route - '/search/search33': typeof genSearchSearch33Route - '/search/search34': typeof genSearchSearch34Route - '/search/search35': typeof genSearchSearch35Route - '/search/search36': typeof genSearchSearch36Route - '/search/search37': typeof genSearchSearch37Route - '/search/search38': typeof genSearchSearch38Route - '/search/search39': typeof genSearchSearch39Route - '/search/search4': typeof genSearchSearch4Route - '/search/search40': typeof genSearchSearch40Route - '/search/search41': typeof genSearchSearch41Route - '/search/search42': typeof genSearchSearch42Route - '/search/search43': typeof genSearchSearch43Route - '/search/search44': typeof genSearchSearch44Route - '/search/search45': typeof genSearchSearch45Route - '/search/search46': typeof genSearchSearch46Route - '/search/search47': typeof genSearchSearch47Route - '/search/search48': typeof genSearchSearch48Route - '/search/search49': typeof genSearchSearch49Route - '/search/search5': typeof genSearchSearch5Route - '/search/search50': typeof genSearchSearch50Route - '/search/search51': typeof genSearchSearch51Route - '/search/search52': typeof genSearchSearch52Route - '/search/search53': typeof genSearchSearch53Route - '/search/search54': typeof genSearchSearch54Route - '/search/search55': typeof genSearchSearch55Route - '/search/search56': typeof genSearchSearch56Route - '/search/search57': typeof genSearchSearch57Route - '/search/search58': typeof genSearchSearch58Route - '/search/search59': typeof genSearchSearch59Route - '/search/search6': typeof genSearchSearch6Route - '/search/search60': typeof genSearchSearch60Route - '/search/search61': typeof genSearchSearch61Route - '/search/search62': typeof genSearchSearch62Route - '/search/search63': typeof genSearchSearch63Route - '/search/search64': typeof genSearchSearch64Route - '/search/search65': typeof genSearchSearch65Route - '/search/search66': typeof genSearchSearch66Route - '/search/search67': typeof genSearchSearch67Route - '/search/search68': typeof genSearchSearch68Route - '/search/search69': typeof genSearchSearch69Route - '/search/search7': typeof genSearchSearch7Route - '/search/search70': typeof genSearchSearch70Route - '/search/search71': typeof genSearchSearch71Route - '/search/search72': typeof genSearchSearch72Route - '/search/search73': typeof genSearchSearch73Route - '/search/search74': typeof genSearchSearch74Route - '/search/search75': typeof genSearchSearch75Route - '/search/search76': typeof genSearchSearch76Route - '/search/search77': typeof genSearchSearch77Route - '/search/search78': typeof genSearchSearch78Route - '/search/search79': typeof genSearchSearch79Route - '/search/search8': typeof genSearchSearch8Route - '/search/search80': typeof genSearchSearch80Route - '/search/search81': typeof genSearchSearch81Route - '/search/search82': typeof genSearchSearch82Route - '/search/search83': typeof genSearchSearch83Route - '/search/search84': typeof genSearchSearch84Route - '/search/search85': typeof genSearchSearch85Route - '/search/search86': typeof genSearchSearch86Route - '/search/search87': typeof genSearchSearch87Route - '/search/search88': typeof genSearchSearch88Route - '/search/search89': typeof genSearchSearch89Route - '/search/search9': typeof genSearchSearch9Route - '/search/search90': typeof genSearchSearch90Route - '/search/search91': typeof genSearchSearch91Route - '/search/search92': typeof genSearchSearch92Route - '/search/search93': typeof genSearchSearch93Route - '/search/search94': typeof genSearchSearch94Route - '/search/search95': typeof genSearchSearch95Route - '/search/search96': typeof genSearchSearch96Route - '/search/search97': typeof genSearchSearch97Route - '/search/search98': typeof genSearchSearch98Route - '/search/search99': typeof genSearchSearch99Route } export interface FileRoutesByTo { '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/search/search0': typeof genSearchSearch0Route - '/search/search1': typeof genSearchSearch1Route - '/search/search10': typeof genSearchSearch10Route - '/search/search11': typeof genSearchSearch11Route - '/search/search12': typeof genSearchSearch12Route - '/search/search13': typeof genSearchSearch13Route - '/search/search14': typeof genSearchSearch14Route - '/search/search15': typeof genSearchSearch15Route - '/search/search16': typeof genSearchSearch16Route - '/search/search17': typeof genSearchSearch17Route - '/search/search18': typeof genSearchSearch18Route - '/search/search19': typeof genSearchSearch19Route - '/search/search2': typeof genSearchSearch2Route - '/search/search20': typeof genSearchSearch20Route - '/search/search21': typeof genSearchSearch21Route - '/search/search22': typeof genSearchSearch22Route - '/search/search23': typeof genSearchSearch23Route - '/search/search24': typeof genSearchSearch24Route - '/search/search25': typeof genSearchSearch25Route - '/search/search26': typeof genSearchSearch26Route - '/search/search27': typeof genSearchSearch27Route - '/search/search28': typeof genSearchSearch28Route - '/search/search29': typeof genSearchSearch29Route - '/search/search3': typeof genSearchSearch3Route - '/search/search30': typeof genSearchSearch30Route - '/search/search31': typeof genSearchSearch31Route - '/search/search32': typeof genSearchSearch32Route - '/search/search33': typeof genSearchSearch33Route - '/search/search34': typeof genSearchSearch34Route - '/search/search35': typeof genSearchSearch35Route - '/search/search36': typeof genSearchSearch36Route - '/search/search37': typeof genSearchSearch37Route - '/search/search38': typeof genSearchSearch38Route - '/search/search39': typeof genSearchSearch39Route - '/search/search4': typeof genSearchSearch4Route - '/search/search40': typeof genSearchSearch40Route - '/search/search41': typeof genSearchSearch41Route - '/search/search42': typeof genSearchSearch42Route - '/search/search43': typeof genSearchSearch43Route - '/search/search44': typeof genSearchSearch44Route - '/search/search45': typeof genSearchSearch45Route - '/search/search46': typeof genSearchSearch46Route - '/search/search47': typeof genSearchSearch47Route - '/search/search48': typeof genSearchSearch48Route - '/search/search49': typeof genSearchSearch49Route - '/search/search5': typeof genSearchSearch5Route - '/search/search50': typeof genSearchSearch50Route - '/search/search51': typeof genSearchSearch51Route - '/search/search52': typeof genSearchSearch52Route - '/search/search53': typeof genSearchSearch53Route - '/search/search54': typeof genSearchSearch54Route - '/search/search55': typeof genSearchSearch55Route - '/search/search56': typeof genSearchSearch56Route - '/search/search57': typeof genSearchSearch57Route - '/search/search58': typeof genSearchSearch58Route - '/search/search59': typeof genSearchSearch59Route - '/search/search6': typeof genSearchSearch6Route - '/search/search60': typeof genSearchSearch60Route - '/search/search61': typeof genSearchSearch61Route - '/search/search62': typeof genSearchSearch62Route - '/search/search63': typeof genSearchSearch63Route - '/search/search64': typeof genSearchSearch64Route - '/search/search65': typeof genSearchSearch65Route - '/search/search66': typeof genSearchSearch66Route - '/search/search67': typeof genSearchSearch67Route - '/search/search68': typeof genSearchSearch68Route - '/search/search69': typeof genSearchSearch69Route - '/search/search7': typeof genSearchSearch7Route - '/search/search70': typeof genSearchSearch70Route - '/search/search71': typeof genSearchSearch71Route - '/search/search72': typeof genSearchSearch72Route - '/search/search73': typeof genSearchSearch73Route - '/search/search74': typeof genSearchSearch74Route - '/search/search75': typeof genSearchSearch75Route - '/search/search76': typeof genSearchSearch76Route - '/search/search77': typeof genSearchSearch77Route - '/search/search78': typeof genSearchSearch78Route - '/search/search79': typeof genSearchSearch79Route - '/search/search8': typeof genSearchSearch8Route - '/search/search80': typeof genSearchSearch80Route - '/search/search81': typeof genSearchSearch81Route - '/search/search82': typeof genSearchSearch82Route - '/search/search83': typeof genSearchSearch83Route - '/search/search84': typeof genSearchSearch84Route - '/search/search85': typeof genSearchSearch85Route - '/search/search86': typeof genSearchSearch86Route - '/search/search87': typeof genSearchSearch87Route - '/search/search88': typeof genSearchSearch88Route - '/search/search89': typeof genSearchSearch89Route - '/search/search9': typeof genSearchSearch9Route - '/search/search90': typeof genSearchSearch90Route - '/search/search91': typeof genSearchSearch91Route - '/search/search92': typeof genSearchSearch92Route - '/search/search93': typeof genSearchSearch93Route - '/search/search94': typeof genSearchSearch94Route - '/search/search95': typeof genSearchSearch95Route - '/search/search96': typeof genSearchSearch96Route - '/search/search97': typeof genSearchSearch97Route - '/search/search98': typeof genSearchSearch98Route - '/search/search99': typeof genSearchSearch99Route } export interface FileRoutesById { __root__: typeof rootRoute '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/(gen)/search/search0': typeof genSearchSearch0Route - '/(gen)/search/search1': typeof genSearchSearch1Route - '/(gen)/search/search10': typeof genSearchSearch10Route - '/(gen)/search/search11': typeof genSearchSearch11Route - '/(gen)/search/search12': typeof genSearchSearch12Route - '/(gen)/search/search13': typeof genSearchSearch13Route - '/(gen)/search/search14': typeof genSearchSearch14Route - '/(gen)/search/search15': typeof genSearchSearch15Route - '/(gen)/search/search16': typeof genSearchSearch16Route - '/(gen)/search/search17': typeof genSearchSearch17Route - '/(gen)/search/search18': typeof genSearchSearch18Route - '/(gen)/search/search19': typeof genSearchSearch19Route - '/(gen)/search/search2': typeof genSearchSearch2Route - '/(gen)/search/search20': typeof genSearchSearch20Route - '/(gen)/search/search21': typeof genSearchSearch21Route - '/(gen)/search/search22': typeof genSearchSearch22Route - '/(gen)/search/search23': typeof genSearchSearch23Route - '/(gen)/search/search24': typeof genSearchSearch24Route - '/(gen)/search/search25': typeof genSearchSearch25Route - '/(gen)/search/search26': typeof genSearchSearch26Route - '/(gen)/search/search27': typeof genSearchSearch27Route - '/(gen)/search/search28': typeof genSearchSearch28Route - '/(gen)/search/search29': typeof genSearchSearch29Route - '/(gen)/search/search3': typeof genSearchSearch3Route - '/(gen)/search/search30': typeof genSearchSearch30Route - '/(gen)/search/search31': typeof genSearchSearch31Route - '/(gen)/search/search32': typeof genSearchSearch32Route - '/(gen)/search/search33': typeof genSearchSearch33Route - '/(gen)/search/search34': typeof genSearchSearch34Route - '/(gen)/search/search35': typeof genSearchSearch35Route - '/(gen)/search/search36': typeof genSearchSearch36Route - '/(gen)/search/search37': typeof genSearchSearch37Route - '/(gen)/search/search38': typeof genSearchSearch38Route - '/(gen)/search/search39': typeof genSearchSearch39Route - '/(gen)/search/search4': typeof genSearchSearch4Route - '/(gen)/search/search40': typeof genSearchSearch40Route - '/(gen)/search/search41': typeof genSearchSearch41Route - '/(gen)/search/search42': typeof genSearchSearch42Route - '/(gen)/search/search43': typeof genSearchSearch43Route - '/(gen)/search/search44': typeof genSearchSearch44Route - '/(gen)/search/search45': typeof genSearchSearch45Route - '/(gen)/search/search46': typeof genSearchSearch46Route - '/(gen)/search/search47': typeof genSearchSearch47Route - '/(gen)/search/search48': typeof genSearchSearch48Route - '/(gen)/search/search49': typeof genSearchSearch49Route - '/(gen)/search/search5': typeof genSearchSearch5Route - '/(gen)/search/search50': typeof genSearchSearch50Route - '/(gen)/search/search51': typeof genSearchSearch51Route - '/(gen)/search/search52': typeof genSearchSearch52Route - '/(gen)/search/search53': typeof genSearchSearch53Route - '/(gen)/search/search54': typeof genSearchSearch54Route - '/(gen)/search/search55': typeof genSearchSearch55Route - '/(gen)/search/search56': typeof genSearchSearch56Route - '/(gen)/search/search57': typeof genSearchSearch57Route - '/(gen)/search/search58': typeof genSearchSearch58Route - '/(gen)/search/search59': typeof genSearchSearch59Route - '/(gen)/search/search6': typeof genSearchSearch6Route - '/(gen)/search/search60': typeof genSearchSearch60Route - '/(gen)/search/search61': typeof genSearchSearch61Route - '/(gen)/search/search62': typeof genSearchSearch62Route - '/(gen)/search/search63': typeof genSearchSearch63Route - '/(gen)/search/search64': typeof genSearchSearch64Route - '/(gen)/search/search65': typeof genSearchSearch65Route - '/(gen)/search/search66': typeof genSearchSearch66Route - '/(gen)/search/search67': typeof genSearchSearch67Route - '/(gen)/search/search68': typeof genSearchSearch68Route - '/(gen)/search/search69': typeof genSearchSearch69Route - '/(gen)/search/search7': typeof genSearchSearch7Route - '/(gen)/search/search70': typeof genSearchSearch70Route - '/(gen)/search/search71': typeof genSearchSearch71Route - '/(gen)/search/search72': typeof genSearchSearch72Route - '/(gen)/search/search73': typeof genSearchSearch73Route - '/(gen)/search/search74': typeof genSearchSearch74Route - '/(gen)/search/search75': typeof genSearchSearch75Route - '/(gen)/search/search76': typeof genSearchSearch76Route - '/(gen)/search/search77': typeof genSearchSearch77Route - '/(gen)/search/search78': typeof genSearchSearch78Route - '/(gen)/search/search79': typeof genSearchSearch79Route - '/(gen)/search/search8': typeof genSearchSearch8Route - '/(gen)/search/search80': typeof genSearchSearch80Route - '/(gen)/search/search81': typeof genSearchSearch81Route - '/(gen)/search/search82': typeof genSearchSearch82Route - '/(gen)/search/search83': typeof genSearchSearch83Route - '/(gen)/search/search84': typeof genSearchSearch84Route - '/(gen)/search/search85': typeof genSearchSearch85Route - '/(gen)/search/search86': typeof genSearchSearch86Route - '/(gen)/search/search87': typeof genSearchSearch87Route - '/(gen)/search/search88': typeof genSearchSearch88Route - '/(gen)/search/search89': typeof genSearchSearch89Route - '/(gen)/search/search9': typeof genSearchSearch9Route - '/(gen)/search/search90': typeof genSearchSearch90Route - '/(gen)/search/search91': typeof genSearchSearch91Route - '/(gen)/search/search92': typeof genSearchSearch92Route - '/(gen)/search/search93': typeof genSearchSearch93Route - '/(gen)/search/search94': typeof genSearchSearch94Route - '/(gen)/search/search95': typeof genSearchSearch95Route - '/(gen)/search/search96': typeof genSearchSearch96Route - '/(gen)/search/search97': typeof genSearchSearch97Route - '/(gen)/search/search98': typeof genSearchSearch98Route - '/(gen)/search/search99': typeof genSearchSearch99Route } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: - | '/search/searchPlaceholder' - | '/search/search0' - | '/search/search1' - | '/search/search10' - | '/search/search11' - | '/search/search12' - | '/search/search13' - | '/search/search14' - | '/search/search15' - | '/search/search16' - | '/search/search17' - | '/search/search18' - | '/search/search19' - | '/search/search2' - | '/search/search20' - | '/search/search21' - | '/search/search22' - | '/search/search23' - | '/search/search24' - | '/search/search25' - | '/search/search26' - | '/search/search27' - | '/search/search28' - | '/search/search29' - | '/search/search3' - | '/search/search30' - | '/search/search31' - | '/search/search32' - | '/search/search33' - | '/search/search34' - | '/search/search35' - | '/search/search36' - | '/search/search37' - | '/search/search38' - | '/search/search39' - | '/search/search4' - | '/search/search40' - | '/search/search41' - | '/search/search42' - | '/search/search43' - | '/search/search44' - | '/search/search45' - | '/search/search46' - | '/search/search47' - | '/search/search48' - | '/search/search49' - | '/search/search5' - | '/search/search50' - | '/search/search51' - | '/search/search52' - | '/search/search53' - | '/search/search54' - | '/search/search55' - | '/search/search56' - | '/search/search57' - | '/search/search58' - | '/search/search59' - | '/search/search6' - | '/search/search60' - | '/search/search61' - | '/search/search62' - | '/search/search63' - | '/search/search64' - | '/search/search65' - | '/search/search66' - | '/search/search67' - | '/search/search68' - | '/search/search69' - | '/search/search7' - | '/search/search70' - | '/search/search71' - | '/search/search72' - | '/search/search73' - | '/search/search74' - | '/search/search75' - | '/search/search76' - | '/search/search77' - | '/search/search78' - | '/search/search79' - | '/search/search8' - | '/search/search80' - | '/search/search81' - | '/search/search82' - | '/search/search83' - | '/search/search84' - | '/search/search85' - | '/search/search86' - | '/search/search87' - | '/search/search88' - | '/search/search89' - | '/search/search9' - | '/search/search90' - | '/search/search91' - | '/search/search92' - | '/search/search93' - | '/search/search94' - | '/search/search95' - | '/search/search96' - | '/search/search97' - | '/search/search98' - | '/search/search99' + fullPaths: '/search/searchPlaceholder' fileRoutesByTo: FileRoutesByTo - to: - | '/search/searchPlaceholder' - | '/search/search0' - | '/search/search1' - | '/search/search10' - | '/search/search11' - | '/search/search12' - | '/search/search13' - | '/search/search14' - | '/search/search15' - | '/search/search16' - | '/search/search17' - | '/search/search18' - | '/search/search19' - | '/search/search2' - | '/search/search20' - | '/search/search21' - | '/search/search22' - | '/search/search23' - | '/search/search24' - | '/search/search25' - | '/search/search26' - | '/search/search27' - | '/search/search28' - | '/search/search29' - | '/search/search3' - | '/search/search30' - | '/search/search31' - | '/search/search32' - | '/search/search33' - | '/search/search34' - | '/search/search35' - | '/search/search36' - | '/search/search37' - | '/search/search38' - | '/search/search39' - | '/search/search4' - | '/search/search40' - | '/search/search41' - | '/search/search42' - | '/search/search43' - | '/search/search44' - | '/search/search45' - | '/search/search46' - | '/search/search47' - | '/search/search48' - | '/search/search49' - | '/search/search5' - | '/search/search50' - | '/search/search51' - | '/search/search52' - | '/search/search53' - | '/search/search54' - | '/search/search55' - | '/search/search56' - | '/search/search57' - | '/search/search58' - | '/search/search59' - | '/search/search6' - | '/search/search60' - | '/search/search61' - | '/search/search62' - | '/search/search63' - | '/search/search64' - | '/search/search65' - | '/search/search66' - | '/search/search67' - | '/search/search68' - | '/search/search69' - | '/search/search7' - | '/search/search70' - | '/search/search71' - | '/search/search72' - | '/search/search73' - | '/search/search74' - | '/search/search75' - | '/search/search76' - | '/search/search77' - | '/search/search78' - | '/search/search79' - | '/search/search8' - | '/search/search80' - | '/search/search81' - | '/search/search82' - | '/search/search83' - | '/search/search84' - | '/search/search85' - | '/search/search86' - | '/search/search87' - | '/search/search88' - | '/search/search89' - | '/search/search9' - | '/search/search90' - | '/search/search91' - | '/search/search92' - | '/search/search93' - | '/search/search94' - | '/search/search95' - | '/search/search96' - | '/search/search97' - | '/search/search98' - | '/search/search99' - id: - | '__root__' - | '/search/searchPlaceholder' - | '/(gen)/search/search0' - | '/(gen)/search/search1' - | '/(gen)/search/search10' - | '/(gen)/search/search11' - | '/(gen)/search/search12' - | '/(gen)/search/search13' - | '/(gen)/search/search14' - | '/(gen)/search/search15' - | '/(gen)/search/search16' - | '/(gen)/search/search17' - | '/(gen)/search/search18' - | '/(gen)/search/search19' - | '/(gen)/search/search2' - | '/(gen)/search/search20' - | '/(gen)/search/search21' - | '/(gen)/search/search22' - | '/(gen)/search/search23' - | '/(gen)/search/search24' - | '/(gen)/search/search25' - | '/(gen)/search/search26' - | '/(gen)/search/search27' - | '/(gen)/search/search28' - | '/(gen)/search/search29' - | '/(gen)/search/search3' - | '/(gen)/search/search30' - | '/(gen)/search/search31' - | '/(gen)/search/search32' - | '/(gen)/search/search33' - | '/(gen)/search/search34' - | '/(gen)/search/search35' - | '/(gen)/search/search36' - | '/(gen)/search/search37' - | '/(gen)/search/search38' - | '/(gen)/search/search39' - | '/(gen)/search/search4' - | '/(gen)/search/search40' - | '/(gen)/search/search41' - | '/(gen)/search/search42' - | '/(gen)/search/search43' - | '/(gen)/search/search44' - | '/(gen)/search/search45' - | '/(gen)/search/search46' - | '/(gen)/search/search47' - | '/(gen)/search/search48' - | '/(gen)/search/search49' - | '/(gen)/search/search5' - | '/(gen)/search/search50' - | '/(gen)/search/search51' - | '/(gen)/search/search52' - | '/(gen)/search/search53' - | '/(gen)/search/search54' - | '/(gen)/search/search55' - | '/(gen)/search/search56' - | '/(gen)/search/search57' - | '/(gen)/search/search58' - | '/(gen)/search/search59' - | '/(gen)/search/search6' - | '/(gen)/search/search60' - | '/(gen)/search/search61' - | '/(gen)/search/search62' - | '/(gen)/search/search63' - | '/(gen)/search/search64' - | '/(gen)/search/search65' - | '/(gen)/search/search66' - | '/(gen)/search/search67' - | '/(gen)/search/search68' - | '/(gen)/search/search69' - | '/(gen)/search/search7' - | '/(gen)/search/search70' - | '/(gen)/search/search71' - | '/(gen)/search/search72' - | '/(gen)/search/search73' - | '/(gen)/search/search74' - | '/(gen)/search/search75' - | '/(gen)/search/search76' - | '/(gen)/search/search77' - | '/(gen)/search/search78' - | '/(gen)/search/search79' - | '/(gen)/search/search8' - | '/(gen)/search/search80' - | '/(gen)/search/search81' - | '/(gen)/search/search82' - | '/(gen)/search/search83' - | '/(gen)/search/search84' - | '/(gen)/search/search85' - | '/(gen)/search/search86' - | '/(gen)/search/search87' - | '/(gen)/search/search88' - | '/(gen)/search/search89' - | '/(gen)/search/search9' - | '/(gen)/search/search90' - | '/(gen)/search/search91' - | '/(gen)/search/search92' - | '/(gen)/search/search93' - | '/(gen)/search/search94' - | '/(gen)/search/search95' - | '/(gen)/search/search96' - | '/(gen)/search/search97' - | '/(gen)/search/search98' - | '/(gen)/search/search99' + to: '/search/searchPlaceholder' + id: '__root__' | '/search/searchPlaceholder' fileRoutesById: FileRoutesById } export interface RootRouteChildren { SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute - genSearchSearch0Route: typeof genSearchSearch0Route - genSearchSearch1Route: typeof genSearchSearch1Route - genSearchSearch10Route: typeof genSearchSearch10Route - genSearchSearch11Route: typeof genSearchSearch11Route - genSearchSearch12Route: typeof genSearchSearch12Route - genSearchSearch13Route: typeof genSearchSearch13Route - genSearchSearch14Route: typeof genSearchSearch14Route - genSearchSearch15Route: typeof genSearchSearch15Route - genSearchSearch16Route: typeof genSearchSearch16Route - genSearchSearch17Route: typeof genSearchSearch17Route - genSearchSearch18Route: typeof genSearchSearch18Route - genSearchSearch19Route: typeof genSearchSearch19Route - genSearchSearch2Route: typeof genSearchSearch2Route - genSearchSearch20Route: typeof genSearchSearch20Route - genSearchSearch21Route: typeof genSearchSearch21Route - genSearchSearch22Route: typeof genSearchSearch22Route - genSearchSearch23Route: typeof genSearchSearch23Route - genSearchSearch24Route: typeof genSearchSearch24Route - genSearchSearch25Route: typeof genSearchSearch25Route - genSearchSearch26Route: typeof genSearchSearch26Route - genSearchSearch27Route: typeof genSearchSearch27Route - genSearchSearch28Route: typeof genSearchSearch28Route - genSearchSearch29Route: typeof genSearchSearch29Route - genSearchSearch3Route: typeof genSearchSearch3Route - genSearchSearch30Route: typeof genSearchSearch30Route - genSearchSearch31Route: typeof genSearchSearch31Route - genSearchSearch32Route: typeof genSearchSearch32Route - genSearchSearch33Route: typeof genSearchSearch33Route - genSearchSearch34Route: typeof genSearchSearch34Route - genSearchSearch35Route: typeof genSearchSearch35Route - genSearchSearch36Route: typeof genSearchSearch36Route - genSearchSearch37Route: typeof genSearchSearch37Route - genSearchSearch38Route: typeof genSearchSearch38Route - genSearchSearch39Route: typeof genSearchSearch39Route - genSearchSearch4Route: typeof genSearchSearch4Route - genSearchSearch40Route: typeof genSearchSearch40Route - genSearchSearch41Route: typeof genSearchSearch41Route - genSearchSearch42Route: typeof genSearchSearch42Route - genSearchSearch43Route: typeof genSearchSearch43Route - genSearchSearch44Route: typeof genSearchSearch44Route - genSearchSearch45Route: typeof genSearchSearch45Route - genSearchSearch46Route: typeof genSearchSearch46Route - genSearchSearch47Route: typeof genSearchSearch47Route - genSearchSearch48Route: typeof genSearchSearch48Route - genSearchSearch49Route: typeof genSearchSearch49Route - genSearchSearch5Route: typeof genSearchSearch5Route - genSearchSearch50Route: typeof genSearchSearch50Route - genSearchSearch51Route: typeof genSearchSearch51Route - genSearchSearch52Route: typeof genSearchSearch52Route - genSearchSearch53Route: typeof genSearchSearch53Route - genSearchSearch54Route: typeof genSearchSearch54Route - genSearchSearch55Route: typeof genSearchSearch55Route - genSearchSearch56Route: typeof genSearchSearch56Route - genSearchSearch57Route: typeof genSearchSearch57Route - genSearchSearch58Route: typeof genSearchSearch58Route - genSearchSearch59Route: typeof genSearchSearch59Route - genSearchSearch6Route: typeof genSearchSearch6Route - genSearchSearch60Route: typeof genSearchSearch60Route - genSearchSearch61Route: typeof genSearchSearch61Route - genSearchSearch62Route: typeof genSearchSearch62Route - genSearchSearch63Route: typeof genSearchSearch63Route - genSearchSearch64Route: typeof genSearchSearch64Route - genSearchSearch65Route: typeof genSearchSearch65Route - genSearchSearch66Route: typeof genSearchSearch66Route - genSearchSearch67Route: typeof genSearchSearch67Route - genSearchSearch68Route: typeof genSearchSearch68Route - genSearchSearch69Route: typeof genSearchSearch69Route - genSearchSearch7Route: typeof genSearchSearch7Route - genSearchSearch70Route: typeof genSearchSearch70Route - genSearchSearch71Route: typeof genSearchSearch71Route - genSearchSearch72Route: typeof genSearchSearch72Route - genSearchSearch73Route: typeof genSearchSearch73Route - genSearchSearch74Route: typeof genSearchSearch74Route - genSearchSearch75Route: typeof genSearchSearch75Route - genSearchSearch76Route: typeof genSearchSearch76Route - genSearchSearch77Route: typeof genSearchSearch77Route - genSearchSearch78Route: typeof genSearchSearch78Route - genSearchSearch79Route: typeof genSearchSearch79Route - genSearchSearch8Route: typeof genSearchSearch8Route - genSearchSearch80Route: typeof genSearchSearch80Route - genSearchSearch81Route: typeof genSearchSearch81Route - genSearchSearch82Route: typeof genSearchSearch82Route - genSearchSearch83Route: typeof genSearchSearch83Route - genSearchSearch84Route: typeof genSearchSearch84Route - genSearchSearch85Route: typeof genSearchSearch85Route - genSearchSearch86Route: typeof genSearchSearch86Route - genSearchSearch87Route: typeof genSearchSearch87Route - genSearchSearch88Route: typeof genSearchSearch88Route - genSearchSearch89Route: typeof genSearchSearch89Route - genSearchSearch9Route: typeof genSearchSearch9Route - genSearchSearch90Route: typeof genSearchSearch90Route - genSearchSearch91Route: typeof genSearchSearch91Route - genSearchSearch92Route: typeof genSearchSearch92Route - genSearchSearch93Route: typeof genSearchSearch93Route - genSearchSearch94Route: typeof genSearchSearch94Route - genSearchSearch95Route: typeof genSearchSearch95Route - genSearchSearch96Route: typeof genSearchSearch96Route - genSearchSearch97Route: typeof genSearchSearch97Route - genSearchSearch98Route: typeof genSearchSearch98Route - genSearchSearch99Route: typeof genSearchSearch99Route } const rootRouteChildren: RootRouteChildren = { SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, - genSearchSearch0Route: genSearchSearch0Route, - genSearchSearch1Route: genSearchSearch1Route, - genSearchSearch10Route: genSearchSearch10Route, - genSearchSearch11Route: genSearchSearch11Route, - genSearchSearch12Route: genSearchSearch12Route, - genSearchSearch13Route: genSearchSearch13Route, - genSearchSearch14Route: genSearchSearch14Route, - genSearchSearch15Route: genSearchSearch15Route, - genSearchSearch16Route: genSearchSearch16Route, - genSearchSearch17Route: genSearchSearch17Route, - genSearchSearch18Route: genSearchSearch18Route, - genSearchSearch19Route: genSearchSearch19Route, - genSearchSearch2Route: genSearchSearch2Route, - genSearchSearch20Route: genSearchSearch20Route, - genSearchSearch21Route: genSearchSearch21Route, - genSearchSearch22Route: genSearchSearch22Route, - genSearchSearch23Route: genSearchSearch23Route, - genSearchSearch24Route: genSearchSearch24Route, - genSearchSearch25Route: genSearchSearch25Route, - genSearchSearch26Route: genSearchSearch26Route, - genSearchSearch27Route: genSearchSearch27Route, - genSearchSearch28Route: genSearchSearch28Route, - genSearchSearch29Route: genSearchSearch29Route, - genSearchSearch3Route: genSearchSearch3Route, - genSearchSearch30Route: genSearchSearch30Route, - genSearchSearch31Route: genSearchSearch31Route, - genSearchSearch32Route: genSearchSearch32Route, - genSearchSearch33Route: genSearchSearch33Route, - genSearchSearch34Route: genSearchSearch34Route, - genSearchSearch35Route: genSearchSearch35Route, - genSearchSearch36Route: genSearchSearch36Route, - genSearchSearch37Route: genSearchSearch37Route, - genSearchSearch38Route: genSearchSearch38Route, - genSearchSearch39Route: genSearchSearch39Route, - genSearchSearch4Route: genSearchSearch4Route, - genSearchSearch40Route: genSearchSearch40Route, - genSearchSearch41Route: genSearchSearch41Route, - genSearchSearch42Route: genSearchSearch42Route, - genSearchSearch43Route: genSearchSearch43Route, - genSearchSearch44Route: genSearchSearch44Route, - genSearchSearch45Route: genSearchSearch45Route, - genSearchSearch46Route: genSearchSearch46Route, - genSearchSearch47Route: genSearchSearch47Route, - genSearchSearch48Route: genSearchSearch48Route, - genSearchSearch49Route: genSearchSearch49Route, - genSearchSearch5Route: genSearchSearch5Route, - genSearchSearch50Route: genSearchSearch50Route, - genSearchSearch51Route: genSearchSearch51Route, - genSearchSearch52Route: genSearchSearch52Route, - genSearchSearch53Route: genSearchSearch53Route, - genSearchSearch54Route: genSearchSearch54Route, - genSearchSearch55Route: genSearchSearch55Route, - genSearchSearch56Route: genSearchSearch56Route, - genSearchSearch57Route: genSearchSearch57Route, - genSearchSearch58Route: genSearchSearch58Route, - genSearchSearch59Route: genSearchSearch59Route, - genSearchSearch6Route: genSearchSearch6Route, - genSearchSearch60Route: genSearchSearch60Route, - genSearchSearch61Route: genSearchSearch61Route, - genSearchSearch62Route: genSearchSearch62Route, - genSearchSearch63Route: genSearchSearch63Route, - genSearchSearch64Route: genSearchSearch64Route, - genSearchSearch65Route: genSearchSearch65Route, - genSearchSearch66Route: genSearchSearch66Route, - genSearchSearch67Route: genSearchSearch67Route, - genSearchSearch68Route: genSearchSearch68Route, - genSearchSearch69Route: genSearchSearch69Route, - genSearchSearch7Route: genSearchSearch7Route, - genSearchSearch70Route: genSearchSearch70Route, - genSearchSearch71Route: genSearchSearch71Route, - genSearchSearch72Route: genSearchSearch72Route, - genSearchSearch73Route: genSearchSearch73Route, - genSearchSearch74Route: genSearchSearch74Route, - genSearchSearch75Route: genSearchSearch75Route, - genSearchSearch76Route: genSearchSearch76Route, - genSearchSearch77Route: genSearchSearch77Route, - genSearchSearch78Route: genSearchSearch78Route, - genSearchSearch79Route: genSearchSearch79Route, - genSearchSearch8Route: genSearchSearch8Route, - genSearchSearch80Route: genSearchSearch80Route, - genSearchSearch81Route: genSearchSearch81Route, - genSearchSearch82Route: genSearchSearch82Route, - genSearchSearch83Route: genSearchSearch83Route, - genSearchSearch84Route: genSearchSearch84Route, - genSearchSearch85Route: genSearchSearch85Route, - genSearchSearch86Route: genSearchSearch86Route, - genSearchSearch87Route: genSearchSearch87Route, - genSearchSearch88Route: genSearchSearch88Route, - genSearchSearch89Route: genSearchSearch89Route, - genSearchSearch9Route: genSearchSearch9Route, - genSearchSearch90Route: genSearchSearch90Route, - genSearchSearch91Route: genSearchSearch91Route, - genSearchSearch92Route: genSearchSearch92Route, - genSearchSearch93Route: genSearchSearch93Route, - genSearchSearch94Route: genSearchSearch94Route, - genSearchSearch95Route: genSearchSearch95Route, - genSearchSearch96Route: genSearchSearch96Route, - genSearchSearch97Route: genSearchSearch97Route, - genSearchSearch98Route: genSearchSearch98Route, - genSearchSearch99Route: genSearchSearch99Route, } export const routeTree = rootRoute @@ -3203,411 +99,11 @@ export const routeTree = rootRoute "__root__": { "filePath": "__root.tsx", "children": [ - "/search/searchPlaceholder", - "/(gen)/search/search0", - "/(gen)/search/search1", - "/(gen)/search/search10", - "/(gen)/search/search11", - "/(gen)/search/search12", - "/(gen)/search/search13", - "/(gen)/search/search14", - "/(gen)/search/search15", - "/(gen)/search/search16", - "/(gen)/search/search17", - "/(gen)/search/search18", - "/(gen)/search/search19", - "/(gen)/search/search2", - "/(gen)/search/search20", - "/(gen)/search/search21", - "/(gen)/search/search22", - "/(gen)/search/search23", - "/(gen)/search/search24", - "/(gen)/search/search25", - "/(gen)/search/search26", - "/(gen)/search/search27", - "/(gen)/search/search28", - "/(gen)/search/search29", - "/(gen)/search/search3", - "/(gen)/search/search30", - "/(gen)/search/search31", - "/(gen)/search/search32", - "/(gen)/search/search33", - "/(gen)/search/search34", - "/(gen)/search/search35", - "/(gen)/search/search36", - "/(gen)/search/search37", - "/(gen)/search/search38", - "/(gen)/search/search39", - "/(gen)/search/search4", - "/(gen)/search/search40", - "/(gen)/search/search41", - "/(gen)/search/search42", - "/(gen)/search/search43", - "/(gen)/search/search44", - "/(gen)/search/search45", - "/(gen)/search/search46", - "/(gen)/search/search47", - "/(gen)/search/search48", - "/(gen)/search/search49", - "/(gen)/search/search5", - "/(gen)/search/search50", - "/(gen)/search/search51", - "/(gen)/search/search52", - "/(gen)/search/search53", - "/(gen)/search/search54", - "/(gen)/search/search55", - "/(gen)/search/search56", - "/(gen)/search/search57", - "/(gen)/search/search58", - "/(gen)/search/search59", - "/(gen)/search/search6", - "/(gen)/search/search60", - "/(gen)/search/search61", - "/(gen)/search/search62", - "/(gen)/search/search63", - "/(gen)/search/search64", - "/(gen)/search/search65", - "/(gen)/search/search66", - "/(gen)/search/search67", - "/(gen)/search/search68", - "/(gen)/search/search69", - "/(gen)/search/search7", - "/(gen)/search/search70", - "/(gen)/search/search71", - "/(gen)/search/search72", - "/(gen)/search/search73", - "/(gen)/search/search74", - "/(gen)/search/search75", - "/(gen)/search/search76", - "/(gen)/search/search77", - "/(gen)/search/search78", - "/(gen)/search/search79", - "/(gen)/search/search8", - "/(gen)/search/search80", - "/(gen)/search/search81", - "/(gen)/search/search82", - "/(gen)/search/search83", - "/(gen)/search/search84", - "/(gen)/search/search85", - "/(gen)/search/search86", - "/(gen)/search/search87", - "/(gen)/search/search88", - "/(gen)/search/search89", - "/(gen)/search/search9", - "/(gen)/search/search90", - "/(gen)/search/search91", - "/(gen)/search/search92", - "/(gen)/search/search93", - "/(gen)/search/search94", - "/(gen)/search/search95", - "/(gen)/search/search96", - "/(gen)/search/search97", - "/(gen)/search/search98", - "/(gen)/search/search99" + "/search/searchPlaceholder" ] }, "/search/searchPlaceholder": { "filePath": "search/searchPlaceholder.tsx" - }, - "/(gen)/search/search0": { - "filePath": "(gen)/search/search0.tsx" - }, - "/(gen)/search/search1": { - "filePath": "(gen)/search/search1.tsx" - }, - "/(gen)/search/search10": { - "filePath": "(gen)/search/search10.tsx" - }, - "/(gen)/search/search11": { - "filePath": "(gen)/search/search11.tsx" - }, - "/(gen)/search/search12": { - "filePath": "(gen)/search/search12.tsx" - }, - "/(gen)/search/search13": { - "filePath": "(gen)/search/search13.tsx" - }, - "/(gen)/search/search14": { - "filePath": "(gen)/search/search14.tsx" - }, - "/(gen)/search/search15": { - "filePath": "(gen)/search/search15.tsx" - }, - "/(gen)/search/search16": { - "filePath": "(gen)/search/search16.tsx" - }, - "/(gen)/search/search17": { - "filePath": "(gen)/search/search17.tsx" - }, - "/(gen)/search/search18": { - "filePath": "(gen)/search/search18.tsx" - }, - "/(gen)/search/search19": { - "filePath": "(gen)/search/search19.tsx" - }, - "/(gen)/search/search2": { - "filePath": "(gen)/search/search2.tsx" - }, - "/(gen)/search/search20": { - "filePath": "(gen)/search/search20.tsx" - }, - "/(gen)/search/search21": { - "filePath": "(gen)/search/search21.tsx" - }, - "/(gen)/search/search22": { - "filePath": "(gen)/search/search22.tsx" - }, - "/(gen)/search/search23": { - "filePath": "(gen)/search/search23.tsx" - }, - "/(gen)/search/search24": { - "filePath": "(gen)/search/search24.tsx" - }, - "/(gen)/search/search25": { - "filePath": "(gen)/search/search25.tsx" - }, - "/(gen)/search/search26": { - "filePath": "(gen)/search/search26.tsx" - }, - "/(gen)/search/search27": { - "filePath": "(gen)/search/search27.tsx" - }, - "/(gen)/search/search28": { - "filePath": "(gen)/search/search28.tsx" - }, - "/(gen)/search/search29": { - "filePath": "(gen)/search/search29.tsx" - }, - "/(gen)/search/search3": { - "filePath": "(gen)/search/search3.tsx" - }, - "/(gen)/search/search30": { - "filePath": "(gen)/search/search30.tsx" - }, - "/(gen)/search/search31": { - "filePath": "(gen)/search/search31.tsx" - }, - "/(gen)/search/search32": { - "filePath": "(gen)/search/search32.tsx" - }, - "/(gen)/search/search33": { - "filePath": "(gen)/search/search33.tsx" - }, - "/(gen)/search/search34": { - "filePath": "(gen)/search/search34.tsx" - }, - "/(gen)/search/search35": { - "filePath": "(gen)/search/search35.tsx" - }, - "/(gen)/search/search36": { - "filePath": "(gen)/search/search36.tsx" - }, - "/(gen)/search/search37": { - "filePath": "(gen)/search/search37.tsx" - }, - "/(gen)/search/search38": { - "filePath": "(gen)/search/search38.tsx" - }, - "/(gen)/search/search39": { - "filePath": "(gen)/search/search39.tsx" - }, - "/(gen)/search/search4": { - "filePath": "(gen)/search/search4.tsx" - }, - "/(gen)/search/search40": { - "filePath": "(gen)/search/search40.tsx" - }, - "/(gen)/search/search41": { - "filePath": "(gen)/search/search41.tsx" - }, - "/(gen)/search/search42": { - "filePath": "(gen)/search/search42.tsx" - }, - "/(gen)/search/search43": { - "filePath": "(gen)/search/search43.tsx" - }, - "/(gen)/search/search44": { - "filePath": "(gen)/search/search44.tsx" - }, - "/(gen)/search/search45": { - "filePath": "(gen)/search/search45.tsx" - }, - "/(gen)/search/search46": { - "filePath": "(gen)/search/search46.tsx" - }, - "/(gen)/search/search47": { - "filePath": "(gen)/search/search47.tsx" - }, - "/(gen)/search/search48": { - "filePath": "(gen)/search/search48.tsx" - }, - "/(gen)/search/search49": { - "filePath": "(gen)/search/search49.tsx" - }, - "/(gen)/search/search5": { - "filePath": "(gen)/search/search5.tsx" - }, - "/(gen)/search/search50": { - "filePath": "(gen)/search/search50.tsx" - }, - "/(gen)/search/search51": { - "filePath": "(gen)/search/search51.tsx" - }, - "/(gen)/search/search52": { - "filePath": "(gen)/search/search52.tsx" - }, - "/(gen)/search/search53": { - "filePath": "(gen)/search/search53.tsx" - }, - "/(gen)/search/search54": { - "filePath": "(gen)/search/search54.tsx" - }, - "/(gen)/search/search55": { - "filePath": "(gen)/search/search55.tsx" - }, - "/(gen)/search/search56": { - "filePath": "(gen)/search/search56.tsx" - }, - "/(gen)/search/search57": { - "filePath": "(gen)/search/search57.tsx" - }, - "/(gen)/search/search58": { - "filePath": "(gen)/search/search58.tsx" - }, - "/(gen)/search/search59": { - "filePath": "(gen)/search/search59.tsx" - }, - "/(gen)/search/search6": { - "filePath": "(gen)/search/search6.tsx" - }, - "/(gen)/search/search60": { - "filePath": "(gen)/search/search60.tsx" - }, - "/(gen)/search/search61": { - "filePath": "(gen)/search/search61.tsx" - }, - "/(gen)/search/search62": { - "filePath": "(gen)/search/search62.tsx" - }, - "/(gen)/search/search63": { - "filePath": "(gen)/search/search63.tsx" - }, - "/(gen)/search/search64": { - "filePath": "(gen)/search/search64.tsx" - }, - "/(gen)/search/search65": { - "filePath": "(gen)/search/search65.tsx" - }, - "/(gen)/search/search66": { - "filePath": "(gen)/search/search66.tsx" - }, - "/(gen)/search/search67": { - "filePath": "(gen)/search/search67.tsx" - }, - "/(gen)/search/search68": { - "filePath": "(gen)/search/search68.tsx" - }, - "/(gen)/search/search69": { - "filePath": "(gen)/search/search69.tsx" - }, - "/(gen)/search/search7": { - "filePath": "(gen)/search/search7.tsx" - }, - "/(gen)/search/search70": { - "filePath": "(gen)/search/search70.tsx" - }, - "/(gen)/search/search71": { - "filePath": "(gen)/search/search71.tsx" - }, - "/(gen)/search/search72": { - "filePath": "(gen)/search/search72.tsx" - }, - "/(gen)/search/search73": { - "filePath": "(gen)/search/search73.tsx" - }, - "/(gen)/search/search74": { - "filePath": "(gen)/search/search74.tsx" - }, - "/(gen)/search/search75": { - "filePath": "(gen)/search/search75.tsx" - }, - "/(gen)/search/search76": { - "filePath": "(gen)/search/search76.tsx" - }, - "/(gen)/search/search77": { - "filePath": "(gen)/search/search77.tsx" - }, - "/(gen)/search/search78": { - "filePath": "(gen)/search/search78.tsx" - }, - "/(gen)/search/search79": { - "filePath": "(gen)/search/search79.tsx" - }, - "/(gen)/search/search8": { - "filePath": "(gen)/search/search8.tsx" - }, - "/(gen)/search/search80": { - "filePath": "(gen)/search/search80.tsx" - }, - "/(gen)/search/search81": { - "filePath": "(gen)/search/search81.tsx" - }, - "/(gen)/search/search82": { - "filePath": "(gen)/search/search82.tsx" - }, - "/(gen)/search/search83": { - "filePath": "(gen)/search/search83.tsx" - }, - "/(gen)/search/search84": { - "filePath": "(gen)/search/search84.tsx" - }, - "/(gen)/search/search85": { - "filePath": "(gen)/search/search85.tsx" - }, - "/(gen)/search/search86": { - "filePath": "(gen)/search/search86.tsx" - }, - "/(gen)/search/search87": { - "filePath": "(gen)/search/search87.tsx" - }, - "/(gen)/search/search88": { - "filePath": "(gen)/search/search88.tsx" - }, - "/(gen)/search/search89": { - "filePath": "(gen)/search/search89.tsx" - }, - "/(gen)/search/search9": { - "filePath": "(gen)/search/search9.tsx" - }, - "/(gen)/search/search90": { - "filePath": "(gen)/search/search90.tsx" - }, - "/(gen)/search/search91": { - "filePath": "(gen)/search/search91.tsx" - }, - "/(gen)/search/search92": { - "filePath": "(gen)/search/search92.tsx" - }, - "/(gen)/search/search93": { - "filePath": "(gen)/search/search93.tsx" - }, - "/(gen)/search/search94": { - "filePath": "(gen)/search/search94.tsx" - }, - "/(gen)/search/search95": { - "filePath": "(gen)/search/search95.tsx" - }, - "/(gen)/search/search96": { - "filePath": "(gen)/search/search96.tsx" - }, - "/(gen)/search/search97": { - "filePath": "(gen)/search/search97.tsx" - }, - "/(gen)/search/search98": { - "filePath": "(gen)/search/search98.tsx" - }, - "/(gen)/search/search99": { - "filePath": "(gen)/search/search99.tsx" } } } diff --git a/examples/react/start-large/src/routeTree.gen.ts b/examples/react/start-large/src/routeTree.gen.ts index 93ec8b8345..44cc9055f8 100644 --- a/examples/react/start-large/src/routeTree.gen.ts +++ b/examples/react/start-large/src/routeTree.gen.ts @@ -21,408 +21,6 @@ import { Route as ParamsRouteRouteImport } from './routes/params/route' import { Route as IndexRouteImport } from './routes/index' import { Route as SearchSearchPlaceholderRouteImport } from './routes/search/searchPlaceholder' import { Route as ParamsParamsPlaceholderRouteImport } from './routes/params/$paramsPlaceholder' -import { Route as genRelative99RouteImport } from './routes/(gen)/relative99' -import { Route as genRelative98RouteImport } from './routes/(gen)/relative98' -import { Route as genRelative97RouteImport } from './routes/(gen)/relative97' -import { Route as genRelative96RouteImport } from './routes/(gen)/relative96' -import { Route as genRelative95RouteImport } from './routes/(gen)/relative95' -import { Route as genRelative94RouteImport } from './routes/(gen)/relative94' -import { Route as genRelative93RouteImport } from './routes/(gen)/relative93' -import { Route as genRelative92RouteImport } from './routes/(gen)/relative92' -import { Route as genRelative91RouteImport } from './routes/(gen)/relative91' -import { Route as genRelative90RouteImport } from './routes/(gen)/relative90' -import { Route as genRelative9RouteImport } from './routes/(gen)/relative9' -import { Route as genRelative89RouteImport } from './routes/(gen)/relative89' -import { Route as genRelative88RouteImport } from './routes/(gen)/relative88' -import { Route as genRelative87RouteImport } from './routes/(gen)/relative87' -import { Route as genRelative86RouteImport } from './routes/(gen)/relative86' -import { Route as genRelative85RouteImport } from './routes/(gen)/relative85' -import { Route as genRelative84RouteImport } from './routes/(gen)/relative84' -import { Route as genRelative83RouteImport } from './routes/(gen)/relative83' -import { Route as genRelative82RouteImport } from './routes/(gen)/relative82' -import { Route as genRelative81RouteImport } from './routes/(gen)/relative81' -import { Route as genRelative80RouteImport } from './routes/(gen)/relative80' -import { Route as genRelative8RouteImport } from './routes/(gen)/relative8' -import { Route as genRelative79RouteImport } from './routes/(gen)/relative79' -import { Route as genRelative78RouteImport } from './routes/(gen)/relative78' -import { Route as genRelative77RouteImport } from './routes/(gen)/relative77' -import { Route as genRelative76RouteImport } from './routes/(gen)/relative76' -import { Route as genRelative75RouteImport } from './routes/(gen)/relative75' -import { Route as genRelative74RouteImport } from './routes/(gen)/relative74' -import { Route as genRelative73RouteImport } from './routes/(gen)/relative73' -import { Route as genRelative72RouteImport } from './routes/(gen)/relative72' -import { Route as genRelative71RouteImport } from './routes/(gen)/relative71' -import { Route as genRelative70RouteImport } from './routes/(gen)/relative70' -import { Route as genRelative7RouteImport } from './routes/(gen)/relative7' -import { Route as genRelative69RouteImport } from './routes/(gen)/relative69' -import { Route as genRelative68RouteImport } from './routes/(gen)/relative68' -import { Route as genRelative67RouteImport } from './routes/(gen)/relative67' -import { Route as genRelative66RouteImport } from './routes/(gen)/relative66' -import { Route as genRelative65RouteImport } from './routes/(gen)/relative65' -import { Route as genRelative64RouteImport } from './routes/(gen)/relative64' -import { Route as genRelative63RouteImport } from './routes/(gen)/relative63' -import { Route as genRelative62RouteImport } from './routes/(gen)/relative62' -import { Route as genRelative61RouteImport } from './routes/(gen)/relative61' -import { Route as genRelative60RouteImport } from './routes/(gen)/relative60' -import { Route as genRelative6RouteImport } from './routes/(gen)/relative6' -import { Route as genRelative59RouteImport } from './routes/(gen)/relative59' -import { Route as genRelative58RouteImport } from './routes/(gen)/relative58' -import { Route as genRelative57RouteImport } from './routes/(gen)/relative57' -import { Route as genRelative56RouteImport } from './routes/(gen)/relative56' -import { Route as genRelative55RouteImport } from './routes/(gen)/relative55' -import { Route as genRelative54RouteImport } from './routes/(gen)/relative54' -import { Route as genRelative53RouteImport } from './routes/(gen)/relative53' -import { Route as genRelative52RouteImport } from './routes/(gen)/relative52' -import { Route as genRelative51RouteImport } from './routes/(gen)/relative51' -import { Route as genRelative50RouteImport } from './routes/(gen)/relative50' -import { Route as genRelative5RouteImport } from './routes/(gen)/relative5' -import { Route as genRelative49RouteImport } from './routes/(gen)/relative49' -import { Route as genRelative48RouteImport } from './routes/(gen)/relative48' -import { Route as genRelative47RouteImport } from './routes/(gen)/relative47' -import { Route as genRelative46RouteImport } from './routes/(gen)/relative46' -import { Route as genRelative45RouteImport } from './routes/(gen)/relative45' -import { Route as genRelative44RouteImport } from './routes/(gen)/relative44' -import { Route as genRelative43RouteImport } from './routes/(gen)/relative43' -import { Route as genRelative42RouteImport } from './routes/(gen)/relative42' -import { Route as genRelative41RouteImport } from './routes/(gen)/relative41' -import { Route as genRelative40RouteImport } from './routes/(gen)/relative40' -import { Route as genRelative4RouteImport } from './routes/(gen)/relative4' -import { Route as genRelative39RouteImport } from './routes/(gen)/relative39' -import { Route as genRelative38RouteImport } from './routes/(gen)/relative38' -import { Route as genRelative37RouteImport } from './routes/(gen)/relative37' -import { Route as genRelative36RouteImport } from './routes/(gen)/relative36' -import { Route as genRelative35RouteImport } from './routes/(gen)/relative35' -import { Route as genRelative34RouteImport } from './routes/(gen)/relative34' -import { Route as genRelative33RouteImport } from './routes/(gen)/relative33' -import { Route as genRelative32RouteImport } from './routes/(gen)/relative32' -import { Route as genRelative31RouteImport } from './routes/(gen)/relative31' -import { Route as genRelative30RouteImport } from './routes/(gen)/relative30' -import { Route as genRelative3RouteImport } from './routes/(gen)/relative3' -import { Route as genRelative29RouteImport } from './routes/(gen)/relative29' -import { Route as genRelative28RouteImport } from './routes/(gen)/relative28' -import { Route as genRelative27RouteImport } from './routes/(gen)/relative27' -import { Route as genRelative26RouteImport } from './routes/(gen)/relative26' -import { Route as genRelative25RouteImport } from './routes/(gen)/relative25' -import { Route as genRelative24RouteImport } from './routes/(gen)/relative24' -import { Route as genRelative23RouteImport } from './routes/(gen)/relative23' -import { Route as genRelative22RouteImport } from './routes/(gen)/relative22' -import { Route as genRelative21RouteImport } from './routes/(gen)/relative21' -import { Route as genRelative20RouteImport } from './routes/(gen)/relative20' -import { Route as genRelative2RouteImport } from './routes/(gen)/relative2' -import { Route as genRelative19RouteImport } from './routes/(gen)/relative19' -import { Route as genRelative18RouteImport } from './routes/(gen)/relative18' -import { Route as genRelative17RouteImport } from './routes/(gen)/relative17' -import { Route as genRelative16RouteImport } from './routes/(gen)/relative16' -import { Route as genRelative15RouteImport } from './routes/(gen)/relative15' -import { Route as genRelative14RouteImport } from './routes/(gen)/relative14' -import { Route as genRelative13RouteImport } from './routes/(gen)/relative13' -import { Route as genRelative12RouteImport } from './routes/(gen)/relative12' -import { Route as genRelative11RouteImport } from './routes/(gen)/relative11' -import { Route as genRelative10RouteImport } from './routes/(gen)/relative10' -import { Route as genRelative1RouteImport } from './routes/(gen)/relative1' -import { Route as genRelative0RouteImport } from './routes/(gen)/relative0' -import { Route as genAbsolute99RouteImport } from './routes/(gen)/absolute99' -import { Route as genAbsolute98RouteImport } from './routes/(gen)/absolute98' -import { Route as genAbsolute97RouteImport } from './routes/(gen)/absolute97' -import { Route as genAbsolute96RouteImport } from './routes/(gen)/absolute96' -import { Route as genAbsolute95RouteImport } from './routes/(gen)/absolute95' -import { Route as genAbsolute94RouteImport } from './routes/(gen)/absolute94' -import { Route as genAbsolute93RouteImport } from './routes/(gen)/absolute93' -import { Route as genAbsolute92RouteImport } from './routes/(gen)/absolute92' -import { Route as genAbsolute91RouteImport } from './routes/(gen)/absolute91' -import { Route as genAbsolute90RouteImport } from './routes/(gen)/absolute90' -import { Route as genAbsolute9RouteImport } from './routes/(gen)/absolute9' -import { Route as genAbsolute89RouteImport } from './routes/(gen)/absolute89' -import { Route as genAbsolute88RouteImport } from './routes/(gen)/absolute88' -import { Route as genAbsolute87RouteImport } from './routes/(gen)/absolute87' -import { Route as genAbsolute86RouteImport } from './routes/(gen)/absolute86' -import { Route as genAbsolute85RouteImport } from './routes/(gen)/absolute85' -import { Route as genAbsolute84RouteImport } from './routes/(gen)/absolute84' -import { Route as genAbsolute83RouteImport } from './routes/(gen)/absolute83' -import { Route as genAbsolute82RouteImport } from './routes/(gen)/absolute82' -import { Route as genAbsolute81RouteImport } from './routes/(gen)/absolute81' -import { Route as genAbsolute80RouteImport } from './routes/(gen)/absolute80' -import { Route as genAbsolute8RouteImport } from './routes/(gen)/absolute8' -import { Route as genAbsolute79RouteImport } from './routes/(gen)/absolute79' -import { Route as genAbsolute78RouteImport } from './routes/(gen)/absolute78' -import { Route as genAbsolute77RouteImport } from './routes/(gen)/absolute77' -import { Route as genAbsolute76RouteImport } from './routes/(gen)/absolute76' -import { Route as genAbsolute75RouteImport } from './routes/(gen)/absolute75' -import { Route as genAbsolute74RouteImport } from './routes/(gen)/absolute74' -import { Route as genAbsolute73RouteImport } from './routes/(gen)/absolute73' -import { Route as genAbsolute72RouteImport } from './routes/(gen)/absolute72' -import { Route as genAbsolute71RouteImport } from './routes/(gen)/absolute71' -import { Route as genAbsolute70RouteImport } from './routes/(gen)/absolute70' -import { Route as genAbsolute7RouteImport } from './routes/(gen)/absolute7' -import { Route as genAbsolute69RouteImport } from './routes/(gen)/absolute69' -import { Route as genAbsolute68RouteImport } from './routes/(gen)/absolute68' -import { Route as genAbsolute67RouteImport } from './routes/(gen)/absolute67' -import { Route as genAbsolute66RouteImport } from './routes/(gen)/absolute66' -import { Route as genAbsolute65RouteImport } from './routes/(gen)/absolute65' -import { Route as genAbsolute64RouteImport } from './routes/(gen)/absolute64' -import { Route as genAbsolute63RouteImport } from './routes/(gen)/absolute63' -import { Route as genAbsolute62RouteImport } from './routes/(gen)/absolute62' -import { Route as genAbsolute61RouteImport } from './routes/(gen)/absolute61' -import { Route as genAbsolute60RouteImport } from './routes/(gen)/absolute60' -import { Route as genAbsolute6RouteImport } from './routes/(gen)/absolute6' -import { Route as genAbsolute59RouteImport } from './routes/(gen)/absolute59' -import { Route as genAbsolute58RouteImport } from './routes/(gen)/absolute58' -import { Route as genAbsolute57RouteImport } from './routes/(gen)/absolute57' -import { Route as genAbsolute56RouteImport } from './routes/(gen)/absolute56' -import { Route as genAbsolute55RouteImport } from './routes/(gen)/absolute55' -import { Route as genAbsolute54RouteImport } from './routes/(gen)/absolute54' -import { Route as genAbsolute53RouteImport } from './routes/(gen)/absolute53' -import { Route as genAbsolute52RouteImport } from './routes/(gen)/absolute52' -import { Route as genAbsolute51RouteImport } from './routes/(gen)/absolute51' -import { Route as genAbsolute50RouteImport } from './routes/(gen)/absolute50' -import { Route as genAbsolute5RouteImport } from './routes/(gen)/absolute5' -import { Route as genAbsolute49RouteImport } from './routes/(gen)/absolute49' -import { Route as genAbsolute48RouteImport } from './routes/(gen)/absolute48' -import { Route as genAbsolute47RouteImport } from './routes/(gen)/absolute47' -import { Route as genAbsolute46RouteImport } from './routes/(gen)/absolute46' -import { Route as genAbsolute45RouteImport } from './routes/(gen)/absolute45' -import { Route as genAbsolute44RouteImport } from './routes/(gen)/absolute44' -import { Route as genAbsolute43RouteImport } from './routes/(gen)/absolute43' -import { Route as genAbsolute42RouteImport } from './routes/(gen)/absolute42' -import { Route as genAbsolute41RouteImport } from './routes/(gen)/absolute41' -import { Route as genAbsolute40RouteImport } from './routes/(gen)/absolute40' -import { Route as genAbsolute4RouteImport } from './routes/(gen)/absolute4' -import { Route as genAbsolute39RouteImport } from './routes/(gen)/absolute39' -import { Route as genAbsolute38RouteImport } from './routes/(gen)/absolute38' -import { Route as genAbsolute37RouteImport } from './routes/(gen)/absolute37' -import { Route as genAbsolute36RouteImport } from './routes/(gen)/absolute36' -import { Route as genAbsolute35RouteImport } from './routes/(gen)/absolute35' -import { Route as genAbsolute34RouteImport } from './routes/(gen)/absolute34' -import { Route as genAbsolute33RouteImport } from './routes/(gen)/absolute33' -import { Route as genAbsolute32RouteImport } from './routes/(gen)/absolute32' -import { Route as genAbsolute31RouteImport } from './routes/(gen)/absolute31' -import { Route as genAbsolute30RouteImport } from './routes/(gen)/absolute30' -import { Route as genAbsolute3RouteImport } from './routes/(gen)/absolute3' -import { Route as genAbsolute29RouteImport } from './routes/(gen)/absolute29' -import { Route as genAbsolute28RouteImport } from './routes/(gen)/absolute28' -import { Route as genAbsolute27RouteImport } from './routes/(gen)/absolute27' -import { Route as genAbsolute26RouteImport } from './routes/(gen)/absolute26' -import { Route as genAbsolute25RouteImport } from './routes/(gen)/absolute25' -import { Route as genAbsolute24RouteImport } from './routes/(gen)/absolute24' -import { Route as genAbsolute23RouteImport } from './routes/(gen)/absolute23' -import { Route as genAbsolute22RouteImport } from './routes/(gen)/absolute22' -import { Route as genAbsolute21RouteImport } from './routes/(gen)/absolute21' -import { Route as genAbsolute20RouteImport } from './routes/(gen)/absolute20' -import { Route as genAbsolute2RouteImport } from './routes/(gen)/absolute2' -import { Route as genAbsolute19RouteImport } from './routes/(gen)/absolute19' -import { Route as genAbsolute18RouteImport } from './routes/(gen)/absolute18' -import { Route as genAbsolute17RouteImport } from './routes/(gen)/absolute17' -import { Route as genAbsolute16RouteImport } from './routes/(gen)/absolute16' -import { Route as genAbsolute15RouteImport } from './routes/(gen)/absolute15' -import { Route as genAbsolute14RouteImport } from './routes/(gen)/absolute14' -import { Route as genAbsolute13RouteImport } from './routes/(gen)/absolute13' -import { Route as genAbsolute12RouteImport } from './routes/(gen)/absolute12' -import { Route as genAbsolute11RouteImport } from './routes/(gen)/absolute11' -import { Route as genAbsolute10RouteImport } from './routes/(gen)/absolute10' -import { Route as genAbsolute1RouteImport } from './routes/(gen)/absolute1' -import { Route as genAbsolute0RouteImport } from './routes/(gen)/absolute0' -import { Route as genSearchRouteRouteImport } from './routes/(gen)/search/route' -import { Route as genParamsRouteRouteImport } from './routes/(gen)/params/route' -import { Route as genSearchSearch99RouteImport } from './routes/(gen)/search/search99' -import { Route as genSearchSearch98RouteImport } from './routes/(gen)/search/search98' -import { Route as genSearchSearch97RouteImport } from './routes/(gen)/search/search97' -import { Route as genSearchSearch96RouteImport } from './routes/(gen)/search/search96' -import { Route as genSearchSearch95RouteImport } from './routes/(gen)/search/search95' -import { Route as genSearchSearch94RouteImport } from './routes/(gen)/search/search94' -import { Route as genSearchSearch93RouteImport } from './routes/(gen)/search/search93' -import { Route as genSearchSearch92RouteImport } from './routes/(gen)/search/search92' -import { Route as genSearchSearch91RouteImport } from './routes/(gen)/search/search91' -import { Route as genSearchSearch90RouteImport } from './routes/(gen)/search/search90' -import { Route as genSearchSearch9RouteImport } from './routes/(gen)/search/search9' -import { Route as genSearchSearch89RouteImport } from './routes/(gen)/search/search89' -import { Route as genSearchSearch88RouteImport } from './routes/(gen)/search/search88' -import { Route as genSearchSearch87RouteImport } from './routes/(gen)/search/search87' -import { Route as genSearchSearch86RouteImport } from './routes/(gen)/search/search86' -import { Route as genSearchSearch85RouteImport } from './routes/(gen)/search/search85' -import { Route as genSearchSearch84RouteImport } from './routes/(gen)/search/search84' -import { Route as genSearchSearch83RouteImport } from './routes/(gen)/search/search83' -import { Route as genSearchSearch82RouteImport } from './routes/(gen)/search/search82' -import { Route as genSearchSearch81RouteImport } from './routes/(gen)/search/search81' -import { Route as genSearchSearch80RouteImport } from './routes/(gen)/search/search80' -import { Route as genSearchSearch8RouteImport } from './routes/(gen)/search/search8' -import { Route as genSearchSearch79RouteImport } from './routes/(gen)/search/search79' -import { Route as genSearchSearch78RouteImport } from './routes/(gen)/search/search78' -import { Route as genSearchSearch77RouteImport } from './routes/(gen)/search/search77' -import { Route as genSearchSearch76RouteImport } from './routes/(gen)/search/search76' -import { Route as genSearchSearch75RouteImport } from './routes/(gen)/search/search75' -import { Route as genSearchSearch74RouteImport } from './routes/(gen)/search/search74' -import { Route as genSearchSearch73RouteImport } from './routes/(gen)/search/search73' -import { Route as genSearchSearch72RouteImport } from './routes/(gen)/search/search72' -import { Route as genSearchSearch71RouteImport } from './routes/(gen)/search/search71' -import { Route as genSearchSearch70RouteImport } from './routes/(gen)/search/search70' -import { Route as genSearchSearch7RouteImport } from './routes/(gen)/search/search7' -import { Route as genSearchSearch69RouteImport } from './routes/(gen)/search/search69' -import { Route as genSearchSearch68RouteImport } from './routes/(gen)/search/search68' -import { Route as genSearchSearch67RouteImport } from './routes/(gen)/search/search67' -import { Route as genSearchSearch66RouteImport } from './routes/(gen)/search/search66' -import { Route as genSearchSearch65RouteImport } from './routes/(gen)/search/search65' -import { Route as genSearchSearch64RouteImport } from './routes/(gen)/search/search64' -import { Route as genSearchSearch63RouteImport } from './routes/(gen)/search/search63' -import { Route as genSearchSearch62RouteImport } from './routes/(gen)/search/search62' -import { Route as genSearchSearch61RouteImport } from './routes/(gen)/search/search61' -import { Route as genSearchSearch60RouteImport } from './routes/(gen)/search/search60' -import { Route as genSearchSearch6RouteImport } from './routes/(gen)/search/search6' -import { Route as genSearchSearch59RouteImport } from './routes/(gen)/search/search59' -import { Route as genSearchSearch58RouteImport } from './routes/(gen)/search/search58' -import { Route as genSearchSearch57RouteImport } from './routes/(gen)/search/search57' -import { Route as genSearchSearch56RouteImport } from './routes/(gen)/search/search56' -import { Route as genSearchSearch55RouteImport } from './routes/(gen)/search/search55' -import { Route as genSearchSearch54RouteImport } from './routes/(gen)/search/search54' -import { Route as genSearchSearch53RouteImport } from './routes/(gen)/search/search53' -import { Route as genSearchSearch52RouteImport } from './routes/(gen)/search/search52' -import { Route as genSearchSearch51RouteImport } from './routes/(gen)/search/search51' -import { Route as genSearchSearch50RouteImport } from './routes/(gen)/search/search50' -import { Route as genSearchSearch5RouteImport } from './routes/(gen)/search/search5' -import { Route as genSearchSearch49RouteImport } from './routes/(gen)/search/search49' -import { Route as genSearchSearch48RouteImport } from './routes/(gen)/search/search48' -import { Route as genSearchSearch47RouteImport } from './routes/(gen)/search/search47' -import { Route as genSearchSearch46RouteImport } from './routes/(gen)/search/search46' -import { Route as genSearchSearch45RouteImport } from './routes/(gen)/search/search45' -import { Route as genSearchSearch44RouteImport } from './routes/(gen)/search/search44' -import { Route as genSearchSearch43RouteImport } from './routes/(gen)/search/search43' -import { Route as genSearchSearch42RouteImport } from './routes/(gen)/search/search42' -import { Route as genSearchSearch41RouteImport } from './routes/(gen)/search/search41' -import { Route as genSearchSearch40RouteImport } from './routes/(gen)/search/search40' -import { Route as genSearchSearch4RouteImport } from './routes/(gen)/search/search4' -import { Route as genSearchSearch39RouteImport } from './routes/(gen)/search/search39' -import { Route as genSearchSearch38RouteImport } from './routes/(gen)/search/search38' -import { Route as genSearchSearch37RouteImport } from './routes/(gen)/search/search37' -import { Route as genSearchSearch36RouteImport } from './routes/(gen)/search/search36' -import { Route as genSearchSearch35RouteImport } from './routes/(gen)/search/search35' -import { Route as genSearchSearch34RouteImport } from './routes/(gen)/search/search34' -import { Route as genSearchSearch33RouteImport } from './routes/(gen)/search/search33' -import { Route as genSearchSearch32RouteImport } from './routes/(gen)/search/search32' -import { Route as genSearchSearch31RouteImport } from './routes/(gen)/search/search31' -import { Route as genSearchSearch30RouteImport } from './routes/(gen)/search/search30' -import { Route as genSearchSearch3RouteImport } from './routes/(gen)/search/search3' -import { Route as genSearchSearch29RouteImport } from './routes/(gen)/search/search29' -import { Route as genSearchSearch28RouteImport } from './routes/(gen)/search/search28' -import { Route as genSearchSearch27RouteImport } from './routes/(gen)/search/search27' -import { Route as genSearchSearch26RouteImport } from './routes/(gen)/search/search26' -import { Route as genSearchSearch25RouteImport } from './routes/(gen)/search/search25' -import { Route as genSearchSearch24RouteImport } from './routes/(gen)/search/search24' -import { Route as genSearchSearch23RouteImport } from './routes/(gen)/search/search23' -import { Route as genSearchSearch22RouteImport } from './routes/(gen)/search/search22' -import { Route as genSearchSearch21RouteImport } from './routes/(gen)/search/search21' -import { Route as genSearchSearch20RouteImport } from './routes/(gen)/search/search20' -import { Route as genSearchSearch2RouteImport } from './routes/(gen)/search/search2' -import { Route as genSearchSearch19RouteImport } from './routes/(gen)/search/search19' -import { Route as genSearchSearch18RouteImport } from './routes/(gen)/search/search18' -import { Route as genSearchSearch17RouteImport } from './routes/(gen)/search/search17' -import { Route as genSearchSearch16RouteImport } from './routes/(gen)/search/search16' -import { Route as genSearchSearch15RouteImport } from './routes/(gen)/search/search15' -import { Route as genSearchSearch14RouteImport } from './routes/(gen)/search/search14' -import { Route as genSearchSearch13RouteImport } from './routes/(gen)/search/search13' -import { Route as genSearchSearch12RouteImport } from './routes/(gen)/search/search12' -import { Route as genSearchSearch11RouteImport } from './routes/(gen)/search/search11' -import { Route as genSearchSearch10RouteImport } from './routes/(gen)/search/search10' -import { Route as genSearchSearch1RouteImport } from './routes/(gen)/search/search1' -import { Route as genSearchSearch0RouteImport } from './routes/(gen)/search/search0' -import { Route as genParamsParam99RouteImport } from './routes/(gen)/params/$param99' -import { Route as genParamsParam98RouteImport } from './routes/(gen)/params/$param98' -import { Route as genParamsParam97RouteImport } from './routes/(gen)/params/$param97' -import { Route as genParamsParam96RouteImport } from './routes/(gen)/params/$param96' -import { Route as genParamsParam95RouteImport } from './routes/(gen)/params/$param95' -import { Route as genParamsParam94RouteImport } from './routes/(gen)/params/$param94' -import { Route as genParamsParam93RouteImport } from './routes/(gen)/params/$param93' -import { Route as genParamsParam92RouteImport } from './routes/(gen)/params/$param92' -import { Route as genParamsParam91RouteImport } from './routes/(gen)/params/$param91' -import { Route as genParamsParam90RouteImport } from './routes/(gen)/params/$param90' -import { Route as genParamsParam9RouteImport } from './routes/(gen)/params/$param9' -import { Route as genParamsParam89RouteImport } from './routes/(gen)/params/$param89' -import { Route as genParamsParam88RouteImport } from './routes/(gen)/params/$param88' -import { Route as genParamsParam87RouteImport } from './routes/(gen)/params/$param87' -import { Route as genParamsParam86RouteImport } from './routes/(gen)/params/$param86' -import { Route as genParamsParam85RouteImport } from './routes/(gen)/params/$param85' -import { Route as genParamsParam84RouteImport } from './routes/(gen)/params/$param84' -import { Route as genParamsParam83RouteImport } from './routes/(gen)/params/$param83' -import { Route as genParamsParam82RouteImport } from './routes/(gen)/params/$param82' -import { Route as genParamsParam81RouteImport } from './routes/(gen)/params/$param81' -import { Route as genParamsParam80RouteImport } from './routes/(gen)/params/$param80' -import { Route as genParamsParam8RouteImport } from './routes/(gen)/params/$param8' -import { Route as genParamsParam79RouteImport } from './routes/(gen)/params/$param79' -import { Route as genParamsParam78RouteImport } from './routes/(gen)/params/$param78' -import { Route as genParamsParam77RouteImport } from './routes/(gen)/params/$param77' -import { Route as genParamsParam76RouteImport } from './routes/(gen)/params/$param76' -import { Route as genParamsParam75RouteImport } from './routes/(gen)/params/$param75' -import { Route as genParamsParam74RouteImport } from './routes/(gen)/params/$param74' -import { Route as genParamsParam73RouteImport } from './routes/(gen)/params/$param73' -import { Route as genParamsParam72RouteImport } from './routes/(gen)/params/$param72' -import { Route as genParamsParam71RouteImport } from './routes/(gen)/params/$param71' -import { Route as genParamsParam70RouteImport } from './routes/(gen)/params/$param70' -import { Route as genParamsParam7RouteImport } from './routes/(gen)/params/$param7' -import { Route as genParamsParam69RouteImport } from './routes/(gen)/params/$param69' -import { Route as genParamsParam68RouteImport } from './routes/(gen)/params/$param68' -import { Route as genParamsParam67RouteImport } from './routes/(gen)/params/$param67' -import { Route as genParamsParam66RouteImport } from './routes/(gen)/params/$param66' -import { Route as genParamsParam65RouteImport } from './routes/(gen)/params/$param65' -import { Route as genParamsParam64RouteImport } from './routes/(gen)/params/$param64' -import { Route as genParamsParam63RouteImport } from './routes/(gen)/params/$param63' -import { Route as genParamsParam62RouteImport } from './routes/(gen)/params/$param62' -import { Route as genParamsParam61RouteImport } from './routes/(gen)/params/$param61' -import { Route as genParamsParam60RouteImport } from './routes/(gen)/params/$param60' -import { Route as genParamsParam6RouteImport } from './routes/(gen)/params/$param6' -import { Route as genParamsParam59RouteImport } from './routes/(gen)/params/$param59' -import { Route as genParamsParam58RouteImport } from './routes/(gen)/params/$param58' -import { Route as genParamsParam57RouteImport } from './routes/(gen)/params/$param57' -import { Route as genParamsParam56RouteImport } from './routes/(gen)/params/$param56' -import { Route as genParamsParam55RouteImport } from './routes/(gen)/params/$param55' -import { Route as genParamsParam54RouteImport } from './routes/(gen)/params/$param54' -import { Route as genParamsParam53RouteImport } from './routes/(gen)/params/$param53' -import { Route as genParamsParam52RouteImport } from './routes/(gen)/params/$param52' -import { Route as genParamsParam51RouteImport } from './routes/(gen)/params/$param51' -import { Route as genParamsParam50RouteImport } from './routes/(gen)/params/$param50' -import { Route as genParamsParam5RouteImport } from './routes/(gen)/params/$param5' -import { Route as genParamsParam49RouteImport } from './routes/(gen)/params/$param49' -import { Route as genParamsParam48RouteImport } from './routes/(gen)/params/$param48' -import { Route as genParamsParam47RouteImport } from './routes/(gen)/params/$param47' -import { Route as genParamsParam46RouteImport } from './routes/(gen)/params/$param46' -import { Route as genParamsParam45RouteImport } from './routes/(gen)/params/$param45' -import { Route as genParamsParam44RouteImport } from './routes/(gen)/params/$param44' -import { Route as genParamsParam43RouteImport } from './routes/(gen)/params/$param43' -import { Route as genParamsParam42RouteImport } from './routes/(gen)/params/$param42' -import { Route as genParamsParam41RouteImport } from './routes/(gen)/params/$param41' -import { Route as genParamsParam40RouteImport } from './routes/(gen)/params/$param40' -import { Route as genParamsParam4RouteImport } from './routes/(gen)/params/$param4' -import { Route as genParamsParam39RouteImport } from './routes/(gen)/params/$param39' -import { Route as genParamsParam38RouteImport } from './routes/(gen)/params/$param38' -import { Route as genParamsParam37RouteImport } from './routes/(gen)/params/$param37' -import { Route as genParamsParam36RouteImport } from './routes/(gen)/params/$param36' -import { Route as genParamsParam35RouteImport } from './routes/(gen)/params/$param35' -import { Route as genParamsParam34RouteImport } from './routes/(gen)/params/$param34' -import { Route as genParamsParam33RouteImport } from './routes/(gen)/params/$param33' -import { Route as genParamsParam32RouteImport } from './routes/(gen)/params/$param32' -import { Route as genParamsParam31RouteImport } from './routes/(gen)/params/$param31' -import { Route as genParamsParam30RouteImport } from './routes/(gen)/params/$param30' -import { Route as genParamsParam3RouteImport } from './routes/(gen)/params/$param3' -import { Route as genParamsParam29RouteImport } from './routes/(gen)/params/$param29' -import { Route as genParamsParam28RouteImport } from './routes/(gen)/params/$param28' -import { Route as genParamsParam27RouteImport } from './routes/(gen)/params/$param27' -import { Route as genParamsParam26RouteImport } from './routes/(gen)/params/$param26' -import { Route as genParamsParam25RouteImport } from './routes/(gen)/params/$param25' -import { Route as genParamsParam24RouteImport } from './routes/(gen)/params/$param24' -import { Route as genParamsParam23RouteImport } from './routes/(gen)/params/$param23' -import { Route as genParamsParam22RouteImport } from './routes/(gen)/params/$param22' -import { Route as genParamsParam21RouteImport } from './routes/(gen)/params/$param21' -import { Route as genParamsParam20RouteImport } from './routes/(gen)/params/$param20' -import { Route as genParamsParam2RouteImport } from './routes/(gen)/params/$param2' -import { Route as genParamsParam19RouteImport } from './routes/(gen)/params/$param19' -import { Route as genParamsParam18RouteImport } from './routes/(gen)/params/$param18' -import { Route as genParamsParam17RouteImport } from './routes/(gen)/params/$param17' -import { Route as genParamsParam16RouteImport } from './routes/(gen)/params/$param16' -import { Route as genParamsParam15RouteImport } from './routes/(gen)/params/$param15' -import { Route as genParamsParam14RouteImport } from './routes/(gen)/params/$param14' -import { Route as genParamsParam13RouteImport } from './routes/(gen)/params/$param13' -import { Route as genParamsParam12RouteImport } from './routes/(gen)/params/$param12' -import { Route as genParamsParam11RouteImport } from './routes/(gen)/params/$param11' -import { Route as genParamsParam10RouteImport } from './routes/(gen)/params/$param10' -import { Route as genParamsParam1RouteImport } from './routes/(gen)/params/$param1' -import { Route as genParamsParam0RouteImport } from './routes/(gen)/params/$param0' // Create/Update Routes @@ -474,13381 +72,297 @@ const ParamsParamsPlaceholderRoute = ParamsParamsPlaceholderRouteImport.update({ getParentRoute: () => ParamsRouteRoute, } as any) -const genRelative99Route = genRelative99RouteImport.update({ - id: '/(gen)/relative99', - path: '/relative99', - getParentRoute: () => rootRoute, -} as any) - -const genRelative98Route = genRelative98RouteImport.update({ - id: '/(gen)/relative98', - path: '/relative98', - getParentRoute: () => rootRoute, -} as any) - -const genRelative97Route = genRelative97RouteImport.update({ - id: '/(gen)/relative97', - path: '/relative97', - getParentRoute: () => rootRoute, -} as any) - -const genRelative96Route = genRelative96RouteImport.update({ - id: '/(gen)/relative96', - path: '/relative96', - getParentRoute: () => rootRoute, -} as any) +// Populate the FileRoutesByPath interface -const genRelative95Route = genRelative95RouteImport.update({ - id: '/(gen)/relative95', - path: '/relative95', - getParentRoute: () => rootRoute, -} as any) +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + '/params': { + id: '/params' + path: '/params' + fullPath: '/params' + preLoaderRoute: typeof ParamsRouteRouteImport + parentRoute: typeof rootRoute + } + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteRouteImport + parentRoute: typeof rootRoute + } + '/absolute': { + id: '/absolute' + path: '/absolute' + fullPath: '/absolute' + preLoaderRoute: typeof AbsoluteRouteImport + parentRoute: typeof rootRoute + } + '/linkProps': { + id: '/linkProps' + path: '/linkProps' + fullPath: '/linkProps' + preLoaderRoute: typeof LinkPropsRouteImport + parentRoute: typeof rootRoute + } + '/relative': { + id: '/relative' + path: '/relative' + fullPath: '/relative' + preLoaderRoute: typeof RelativeRouteImport + parentRoute: typeof rootRoute + } + '/params/$paramsPlaceholder': { + id: '/params/$paramsPlaceholder' + path: '/$paramsPlaceholder' + fullPath: '/params/$paramsPlaceholder' + preLoaderRoute: typeof ParamsParamsPlaceholderRouteImport + parentRoute: typeof ParamsRouteRouteImport + } + '/search/searchPlaceholder': { + id: '/search/searchPlaceholder' + path: '/searchPlaceholder' + fullPath: '/search/searchPlaceholder' + preLoaderRoute: typeof SearchSearchPlaceholderRouteImport + parentRoute: typeof SearchRouteRouteImport + } + } +} -const genRelative94Route = genRelative94RouteImport.update({ - id: '/(gen)/relative94', - path: '/relative94', - getParentRoute: () => rootRoute, -} as any) +// Add type-safety to the createFileRoute function across the route tree -const genRelative93Route = genRelative93RouteImport.update({ - id: '/(gen)/relative93', - path: '/relative93', - getParentRoute: () => rootRoute, -} as any) +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/params/route' { + const createFileRoute: CreateFileRoute< + '/params', + FileRoutesByPath['/params']['parentRoute'], + FileRoutesByPath['/params']['id'], + FileRoutesByPath['/params']['path'], + FileRoutesByPath['/params']['fullPath'] + > +} +declare module './routes/search/route' { + const createFileRoute: CreateFileRoute< + '/search', + FileRoutesByPath['/search']['parentRoute'], + FileRoutesByPath['/search']['id'], + FileRoutesByPath['/search']['path'], + FileRoutesByPath['/search']['fullPath'] + > +} +declare module './routes/absolute' { + const createFileRoute: CreateFileRoute< + '/absolute', + FileRoutesByPath['/absolute']['parentRoute'], + FileRoutesByPath['/absolute']['id'], + FileRoutesByPath['/absolute']['path'], + FileRoutesByPath['/absolute']['fullPath'] + > +} +declare module './routes/linkProps' { + const createFileRoute: CreateFileRoute< + '/linkProps', + FileRoutesByPath['/linkProps']['parentRoute'], + FileRoutesByPath['/linkProps']['id'], + FileRoutesByPath['/linkProps']['path'], + FileRoutesByPath['/linkProps']['fullPath'] + > +} +declare module './routes/relative' { + const createFileRoute: CreateFileRoute< + '/relative', + FileRoutesByPath['/relative']['parentRoute'], + FileRoutesByPath['/relative']['id'], + FileRoutesByPath['/relative']['path'], + FileRoutesByPath['/relative']['fullPath'] + > +} +declare module './routes/params/$paramsPlaceholder' { + const createFileRoute: CreateFileRoute< + '/params/$paramsPlaceholder', + FileRoutesByPath['/params/$paramsPlaceholder']['parentRoute'], + FileRoutesByPath['/params/$paramsPlaceholder']['id'], + FileRoutesByPath['/params/$paramsPlaceholder']['path'], + FileRoutesByPath['/params/$paramsPlaceholder']['fullPath'] + > +} +declare module './routes/search/searchPlaceholder' { + const createFileRoute: CreateFileRoute< + '/search/searchPlaceholder', + FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], + FileRoutesByPath['/search/searchPlaceholder']['id'], + FileRoutesByPath['/search/searchPlaceholder']['path'], + FileRoutesByPath['/search/searchPlaceholder']['fullPath'] + > +} -const genRelative92Route = genRelative92RouteImport.update({ - id: '/(gen)/relative92', - path: '/relative92', - getParentRoute: () => rootRoute, -} as any) +// Create and export the route tree -const genRelative91Route = genRelative91RouteImport.update({ - id: '/(gen)/relative91', - path: '/relative91', - getParentRoute: () => rootRoute, -} as any) +interface ParamsRouteRouteChildren { + ParamsParamsPlaceholderRoute: typeof ParamsParamsPlaceholderRoute +} -const genRelative90Route = genRelative90RouteImport.update({ - id: '/(gen)/relative90', - path: '/relative90', - getParentRoute: () => rootRoute, -} as any) +const ParamsRouteRouteChildren: ParamsRouteRouteChildren = { + ParamsParamsPlaceholderRoute: ParamsParamsPlaceholderRoute, +} -const genRelative9Route = genRelative9RouteImport.update({ - id: '/(gen)/relative9', - path: '/relative9', - getParentRoute: () => rootRoute, -} as any) +const ParamsRouteRouteWithChildren = ParamsRouteRoute._addFileChildren( + ParamsRouteRouteChildren, +) -const genRelative89Route = genRelative89RouteImport.update({ - id: '/(gen)/relative89', - path: '/relative89', - getParentRoute: () => rootRoute, -} as any) +interface SearchRouteRouteChildren { + SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute +} -const genRelative88Route = genRelative88RouteImport.update({ - id: '/(gen)/relative88', - path: '/relative88', - getParentRoute: () => rootRoute, -} as any) +const SearchRouteRouteChildren: SearchRouteRouteChildren = { + SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, +} -const genRelative87Route = genRelative87RouteImport.update({ - id: '/(gen)/relative87', - path: '/relative87', - getParentRoute: () => rootRoute, -} as any) +const SearchRouteRouteWithChildren = SearchRouteRoute._addFileChildren( + SearchRouteRouteChildren, +) -const genRelative86Route = genRelative86RouteImport.update({ - id: '/(gen)/relative86', - path: '/relative86', - getParentRoute: () => rootRoute, -} as any) +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/params': typeof ParamsRouteRouteWithChildren + '/search': typeof SearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute +} -const genRelative85Route = genRelative85RouteImport.update({ - id: '/(gen)/relative85', - path: '/relative85', - getParentRoute: () => rootRoute, -} as any) +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/params': typeof ParamsRouteRouteWithChildren + '/search': typeof SearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute +} -const genRelative84Route = genRelative84RouteImport.update({ - id: '/(gen)/relative84', - path: '/relative84', - getParentRoute: () => rootRoute, -} as any) +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute + '/params': typeof ParamsRouteRouteWithChildren + '/search': typeof SearchRouteRouteWithChildren + '/absolute': typeof AbsoluteRoute + '/linkProps': typeof LinkPropsRoute + '/relative': typeof RelativeRoute + '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute + '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute +} -const genRelative83Route = genRelative83RouteImport.update({ - id: '/(gen)/relative83', - path: '/relative83', - getParentRoute: () => rootRoute, -} as any) +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + id: + | '__root__' + | '/' + | '/params' + | '/search' + | '/absolute' + | '/linkProps' + | '/relative' + | '/params/$paramsPlaceholder' + | '/search/searchPlaceholder' + fileRoutesById: FileRoutesById +} -const genRelative82Route = genRelative82RouteImport.update({ - id: '/(gen)/relative82', - path: '/relative82', - getParentRoute: () => rootRoute, -} as any) - -const genRelative81Route = genRelative81RouteImport.update({ - id: '/(gen)/relative81', - path: '/relative81', - getParentRoute: () => rootRoute, -} as any) - -const genRelative80Route = genRelative80RouteImport.update({ - id: '/(gen)/relative80', - path: '/relative80', - getParentRoute: () => rootRoute, -} as any) - -const genRelative8Route = genRelative8RouteImport.update({ - id: '/(gen)/relative8', - path: '/relative8', - getParentRoute: () => rootRoute, -} as any) - -const genRelative79Route = genRelative79RouteImport.update({ - id: '/(gen)/relative79', - path: '/relative79', - getParentRoute: () => rootRoute, -} as any) - -const genRelative78Route = genRelative78RouteImport.update({ - id: '/(gen)/relative78', - path: '/relative78', - getParentRoute: () => rootRoute, -} as any) - -const genRelative77Route = genRelative77RouteImport.update({ - id: '/(gen)/relative77', - path: '/relative77', - getParentRoute: () => rootRoute, -} as any) - -const genRelative76Route = genRelative76RouteImport.update({ - id: '/(gen)/relative76', - path: '/relative76', - getParentRoute: () => rootRoute, -} as any) - -const genRelative75Route = genRelative75RouteImport.update({ - id: '/(gen)/relative75', - path: '/relative75', - getParentRoute: () => rootRoute, -} as any) - -const genRelative74Route = genRelative74RouteImport.update({ - id: '/(gen)/relative74', - path: '/relative74', - getParentRoute: () => rootRoute, -} as any) - -const genRelative73Route = genRelative73RouteImport.update({ - id: '/(gen)/relative73', - path: '/relative73', - getParentRoute: () => rootRoute, -} as any) - -const genRelative72Route = genRelative72RouteImport.update({ - id: '/(gen)/relative72', - path: '/relative72', - getParentRoute: () => rootRoute, -} as any) - -const genRelative71Route = genRelative71RouteImport.update({ - id: '/(gen)/relative71', - path: '/relative71', - getParentRoute: () => rootRoute, -} as any) - -const genRelative70Route = genRelative70RouteImport.update({ - id: '/(gen)/relative70', - path: '/relative70', - getParentRoute: () => rootRoute, -} as any) - -const genRelative7Route = genRelative7RouteImport.update({ - id: '/(gen)/relative7', - path: '/relative7', - getParentRoute: () => rootRoute, -} as any) - -const genRelative69Route = genRelative69RouteImport.update({ - id: '/(gen)/relative69', - path: '/relative69', - getParentRoute: () => rootRoute, -} as any) - -const genRelative68Route = genRelative68RouteImport.update({ - id: '/(gen)/relative68', - path: '/relative68', - getParentRoute: () => rootRoute, -} as any) - -const genRelative67Route = genRelative67RouteImport.update({ - id: '/(gen)/relative67', - path: '/relative67', - getParentRoute: () => rootRoute, -} as any) - -const genRelative66Route = genRelative66RouteImport.update({ - id: '/(gen)/relative66', - path: '/relative66', - getParentRoute: () => rootRoute, -} as any) - -const genRelative65Route = genRelative65RouteImport.update({ - id: '/(gen)/relative65', - path: '/relative65', - getParentRoute: () => rootRoute, -} as any) - -const genRelative64Route = genRelative64RouteImport.update({ - id: '/(gen)/relative64', - path: '/relative64', - getParentRoute: () => rootRoute, -} as any) - -const genRelative63Route = genRelative63RouteImport.update({ - id: '/(gen)/relative63', - path: '/relative63', - getParentRoute: () => rootRoute, -} as any) - -const genRelative62Route = genRelative62RouteImport.update({ - id: '/(gen)/relative62', - path: '/relative62', - getParentRoute: () => rootRoute, -} as any) - -const genRelative61Route = genRelative61RouteImport.update({ - id: '/(gen)/relative61', - path: '/relative61', - getParentRoute: () => rootRoute, -} as any) - -const genRelative60Route = genRelative60RouteImport.update({ - id: '/(gen)/relative60', - path: '/relative60', - getParentRoute: () => rootRoute, -} as any) - -const genRelative6Route = genRelative6RouteImport.update({ - id: '/(gen)/relative6', - path: '/relative6', - getParentRoute: () => rootRoute, -} as any) - -const genRelative59Route = genRelative59RouteImport.update({ - id: '/(gen)/relative59', - path: '/relative59', - getParentRoute: () => rootRoute, -} as any) - -const genRelative58Route = genRelative58RouteImport.update({ - id: '/(gen)/relative58', - path: '/relative58', - getParentRoute: () => rootRoute, -} as any) - -const genRelative57Route = genRelative57RouteImport.update({ - id: '/(gen)/relative57', - path: '/relative57', - getParentRoute: () => rootRoute, -} as any) - -const genRelative56Route = genRelative56RouteImport.update({ - id: '/(gen)/relative56', - path: '/relative56', - getParentRoute: () => rootRoute, -} as any) - -const genRelative55Route = genRelative55RouteImport.update({ - id: '/(gen)/relative55', - path: '/relative55', - getParentRoute: () => rootRoute, -} as any) - -const genRelative54Route = genRelative54RouteImport.update({ - id: '/(gen)/relative54', - path: '/relative54', - getParentRoute: () => rootRoute, -} as any) - -const genRelative53Route = genRelative53RouteImport.update({ - id: '/(gen)/relative53', - path: '/relative53', - getParentRoute: () => rootRoute, -} as any) - -const genRelative52Route = genRelative52RouteImport.update({ - id: '/(gen)/relative52', - path: '/relative52', - getParentRoute: () => rootRoute, -} as any) - -const genRelative51Route = genRelative51RouteImport.update({ - id: '/(gen)/relative51', - path: '/relative51', - getParentRoute: () => rootRoute, -} as any) - -const genRelative50Route = genRelative50RouteImport.update({ - id: '/(gen)/relative50', - path: '/relative50', - getParentRoute: () => rootRoute, -} as any) - -const genRelative5Route = genRelative5RouteImport.update({ - id: '/(gen)/relative5', - path: '/relative5', - getParentRoute: () => rootRoute, -} as any) - -const genRelative49Route = genRelative49RouteImport.update({ - id: '/(gen)/relative49', - path: '/relative49', - getParentRoute: () => rootRoute, -} as any) - -const genRelative48Route = genRelative48RouteImport.update({ - id: '/(gen)/relative48', - path: '/relative48', - getParentRoute: () => rootRoute, -} as any) - -const genRelative47Route = genRelative47RouteImport.update({ - id: '/(gen)/relative47', - path: '/relative47', - getParentRoute: () => rootRoute, -} as any) - -const genRelative46Route = genRelative46RouteImport.update({ - id: '/(gen)/relative46', - path: '/relative46', - getParentRoute: () => rootRoute, -} as any) - -const genRelative45Route = genRelative45RouteImport.update({ - id: '/(gen)/relative45', - path: '/relative45', - getParentRoute: () => rootRoute, -} as any) - -const genRelative44Route = genRelative44RouteImport.update({ - id: '/(gen)/relative44', - path: '/relative44', - getParentRoute: () => rootRoute, -} as any) - -const genRelative43Route = genRelative43RouteImport.update({ - id: '/(gen)/relative43', - path: '/relative43', - getParentRoute: () => rootRoute, -} as any) - -const genRelative42Route = genRelative42RouteImport.update({ - id: '/(gen)/relative42', - path: '/relative42', - getParentRoute: () => rootRoute, -} as any) - -const genRelative41Route = genRelative41RouteImport.update({ - id: '/(gen)/relative41', - path: '/relative41', - getParentRoute: () => rootRoute, -} as any) - -const genRelative40Route = genRelative40RouteImport.update({ - id: '/(gen)/relative40', - path: '/relative40', - getParentRoute: () => rootRoute, -} as any) - -const genRelative4Route = genRelative4RouteImport.update({ - id: '/(gen)/relative4', - path: '/relative4', - getParentRoute: () => rootRoute, -} as any) - -const genRelative39Route = genRelative39RouteImport.update({ - id: '/(gen)/relative39', - path: '/relative39', - getParentRoute: () => rootRoute, -} as any) - -const genRelative38Route = genRelative38RouteImport.update({ - id: '/(gen)/relative38', - path: '/relative38', - getParentRoute: () => rootRoute, -} as any) - -const genRelative37Route = genRelative37RouteImport.update({ - id: '/(gen)/relative37', - path: '/relative37', - getParentRoute: () => rootRoute, -} as any) - -const genRelative36Route = genRelative36RouteImport.update({ - id: '/(gen)/relative36', - path: '/relative36', - getParentRoute: () => rootRoute, -} as any) - -const genRelative35Route = genRelative35RouteImport.update({ - id: '/(gen)/relative35', - path: '/relative35', - getParentRoute: () => rootRoute, -} as any) - -const genRelative34Route = genRelative34RouteImport.update({ - id: '/(gen)/relative34', - path: '/relative34', - getParentRoute: () => rootRoute, -} as any) - -const genRelative33Route = genRelative33RouteImport.update({ - id: '/(gen)/relative33', - path: '/relative33', - getParentRoute: () => rootRoute, -} as any) - -const genRelative32Route = genRelative32RouteImport.update({ - id: '/(gen)/relative32', - path: '/relative32', - getParentRoute: () => rootRoute, -} as any) - -const genRelative31Route = genRelative31RouteImport.update({ - id: '/(gen)/relative31', - path: '/relative31', - getParentRoute: () => rootRoute, -} as any) - -const genRelative30Route = genRelative30RouteImport.update({ - id: '/(gen)/relative30', - path: '/relative30', - getParentRoute: () => rootRoute, -} as any) - -const genRelative3Route = genRelative3RouteImport.update({ - id: '/(gen)/relative3', - path: '/relative3', - getParentRoute: () => rootRoute, -} as any) - -const genRelative29Route = genRelative29RouteImport.update({ - id: '/(gen)/relative29', - path: '/relative29', - getParentRoute: () => rootRoute, -} as any) - -const genRelative28Route = genRelative28RouteImport.update({ - id: '/(gen)/relative28', - path: '/relative28', - getParentRoute: () => rootRoute, -} as any) - -const genRelative27Route = genRelative27RouteImport.update({ - id: '/(gen)/relative27', - path: '/relative27', - getParentRoute: () => rootRoute, -} as any) - -const genRelative26Route = genRelative26RouteImport.update({ - id: '/(gen)/relative26', - path: '/relative26', - getParentRoute: () => rootRoute, -} as any) - -const genRelative25Route = genRelative25RouteImport.update({ - id: '/(gen)/relative25', - path: '/relative25', - getParentRoute: () => rootRoute, -} as any) - -const genRelative24Route = genRelative24RouteImport.update({ - id: '/(gen)/relative24', - path: '/relative24', - getParentRoute: () => rootRoute, -} as any) - -const genRelative23Route = genRelative23RouteImport.update({ - id: '/(gen)/relative23', - path: '/relative23', - getParentRoute: () => rootRoute, -} as any) - -const genRelative22Route = genRelative22RouteImport.update({ - id: '/(gen)/relative22', - path: '/relative22', - getParentRoute: () => rootRoute, -} as any) - -const genRelative21Route = genRelative21RouteImport.update({ - id: '/(gen)/relative21', - path: '/relative21', - getParentRoute: () => rootRoute, -} as any) - -const genRelative20Route = genRelative20RouteImport.update({ - id: '/(gen)/relative20', - path: '/relative20', - getParentRoute: () => rootRoute, -} as any) - -const genRelative2Route = genRelative2RouteImport.update({ - id: '/(gen)/relative2', - path: '/relative2', - getParentRoute: () => rootRoute, -} as any) - -const genRelative19Route = genRelative19RouteImport.update({ - id: '/(gen)/relative19', - path: '/relative19', - getParentRoute: () => rootRoute, -} as any) - -const genRelative18Route = genRelative18RouteImport.update({ - id: '/(gen)/relative18', - path: '/relative18', - getParentRoute: () => rootRoute, -} as any) - -const genRelative17Route = genRelative17RouteImport.update({ - id: '/(gen)/relative17', - path: '/relative17', - getParentRoute: () => rootRoute, -} as any) - -const genRelative16Route = genRelative16RouteImport.update({ - id: '/(gen)/relative16', - path: '/relative16', - getParentRoute: () => rootRoute, -} as any) - -const genRelative15Route = genRelative15RouteImport.update({ - id: '/(gen)/relative15', - path: '/relative15', - getParentRoute: () => rootRoute, -} as any) - -const genRelative14Route = genRelative14RouteImport.update({ - id: '/(gen)/relative14', - path: '/relative14', - getParentRoute: () => rootRoute, -} as any) - -const genRelative13Route = genRelative13RouteImport.update({ - id: '/(gen)/relative13', - path: '/relative13', - getParentRoute: () => rootRoute, -} as any) - -const genRelative12Route = genRelative12RouteImport.update({ - id: '/(gen)/relative12', - path: '/relative12', - getParentRoute: () => rootRoute, -} as any) - -const genRelative11Route = genRelative11RouteImport.update({ - id: '/(gen)/relative11', - path: '/relative11', - getParentRoute: () => rootRoute, -} as any) - -const genRelative10Route = genRelative10RouteImport.update({ - id: '/(gen)/relative10', - path: '/relative10', - getParentRoute: () => rootRoute, -} as any) - -const genRelative1Route = genRelative1RouteImport.update({ - id: '/(gen)/relative1', - path: '/relative1', - getParentRoute: () => rootRoute, -} as any) - -const genRelative0Route = genRelative0RouteImport.update({ - id: '/(gen)/relative0', - path: '/relative0', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute99Route = genAbsolute99RouteImport.update({ - id: '/(gen)/absolute99', - path: '/absolute99', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute98Route = genAbsolute98RouteImport.update({ - id: '/(gen)/absolute98', - path: '/absolute98', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute97Route = genAbsolute97RouteImport.update({ - id: '/(gen)/absolute97', - path: '/absolute97', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute96Route = genAbsolute96RouteImport.update({ - id: '/(gen)/absolute96', - path: '/absolute96', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute95Route = genAbsolute95RouteImport.update({ - id: '/(gen)/absolute95', - path: '/absolute95', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute94Route = genAbsolute94RouteImport.update({ - id: '/(gen)/absolute94', - path: '/absolute94', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute93Route = genAbsolute93RouteImport.update({ - id: '/(gen)/absolute93', - path: '/absolute93', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute92Route = genAbsolute92RouteImport.update({ - id: '/(gen)/absolute92', - path: '/absolute92', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute91Route = genAbsolute91RouteImport.update({ - id: '/(gen)/absolute91', - path: '/absolute91', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute90Route = genAbsolute90RouteImport.update({ - id: '/(gen)/absolute90', - path: '/absolute90', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute9Route = genAbsolute9RouteImport.update({ - id: '/(gen)/absolute9', - path: '/absolute9', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute89Route = genAbsolute89RouteImport.update({ - id: '/(gen)/absolute89', - path: '/absolute89', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute88Route = genAbsolute88RouteImport.update({ - id: '/(gen)/absolute88', - path: '/absolute88', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute87Route = genAbsolute87RouteImport.update({ - id: '/(gen)/absolute87', - path: '/absolute87', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute86Route = genAbsolute86RouteImport.update({ - id: '/(gen)/absolute86', - path: '/absolute86', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute85Route = genAbsolute85RouteImport.update({ - id: '/(gen)/absolute85', - path: '/absolute85', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute84Route = genAbsolute84RouteImport.update({ - id: '/(gen)/absolute84', - path: '/absolute84', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute83Route = genAbsolute83RouteImport.update({ - id: '/(gen)/absolute83', - path: '/absolute83', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute82Route = genAbsolute82RouteImport.update({ - id: '/(gen)/absolute82', - path: '/absolute82', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute81Route = genAbsolute81RouteImport.update({ - id: '/(gen)/absolute81', - path: '/absolute81', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute80Route = genAbsolute80RouteImport.update({ - id: '/(gen)/absolute80', - path: '/absolute80', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute8Route = genAbsolute8RouteImport.update({ - id: '/(gen)/absolute8', - path: '/absolute8', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute79Route = genAbsolute79RouteImport.update({ - id: '/(gen)/absolute79', - path: '/absolute79', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute78Route = genAbsolute78RouteImport.update({ - id: '/(gen)/absolute78', - path: '/absolute78', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute77Route = genAbsolute77RouteImport.update({ - id: '/(gen)/absolute77', - path: '/absolute77', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute76Route = genAbsolute76RouteImport.update({ - id: '/(gen)/absolute76', - path: '/absolute76', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute75Route = genAbsolute75RouteImport.update({ - id: '/(gen)/absolute75', - path: '/absolute75', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute74Route = genAbsolute74RouteImport.update({ - id: '/(gen)/absolute74', - path: '/absolute74', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute73Route = genAbsolute73RouteImport.update({ - id: '/(gen)/absolute73', - path: '/absolute73', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute72Route = genAbsolute72RouteImport.update({ - id: '/(gen)/absolute72', - path: '/absolute72', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute71Route = genAbsolute71RouteImport.update({ - id: '/(gen)/absolute71', - path: '/absolute71', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute70Route = genAbsolute70RouteImport.update({ - id: '/(gen)/absolute70', - path: '/absolute70', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute7Route = genAbsolute7RouteImport.update({ - id: '/(gen)/absolute7', - path: '/absolute7', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute69Route = genAbsolute69RouteImport.update({ - id: '/(gen)/absolute69', - path: '/absolute69', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute68Route = genAbsolute68RouteImport.update({ - id: '/(gen)/absolute68', - path: '/absolute68', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute67Route = genAbsolute67RouteImport.update({ - id: '/(gen)/absolute67', - path: '/absolute67', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute66Route = genAbsolute66RouteImport.update({ - id: '/(gen)/absolute66', - path: '/absolute66', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute65Route = genAbsolute65RouteImport.update({ - id: '/(gen)/absolute65', - path: '/absolute65', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute64Route = genAbsolute64RouteImport.update({ - id: '/(gen)/absolute64', - path: '/absolute64', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute63Route = genAbsolute63RouteImport.update({ - id: '/(gen)/absolute63', - path: '/absolute63', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute62Route = genAbsolute62RouteImport.update({ - id: '/(gen)/absolute62', - path: '/absolute62', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute61Route = genAbsolute61RouteImport.update({ - id: '/(gen)/absolute61', - path: '/absolute61', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute60Route = genAbsolute60RouteImport.update({ - id: '/(gen)/absolute60', - path: '/absolute60', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute6Route = genAbsolute6RouteImport.update({ - id: '/(gen)/absolute6', - path: '/absolute6', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute59Route = genAbsolute59RouteImport.update({ - id: '/(gen)/absolute59', - path: '/absolute59', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute58Route = genAbsolute58RouteImport.update({ - id: '/(gen)/absolute58', - path: '/absolute58', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute57Route = genAbsolute57RouteImport.update({ - id: '/(gen)/absolute57', - path: '/absolute57', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute56Route = genAbsolute56RouteImport.update({ - id: '/(gen)/absolute56', - path: '/absolute56', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute55Route = genAbsolute55RouteImport.update({ - id: '/(gen)/absolute55', - path: '/absolute55', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute54Route = genAbsolute54RouteImport.update({ - id: '/(gen)/absolute54', - path: '/absolute54', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute53Route = genAbsolute53RouteImport.update({ - id: '/(gen)/absolute53', - path: '/absolute53', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute52Route = genAbsolute52RouteImport.update({ - id: '/(gen)/absolute52', - path: '/absolute52', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute51Route = genAbsolute51RouteImport.update({ - id: '/(gen)/absolute51', - path: '/absolute51', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute50Route = genAbsolute50RouteImport.update({ - id: '/(gen)/absolute50', - path: '/absolute50', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute5Route = genAbsolute5RouteImport.update({ - id: '/(gen)/absolute5', - path: '/absolute5', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute49Route = genAbsolute49RouteImport.update({ - id: '/(gen)/absolute49', - path: '/absolute49', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute48Route = genAbsolute48RouteImport.update({ - id: '/(gen)/absolute48', - path: '/absolute48', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute47Route = genAbsolute47RouteImport.update({ - id: '/(gen)/absolute47', - path: '/absolute47', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute46Route = genAbsolute46RouteImport.update({ - id: '/(gen)/absolute46', - path: '/absolute46', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute45Route = genAbsolute45RouteImport.update({ - id: '/(gen)/absolute45', - path: '/absolute45', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute44Route = genAbsolute44RouteImport.update({ - id: '/(gen)/absolute44', - path: '/absolute44', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute43Route = genAbsolute43RouteImport.update({ - id: '/(gen)/absolute43', - path: '/absolute43', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute42Route = genAbsolute42RouteImport.update({ - id: '/(gen)/absolute42', - path: '/absolute42', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute41Route = genAbsolute41RouteImport.update({ - id: '/(gen)/absolute41', - path: '/absolute41', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute40Route = genAbsolute40RouteImport.update({ - id: '/(gen)/absolute40', - path: '/absolute40', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute4Route = genAbsolute4RouteImport.update({ - id: '/(gen)/absolute4', - path: '/absolute4', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute39Route = genAbsolute39RouteImport.update({ - id: '/(gen)/absolute39', - path: '/absolute39', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute38Route = genAbsolute38RouteImport.update({ - id: '/(gen)/absolute38', - path: '/absolute38', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute37Route = genAbsolute37RouteImport.update({ - id: '/(gen)/absolute37', - path: '/absolute37', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute36Route = genAbsolute36RouteImport.update({ - id: '/(gen)/absolute36', - path: '/absolute36', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute35Route = genAbsolute35RouteImport.update({ - id: '/(gen)/absolute35', - path: '/absolute35', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute34Route = genAbsolute34RouteImport.update({ - id: '/(gen)/absolute34', - path: '/absolute34', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute33Route = genAbsolute33RouteImport.update({ - id: '/(gen)/absolute33', - path: '/absolute33', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute32Route = genAbsolute32RouteImport.update({ - id: '/(gen)/absolute32', - path: '/absolute32', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute31Route = genAbsolute31RouteImport.update({ - id: '/(gen)/absolute31', - path: '/absolute31', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute30Route = genAbsolute30RouteImport.update({ - id: '/(gen)/absolute30', - path: '/absolute30', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute3Route = genAbsolute3RouteImport.update({ - id: '/(gen)/absolute3', - path: '/absolute3', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute29Route = genAbsolute29RouteImport.update({ - id: '/(gen)/absolute29', - path: '/absolute29', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute28Route = genAbsolute28RouteImport.update({ - id: '/(gen)/absolute28', - path: '/absolute28', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute27Route = genAbsolute27RouteImport.update({ - id: '/(gen)/absolute27', - path: '/absolute27', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute26Route = genAbsolute26RouteImport.update({ - id: '/(gen)/absolute26', - path: '/absolute26', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute25Route = genAbsolute25RouteImport.update({ - id: '/(gen)/absolute25', - path: '/absolute25', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute24Route = genAbsolute24RouteImport.update({ - id: '/(gen)/absolute24', - path: '/absolute24', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute23Route = genAbsolute23RouteImport.update({ - id: '/(gen)/absolute23', - path: '/absolute23', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute22Route = genAbsolute22RouteImport.update({ - id: '/(gen)/absolute22', - path: '/absolute22', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute21Route = genAbsolute21RouteImport.update({ - id: '/(gen)/absolute21', - path: '/absolute21', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute20Route = genAbsolute20RouteImport.update({ - id: '/(gen)/absolute20', - path: '/absolute20', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute2Route = genAbsolute2RouteImport.update({ - id: '/(gen)/absolute2', - path: '/absolute2', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute19Route = genAbsolute19RouteImport.update({ - id: '/(gen)/absolute19', - path: '/absolute19', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute18Route = genAbsolute18RouteImport.update({ - id: '/(gen)/absolute18', - path: '/absolute18', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute17Route = genAbsolute17RouteImport.update({ - id: '/(gen)/absolute17', - path: '/absolute17', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute16Route = genAbsolute16RouteImport.update({ - id: '/(gen)/absolute16', - path: '/absolute16', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute15Route = genAbsolute15RouteImport.update({ - id: '/(gen)/absolute15', - path: '/absolute15', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute14Route = genAbsolute14RouteImport.update({ - id: '/(gen)/absolute14', - path: '/absolute14', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute13Route = genAbsolute13RouteImport.update({ - id: '/(gen)/absolute13', - path: '/absolute13', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute12Route = genAbsolute12RouteImport.update({ - id: '/(gen)/absolute12', - path: '/absolute12', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute11Route = genAbsolute11RouteImport.update({ - id: '/(gen)/absolute11', - path: '/absolute11', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute10Route = genAbsolute10RouteImport.update({ - id: '/(gen)/absolute10', - path: '/absolute10', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute1Route = genAbsolute1RouteImport.update({ - id: '/(gen)/absolute1', - path: '/absolute1', - getParentRoute: () => rootRoute, -} as any) - -const genAbsolute0Route = genAbsolute0RouteImport.update({ - id: '/(gen)/absolute0', - path: '/absolute0', - getParentRoute: () => rootRoute, -} as any) - -const genSearchRouteRoute = genSearchRouteRouteImport.update({ - id: '/(gen)/search', - path: '/search', - getParentRoute: () => rootRoute, -} as any) - -const genParamsRouteRoute = genParamsRouteRouteImport.update({ - id: '/(gen)/params', - path: '/params', - getParentRoute: () => rootRoute, -} as any) - -const genSearchSearch99Route = genSearchSearch99RouteImport.update({ - id: '/search99', - path: '/search99', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch98Route = genSearchSearch98RouteImport.update({ - id: '/search98', - path: '/search98', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch97Route = genSearchSearch97RouteImport.update({ - id: '/search97', - path: '/search97', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch96Route = genSearchSearch96RouteImport.update({ - id: '/search96', - path: '/search96', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch95Route = genSearchSearch95RouteImport.update({ - id: '/search95', - path: '/search95', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch94Route = genSearchSearch94RouteImport.update({ - id: '/search94', - path: '/search94', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch93Route = genSearchSearch93RouteImport.update({ - id: '/search93', - path: '/search93', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch92Route = genSearchSearch92RouteImport.update({ - id: '/search92', - path: '/search92', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch91Route = genSearchSearch91RouteImport.update({ - id: '/search91', - path: '/search91', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch90Route = genSearchSearch90RouteImport.update({ - id: '/search90', - path: '/search90', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch9Route = genSearchSearch9RouteImport.update({ - id: '/search9', - path: '/search9', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch89Route = genSearchSearch89RouteImport.update({ - id: '/search89', - path: '/search89', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch88Route = genSearchSearch88RouteImport.update({ - id: '/search88', - path: '/search88', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch87Route = genSearchSearch87RouteImport.update({ - id: '/search87', - path: '/search87', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch86Route = genSearchSearch86RouteImport.update({ - id: '/search86', - path: '/search86', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch85Route = genSearchSearch85RouteImport.update({ - id: '/search85', - path: '/search85', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch84Route = genSearchSearch84RouteImport.update({ - id: '/search84', - path: '/search84', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch83Route = genSearchSearch83RouteImport.update({ - id: '/search83', - path: '/search83', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch82Route = genSearchSearch82RouteImport.update({ - id: '/search82', - path: '/search82', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch81Route = genSearchSearch81RouteImport.update({ - id: '/search81', - path: '/search81', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch80Route = genSearchSearch80RouteImport.update({ - id: '/search80', - path: '/search80', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch8Route = genSearchSearch8RouteImport.update({ - id: '/search8', - path: '/search8', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch79Route = genSearchSearch79RouteImport.update({ - id: '/search79', - path: '/search79', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch78Route = genSearchSearch78RouteImport.update({ - id: '/search78', - path: '/search78', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch77Route = genSearchSearch77RouteImport.update({ - id: '/search77', - path: '/search77', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch76Route = genSearchSearch76RouteImport.update({ - id: '/search76', - path: '/search76', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch75Route = genSearchSearch75RouteImport.update({ - id: '/search75', - path: '/search75', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch74Route = genSearchSearch74RouteImport.update({ - id: '/search74', - path: '/search74', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch73Route = genSearchSearch73RouteImport.update({ - id: '/search73', - path: '/search73', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch72Route = genSearchSearch72RouteImport.update({ - id: '/search72', - path: '/search72', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch71Route = genSearchSearch71RouteImport.update({ - id: '/search71', - path: '/search71', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch70Route = genSearchSearch70RouteImport.update({ - id: '/search70', - path: '/search70', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch7Route = genSearchSearch7RouteImport.update({ - id: '/search7', - path: '/search7', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch69Route = genSearchSearch69RouteImport.update({ - id: '/search69', - path: '/search69', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch68Route = genSearchSearch68RouteImport.update({ - id: '/search68', - path: '/search68', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch67Route = genSearchSearch67RouteImport.update({ - id: '/search67', - path: '/search67', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch66Route = genSearchSearch66RouteImport.update({ - id: '/search66', - path: '/search66', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch65Route = genSearchSearch65RouteImport.update({ - id: '/search65', - path: '/search65', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch64Route = genSearchSearch64RouteImport.update({ - id: '/search64', - path: '/search64', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch63Route = genSearchSearch63RouteImport.update({ - id: '/search63', - path: '/search63', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch62Route = genSearchSearch62RouteImport.update({ - id: '/search62', - path: '/search62', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch61Route = genSearchSearch61RouteImport.update({ - id: '/search61', - path: '/search61', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch60Route = genSearchSearch60RouteImport.update({ - id: '/search60', - path: '/search60', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch6Route = genSearchSearch6RouteImport.update({ - id: '/search6', - path: '/search6', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch59Route = genSearchSearch59RouteImport.update({ - id: '/search59', - path: '/search59', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch58Route = genSearchSearch58RouteImport.update({ - id: '/search58', - path: '/search58', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch57Route = genSearchSearch57RouteImport.update({ - id: '/search57', - path: '/search57', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch56Route = genSearchSearch56RouteImport.update({ - id: '/search56', - path: '/search56', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch55Route = genSearchSearch55RouteImport.update({ - id: '/search55', - path: '/search55', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch54Route = genSearchSearch54RouteImport.update({ - id: '/search54', - path: '/search54', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch53Route = genSearchSearch53RouteImport.update({ - id: '/search53', - path: '/search53', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch52Route = genSearchSearch52RouteImport.update({ - id: '/search52', - path: '/search52', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch51Route = genSearchSearch51RouteImport.update({ - id: '/search51', - path: '/search51', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch50Route = genSearchSearch50RouteImport.update({ - id: '/search50', - path: '/search50', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch5Route = genSearchSearch5RouteImport.update({ - id: '/search5', - path: '/search5', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch49Route = genSearchSearch49RouteImport.update({ - id: '/search49', - path: '/search49', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch48Route = genSearchSearch48RouteImport.update({ - id: '/search48', - path: '/search48', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch47Route = genSearchSearch47RouteImport.update({ - id: '/search47', - path: '/search47', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch46Route = genSearchSearch46RouteImport.update({ - id: '/search46', - path: '/search46', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch45Route = genSearchSearch45RouteImport.update({ - id: '/search45', - path: '/search45', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch44Route = genSearchSearch44RouteImport.update({ - id: '/search44', - path: '/search44', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch43Route = genSearchSearch43RouteImport.update({ - id: '/search43', - path: '/search43', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch42Route = genSearchSearch42RouteImport.update({ - id: '/search42', - path: '/search42', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch41Route = genSearchSearch41RouteImport.update({ - id: '/search41', - path: '/search41', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch40Route = genSearchSearch40RouteImport.update({ - id: '/search40', - path: '/search40', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch4Route = genSearchSearch4RouteImport.update({ - id: '/search4', - path: '/search4', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch39Route = genSearchSearch39RouteImport.update({ - id: '/search39', - path: '/search39', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch38Route = genSearchSearch38RouteImport.update({ - id: '/search38', - path: '/search38', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch37Route = genSearchSearch37RouteImport.update({ - id: '/search37', - path: '/search37', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch36Route = genSearchSearch36RouteImport.update({ - id: '/search36', - path: '/search36', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch35Route = genSearchSearch35RouteImport.update({ - id: '/search35', - path: '/search35', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch34Route = genSearchSearch34RouteImport.update({ - id: '/search34', - path: '/search34', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch33Route = genSearchSearch33RouteImport.update({ - id: '/search33', - path: '/search33', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch32Route = genSearchSearch32RouteImport.update({ - id: '/search32', - path: '/search32', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch31Route = genSearchSearch31RouteImport.update({ - id: '/search31', - path: '/search31', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch30Route = genSearchSearch30RouteImport.update({ - id: '/search30', - path: '/search30', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch3Route = genSearchSearch3RouteImport.update({ - id: '/search3', - path: '/search3', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch29Route = genSearchSearch29RouteImport.update({ - id: '/search29', - path: '/search29', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch28Route = genSearchSearch28RouteImport.update({ - id: '/search28', - path: '/search28', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch27Route = genSearchSearch27RouteImport.update({ - id: '/search27', - path: '/search27', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch26Route = genSearchSearch26RouteImport.update({ - id: '/search26', - path: '/search26', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch25Route = genSearchSearch25RouteImport.update({ - id: '/search25', - path: '/search25', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch24Route = genSearchSearch24RouteImport.update({ - id: '/search24', - path: '/search24', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch23Route = genSearchSearch23RouteImport.update({ - id: '/search23', - path: '/search23', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch22Route = genSearchSearch22RouteImport.update({ - id: '/search22', - path: '/search22', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch21Route = genSearchSearch21RouteImport.update({ - id: '/search21', - path: '/search21', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch20Route = genSearchSearch20RouteImport.update({ - id: '/search20', - path: '/search20', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch2Route = genSearchSearch2RouteImport.update({ - id: '/search2', - path: '/search2', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch19Route = genSearchSearch19RouteImport.update({ - id: '/search19', - path: '/search19', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch18Route = genSearchSearch18RouteImport.update({ - id: '/search18', - path: '/search18', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch17Route = genSearchSearch17RouteImport.update({ - id: '/search17', - path: '/search17', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch16Route = genSearchSearch16RouteImport.update({ - id: '/search16', - path: '/search16', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch15Route = genSearchSearch15RouteImport.update({ - id: '/search15', - path: '/search15', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch14Route = genSearchSearch14RouteImport.update({ - id: '/search14', - path: '/search14', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch13Route = genSearchSearch13RouteImport.update({ - id: '/search13', - path: '/search13', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch12Route = genSearchSearch12RouteImport.update({ - id: '/search12', - path: '/search12', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch11Route = genSearchSearch11RouteImport.update({ - id: '/search11', - path: '/search11', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch10Route = genSearchSearch10RouteImport.update({ - id: '/search10', - path: '/search10', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch1Route = genSearchSearch1RouteImport.update({ - id: '/search1', - path: '/search1', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genSearchSearch0Route = genSearchSearch0RouteImport.update({ - id: '/search0', - path: '/search0', - getParentRoute: () => genSearchRouteRoute, -} as any) - -const genParamsParam99Route = genParamsParam99RouteImport.update({ - id: '/$param99', - path: '/$param99', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam98Route = genParamsParam98RouteImport.update({ - id: '/$param98', - path: '/$param98', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam97Route = genParamsParam97RouteImport.update({ - id: '/$param97', - path: '/$param97', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam96Route = genParamsParam96RouteImport.update({ - id: '/$param96', - path: '/$param96', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam95Route = genParamsParam95RouteImport.update({ - id: '/$param95', - path: '/$param95', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam94Route = genParamsParam94RouteImport.update({ - id: '/$param94', - path: '/$param94', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam93Route = genParamsParam93RouteImport.update({ - id: '/$param93', - path: '/$param93', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam92Route = genParamsParam92RouteImport.update({ - id: '/$param92', - path: '/$param92', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam91Route = genParamsParam91RouteImport.update({ - id: '/$param91', - path: '/$param91', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam90Route = genParamsParam90RouteImport.update({ - id: '/$param90', - path: '/$param90', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam9Route = genParamsParam9RouteImport.update({ - id: '/$param9', - path: '/$param9', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam89Route = genParamsParam89RouteImport.update({ - id: '/$param89', - path: '/$param89', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam88Route = genParamsParam88RouteImport.update({ - id: '/$param88', - path: '/$param88', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam87Route = genParamsParam87RouteImport.update({ - id: '/$param87', - path: '/$param87', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam86Route = genParamsParam86RouteImport.update({ - id: '/$param86', - path: '/$param86', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam85Route = genParamsParam85RouteImport.update({ - id: '/$param85', - path: '/$param85', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam84Route = genParamsParam84RouteImport.update({ - id: '/$param84', - path: '/$param84', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam83Route = genParamsParam83RouteImport.update({ - id: '/$param83', - path: '/$param83', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam82Route = genParamsParam82RouteImport.update({ - id: '/$param82', - path: '/$param82', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam81Route = genParamsParam81RouteImport.update({ - id: '/$param81', - path: '/$param81', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam80Route = genParamsParam80RouteImport.update({ - id: '/$param80', - path: '/$param80', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam8Route = genParamsParam8RouteImport.update({ - id: '/$param8', - path: '/$param8', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam79Route = genParamsParam79RouteImport.update({ - id: '/$param79', - path: '/$param79', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam78Route = genParamsParam78RouteImport.update({ - id: '/$param78', - path: '/$param78', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam77Route = genParamsParam77RouteImport.update({ - id: '/$param77', - path: '/$param77', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam76Route = genParamsParam76RouteImport.update({ - id: '/$param76', - path: '/$param76', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam75Route = genParamsParam75RouteImport.update({ - id: '/$param75', - path: '/$param75', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam74Route = genParamsParam74RouteImport.update({ - id: '/$param74', - path: '/$param74', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam73Route = genParamsParam73RouteImport.update({ - id: '/$param73', - path: '/$param73', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam72Route = genParamsParam72RouteImport.update({ - id: '/$param72', - path: '/$param72', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam71Route = genParamsParam71RouteImport.update({ - id: '/$param71', - path: '/$param71', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam70Route = genParamsParam70RouteImport.update({ - id: '/$param70', - path: '/$param70', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam7Route = genParamsParam7RouteImport.update({ - id: '/$param7', - path: '/$param7', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam69Route = genParamsParam69RouteImport.update({ - id: '/$param69', - path: '/$param69', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam68Route = genParamsParam68RouteImport.update({ - id: '/$param68', - path: '/$param68', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam67Route = genParamsParam67RouteImport.update({ - id: '/$param67', - path: '/$param67', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam66Route = genParamsParam66RouteImport.update({ - id: '/$param66', - path: '/$param66', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam65Route = genParamsParam65RouteImport.update({ - id: '/$param65', - path: '/$param65', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam64Route = genParamsParam64RouteImport.update({ - id: '/$param64', - path: '/$param64', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam63Route = genParamsParam63RouteImport.update({ - id: '/$param63', - path: '/$param63', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam62Route = genParamsParam62RouteImport.update({ - id: '/$param62', - path: '/$param62', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam61Route = genParamsParam61RouteImport.update({ - id: '/$param61', - path: '/$param61', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam60Route = genParamsParam60RouteImport.update({ - id: '/$param60', - path: '/$param60', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam6Route = genParamsParam6RouteImport.update({ - id: '/$param6', - path: '/$param6', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam59Route = genParamsParam59RouteImport.update({ - id: '/$param59', - path: '/$param59', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam58Route = genParamsParam58RouteImport.update({ - id: '/$param58', - path: '/$param58', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam57Route = genParamsParam57RouteImport.update({ - id: '/$param57', - path: '/$param57', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam56Route = genParamsParam56RouteImport.update({ - id: '/$param56', - path: '/$param56', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam55Route = genParamsParam55RouteImport.update({ - id: '/$param55', - path: '/$param55', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam54Route = genParamsParam54RouteImport.update({ - id: '/$param54', - path: '/$param54', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam53Route = genParamsParam53RouteImport.update({ - id: '/$param53', - path: '/$param53', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam52Route = genParamsParam52RouteImport.update({ - id: '/$param52', - path: '/$param52', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam51Route = genParamsParam51RouteImport.update({ - id: '/$param51', - path: '/$param51', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam50Route = genParamsParam50RouteImport.update({ - id: '/$param50', - path: '/$param50', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam5Route = genParamsParam5RouteImport.update({ - id: '/$param5', - path: '/$param5', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam49Route = genParamsParam49RouteImport.update({ - id: '/$param49', - path: '/$param49', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam48Route = genParamsParam48RouteImport.update({ - id: '/$param48', - path: '/$param48', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam47Route = genParamsParam47RouteImport.update({ - id: '/$param47', - path: '/$param47', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam46Route = genParamsParam46RouteImport.update({ - id: '/$param46', - path: '/$param46', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam45Route = genParamsParam45RouteImport.update({ - id: '/$param45', - path: '/$param45', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam44Route = genParamsParam44RouteImport.update({ - id: '/$param44', - path: '/$param44', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam43Route = genParamsParam43RouteImport.update({ - id: '/$param43', - path: '/$param43', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam42Route = genParamsParam42RouteImport.update({ - id: '/$param42', - path: '/$param42', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam41Route = genParamsParam41RouteImport.update({ - id: '/$param41', - path: '/$param41', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam40Route = genParamsParam40RouteImport.update({ - id: '/$param40', - path: '/$param40', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam4Route = genParamsParam4RouteImport.update({ - id: '/$param4', - path: '/$param4', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam39Route = genParamsParam39RouteImport.update({ - id: '/$param39', - path: '/$param39', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam38Route = genParamsParam38RouteImport.update({ - id: '/$param38', - path: '/$param38', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam37Route = genParamsParam37RouteImport.update({ - id: '/$param37', - path: '/$param37', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam36Route = genParamsParam36RouteImport.update({ - id: '/$param36', - path: '/$param36', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam35Route = genParamsParam35RouteImport.update({ - id: '/$param35', - path: '/$param35', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam34Route = genParamsParam34RouteImport.update({ - id: '/$param34', - path: '/$param34', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam33Route = genParamsParam33RouteImport.update({ - id: '/$param33', - path: '/$param33', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam32Route = genParamsParam32RouteImport.update({ - id: '/$param32', - path: '/$param32', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam31Route = genParamsParam31RouteImport.update({ - id: '/$param31', - path: '/$param31', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam30Route = genParamsParam30RouteImport.update({ - id: '/$param30', - path: '/$param30', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam3Route = genParamsParam3RouteImport.update({ - id: '/$param3', - path: '/$param3', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam29Route = genParamsParam29RouteImport.update({ - id: '/$param29', - path: '/$param29', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam28Route = genParamsParam28RouteImport.update({ - id: '/$param28', - path: '/$param28', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam27Route = genParamsParam27RouteImport.update({ - id: '/$param27', - path: '/$param27', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam26Route = genParamsParam26RouteImport.update({ - id: '/$param26', - path: '/$param26', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam25Route = genParamsParam25RouteImport.update({ - id: '/$param25', - path: '/$param25', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam24Route = genParamsParam24RouteImport.update({ - id: '/$param24', - path: '/$param24', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam23Route = genParamsParam23RouteImport.update({ - id: '/$param23', - path: '/$param23', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam22Route = genParamsParam22RouteImport.update({ - id: '/$param22', - path: '/$param22', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam21Route = genParamsParam21RouteImport.update({ - id: '/$param21', - path: '/$param21', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam20Route = genParamsParam20RouteImport.update({ - id: '/$param20', - path: '/$param20', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam2Route = genParamsParam2RouteImport.update({ - id: '/$param2', - path: '/$param2', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam19Route = genParamsParam19RouteImport.update({ - id: '/$param19', - path: '/$param19', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam18Route = genParamsParam18RouteImport.update({ - id: '/$param18', - path: '/$param18', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam17Route = genParamsParam17RouteImport.update({ - id: '/$param17', - path: '/$param17', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam16Route = genParamsParam16RouteImport.update({ - id: '/$param16', - path: '/$param16', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam15Route = genParamsParam15RouteImport.update({ - id: '/$param15', - path: '/$param15', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam14Route = genParamsParam14RouteImport.update({ - id: '/$param14', - path: '/$param14', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam13Route = genParamsParam13RouteImport.update({ - id: '/$param13', - path: '/$param13', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam12Route = genParamsParam12RouteImport.update({ - id: '/$param12', - path: '/$param12', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam11Route = genParamsParam11RouteImport.update({ - id: '/$param11', - path: '/$param11', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam10Route = genParamsParam10RouteImport.update({ - id: '/$param10', - path: '/$param10', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam1Route = genParamsParam1RouteImport.update({ - id: '/$param1', - path: '/$param1', - getParentRoute: () => genParamsRouteRoute, -} as any) - -const genParamsParam0Route = genParamsParam0RouteImport.update({ - id: '/$param0', - path: '/$param0', - getParentRoute: () => genParamsRouteRoute, -} as any) - -// Populate the FileRoutesByPath interface - -declare module '@tanstack/react-router' { - interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRoute - } - '/params': { - id: '/params' - path: '/params' - fullPath: '/params' - preLoaderRoute: typeof ParamsRouteRouteImport - parentRoute: typeof rootRoute - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteRouteImport - parentRoute: typeof rootRoute - } - '/absolute': { - id: '/absolute' - path: '/absolute' - fullPath: '/absolute' - preLoaderRoute: typeof AbsoluteRouteImport - parentRoute: typeof rootRoute - } - '/linkProps': { - id: '/linkProps' - path: '/linkProps' - fullPath: '/linkProps' - preLoaderRoute: typeof LinkPropsRouteImport - parentRoute: typeof rootRoute - } - '/relative': { - id: '/relative' - path: '/relative' - fullPath: '/relative' - preLoaderRoute: typeof RelativeRouteImport - parentRoute: typeof rootRoute - } - '/(gen)/params': { - id: '/(gen)/params' - path: '/params' - fullPath: '/params' - preLoaderRoute: typeof genParamsRouteRouteImport - parentRoute: typeof rootRoute - } - '/(gen)/search': { - id: '/(gen)/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof genSearchRouteRouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute0': { - id: '/(gen)/absolute0' - path: '/absolute0' - fullPath: '/absolute0' - preLoaderRoute: typeof genAbsolute0RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute1': { - id: '/(gen)/absolute1' - path: '/absolute1' - fullPath: '/absolute1' - preLoaderRoute: typeof genAbsolute1RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute10': { - id: '/(gen)/absolute10' - path: '/absolute10' - fullPath: '/absolute10' - preLoaderRoute: typeof genAbsolute10RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute11': { - id: '/(gen)/absolute11' - path: '/absolute11' - fullPath: '/absolute11' - preLoaderRoute: typeof genAbsolute11RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute12': { - id: '/(gen)/absolute12' - path: '/absolute12' - fullPath: '/absolute12' - preLoaderRoute: typeof genAbsolute12RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute13': { - id: '/(gen)/absolute13' - path: '/absolute13' - fullPath: '/absolute13' - preLoaderRoute: typeof genAbsolute13RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute14': { - id: '/(gen)/absolute14' - path: '/absolute14' - fullPath: '/absolute14' - preLoaderRoute: typeof genAbsolute14RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute15': { - id: '/(gen)/absolute15' - path: '/absolute15' - fullPath: '/absolute15' - preLoaderRoute: typeof genAbsolute15RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute16': { - id: '/(gen)/absolute16' - path: '/absolute16' - fullPath: '/absolute16' - preLoaderRoute: typeof genAbsolute16RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute17': { - id: '/(gen)/absolute17' - path: '/absolute17' - fullPath: '/absolute17' - preLoaderRoute: typeof genAbsolute17RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute18': { - id: '/(gen)/absolute18' - path: '/absolute18' - fullPath: '/absolute18' - preLoaderRoute: typeof genAbsolute18RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute19': { - id: '/(gen)/absolute19' - path: '/absolute19' - fullPath: '/absolute19' - preLoaderRoute: typeof genAbsolute19RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute2': { - id: '/(gen)/absolute2' - path: '/absolute2' - fullPath: '/absolute2' - preLoaderRoute: typeof genAbsolute2RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute20': { - id: '/(gen)/absolute20' - path: '/absolute20' - fullPath: '/absolute20' - preLoaderRoute: typeof genAbsolute20RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute21': { - id: '/(gen)/absolute21' - path: '/absolute21' - fullPath: '/absolute21' - preLoaderRoute: typeof genAbsolute21RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute22': { - id: '/(gen)/absolute22' - path: '/absolute22' - fullPath: '/absolute22' - preLoaderRoute: typeof genAbsolute22RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute23': { - id: '/(gen)/absolute23' - path: '/absolute23' - fullPath: '/absolute23' - preLoaderRoute: typeof genAbsolute23RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute24': { - id: '/(gen)/absolute24' - path: '/absolute24' - fullPath: '/absolute24' - preLoaderRoute: typeof genAbsolute24RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute25': { - id: '/(gen)/absolute25' - path: '/absolute25' - fullPath: '/absolute25' - preLoaderRoute: typeof genAbsolute25RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute26': { - id: '/(gen)/absolute26' - path: '/absolute26' - fullPath: '/absolute26' - preLoaderRoute: typeof genAbsolute26RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute27': { - id: '/(gen)/absolute27' - path: '/absolute27' - fullPath: '/absolute27' - preLoaderRoute: typeof genAbsolute27RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute28': { - id: '/(gen)/absolute28' - path: '/absolute28' - fullPath: '/absolute28' - preLoaderRoute: typeof genAbsolute28RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute29': { - id: '/(gen)/absolute29' - path: '/absolute29' - fullPath: '/absolute29' - preLoaderRoute: typeof genAbsolute29RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute3': { - id: '/(gen)/absolute3' - path: '/absolute3' - fullPath: '/absolute3' - preLoaderRoute: typeof genAbsolute3RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute30': { - id: '/(gen)/absolute30' - path: '/absolute30' - fullPath: '/absolute30' - preLoaderRoute: typeof genAbsolute30RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute31': { - id: '/(gen)/absolute31' - path: '/absolute31' - fullPath: '/absolute31' - preLoaderRoute: typeof genAbsolute31RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute32': { - id: '/(gen)/absolute32' - path: '/absolute32' - fullPath: '/absolute32' - preLoaderRoute: typeof genAbsolute32RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute33': { - id: '/(gen)/absolute33' - path: '/absolute33' - fullPath: '/absolute33' - preLoaderRoute: typeof genAbsolute33RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute34': { - id: '/(gen)/absolute34' - path: '/absolute34' - fullPath: '/absolute34' - preLoaderRoute: typeof genAbsolute34RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute35': { - id: '/(gen)/absolute35' - path: '/absolute35' - fullPath: '/absolute35' - preLoaderRoute: typeof genAbsolute35RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute36': { - id: '/(gen)/absolute36' - path: '/absolute36' - fullPath: '/absolute36' - preLoaderRoute: typeof genAbsolute36RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute37': { - id: '/(gen)/absolute37' - path: '/absolute37' - fullPath: '/absolute37' - preLoaderRoute: typeof genAbsolute37RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute38': { - id: '/(gen)/absolute38' - path: '/absolute38' - fullPath: '/absolute38' - preLoaderRoute: typeof genAbsolute38RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute39': { - id: '/(gen)/absolute39' - path: '/absolute39' - fullPath: '/absolute39' - preLoaderRoute: typeof genAbsolute39RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute4': { - id: '/(gen)/absolute4' - path: '/absolute4' - fullPath: '/absolute4' - preLoaderRoute: typeof genAbsolute4RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute40': { - id: '/(gen)/absolute40' - path: '/absolute40' - fullPath: '/absolute40' - preLoaderRoute: typeof genAbsolute40RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute41': { - id: '/(gen)/absolute41' - path: '/absolute41' - fullPath: '/absolute41' - preLoaderRoute: typeof genAbsolute41RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute42': { - id: '/(gen)/absolute42' - path: '/absolute42' - fullPath: '/absolute42' - preLoaderRoute: typeof genAbsolute42RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute43': { - id: '/(gen)/absolute43' - path: '/absolute43' - fullPath: '/absolute43' - preLoaderRoute: typeof genAbsolute43RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute44': { - id: '/(gen)/absolute44' - path: '/absolute44' - fullPath: '/absolute44' - preLoaderRoute: typeof genAbsolute44RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute45': { - id: '/(gen)/absolute45' - path: '/absolute45' - fullPath: '/absolute45' - preLoaderRoute: typeof genAbsolute45RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute46': { - id: '/(gen)/absolute46' - path: '/absolute46' - fullPath: '/absolute46' - preLoaderRoute: typeof genAbsolute46RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute47': { - id: '/(gen)/absolute47' - path: '/absolute47' - fullPath: '/absolute47' - preLoaderRoute: typeof genAbsolute47RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute48': { - id: '/(gen)/absolute48' - path: '/absolute48' - fullPath: '/absolute48' - preLoaderRoute: typeof genAbsolute48RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute49': { - id: '/(gen)/absolute49' - path: '/absolute49' - fullPath: '/absolute49' - preLoaderRoute: typeof genAbsolute49RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute5': { - id: '/(gen)/absolute5' - path: '/absolute5' - fullPath: '/absolute5' - preLoaderRoute: typeof genAbsolute5RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute50': { - id: '/(gen)/absolute50' - path: '/absolute50' - fullPath: '/absolute50' - preLoaderRoute: typeof genAbsolute50RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute51': { - id: '/(gen)/absolute51' - path: '/absolute51' - fullPath: '/absolute51' - preLoaderRoute: typeof genAbsolute51RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute52': { - id: '/(gen)/absolute52' - path: '/absolute52' - fullPath: '/absolute52' - preLoaderRoute: typeof genAbsolute52RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute53': { - id: '/(gen)/absolute53' - path: '/absolute53' - fullPath: '/absolute53' - preLoaderRoute: typeof genAbsolute53RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute54': { - id: '/(gen)/absolute54' - path: '/absolute54' - fullPath: '/absolute54' - preLoaderRoute: typeof genAbsolute54RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute55': { - id: '/(gen)/absolute55' - path: '/absolute55' - fullPath: '/absolute55' - preLoaderRoute: typeof genAbsolute55RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute56': { - id: '/(gen)/absolute56' - path: '/absolute56' - fullPath: '/absolute56' - preLoaderRoute: typeof genAbsolute56RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute57': { - id: '/(gen)/absolute57' - path: '/absolute57' - fullPath: '/absolute57' - preLoaderRoute: typeof genAbsolute57RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute58': { - id: '/(gen)/absolute58' - path: '/absolute58' - fullPath: '/absolute58' - preLoaderRoute: typeof genAbsolute58RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute59': { - id: '/(gen)/absolute59' - path: '/absolute59' - fullPath: '/absolute59' - preLoaderRoute: typeof genAbsolute59RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute6': { - id: '/(gen)/absolute6' - path: '/absolute6' - fullPath: '/absolute6' - preLoaderRoute: typeof genAbsolute6RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute60': { - id: '/(gen)/absolute60' - path: '/absolute60' - fullPath: '/absolute60' - preLoaderRoute: typeof genAbsolute60RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute61': { - id: '/(gen)/absolute61' - path: '/absolute61' - fullPath: '/absolute61' - preLoaderRoute: typeof genAbsolute61RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute62': { - id: '/(gen)/absolute62' - path: '/absolute62' - fullPath: '/absolute62' - preLoaderRoute: typeof genAbsolute62RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute63': { - id: '/(gen)/absolute63' - path: '/absolute63' - fullPath: '/absolute63' - preLoaderRoute: typeof genAbsolute63RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute64': { - id: '/(gen)/absolute64' - path: '/absolute64' - fullPath: '/absolute64' - preLoaderRoute: typeof genAbsolute64RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute65': { - id: '/(gen)/absolute65' - path: '/absolute65' - fullPath: '/absolute65' - preLoaderRoute: typeof genAbsolute65RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute66': { - id: '/(gen)/absolute66' - path: '/absolute66' - fullPath: '/absolute66' - preLoaderRoute: typeof genAbsolute66RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute67': { - id: '/(gen)/absolute67' - path: '/absolute67' - fullPath: '/absolute67' - preLoaderRoute: typeof genAbsolute67RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute68': { - id: '/(gen)/absolute68' - path: '/absolute68' - fullPath: '/absolute68' - preLoaderRoute: typeof genAbsolute68RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute69': { - id: '/(gen)/absolute69' - path: '/absolute69' - fullPath: '/absolute69' - preLoaderRoute: typeof genAbsolute69RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute7': { - id: '/(gen)/absolute7' - path: '/absolute7' - fullPath: '/absolute7' - preLoaderRoute: typeof genAbsolute7RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute70': { - id: '/(gen)/absolute70' - path: '/absolute70' - fullPath: '/absolute70' - preLoaderRoute: typeof genAbsolute70RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute71': { - id: '/(gen)/absolute71' - path: '/absolute71' - fullPath: '/absolute71' - preLoaderRoute: typeof genAbsolute71RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute72': { - id: '/(gen)/absolute72' - path: '/absolute72' - fullPath: '/absolute72' - preLoaderRoute: typeof genAbsolute72RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute73': { - id: '/(gen)/absolute73' - path: '/absolute73' - fullPath: '/absolute73' - preLoaderRoute: typeof genAbsolute73RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute74': { - id: '/(gen)/absolute74' - path: '/absolute74' - fullPath: '/absolute74' - preLoaderRoute: typeof genAbsolute74RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute75': { - id: '/(gen)/absolute75' - path: '/absolute75' - fullPath: '/absolute75' - preLoaderRoute: typeof genAbsolute75RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute76': { - id: '/(gen)/absolute76' - path: '/absolute76' - fullPath: '/absolute76' - preLoaderRoute: typeof genAbsolute76RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute77': { - id: '/(gen)/absolute77' - path: '/absolute77' - fullPath: '/absolute77' - preLoaderRoute: typeof genAbsolute77RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute78': { - id: '/(gen)/absolute78' - path: '/absolute78' - fullPath: '/absolute78' - preLoaderRoute: typeof genAbsolute78RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute79': { - id: '/(gen)/absolute79' - path: '/absolute79' - fullPath: '/absolute79' - preLoaderRoute: typeof genAbsolute79RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute8': { - id: '/(gen)/absolute8' - path: '/absolute8' - fullPath: '/absolute8' - preLoaderRoute: typeof genAbsolute8RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute80': { - id: '/(gen)/absolute80' - path: '/absolute80' - fullPath: '/absolute80' - preLoaderRoute: typeof genAbsolute80RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute81': { - id: '/(gen)/absolute81' - path: '/absolute81' - fullPath: '/absolute81' - preLoaderRoute: typeof genAbsolute81RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute82': { - id: '/(gen)/absolute82' - path: '/absolute82' - fullPath: '/absolute82' - preLoaderRoute: typeof genAbsolute82RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute83': { - id: '/(gen)/absolute83' - path: '/absolute83' - fullPath: '/absolute83' - preLoaderRoute: typeof genAbsolute83RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute84': { - id: '/(gen)/absolute84' - path: '/absolute84' - fullPath: '/absolute84' - preLoaderRoute: typeof genAbsolute84RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute85': { - id: '/(gen)/absolute85' - path: '/absolute85' - fullPath: '/absolute85' - preLoaderRoute: typeof genAbsolute85RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute86': { - id: '/(gen)/absolute86' - path: '/absolute86' - fullPath: '/absolute86' - preLoaderRoute: typeof genAbsolute86RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute87': { - id: '/(gen)/absolute87' - path: '/absolute87' - fullPath: '/absolute87' - preLoaderRoute: typeof genAbsolute87RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute88': { - id: '/(gen)/absolute88' - path: '/absolute88' - fullPath: '/absolute88' - preLoaderRoute: typeof genAbsolute88RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute89': { - id: '/(gen)/absolute89' - path: '/absolute89' - fullPath: '/absolute89' - preLoaderRoute: typeof genAbsolute89RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute9': { - id: '/(gen)/absolute9' - path: '/absolute9' - fullPath: '/absolute9' - preLoaderRoute: typeof genAbsolute9RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute90': { - id: '/(gen)/absolute90' - path: '/absolute90' - fullPath: '/absolute90' - preLoaderRoute: typeof genAbsolute90RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute91': { - id: '/(gen)/absolute91' - path: '/absolute91' - fullPath: '/absolute91' - preLoaderRoute: typeof genAbsolute91RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute92': { - id: '/(gen)/absolute92' - path: '/absolute92' - fullPath: '/absolute92' - preLoaderRoute: typeof genAbsolute92RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute93': { - id: '/(gen)/absolute93' - path: '/absolute93' - fullPath: '/absolute93' - preLoaderRoute: typeof genAbsolute93RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute94': { - id: '/(gen)/absolute94' - path: '/absolute94' - fullPath: '/absolute94' - preLoaderRoute: typeof genAbsolute94RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute95': { - id: '/(gen)/absolute95' - path: '/absolute95' - fullPath: '/absolute95' - preLoaderRoute: typeof genAbsolute95RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute96': { - id: '/(gen)/absolute96' - path: '/absolute96' - fullPath: '/absolute96' - preLoaderRoute: typeof genAbsolute96RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute97': { - id: '/(gen)/absolute97' - path: '/absolute97' - fullPath: '/absolute97' - preLoaderRoute: typeof genAbsolute97RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute98': { - id: '/(gen)/absolute98' - path: '/absolute98' - fullPath: '/absolute98' - preLoaderRoute: typeof genAbsolute98RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/absolute99': { - id: '/(gen)/absolute99' - path: '/absolute99' - fullPath: '/absolute99' - preLoaderRoute: typeof genAbsolute99RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative0': { - id: '/(gen)/relative0' - path: '/relative0' - fullPath: '/relative0' - preLoaderRoute: typeof genRelative0RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative1': { - id: '/(gen)/relative1' - path: '/relative1' - fullPath: '/relative1' - preLoaderRoute: typeof genRelative1RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative10': { - id: '/(gen)/relative10' - path: '/relative10' - fullPath: '/relative10' - preLoaderRoute: typeof genRelative10RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative11': { - id: '/(gen)/relative11' - path: '/relative11' - fullPath: '/relative11' - preLoaderRoute: typeof genRelative11RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative12': { - id: '/(gen)/relative12' - path: '/relative12' - fullPath: '/relative12' - preLoaderRoute: typeof genRelative12RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative13': { - id: '/(gen)/relative13' - path: '/relative13' - fullPath: '/relative13' - preLoaderRoute: typeof genRelative13RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative14': { - id: '/(gen)/relative14' - path: '/relative14' - fullPath: '/relative14' - preLoaderRoute: typeof genRelative14RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative15': { - id: '/(gen)/relative15' - path: '/relative15' - fullPath: '/relative15' - preLoaderRoute: typeof genRelative15RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative16': { - id: '/(gen)/relative16' - path: '/relative16' - fullPath: '/relative16' - preLoaderRoute: typeof genRelative16RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative17': { - id: '/(gen)/relative17' - path: '/relative17' - fullPath: '/relative17' - preLoaderRoute: typeof genRelative17RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative18': { - id: '/(gen)/relative18' - path: '/relative18' - fullPath: '/relative18' - preLoaderRoute: typeof genRelative18RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative19': { - id: '/(gen)/relative19' - path: '/relative19' - fullPath: '/relative19' - preLoaderRoute: typeof genRelative19RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative2': { - id: '/(gen)/relative2' - path: '/relative2' - fullPath: '/relative2' - preLoaderRoute: typeof genRelative2RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative20': { - id: '/(gen)/relative20' - path: '/relative20' - fullPath: '/relative20' - preLoaderRoute: typeof genRelative20RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative21': { - id: '/(gen)/relative21' - path: '/relative21' - fullPath: '/relative21' - preLoaderRoute: typeof genRelative21RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative22': { - id: '/(gen)/relative22' - path: '/relative22' - fullPath: '/relative22' - preLoaderRoute: typeof genRelative22RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative23': { - id: '/(gen)/relative23' - path: '/relative23' - fullPath: '/relative23' - preLoaderRoute: typeof genRelative23RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative24': { - id: '/(gen)/relative24' - path: '/relative24' - fullPath: '/relative24' - preLoaderRoute: typeof genRelative24RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative25': { - id: '/(gen)/relative25' - path: '/relative25' - fullPath: '/relative25' - preLoaderRoute: typeof genRelative25RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative26': { - id: '/(gen)/relative26' - path: '/relative26' - fullPath: '/relative26' - preLoaderRoute: typeof genRelative26RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative27': { - id: '/(gen)/relative27' - path: '/relative27' - fullPath: '/relative27' - preLoaderRoute: typeof genRelative27RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative28': { - id: '/(gen)/relative28' - path: '/relative28' - fullPath: '/relative28' - preLoaderRoute: typeof genRelative28RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative29': { - id: '/(gen)/relative29' - path: '/relative29' - fullPath: '/relative29' - preLoaderRoute: typeof genRelative29RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative3': { - id: '/(gen)/relative3' - path: '/relative3' - fullPath: '/relative3' - preLoaderRoute: typeof genRelative3RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative30': { - id: '/(gen)/relative30' - path: '/relative30' - fullPath: '/relative30' - preLoaderRoute: typeof genRelative30RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative31': { - id: '/(gen)/relative31' - path: '/relative31' - fullPath: '/relative31' - preLoaderRoute: typeof genRelative31RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative32': { - id: '/(gen)/relative32' - path: '/relative32' - fullPath: '/relative32' - preLoaderRoute: typeof genRelative32RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative33': { - id: '/(gen)/relative33' - path: '/relative33' - fullPath: '/relative33' - preLoaderRoute: typeof genRelative33RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative34': { - id: '/(gen)/relative34' - path: '/relative34' - fullPath: '/relative34' - preLoaderRoute: typeof genRelative34RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative35': { - id: '/(gen)/relative35' - path: '/relative35' - fullPath: '/relative35' - preLoaderRoute: typeof genRelative35RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative36': { - id: '/(gen)/relative36' - path: '/relative36' - fullPath: '/relative36' - preLoaderRoute: typeof genRelative36RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative37': { - id: '/(gen)/relative37' - path: '/relative37' - fullPath: '/relative37' - preLoaderRoute: typeof genRelative37RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative38': { - id: '/(gen)/relative38' - path: '/relative38' - fullPath: '/relative38' - preLoaderRoute: typeof genRelative38RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative39': { - id: '/(gen)/relative39' - path: '/relative39' - fullPath: '/relative39' - preLoaderRoute: typeof genRelative39RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative4': { - id: '/(gen)/relative4' - path: '/relative4' - fullPath: '/relative4' - preLoaderRoute: typeof genRelative4RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative40': { - id: '/(gen)/relative40' - path: '/relative40' - fullPath: '/relative40' - preLoaderRoute: typeof genRelative40RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative41': { - id: '/(gen)/relative41' - path: '/relative41' - fullPath: '/relative41' - preLoaderRoute: typeof genRelative41RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative42': { - id: '/(gen)/relative42' - path: '/relative42' - fullPath: '/relative42' - preLoaderRoute: typeof genRelative42RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative43': { - id: '/(gen)/relative43' - path: '/relative43' - fullPath: '/relative43' - preLoaderRoute: typeof genRelative43RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative44': { - id: '/(gen)/relative44' - path: '/relative44' - fullPath: '/relative44' - preLoaderRoute: typeof genRelative44RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative45': { - id: '/(gen)/relative45' - path: '/relative45' - fullPath: '/relative45' - preLoaderRoute: typeof genRelative45RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative46': { - id: '/(gen)/relative46' - path: '/relative46' - fullPath: '/relative46' - preLoaderRoute: typeof genRelative46RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative47': { - id: '/(gen)/relative47' - path: '/relative47' - fullPath: '/relative47' - preLoaderRoute: typeof genRelative47RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative48': { - id: '/(gen)/relative48' - path: '/relative48' - fullPath: '/relative48' - preLoaderRoute: typeof genRelative48RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative49': { - id: '/(gen)/relative49' - path: '/relative49' - fullPath: '/relative49' - preLoaderRoute: typeof genRelative49RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative5': { - id: '/(gen)/relative5' - path: '/relative5' - fullPath: '/relative5' - preLoaderRoute: typeof genRelative5RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative50': { - id: '/(gen)/relative50' - path: '/relative50' - fullPath: '/relative50' - preLoaderRoute: typeof genRelative50RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative51': { - id: '/(gen)/relative51' - path: '/relative51' - fullPath: '/relative51' - preLoaderRoute: typeof genRelative51RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative52': { - id: '/(gen)/relative52' - path: '/relative52' - fullPath: '/relative52' - preLoaderRoute: typeof genRelative52RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative53': { - id: '/(gen)/relative53' - path: '/relative53' - fullPath: '/relative53' - preLoaderRoute: typeof genRelative53RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative54': { - id: '/(gen)/relative54' - path: '/relative54' - fullPath: '/relative54' - preLoaderRoute: typeof genRelative54RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative55': { - id: '/(gen)/relative55' - path: '/relative55' - fullPath: '/relative55' - preLoaderRoute: typeof genRelative55RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative56': { - id: '/(gen)/relative56' - path: '/relative56' - fullPath: '/relative56' - preLoaderRoute: typeof genRelative56RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative57': { - id: '/(gen)/relative57' - path: '/relative57' - fullPath: '/relative57' - preLoaderRoute: typeof genRelative57RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative58': { - id: '/(gen)/relative58' - path: '/relative58' - fullPath: '/relative58' - preLoaderRoute: typeof genRelative58RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative59': { - id: '/(gen)/relative59' - path: '/relative59' - fullPath: '/relative59' - preLoaderRoute: typeof genRelative59RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative6': { - id: '/(gen)/relative6' - path: '/relative6' - fullPath: '/relative6' - preLoaderRoute: typeof genRelative6RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative60': { - id: '/(gen)/relative60' - path: '/relative60' - fullPath: '/relative60' - preLoaderRoute: typeof genRelative60RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative61': { - id: '/(gen)/relative61' - path: '/relative61' - fullPath: '/relative61' - preLoaderRoute: typeof genRelative61RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative62': { - id: '/(gen)/relative62' - path: '/relative62' - fullPath: '/relative62' - preLoaderRoute: typeof genRelative62RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative63': { - id: '/(gen)/relative63' - path: '/relative63' - fullPath: '/relative63' - preLoaderRoute: typeof genRelative63RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative64': { - id: '/(gen)/relative64' - path: '/relative64' - fullPath: '/relative64' - preLoaderRoute: typeof genRelative64RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative65': { - id: '/(gen)/relative65' - path: '/relative65' - fullPath: '/relative65' - preLoaderRoute: typeof genRelative65RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative66': { - id: '/(gen)/relative66' - path: '/relative66' - fullPath: '/relative66' - preLoaderRoute: typeof genRelative66RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative67': { - id: '/(gen)/relative67' - path: '/relative67' - fullPath: '/relative67' - preLoaderRoute: typeof genRelative67RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative68': { - id: '/(gen)/relative68' - path: '/relative68' - fullPath: '/relative68' - preLoaderRoute: typeof genRelative68RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative69': { - id: '/(gen)/relative69' - path: '/relative69' - fullPath: '/relative69' - preLoaderRoute: typeof genRelative69RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative7': { - id: '/(gen)/relative7' - path: '/relative7' - fullPath: '/relative7' - preLoaderRoute: typeof genRelative7RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative70': { - id: '/(gen)/relative70' - path: '/relative70' - fullPath: '/relative70' - preLoaderRoute: typeof genRelative70RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative71': { - id: '/(gen)/relative71' - path: '/relative71' - fullPath: '/relative71' - preLoaderRoute: typeof genRelative71RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative72': { - id: '/(gen)/relative72' - path: '/relative72' - fullPath: '/relative72' - preLoaderRoute: typeof genRelative72RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative73': { - id: '/(gen)/relative73' - path: '/relative73' - fullPath: '/relative73' - preLoaderRoute: typeof genRelative73RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative74': { - id: '/(gen)/relative74' - path: '/relative74' - fullPath: '/relative74' - preLoaderRoute: typeof genRelative74RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative75': { - id: '/(gen)/relative75' - path: '/relative75' - fullPath: '/relative75' - preLoaderRoute: typeof genRelative75RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative76': { - id: '/(gen)/relative76' - path: '/relative76' - fullPath: '/relative76' - preLoaderRoute: typeof genRelative76RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative77': { - id: '/(gen)/relative77' - path: '/relative77' - fullPath: '/relative77' - preLoaderRoute: typeof genRelative77RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative78': { - id: '/(gen)/relative78' - path: '/relative78' - fullPath: '/relative78' - preLoaderRoute: typeof genRelative78RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative79': { - id: '/(gen)/relative79' - path: '/relative79' - fullPath: '/relative79' - preLoaderRoute: typeof genRelative79RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative8': { - id: '/(gen)/relative8' - path: '/relative8' - fullPath: '/relative8' - preLoaderRoute: typeof genRelative8RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative80': { - id: '/(gen)/relative80' - path: '/relative80' - fullPath: '/relative80' - preLoaderRoute: typeof genRelative80RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative81': { - id: '/(gen)/relative81' - path: '/relative81' - fullPath: '/relative81' - preLoaderRoute: typeof genRelative81RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative82': { - id: '/(gen)/relative82' - path: '/relative82' - fullPath: '/relative82' - preLoaderRoute: typeof genRelative82RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative83': { - id: '/(gen)/relative83' - path: '/relative83' - fullPath: '/relative83' - preLoaderRoute: typeof genRelative83RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative84': { - id: '/(gen)/relative84' - path: '/relative84' - fullPath: '/relative84' - preLoaderRoute: typeof genRelative84RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative85': { - id: '/(gen)/relative85' - path: '/relative85' - fullPath: '/relative85' - preLoaderRoute: typeof genRelative85RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative86': { - id: '/(gen)/relative86' - path: '/relative86' - fullPath: '/relative86' - preLoaderRoute: typeof genRelative86RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative87': { - id: '/(gen)/relative87' - path: '/relative87' - fullPath: '/relative87' - preLoaderRoute: typeof genRelative87RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative88': { - id: '/(gen)/relative88' - path: '/relative88' - fullPath: '/relative88' - preLoaderRoute: typeof genRelative88RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative89': { - id: '/(gen)/relative89' - path: '/relative89' - fullPath: '/relative89' - preLoaderRoute: typeof genRelative89RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative9': { - id: '/(gen)/relative9' - path: '/relative9' - fullPath: '/relative9' - preLoaderRoute: typeof genRelative9RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative90': { - id: '/(gen)/relative90' - path: '/relative90' - fullPath: '/relative90' - preLoaderRoute: typeof genRelative90RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative91': { - id: '/(gen)/relative91' - path: '/relative91' - fullPath: '/relative91' - preLoaderRoute: typeof genRelative91RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative92': { - id: '/(gen)/relative92' - path: '/relative92' - fullPath: '/relative92' - preLoaderRoute: typeof genRelative92RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative93': { - id: '/(gen)/relative93' - path: '/relative93' - fullPath: '/relative93' - preLoaderRoute: typeof genRelative93RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative94': { - id: '/(gen)/relative94' - path: '/relative94' - fullPath: '/relative94' - preLoaderRoute: typeof genRelative94RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative95': { - id: '/(gen)/relative95' - path: '/relative95' - fullPath: '/relative95' - preLoaderRoute: typeof genRelative95RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative96': { - id: '/(gen)/relative96' - path: '/relative96' - fullPath: '/relative96' - preLoaderRoute: typeof genRelative96RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative97': { - id: '/(gen)/relative97' - path: '/relative97' - fullPath: '/relative97' - preLoaderRoute: typeof genRelative97RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative98': { - id: '/(gen)/relative98' - path: '/relative98' - fullPath: '/relative98' - preLoaderRoute: typeof genRelative98RouteImport - parentRoute: typeof rootRoute - } - '/(gen)/relative99': { - id: '/(gen)/relative99' - path: '/relative99' - fullPath: '/relative99' - preLoaderRoute: typeof genRelative99RouteImport - parentRoute: typeof rootRoute - } - '/params/$paramsPlaceholder': { - id: '/params/$paramsPlaceholder' - path: '/$paramsPlaceholder' - fullPath: '/params/$paramsPlaceholder' - preLoaderRoute: typeof ParamsParamsPlaceholderRouteImport - parentRoute: typeof ParamsRouteRouteImport - } - '/search/searchPlaceholder': { - id: '/search/searchPlaceholder' - path: '/searchPlaceholder' - fullPath: '/search/searchPlaceholder' - preLoaderRoute: typeof SearchSearchPlaceholderRouteImport - parentRoute: typeof SearchRouteRouteImport - } - '/(gen)/params/$param0': { - id: '/(gen)/params/$param0' - path: '/$param0' - fullPath: '/params/$param0' - preLoaderRoute: typeof genParamsParam0RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param1': { - id: '/(gen)/params/$param1' - path: '/$param1' - fullPath: '/params/$param1' - preLoaderRoute: typeof genParamsParam1RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param10': { - id: '/(gen)/params/$param10' - path: '/$param10' - fullPath: '/params/$param10' - preLoaderRoute: typeof genParamsParam10RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param11': { - id: '/(gen)/params/$param11' - path: '/$param11' - fullPath: '/params/$param11' - preLoaderRoute: typeof genParamsParam11RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param12': { - id: '/(gen)/params/$param12' - path: '/$param12' - fullPath: '/params/$param12' - preLoaderRoute: typeof genParamsParam12RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param13': { - id: '/(gen)/params/$param13' - path: '/$param13' - fullPath: '/params/$param13' - preLoaderRoute: typeof genParamsParam13RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param14': { - id: '/(gen)/params/$param14' - path: '/$param14' - fullPath: '/params/$param14' - preLoaderRoute: typeof genParamsParam14RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param15': { - id: '/(gen)/params/$param15' - path: '/$param15' - fullPath: '/params/$param15' - preLoaderRoute: typeof genParamsParam15RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param16': { - id: '/(gen)/params/$param16' - path: '/$param16' - fullPath: '/params/$param16' - preLoaderRoute: typeof genParamsParam16RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param17': { - id: '/(gen)/params/$param17' - path: '/$param17' - fullPath: '/params/$param17' - preLoaderRoute: typeof genParamsParam17RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param18': { - id: '/(gen)/params/$param18' - path: '/$param18' - fullPath: '/params/$param18' - preLoaderRoute: typeof genParamsParam18RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param19': { - id: '/(gen)/params/$param19' - path: '/$param19' - fullPath: '/params/$param19' - preLoaderRoute: typeof genParamsParam19RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param2': { - id: '/(gen)/params/$param2' - path: '/$param2' - fullPath: '/params/$param2' - preLoaderRoute: typeof genParamsParam2RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param20': { - id: '/(gen)/params/$param20' - path: '/$param20' - fullPath: '/params/$param20' - preLoaderRoute: typeof genParamsParam20RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param21': { - id: '/(gen)/params/$param21' - path: '/$param21' - fullPath: '/params/$param21' - preLoaderRoute: typeof genParamsParam21RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param22': { - id: '/(gen)/params/$param22' - path: '/$param22' - fullPath: '/params/$param22' - preLoaderRoute: typeof genParamsParam22RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param23': { - id: '/(gen)/params/$param23' - path: '/$param23' - fullPath: '/params/$param23' - preLoaderRoute: typeof genParamsParam23RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param24': { - id: '/(gen)/params/$param24' - path: '/$param24' - fullPath: '/params/$param24' - preLoaderRoute: typeof genParamsParam24RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param25': { - id: '/(gen)/params/$param25' - path: '/$param25' - fullPath: '/params/$param25' - preLoaderRoute: typeof genParamsParam25RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param26': { - id: '/(gen)/params/$param26' - path: '/$param26' - fullPath: '/params/$param26' - preLoaderRoute: typeof genParamsParam26RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param27': { - id: '/(gen)/params/$param27' - path: '/$param27' - fullPath: '/params/$param27' - preLoaderRoute: typeof genParamsParam27RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param28': { - id: '/(gen)/params/$param28' - path: '/$param28' - fullPath: '/params/$param28' - preLoaderRoute: typeof genParamsParam28RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param29': { - id: '/(gen)/params/$param29' - path: '/$param29' - fullPath: '/params/$param29' - preLoaderRoute: typeof genParamsParam29RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param3': { - id: '/(gen)/params/$param3' - path: '/$param3' - fullPath: '/params/$param3' - preLoaderRoute: typeof genParamsParam3RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param30': { - id: '/(gen)/params/$param30' - path: '/$param30' - fullPath: '/params/$param30' - preLoaderRoute: typeof genParamsParam30RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param31': { - id: '/(gen)/params/$param31' - path: '/$param31' - fullPath: '/params/$param31' - preLoaderRoute: typeof genParamsParam31RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param32': { - id: '/(gen)/params/$param32' - path: '/$param32' - fullPath: '/params/$param32' - preLoaderRoute: typeof genParamsParam32RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param33': { - id: '/(gen)/params/$param33' - path: '/$param33' - fullPath: '/params/$param33' - preLoaderRoute: typeof genParamsParam33RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param34': { - id: '/(gen)/params/$param34' - path: '/$param34' - fullPath: '/params/$param34' - preLoaderRoute: typeof genParamsParam34RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param35': { - id: '/(gen)/params/$param35' - path: '/$param35' - fullPath: '/params/$param35' - preLoaderRoute: typeof genParamsParam35RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param36': { - id: '/(gen)/params/$param36' - path: '/$param36' - fullPath: '/params/$param36' - preLoaderRoute: typeof genParamsParam36RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param37': { - id: '/(gen)/params/$param37' - path: '/$param37' - fullPath: '/params/$param37' - preLoaderRoute: typeof genParamsParam37RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param38': { - id: '/(gen)/params/$param38' - path: '/$param38' - fullPath: '/params/$param38' - preLoaderRoute: typeof genParamsParam38RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param39': { - id: '/(gen)/params/$param39' - path: '/$param39' - fullPath: '/params/$param39' - preLoaderRoute: typeof genParamsParam39RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param4': { - id: '/(gen)/params/$param4' - path: '/$param4' - fullPath: '/params/$param4' - preLoaderRoute: typeof genParamsParam4RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param40': { - id: '/(gen)/params/$param40' - path: '/$param40' - fullPath: '/params/$param40' - preLoaderRoute: typeof genParamsParam40RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param41': { - id: '/(gen)/params/$param41' - path: '/$param41' - fullPath: '/params/$param41' - preLoaderRoute: typeof genParamsParam41RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param42': { - id: '/(gen)/params/$param42' - path: '/$param42' - fullPath: '/params/$param42' - preLoaderRoute: typeof genParamsParam42RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param43': { - id: '/(gen)/params/$param43' - path: '/$param43' - fullPath: '/params/$param43' - preLoaderRoute: typeof genParamsParam43RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param44': { - id: '/(gen)/params/$param44' - path: '/$param44' - fullPath: '/params/$param44' - preLoaderRoute: typeof genParamsParam44RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param45': { - id: '/(gen)/params/$param45' - path: '/$param45' - fullPath: '/params/$param45' - preLoaderRoute: typeof genParamsParam45RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param46': { - id: '/(gen)/params/$param46' - path: '/$param46' - fullPath: '/params/$param46' - preLoaderRoute: typeof genParamsParam46RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param47': { - id: '/(gen)/params/$param47' - path: '/$param47' - fullPath: '/params/$param47' - preLoaderRoute: typeof genParamsParam47RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param48': { - id: '/(gen)/params/$param48' - path: '/$param48' - fullPath: '/params/$param48' - preLoaderRoute: typeof genParamsParam48RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param49': { - id: '/(gen)/params/$param49' - path: '/$param49' - fullPath: '/params/$param49' - preLoaderRoute: typeof genParamsParam49RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param5': { - id: '/(gen)/params/$param5' - path: '/$param5' - fullPath: '/params/$param5' - preLoaderRoute: typeof genParamsParam5RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param50': { - id: '/(gen)/params/$param50' - path: '/$param50' - fullPath: '/params/$param50' - preLoaderRoute: typeof genParamsParam50RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param51': { - id: '/(gen)/params/$param51' - path: '/$param51' - fullPath: '/params/$param51' - preLoaderRoute: typeof genParamsParam51RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param52': { - id: '/(gen)/params/$param52' - path: '/$param52' - fullPath: '/params/$param52' - preLoaderRoute: typeof genParamsParam52RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param53': { - id: '/(gen)/params/$param53' - path: '/$param53' - fullPath: '/params/$param53' - preLoaderRoute: typeof genParamsParam53RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param54': { - id: '/(gen)/params/$param54' - path: '/$param54' - fullPath: '/params/$param54' - preLoaderRoute: typeof genParamsParam54RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param55': { - id: '/(gen)/params/$param55' - path: '/$param55' - fullPath: '/params/$param55' - preLoaderRoute: typeof genParamsParam55RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param56': { - id: '/(gen)/params/$param56' - path: '/$param56' - fullPath: '/params/$param56' - preLoaderRoute: typeof genParamsParam56RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param57': { - id: '/(gen)/params/$param57' - path: '/$param57' - fullPath: '/params/$param57' - preLoaderRoute: typeof genParamsParam57RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param58': { - id: '/(gen)/params/$param58' - path: '/$param58' - fullPath: '/params/$param58' - preLoaderRoute: typeof genParamsParam58RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param59': { - id: '/(gen)/params/$param59' - path: '/$param59' - fullPath: '/params/$param59' - preLoaderRoute: typeof genParamsParam59RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param6': { - id: '/(gen)/params/$param6' - path: '/$param6' - fullPath: '/params/$param6' - preLoaderRoute: typeof genParamsParam6RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param60': { - id: '/(gen)/params/$param60' - path: '/$param60' - fullPath: '/params/$param60' - preLoaderRoute: typeof genParamsParam60RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param61': { - id: '/(gen)/params/$param61' - path: '/$param61' - fullPath: '/params/$param61' - preLoaderRoute: typeof genParamsParam61RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param62': { - id: '/(gen)/params/$param62' - path: '/$param62' - fullPath: '/params/$param62' - preLoaderRoute: typeof genParamsParam62RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param63': { - id: '/(gen)/params/$param63' - path: '/$param63' - fullPath: '/params/$param63' - preLoaderRoute: typeof genParamsParam63RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param64': { - id: '/(gen)/params/$param64' - path: '/$param64' - fullPath: '/params/$param64' - preLoaderRoute: typeof genParamsParam64RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param65': { - id: '/(gen)/params/$param65' - path: '/$param65' - fullPath: '/params/$param65' - preLoaderRoute: typeof genParamsParam65RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param66': { - id: '/(gen)/params/$param66' - path: '/$param66' - fullPath: '/params/$param66' - preLoaderRoute: typeof genParamsParam66RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param67': { - id: '/(gen)/params/$param67' - path: '/$param67' - fullPath: '/params/$param67' - preLoaderRoute: typeof genParamsParam67RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param68': { - id: '/(gen)/params/$param68' - path: '/$param68' - fullPath: '/params/$param68' - preLoaderRoute: typeof genParamsParam68RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param69': { - id: '/(gen)/params/$param69' - path: '/$param69' - fullPath: '/params/$param69' - preLoaderRoute: typeof genParamsParam69RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param7': { - id: '/(gen)/params/$param7' - path: '/$param7' - fullPath: '/params/$param7' - preLoaderRoute: typeof genParamsParam7RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param70': { - id: '/(gen)/params/$param70' - path: '/$param70' - fullPath: '/params/$param70' - preLoaderRoute: typeof genParamsParam70RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param71': { - id: '/(gen)/params/$param71' - path: '/$param71' - fullPath: '/params/$param71' - preLoaderRoute: typeof genParamsParam71RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param72': { - id: '/(gen)/params/$param72' - path: '/$param72' - fullPath: '/params/$param72' - preLoaderRoute: typeof genParamsParam72RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param73': { - id: '/(gen)/params/$param73' - path: '/$param73' - fullPath: '/params/$param73' - preLoaderRoute: typeof genParamsParam73RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param74': { - id: '/(gen)/params/$param74' - path: '/$param74' - fullPath: '/params/$param74' - preLoaderRoute: typeof genParamsParam74RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param75': { - id: '/(gen)/params/$param75' - path: '/$param75' - fullPath: '/params/$param75' - preLoaderRoute: typeof genParamsParam75RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param76': { - id: '/(gen)/params/$param76' - path: '/$param76' - fullPath: '/params/$param76' - preLoaderRoute: typeof genParamsParam76RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param77': { - id: '/(gen)/params/$param77' - path: '/$param77' - fullPath: '/params/$param77' - preLoaderRoute: typeof genParamsParam77RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param78': { - id: '/(gen)/params/$param78' - path: '/$param78' - fullPath: '/params/$param78' - preLoaderRoute: typeof genParamsParam78RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param79': { - id: '/(gen)/params/$param79' - path: '/$param79' - fullPath: '/params/$param79' - preLoaderRoute: typeof genParamsParam79RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param8': { - id: '/(gen)/params/$param8' - path: '/$param8' - fullPath: '/params/$param8' - preLoaderRoute: typeof genParamsParam8RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param80': { - id: '/(gen)/params/$param80' - path: '/$param80' - fullPath: '/params/$param80' - preLoaderRoute: typeof genParamsParam80RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param81': { - id: '/(gen)/params/$param81' - path: '/$param81' - fullPath: '/params/$param81' - preLoaderRoute: typeof genParamsParam81RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param82': { - id: '/(gen)/params/$param82' - path: '/$param82' - fullPath: '/params/$param82' - preLoaderRoute: typeof genParamsParam82RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param83': { - id: '/(gen)/params/$param83' - path: '/$param83' - fullPath: '/params/$param83' - preLoaderRoute: typeof genParamsParam83RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param84': { - id: '/(gen)/params/$param84' - path: '/$param84' - fullPath: '/params/$param84' - preLoaderRoute: typeof genParamsParam84RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param85': { - id: '/(gen)/params/$param85' - path: '/$param85' - fullPath: '/params/$param85' - preLoaderRoute: typeof genParamsParam85RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param86': { - id: '/(gen)/params/$param86' - path: '/$param86' - fullPath: '/params/$param86' - preLoaderRoute: typeof genParamsParam86RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param87': { - id: '/(gen)/params/$param87' - path: '/$param87' - fullPath: '/params/$param87' - preLoaderRoute: typeof genParamsParam87RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param88': { - id: '/(gen)/params/$param88' - path: '/$param88' - fullPath: '/params/$param88' - preLoaderRoute: typeof genParamsParam88RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param89': { - id: '/(gen)/params/$param89' - path: '/$param89' - fullPath: '/params/$param89' - preLoaderRoute: typeof genParamsParam89RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param9': { - id: '/(gen)/params/$param9' - path: '/$param9' - fullPath: '/params/$param9' - preLoaderRoute: typeof genParamsParam9RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param90': { - id: '/(gen)/params/$param90' - path: '/$param90' - fullPath: '/params/$param90' - preLoaderRoute: typeof genParamsParam90RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param91': { - id: '/(gen)/params/$param91' - path: '/$param91' - fullPath: '/params/$param91' - preLoaderRoute: typeof genParamsParam91RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param92': { - id: '/(gen)/params/$param92' - path: '/$param92' - fullPath: '/params/$param92' - preLoaderRoute: typeof genParamsParam92RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param93': { - id: '/(gen)/params/$param93' - path: '/$param93' - fullPath: '/params/$param93' - preLoaderRoute: typeof genParamsParam93RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param94': { - id: '/(gen)/params/$param94' - path: '/$param94' - fullPath: '/params/$param94' - preLoaderRoute: typeof genParamsParam94RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param95': { - id: '/(gen)/params/$param95' - path: '/$param95' - fullPath: '/params/$param95' - preLoaderRoute: typeof genParamsParam95RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param96': { - id: '/(gen)/params/$param96' - path: '/$param96' - fullPath: '/params/$param96' - preLoaderRoute: typeof genParamsParam96RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param97': { - id: '/(gen)/params/$param97' - path: '/$param97' - fullPath: '/params/$param97' - preLoaderRoute: typeof genParamsParam97RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param98': { - id: '/(gen)/params/$param98' - path: '/$param98' - fullPath: '/params/$param98' - preLoaderRoute: typeof genParamsParam98RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/params/$param99': { - id: '/(gen)/params/$param99' - path: '/$param99' - fullPath: '/params/$param99' - preLoaderRoute: typeof genParamsParam99RouteImport - parentRoute: typeof genParamsRouteRouteImport - } - '/(gen)/search/search0': { - id: '/(gen)/search/search0' - path: '/search0' - fullPath: '/search/search0' - preLoaderRoute: typeof genSearchSearch0RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search1': { - id: '/(gen)/search/search1' - path: '/search1' - fullPath: '/search/search1' - preLoaderRoute: typeof genSearchSearch1RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search10': { - id: '/(gen)/search/search10' - path: '/search10' - fullPath: '/search/search10' - preLoaderRoute: typeof genSearchSearch10RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search11': { - id: '/(gen)/search/search11' - path: '/search11' - fullPath: '/search/search11' - preLoaderRoute: typeof genSearchSearch11RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search12': { - id: '/(gen)/search/search12' - path: '/search12' - fullPath: '/search/search12' - preLoaderRoute: typeof genSearchSearch12RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search13': { - id: '/(gen)/search/search13' - path: '/search13' - fullPath: '/search/search13' - preLoaderRoute: typeof genSearchSearch13RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search14': { - id: '/(gen)/search/search14' - path: '/search14' - fullPath: '/search/search14' - preLoaderRoute: typeof genSearchSearch14RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search15': { - id: '/(gen)/search/search15' - path: '/search15' - fullPath: '/search/search15' - preLoaderRoute: typeof genSearchSearch15RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search16': { - id: '/(gen)/search/search16' - path: '/search16' - fullPath: '/search/search16' - preLoaderRoute: typeof genSearchSearch16RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search17': { - id: '/(gen)/search/search17' - path: '/search17' - fullPath: '/search/search17' - preLoaderRoute: typeof genSearchSearch17RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search18': { - id: '/(gen)/search/search18' - path: '/search18' - fullPath: '/search/search18' - preLoaderRoute: typeof genSearchSearch18RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search19': { - id: '/(gen)/search/search19' - path: '/search19' - fullPath: '/search/search19' - preLoaderRoute: typeof genSearchSearch19RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search2': { - id: '/(gen)/search/search2' - path: '/search2' - fullPath: '/search/search2' - preLoaderRoute: typeof genSearchSearch2RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search20': { - id: '/(gen)/search/search20' - path: '/search20' - fullPath: '/search/search20' - preLoaderRoute: typeof genSearchSearch20RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search21': { - id: '/(gen)/search/search21' - path: '/search21' - fullPath: '/search/search21' - preLoaderRoute: typeof genSearchSearch21RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search22': { - id: '/(gen)/search/search22' - path: '/search22' - fullPath: '/search/search22' - preLoaderRoute: typeof genSearchSearch22RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search23': { - id: '/(gen)/search/search23' - path: '/search23' - fullPath: '/search/search23' - preLoaderRoute: typeof genSearchSearch23RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search24': { - id: '/(gen)/search/search24' - path: '/search24' - fullPath: '/search/search24' - preLoaderRoute: typeof genSearchSearch24RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search25': { - id: '/(gen)/search/search25' - path: '/search25' - fullPath: '/search/search25' - preLoaderRoute: typeof genSearchSearch25RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search26': { - id: '/(gen)/search/search26' - path: '/search26' - fullPath: '/search/search26' - preLoaderRoute: typeof genSearchSearch26RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search27': { - id: '/(gen)/search/search27' - path: '/search27' - fullPath: '/search/search27' - preLoaderRoute: typeof genSearchSearch27RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search28': { - id: '/(gen)/search/search28' - path: '/search28' - fullPath: '/search/search28' - preLoaderRoute: typeof genSearchSearch28RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search29': { - id: '/(gen)/search/search29' - path: '/search29' - fullPath: '/search/search29' - preLoaderRoute: typeof genSearchSearch29RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search3': { - id: '/(gen)/search/search3' - path: '/search3' - fullPath: '/search/search3' - preLoaderRoute: typeof genSearchSearch3RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search30': { - id: '/(gen)/search/search30' - path: '/search30' - fullPath: '/search/search30' - preLoaderRoute: typeof genSearchSearch30RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search31': { - id: '/(gen)/search/search31' - path: '/search31' - fullPath: '/search/search31' - preLoaderRoute: typeof genSearchSearch31RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search32': { - id: '/(gen)/search/search32' - path: '/search32' - fullPath: '/search/search32' - preLoaderRoute: typeof genSearchSearch32RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search33': { - id: '/(gen)/search/search33' - path: '/search33' - fullPath: '/search/search33' - preLoaderRoute: typeof genSearchSearch33RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search34': { - id: '/(gen)/search/search34' - path: '/search34' - fullPath: '/search/search34' - preLoaderRoute: typeof genSearchSearch34RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search35': { - id: '/(gen)/search/search35' - path: '/search35' - fullPath: '/search/search35' - preLoaderRoute: typeof genSearchSearch35RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search36': { - id: '/(gen)/search/search36' - path: '/search36' - fullPath: '/search/search36' - preLoaderRoute: typeof genSearchSearch36RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search37': { - id: '/(gen)/search/search37' - path: '/search37' - fullPath: '/search/search37' - preLoaderRoute: typeof genSearchSearch37RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search38': { - id: '/(gen)/search/search38' - path: '/search38' - fullPath: '/search/search38' - preLoaderRoute: typeof genSearchSearch38RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search39': { - id: '/(gen)/search/search39' - path: '/search39' - fullPath: '/search/search39' - preLoaderRoute: typeof genSearchSearch39RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search4': { - id: '/(gen)/search/search4' - path: '/search4' - fullPath: '/search/search4' - preLoaderRoute: typeof genSearchSearch4RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search40': { - id: '/(gen)/search/search40' - path: '/search40' - fullPath: '/search/search40' - preLoaderRoute: typeof genSearchSearch40RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search41': { - id: '/(gen)/search/search41' - path: '/search41' - fullPath: '/search/search41' - preLoaderRoute: typeof genSearchSearch41RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search42': { - id: '/(gen)/search/search42' - path: '/search42' - fullPath: '/search/search42' - preLoaderRoute: typeof genSearchSearch42RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search43': { - id: '/(gen)/search/search43' - path: '/search43' - fullPath: '/search/search43' - preLoaderRoute: typeof genSearchSearch43RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search44': { - id: '/(gen)/search/search44' - path: '/search44' - fullPath: '/search/search44' - preLoaderRoute: typeof genSearchSearch44RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search45': { - id: '/(gen)/search/search45' - path: '/search45' - fullPath: '/search/search45' - preLoaderRoute: typeof genSearchSearch45RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search46': { - id: '/(gen)/search/search46' - path: '/search46' - fullPath: '/search/search46' - preLoaderRoute: typeof genSearchSearch46RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search47': { - id: '/(gen)/search/search47' - path: '/search47' - fullPath: '/search/search47' - preLoaderRoute: typeof genSearchSearch47RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search48': { - id: '/(gen)/search/search48' - path: '/search48' - fullPath: '/search/search48' - preLoaderRoute: typeof genSearchSearch48RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search49': { - id: '/(gen)/search/search49' - path: '/search49' - fullPath: '/search/search49' - preLoaderRoute: typeof genSearchSearch49RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search5': { - id: '/(gen)/search/search5' - path: '/search5' - fullPath: '/search/search5' - preLoaderRoute: typeof genSearchSearch5RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search50': { - id: '/(gen)/search/search50' - path: '/search50' - fullPath: '/search/search50' - preLoaderRoute: typeof genSearchSearch50RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search51': { - id: '/(gen)/search/search51' - path: '/search51' - fullPath: '/search/search51' - preLoaderRoute: typeof genSearchSearch51RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search52': { - id: '/(gen)/search/search52' - path: '/search52' - fullPath: '/search/search52' - preLoaderRoute: typeof genSearchSearch52RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search53': { - id: '/(gen)/search/search53' - path: '/search53' - fullPath: '/search/search53' - preLoaderRoute: typeof genSearchSearch53RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search54': { - id: '/(gen)/search/search54' - path: '/search54' - fullPath: '/search/search54' - preLoaderRoute: typeof genSearchSearch54RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search55': { - id: '/(gen)/search/search55' - path: '/search55' - fullPath: '/search/search55' - preLoaderRoute: typeof genSearchSearch55RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search56': { - id: '/(gen)/search/search56' - path: '/search56' - fullPath: '/search/search56' - preLoaderRoute: typeof genSearchSearch56RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search57': { - id: '/(gen)/search/search57' - path: '/search57' - fullPath: '/search/search57' - preLoaderRoute: typeof genSearchSearch57RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search58': { - id: '/(gen)/search/search58' - path: '/search58' - fullPath: '/search/search58' - preLoaderRoute: typeof genSearchSearch58RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search59': { - id: '/(gen)/search/search59' - path: '/search59' - fullPath: '/search/search59' - preLoaderRoute: typeof genSearchSearch59RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search6': { - id: '/(gen)/search/search6' - path: '/search6' - fullPath: '/search/search6' - preLoaderRoute: typeof genSearchSearch6RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search60': { - id: '/(gen)/search/search60' - path: '/search60' - fullPath: '/search/search60' - preLoaderRoute: typeof genSearchSearch60RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search61': { - id: '/(gen)/search/search61' - path: '/search61' - fullPath: '/search/search61' - preLoaderRoute: typeof genSearchSearch61RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search62': { - id: '/(gen)/search/search62' - path: '/search62' - fullPath: '/search/search62' - preLoaderRoute: typeof genSearchSearch62RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search63': { - id: '/(gen)/search/search63' - path: '/search63' - fullPath: '/search/search63' - preLoaderRoute: typeof genSearchSearch63RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search64': { - id: '/(gen)/search/search64' - path: '/search64' - fullPath: '/search/search64' - preLoaderRoute: typeof genSearchSearch64RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search65': { - id: '/(gen)/search/search65' - path: '/search65' - fullPath: '/search/search65' - preLoaderRoute: typeof genSearchSearch65RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search66': { - id: '/(gen)/search/search66' - path: '/search66' - fullPath: '/search/search66' - preLoaderRoute: typeof genSearchSearch66RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search67': { - id: '/(gen)/search/search67' - path: '/search67' - fullPath: '/search/search67' - preLoaderRoute: typeof genSearchSearch67RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search68': { - id: '/(gen)/search/search68' - path: '/search68' - fullPath: '/search/search68' - preLoaderRoute: typeof genSearchSearch68RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search69': { - id: '/(gen)/search/search69' - path: '/search69' - fullPath: '/search/search69' - preLoaderRoute: typeof genSearchSearch69RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search7': { - id: '/(gen)/search/search7' - path: '/search7' - fullPath: '/search/search7' - preLoaderRoute: typeof genSearchSearch7RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search70': { - id: '/(gen)/search/search70' - path: '/search70' - fullPath: '/search/search70' - preLoaderRoute: typeof genSearchSearch70RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search71': { - id: '/(gen)/search/search71' - path: '/search71' - fullPath: '/search/search71' - preLoaderRoute: typeof genSearchSearch71RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search72': { - id: '/(gen)/search/search72' - path: '/search72' - fullPath: '/search/search72' - preLoaderRoute: typeof genSearchSearch72RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search73': { - id: '/(gen)/search/search73' - path: '/search73' - fullPath: '/search/search73' - preLoaderRoute: typeof genSearchSearch73RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search74': { - id: '/(gen)/search/search74' - path: '/search74' - fullPath: '/search/search74' - preLoaderRoute: typeof genSearchSearch74RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search75': { - id: '/(gen)/search/search75' - path: '/search75' - fullPath: '/search/search75' - preLoaderRoute: typeof genSearchSearch75RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search76': { - id: '/(gen)/search/search76' - path: '/search76' - fullPath: '/search/search76' - preLoaderRoute: typeof genSearchSearch76RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search77': { - id: '/(gen)/search/search77' - path: '/search77' - fullPath: '/search/search77' - preLoaderRoute: typeof genSearchSearch77RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search78': { - id: '/(gen)/search/search78' - path: '/search78' - fullPath: '/search/search78' - preLoaderRoute: typeof genSearchSearch78RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search79': { - id: '/(gen)/search/search79' - path: '/search79' - fullPath: '/search/search79' - preLoaderRoute: typeof genSearchSearch79RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search8': { - id: '/(gen)/search/search8' - path: '/search8' - fullPath: '/search/search8' - preLoaderRoute: typeof genSearchSearch8RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search80': { - id: '/(gen)/search/search80' - path: '/search80' - fullPath: '/search/search80' - preLoaderRoute: typeof genSearchSearch80RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search81': { - id: '/(gen)/search/search81' - path: '/search81' - fullPath: '/search/search81' - preLoaderRoute: typeof genSearchSearch81RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search82': { - id: '/(gen)/search/search82' - path: '/search82' - fullPath: '/search/search82' - preLoaderRoute: typeof genSearchSearch82RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search83': { - id: '/(gen)/search/search83' - path: '/search83' - fullPath: '/search/search83' - preLoaderRoute: typeof genSearchSearch83RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search84': { - id: '/(gen)/search/search84' - path: '/search84' - fullPath: '/search/search84' - preLoaderRoute: typeof genSearchSearch84RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search85': { - id: '/(gen)/search/search85' - path: '/search85' - fullPath: '/search/search85' - preLoaderRoute: typeof genSearchSearch85RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search86': { - id: '/(gen)/search/search86' - path: '/search86' - fullPath: '/search/search86' - preLoaderRoute: typeof genSearchSearch86RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search87': { - id: '/(gen)/search/search87' - path: '/search87' - fullPath: '/search/search87' - preLoaderRoute: typeof genSearchSearch87RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search88': { - id: '/(gen)/search/search88' - path: '/search88' - fullPath: '/search/search88' - preLoaderRoute: typeof genSearchSearch88RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search89': { - id: '/(gen)/search/search89' - path: '/search89' - fullPath: '/search/search89' - preLoaderRoute: typeof genSearchSearch89RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search9': { - id: '/(gen)/search/search9' - path: '/search9' - fullPath: '/search/search9' - preLoaderRoute: typeof genSearchSearch9RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search90': { - id: '/(gen)/search/search90' - path: '/search90' - fullPath: '/search/search90' - preLoaderRoute: typeof genSearchSearch90RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search91': { - id: '/(gen)/search/search91' - path: '/search91' - fullPath: '/search/search91' - preLoaderRoute: typeof genSearchSearch91RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search92': { - id: '/(gen)/search/search92' - path: '/search92' - fullPath: '/search/search92' - preLoaderRoute: typeof genSearchSearch92RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search93': { - id: '/(gen)/search/search93' - path: '/search93' - fullPath: '/search/search93' - preLoaderRoute: typeof genSearchSearch93RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search94': { - id: '/(gen)/search/search94' - path: '/search94' - fullPath: '/search/search94' - preLoaderRoute: typeof genSearchSearch94RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search95': { - id: '/(gen)/search/search95' - path: '/search95' - fullPath: '/search/search95' - preLoaderRoute: typeof genSearchSearch95RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search96': { - id: '/(gen)/search/search96' - path: '/search96' - fullPath: '/search/search96' - preLoaderRoute: typeof genSearchSearch96RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search97': { - id: '/(gen)/search/search97' - path: '/search97' - fullPath: '/search/search97' - preLoaderRoute: typeof genSearchSearch97RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search98': { - id: '/(gen)/search/search98' - path: '/search98' - fullPath: '/search/search98' - preLoaderRoute: typeof genSearchSearch98RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - '/(gen)/search/search99': { - id: '/(gen)/search/search99' - path: '/search99' - fullPath: '/search/search99' - preLoaderRoute: typeof genSearchSearch99RouteImport - parentRoute: typeof genSearchRouteRouteImport - } - } -} - -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/params/route' { - const createFileRoute: CreateFileRoute< - '/params', - FileRoutesByPath['/params']['parentRoute'], - FileRoutesByPath['/params']['id'], - FileRoutesByPath['/params']['path'], - FileRoutesByPath['/params']['fullPath'] - > -} -declare module './routes/search/route' { - const createFileRoute: CreateFileRoute< - '/search', - FileRoutesByPath['/search']['parentRoute'], - FileRoutesByPath['/search']['id'], - FileRoutesByPath['/search']['path'], - FileRoutesByPath['/search']['fullPath'] - > -} -declare module './routes/absolute' { - const createFileRoute: CreateFileRoute< - '/absolute', - FileRoutesByPath['/absolute']['parentRoute'], - FileRoutesByPath['/absolute']['id'], - FileRoutesByPath['/absolute']['path'], - FileRoutesByPath['/absolute']['fullPath'] - > -} -declare module './routes/linkProps' { - const createFileRoute: CreateFileRoute< - '/linkProps', - FileRoutesByPath['/linkProps']['parentRoute'], - FileRoutesByPath['/linkProps']['id'], - FileRoutesByPath['/linkProps']['path'], - FileRoutesByPath['/linkProps']['fullPath'] - > -} -declare module './routes/relative' { - const createFileRoute: CreateFileRoute< - '/relative', - FileRoutesByPath['/relative']['parentRoute'], - FileRoutesByPath['/relative']['id'], - FileRoutesByPath['/relative']['path'], - FileRoutesByPath['/relative']['fullPath'] - > -} -declare module './routes/(gen)/params/route' { - const createFileRoute: CreateFileRoute< - '/(gen)/params', - FileRoutesByPath['/(gen)/params']['parentRoute'], - FileRoutesByPath['/(gen)/params']['id'], - FileRoutesByPath['/(gen)/params']['path'], - FileRoutesByPath['/(gen)/params']['fullPath'] - > -} -declare module './routes/(gen)/search/route' { - const createFileRoute: CreateFileRoute< - '/(gen)/search', - FileRoutesByPath['/(gen)/search']['parentRoute'], - FileRoutesByPath['/(gen)/search']['id'], - FileRoutesByPath['/(gen)/search']['path'], - FileRoutesByPath['/(gen)/search']['fullPath'] - > -} -declare module './routes/(gen)/absolute0' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute0', - FileRoutesByPath['/(gen)/absolute0']['parentRoute'], - FileRoutesByPath['/(gen)/absolute0']['id'], - FileRoutesByPath['/(gen)/absolute0']['path'], - FileRoutesByPath['/(gen)/absolute0']['fullPath'] - > -} -declare module './routes/(gen)/absolute1' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute1', - FileRoutesByPath['/(gen)/absolute1']['parentRoute'], - FileRoutesByPath['/(gen)/absolute1']['id'], - FileRoutesByPath['/(gen)/absolute1']['path'], - FileRoutesByPath['/(gen)/absolute1']['fullPath'] - > -} -declare module './routes/(gen)/absolute10' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute10', - FileRoutesByPath['/(gen)/absolute10']['parentRoute'], - FileRoutesByPath['/(gen)/absolute10']['id'], - FileRoutesByPath['/(gen)/absolute10']['path'], - FileRoutesByPath['/(gen)/absolute10']['fullPath'] - > -} -declare module './routes/(gen)/absolute11' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute11', - FileRoutesByPath['/(gen)/absolute11']['parentRoute'], - FileRoutesByPath['/(gen)/absolute11']['id'], - FileRoutesByPath['/(gen)/absolute11']['path'], - FileRoutesByPath['/(gen)/absolute11']['fullPath'] - > -} -declare module './routes/(gen)/absolute12' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute12', - FileRoutesByPath['/(gen)/absolute12']['parentRoute'], - FileRoutesByPath['/(gen)/absolute12']['id'], - FileRoutesByPath['/(gen)/absolute12']['path'], - FileRoutesByPath['/(gen)/absolute12']['fullPath'] - > -} -declare module './routes/(gen)/absolute13' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute13', - FileRoutesByPath['/(gen)/absolute13']['parentRoute'], - FileRoutesByPath['/(gen)/absolute13']['id'], - FileRoutesByPath['/(gen)/absolute13']['path'], - FileRoutesByPath['/(gen)/absolute13']['fullPath'] - > -} -declare module './routes/(gen)/absolute14' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute14', - FileRoutesByPath['/(gen)/absolute14']['parentRoute'], - FileRoutesByPath['/(gen)/absolute14']['id'], - FileRoutesByPath['/(gen)/absolute14']['path'], - FileRoutesByPath['/(gen)/absolute14']['fullPath'] - > -} -declare module './routes/(gen)/absolute15' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute15', - FileRoutesByPath['/(gen)/absolute15']['parentRoute'], - FileRoutesByPath['/(gen)/absolute15']['id'], - FileRoutesByPath['/(gen)/absolute15']['path'], - FileRoutesByPath['/(gen)/absolute15']['fullPath'] - > -} -declare module './routes/(gen)/absolute16' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute16', - FileRoutesByPath['/(gen)/absolute16']['parentRoute'], - FileRoutesByPath['/(gen)/absolute16']['id'], - FileRoutesByPath['/(gen)/absolute16']['path'], - FileRoutesByPath['/(gen)/absolute16']['fullPath'] - > -} -declare module './routes/(gen)/absolute17' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute17', - FileRoutesByPath['/(gen)/absolute17']['parentRoute'], - FileRoutesByPath['/(gen)/absolute17']['id'], - FileRoutesByPath['/(gen)/absolute17']['path'], - FileRoutesByPath['/(gen)/absolute17']['fullPath'] - > -} -declare module './routes/(gen)/absolute18' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute18', - FileRoutesByPath['/(gen)/absolute18']['parentRoute'], - FileRoutesByPath['/(gen)/absolute18']['id'], - FileRoutesByPath['/(gen)/absolute18']['path'], - FileRoutesByPath['/(gen)/absolute18']['fullPath'] - > -} -declare module './routes/(gen)/absolute19' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute19', - FileRoutesByPath['/(gen)/absolute19']['parentRoute'], - FileRoutesByPath['/(gen)/absolute19']['id'], - FileRoutesByPath['/(gen)/absolute19']['path'], - FileRoutesByPath['/(gen)/absolute19']['fullPath'] - > -} -declare module './routes/(gen)/absolute2' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute2', - FileRoutesByPath['/(gen)/absolute2']['parentRoute'], - FileRoutesByPath['/(gen)/absolute2']['id'], - FileRoutesByPath['/(gen)/absolute2']['path'], - FileRoutesByPath['/(gen)/absolute2']['fullPath'] - > -} -declare module './routes/(gen)/absolute20' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute20', - FileRoutesByPath['/(gen)/absolute20']['parentRoute'], - FileRoutesByPath['/(gen)/absolute20']['id'], - FileRoutesByPath['/(gen)/absolute20']['path'], - FileRoutesByPath['/(gen)/absolute20']['fullPath'] - > -} -declare module './routes/(gen)/absolute21' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute21', - FileRoutesByPath['/(gen)/absolute21']['parentRoute'], - FileRoutesByPath['/(gen)/absolute21']['id'], - FileRoutesByPath['/(gen)/absolute21']['path'], - FileRoutesByPath['/(gen)/absolute21']['fullPath'] - > -} -declare module './routes/(gen)/absolute22' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute22', - FileRoutesByPath['/(gen)/absolute22']['parentRoute'], - FileRoutesByPath['/(gen)/absolute22']['id'], - FileRoutesByPath['/(gen)/absolute22']['path'], - FileRoutesByPath['/(gen)/absolute22']['fullPath'] - > -} -declare module './routes/(gen)/absolute23' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute23', - FileRoutesByPath['/(gen)/absolute23']['parentRoute'], - FileRoutesByPath['/(gen)/absolute23']['id'], - FileRoutesByPath['/(gen)/absolute23']['path'], - FileRoutesByPath['/(gen)/absolute23']['fullPath'] - > -} -declare module './routes/(gen)/absolute24' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute24', - FileRoutesByPath['/(gen)/absolute24']['parentRoute'], - FileRoutesByPath['/(gen)/absolute24']['id'], - FileRoutesByPath['/(gen)/absolute24']['path'], - FileRoutesByPath['/(gen)/absolute24']['fullPath'] - > -} -declare module './routes/(gen)/absolute25' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute25', - FileRoutesByPath['/(gen)/absolute25']['parentRoute'], - FileRoutesByPath['/(gen)/absolute25']['id'], - FileRoutesByPath['/(gen)/absolute25']['path'], - FileRoutesByPath['/(gen)/absolute25']['fullPath'] - > -} -declare module './routes/(gen)/absolute26' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute26', - FileRoutesByPath['/(gen)/absolute26']['parentRoute'], - FileRoutesByPath['/(gen)/absolute26']['id'], - FileRoutesByPath['/(gen)/absolute26']['path'], - FileRoutesByPath['/(gen)/absolute26']['fullPath'] - > -} -declare module './routes/(gen)/absolute27' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute27', - FileRoutesByPath['/(gen)/absolute27']['parentRoute'], - FileRoutesByPath['/(gen)/absolute27']['id'], - FileRoutesByPath['/(gen)/absolute27']['path'], - FileRoutesByPath['/(gen)/absolute27']['fullPath'] - > -} -declare module './routes/(gen)/absolute28' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute28', - FileRoutesByPath['/(gen)/absolute28']['parentRoute'], - FileRoutesByPath['/(gen)/absolute28']['id'], - FileRoutesByPath['/(gen)/absolute28']['path'], - FileRoutesByPath['/(gen)/absolute28']['fullPath'] - > -} -declare module './routes/(gen)/absolute29' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute29', - FileRoutesByPath['/(gen)/absolute29']['parentRoute'], - FileRoutesByPath['/(gen)/absolute29']['id'], - FileRoutesByPath['/(gen)/absolute29']['path'], - FileRoutesByPath['/(gen)/absolute29']['fullPath'] - > -} -declare module './routes/(gen)/absolute3' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute3', - FileRoutesByPath['/(gen)/absolute3']['parentRoute'], - FileRoutesByPath['/(gen)/absolute3']['id'], - FileRoutesByPath['/(gen)/absolute3']['path'], - FileRoutesByPath['/(gen)/absolute3']['fullPath'] - > -} -declare module './routes/(gen)/absolute30' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute30', - FileRoutesByPath['/(gen)/absolute30']['parentRoute'], - FileRoutesByPath['/(gen)/absolute30']['id'], - FileRoutesByPath['/(gen)/absolute30']['path'], - FileRoutesByPath['/(gen)/absolute30']['fullPath'] - > -} -declare module './routes/(gen)/absolute31' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute31', - FileRoutesByPath['/(gen)/absolute31']['parentRoute'], - FileRoutesByPath['/(gen)/absolute31']['id'], - FileRoutesByPath['/(gen)/absolute31']['path'], - FileRoutesByPath['/(gen)/absolute31']['fullPath'] - > -} -declare module './routes/(gen)/absolute32' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute32', - FileRoutesByPath['/(gen)/absolute32']['parentRoute'], - FileRoutesByPath['/(gen)/absolute32']['id'], - FileRoutesByPath['/(gen)/absolute32']['path'], - FileRoutesByPath['/(gen)/absolute32']['fullPath'] - > -} -declare module './routes/(gen)/absolute33' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute33', - FileRoutesByPath['/(gen)/absolute33']['parentRoute'], - FileRoutesByPath['/(gen)/absolute33']['id'], - FileRoutesByPath['/(gen)/absolute33']['path'], - FileRoutesByPath['/(gen)/absolute33']['fullPath'] - > -} -declare module './routes/(gen)/absolute34' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute34', - FileRoutesByPath['/(gen)/absolute34']['parentRoute'], - FileRoutesByPath['/(gen)/absolute34']['id'], - FileRoutesByPath['/(gen)/absolute34']['path'], - FileRoutesByPath['/(gen)/absolute34']['fullPath'] - > -} -declare module './routes/(gen)/absolute35' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute35', - FileRoutesByPath['/(gen)/absolute35']['parentRoute'], - FileRoutesByPath['/(gen)/absolute35']['id'], - FileRoutesByPath['/(gen)/absolute35']['path'], - FileRoutesByPath['/(gen)/absolute35']['fullPath'] - > -} -declare module './routes/(gen)/absolute36' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute36', - FileRoutesByPath['/(gen)/absolute36']['parentRoute'], - FileRoutesByPath['/(gen)/absolute36']['id'], - FileRoutesByPath['/(gen)/absolute36']['path'], - FileRoutesByPath['/(gen)/absolute36']['fullPath'] - > -} -declare module './routes/(gen)/absolute37' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute37', - FileRoutesByPath['/(gen)/absolute37']['parentRoute'], - FileRoutesByPath['/(gen)/absolute37']['id'], - FileRoutesByPath['/(gen)/absolute37']['path'], - FileRoutesByPath['/(gen)/absolute37']['fullPath'] - > -} -declare module './routes/(gen)/absolute38' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute38', - FileRoutesByPath['/(gen)/absolute38']['parentRoute'], - FileRoutesByPath['/(gen)/absolute38']['id'], - FileRoutesByPath['/(gen)/absolute38']['path'], - FileRoutesByPath['/(gen)/absolute38']['fullPath'] - > -} -declare module './routes/(gen)/absolute39' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute39', - FileRoutesByPath['/(gen)/absolute39']['parentRoute'], - FileRoutesByPath['/(gen)/absolute39']['id'], - FileRoutesByPath['/(gen)/absolute39']['path'], - FileRoutesByPath['/(gen)/absolute39']['fullPath'] - > -} -declare module './routes/(gen)/absolute4' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute4', - FileRoutesByPath['/(gen)/absolute4']['parentRoute'], - FileRoutesByPath['/(gen)/absolute4']['id'], - FileRoutesByPath['/(gen)/absolute4']['path'], - FileRoutesByPath['/(gen)/absolute4']['fullPath'] - > -} -declare module './routes/(gen)/absolute40' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute40', - FileRoutesByPath['/(gen)/absolute40']['parentRoute'], - FileRoutesByPath['/(gen)/absolute40']['id'], - FileRoutesByPath['/(gen)/absolute40']['path'], - FileRoutesByPath['/(gen)/absolute40']['fullPath'] - > -} -declare module './routes/(gen)/absolute41' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute41', - FileRoutesByPath['/(gen)/absolute41']['parentRoute'], - FileRoutesByPath['/(gen)/absolute41']['id'], - FileRoutesByPath['/(gen)/absolute41']['path'], - FileRoutesByPath['/(gen)/absolute41']['fullPath'] - > -} -declare module './routes/(gen)/absolute42' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute42', - FileRoutesByPath['/(gen)/absolute42']['parentRoute'], - FileRoutesByPath['/(gen)/absolute42']['id'], - FileRoutesByPath['/(gen)/absolute42']['path'], - FileRoutesByPath['/(gen)/absolute42']['fullPath'] - > -} -declare module './routes/(gen)/absolute43' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute43', - FileRoutesByPath['/(gen)/absolute43']['parentRoute'], - FileRoutesByPath['/(gen)/absolute43']['id'], - FileRoutesByPath['/(gen)/absolute43']['path'], - FileRoutesByPath['/(gen)/absolute43']['fullPath'] - > -} -declare module './routes/(gen)/absolute44' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute44', - FileRoutesByPath['/(gen)/absolute44']['parentRoute'], - FileRoutesByPath['/(gen)/absolute44']['id'], - FileRoutesByPath['/(gen)/absolute44']['path'], - FileRoutesByPath['/(gen)/absolute44']['fullPath'] - > -} -declare module './routes/(gen)/absolute45' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute45', - FileRoutesByPath['/(gen)/absolute45']['parentRoute'], - FileRoutesByPath['/(gen)/absolute45']['id'], - FileRoutesByPath['/(gen)/absolute45']['path'], - FileRoutesByPath['/(gen)/absolute45']['fullPath'] - > -} -declare module './routes/(gen)/absolute46' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute46', - FileRoutesByPath['/(gen)/absolute46']['parentRoute'], - FileRoutesByPath['/(gen)/absolute46']['id'], - FileRoutesByPath['/(gen)/absolute46']['path'], - FileRoutesByPath['/(gen)/absolute46']['fullPath'] - > -} -declare module './routes/(gen)/absolute47' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute47', - FileRoutesByPath['/(gen)/absolute47']['parentRoute'], - FileRoutesByPath['/(gen)/absolute47']['id'], - FileRoutesByPath['/(gen)/absolute47']['path'], - FileRoutesByPath['/(gen)/absolute47']['fullPath'] - > -} -declare module './routes/(gen)/absolute48' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute48', - FileRoutesByPath['/(gen)/absolute48']['parentRoute'], - FileRoutesByPath['/(gen)/absolute48']['id'], - FileRoutesByPath['/(gen)/absolute48']['path'], - FileRoutesByPath['/(gen)/absolute48']['fullPath'] - > -} -declare module './routes/(gen)/absolute49' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute49', - FileRoutesByPath['/(gen)/absolute49']['parentRoute'], - FileRoutesByPath['/(gen)/absolute49']['id'], - FileRoutesByPath['/(gen)/absolute49']['path'], - FileRoutesByPath['/(gen)/absolute49']['fullPath'] - > -} -declare module './routes/(gen)/absolute5' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute5', - FileRoutesByPath['/(gen)/absolute5']['parentRoute'], - FileRoutesByPath['/(gen)/absolute5']['id'], - FileRoutesByPath['/(gen)/absolute5']['path'], - FileRoutesByPath['/(gen)/absolute5']['fullPath'] - > -} -declare module './routes/(gen)/absolute50' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute50', - FileRoutesByPath['/(gen)/absolute50']['parentRoute'], - FileRoutesByPath['/(gen)/absolute50']['id'], - FileRoutesByPath['/(gen)/absolute50']['path'], - FileRoutesByPath['/(gen)/absolute50']['fullPath'] - > -} -declare module './routes/(gen)/absolute51' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute51', - FileRoutesByPath['/(gen)/absolute51']['parentRoute'], - FileRoutesByPath['/(gen)/absolute51']['id'], - FileRoutesByPath['/(gen)/absolute51']['path'], - FileRoutesByPath['/(gen)/absolute51']['fullPath'] - > -} -declare module './routes/(gen)/absolute52' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute52', - FileRoutesByPath['/(gen)/absolute52']['parentRoute'], - FileRoutesByPath['/(gen)/absolute52']['id'], - FileRoutesByPath['/(gen)/absolute52']['path'], - FileRoutesByPath['/(gen)/absolute52']['fullPath'] - > -} -declare module './routes/(gen)/absolute53' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute53', - FileRoutesByPath['/(gen)/absolute53']['parentRoute'], - FileRoutesByPath['/(gen)/absolute53']['id'], - FileRoutesByPath['/(gen)/absolute53']['path'], - FileRoutesByPath['/(gen)/absolute53']['fullPath'] - > -} -declare module './routes/(gen)/absolute54' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute54', - FileRoutesByPath['/(gen)/absolute54']['parentRoute'], - FileRoutesByPath['/(gen)/absolute54']['id'], - FileRoutesByPath['/(gen)/absolute54']['path'], - FileRoutesByPath['/(gen)/absolute54']['fullPath'] - > -} -declare module './routes/(gen)/absolute55' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute55', - FileRoutesByPath['/(gen)/absolute55']['parentRoute'], - FileRoutesByPath['/(gen)/absolute55']['id'], - FileRoutesByPath['/(gen)/absolute55']['path'], - FileRoutesByPath['/(gen)/absolute55']['fullPath'] - > -} -declare module './routes/(gen)/absolute56' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute56', - FileRoutesByPath['/(gen)/absolute56']['parentRoute'], - FileRoutesByPath['/(gen)/absolute56']['id'], - FileRoutesByPath['/(gen)/absolute56']['path'], - FileRoutesByPath['/(gen)/absolute56']['fullPath'] - > -} -declare module './routes/(gen)/absolute57' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute57', - FileRoutesByPath['/(gen)/absolute57']['parentRoute'], - FileRoutesByPath['/(gen)/absolute57']['id'], - FileRoutesByPath['/(gen)/absolute57']['path'], - FileRoutesByPath['/(gen)/absolute57']['fullPath'] - > -} -declare module './routes/(gen)/absolute58' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute58', - FileRoutesByPath['/(gen)/absolute58']['parentRoute'], - FileRoutesByPath['/(gen)/absolute58']['id'], - FileRoutesByPath['/(gen)/absolute58']['path'], - FileRoutesByPath['/(gen)/absolute58']['fullPath'] - > -} -declare module './routes/(gen)/absolute59' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute59', - FileRoutesByPath['/(gen)/absolute59']['parentRoute'], - FileRoutesByPath['/(gen)/absolute59']['id'], - FileRoutesByPath['/(gen)/absolute59']['path'], - FileRoutesByPath['/(gen)/absolute59']['fullPath'] - > -} -declare module './routes/(gen)/absolute6' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute6', - FileRoutesByPath['/(gen)/absolute6']['parentRoute'], - FileRoutesByPath['/(gen)/absolute6']['id'], - FileRoutesByPath['/(gen)/absolute6']['path'], - FileRoutesByPath['/(gen)/absolute6']['fullPath'] - > -} -declare module './routes/(gen)/absolute60' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute60', - FileRoutesByPath['/(gen)/absolute60']['parentRoute'], - FileRoutesByPath['/(gen)/absolute60']['id'], - FileRoutesByPath['/(gen)/absolute60']['path'], - FileRoutesByPath['/(gen)/absolute60']['fullPath'] - > -} -declare module './routes/(gen)/absolute61' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute61', - FileRoutesByPath['/(gen)/absolute61']['parentRoute'], - FileRoutesByPath['/(gen)/absolute61']['id'], - FileRoutesByPath['/(gen)/absolute61']['path'], - FileRoutesByPath['/(gen)/absolute61']['fullPath'] - > -} -declare module './routes/(gen)/absolute62' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute62', - FileRoutesByPath['/(gen)/absolute62']['parentRoute'], - FileRoutesByPath['/(gen)/absolute62']['id'], - FileRoutesByPath['/(gen)/absolute62']['path'], - FileRoutesByPath['/(gen)/absolute62']['fullPath'] - > -} -declare module './routes/(gen)/absolute63' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute63', - FileRoutesByPath['/(gen)/absolute63']['parentRoute'], - FileRoutesByPath['/(gen)/absolute63']['id'], - FileRoutesByPath['/(gen)/absolute63']['path'], - FileRoutesByPath['/(gen)/absolute63']['fullPath'] - > -} -declare module './routes/(gen)/absolute64' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute64', - FileRoutesByPath['/(gen)/absolute64']['parentRoute'], - FileRoutesByPath['/(gen)/absolute64']['id'], - FileRoutesByPath['/(gen)/absolute64']['path'], - FileRoutesByPath['/(gen)/absolute64']['fullPath'] - > -} -declare module './routes/(gen)/absolute65' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute65', - FileRoutesByPath['/(gen)/absolute65']['parentRoute'], - FileRoutesByPath['/(gen)/absolute65']['id'], - FileRoutesByPath['/(gen)/absolute65']['path'], - FileRoutesByPath['/(gen)/absolute65']['fullPath'] - > -} -declare module './routes/(gen)/absolute66' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute66', - FileRoutesByPath['/(gen)/absolute66']['parentRoute'], - FileRoutesByPath['/(gen)/absolute66']['id'], - FileRoutesByPath['/(gen)/absolute66']['path'], - FileRoutesByPath['/(gen)/absolute66']['fullPath'] - > -} -declare module './routes/(gen)/absolute67' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute67', - FileRoutesByPath['/(gen)/absolute67']['parentRoute'], - FileRoutesByPath['/(gen)/absolute67']['id'], - FileRoutesByPath['/(gen)/absolute67']['path'], - FileRoutesByPath['/(gen)/absolute67']['fullPath'] - > -} -declare module './routes/(gen)/absolute68' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute68', - FileRoutesByPath['/(gen)/absolute68']['parentRoute'], - FileRoutesByPath['/(gen)/absolute68']['id'], - FileRoutesByPath['/(gen)/absolute68']['path'], - FileRoutesByPath['/(gen)/absolute68']['fullPath'] - > -} -declare module './routes/(gen)/absolute69' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute69', - FileRoutesByPath['/(gen)/absolute69']['parentRoute'], - FileRoutesByPath['/(gen)/absolute69']['id'], - FileRoutesByPath['/(gen)/absolute69']['path'], - FileRoutesByPath['/(gen)/absolute69']['fullPath'] - > -} -declare module './routes/(gen)/absolute7' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute7', - FileRoutesByPath['/(gen)/absolute7']['parentRoute'], - FileRoutesByPath['/(gen)/absolute7']['id'], - FileRoutesByPath['/(gen)/absolute7']['path'], - FileRoutesByPath['/(gen)/absolute7']['fullPath'] - > -} -declare module './routes/(gen)/absolute70' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute70', - FileRoutesByPath['/(gen)/absolute70']['parentRoute'], - FileRoutesByPath['/(gen)/absolute70']['id'], - FileRoutesByPath['/(gen)/absolute70']['path'], - FileRoutesByPath['/(gen)/absolute70']['fullPath'] - > -} -declare module './routes/(gen)/absolute71' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute71', - FileRoutesByPath['/(gen)/absolute71']['parentRoute'], - FileRoutesByPath['/(gen)/absolute71']['id'], - FileRoutesByPath['/(gen)/absolute71']['path'], - FileRoutesByPath['/(gen)/absolute71']['fullPath'] - > -} -declare module './routes/(gen)/absolute72' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute72', - FileRoutesByPath['/(gen)/absolute72']['parentRoute'], - FileRoutesByPath['/(gen)/absolute72']['id'], - FileRoutesByPath['/(gen)/absolute72']['path'], - FileRoutesByPath['/(gen)/absolute72']['fullPath'] - > -} -declare module './routes/(gen)/absolute73' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute73', - FileRoutesByPath['/(gen)/absolute73']['parentRoute'], - FileRoutesByPath['/(gen)/absolute73']['id'], - FileRoutesByPath['/(gen)/absolute73']['path'], - FileRoutesByPath['/(gen)/absolute73']['fullPath'] - > -} -declare module './routes/(gen)/absolute74' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute74', - FileRoutesByPath['/(gen)/absolute74']['parentRoute'], - FileRoutesByPath['/(gen)/absolute74']['id'], - FileRoutesByPath['/(gen)/absolute74']['path'], - FileRoutesByPath['/(gen)/absolute74']['fullPath'] - > -} -declare module './routes/(gen)/absolute75' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute75', - FileRoutesByPath['/(gen)/absolute75']['parentRoute'], - FileRoutesByPath['/(gen)/absolute75']['id'], - FileRoutesByPath['/(gen)/absolute75']['path'], - FileRoutesByPath['/(gen)/absolute75']['fullPath'] - > -} -declare module './routes/(gen)/absolute76' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute76', - FileRoutesByPath['/(gen)/absolute76']['parentRoute'], - FileRoutesByPath['/(gen)/absolute76']['id'], - FileRoutesByPath['/(gen)/absolute76']['path'], - FileRoutesByPath['/(gen)/absolute76']['fullPath'] - > -} -declare module './routes/(gen)/absolute77' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute77', - FileRoutesByPath['/(gen)/absolute77']['parentRoute'], - FileRoutesByPath['/(gen)/absolute77']['id'], - FileRoutesByPath['/(gen)/absolute77']['path'], - FileRoutesByPath['/(gen)/absolute77']['fullPath'] - > -} -declare module './routes/(gen)/absolute78' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute78', - FileRoutesByPath['/(gen)/absolute78']['parentRoute'], - FileRoutesByPath['/(gen)/absolute78']['id'], - FileRoutesByPath['/(gen)/absolute78']['path'], - FileRoutesByPath['/(gen)/absolute78']['fullPath'] - > -} -declare module './routes/(gen)/absolute79' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute79', - FileRoutesByPath['/(gen)/absolute79']['parentRoute'], - FileRoutesByPath['/(gen)/absolute79']['id'], - FileRoutesByPath['/(gen)/absolute79']['path'], - FileRoutesByPath['/(gen)/absolute79']['fullPath'] - > -} -declare module './routes/(gen)/absolute8' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute8', - FileRoutesByPath['/(gen)/absolute8']['parentRoute'], - FileRoutesByPath['/(gen)/absolute8']['id'], - FileRoutesByPath['/(gen)/absolute8']['path'], - FileRoutesByPath['/(gen)/absolute8']['fullPath'] - > -} -declare module './routes/(gen)/absolute80' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute80', - FileRoutesByPath['/(gen)/absolute80']['parentRoute'], - FileRoutesByPath['/(gen)/absolute80']['id'], - FileRoutesByPath['/(gen)/absolute80']['path'], - FileRoutesByPath['/(gen)/absolute80']['fullPath'] - > -} -declare module './routes/(gen)/absolute81' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute81', - FileRoutesByPath['/(gen)/absolute81']['parentRoute'], - FileRoutesByPath['/(gen)/absolute81']['id'], - FileRoutesByPath['/(gen)/absolute81']['path'], - FileRoutesByPath['/(gen)/absolute81']['fullPath'] - > -} -declare module './routes/(gen)/absolute82' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute82', - FileRoutesByPath['/(gen)/absolute82']['parentRoute'], - FileRoutesByPath['/(gen)/absolute82']['id'], - FileRoutesByPath['/(gen)/absolute82']['path'], - FileRoutesByPath['/(gen)/absolute82']['fullPath'] - > -} -declare module './routes/(gen)/absolute83' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute83', - FileRoutesByPath['/(gen)/absolute83']['parentRoute'], - FileRoutesByPath['/(gen)/absolute83']['id'], - FileRoutesByPath['/(gen)/absolute83']['path'], - FileRoutesByPath['/(gen)/absolute83']['fullPath'] - > -} -declare module './routes/(gen)/absolute84' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute84', - FileRoutesByPath['/(gen)/absolute84']['parentRoute'], - FileRoutesByPath['/(gen)/absolute84']['id'], - FileRoutesByPath['/(gen)/absolute84']['path'], - FileRoutesByPath['/(gen)/absolute84']['fullPath'] - > -} -declare module './routes/(gen)/absolute85' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute85', - FileRoutesByPath['/(gen)/absolute85']['parentRoute'], - FileRoutesByPath['/(gen)/absolute85']['id'], - FileRoutesByPath['/(gen)/absolute85']['path'], - FileRoutesByPath['/(gen)/absolute85']['fullPath'] - > -} -declare module './routes/(gen)/absolute86' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute86', - FileRoutesByPath['/(gen)/absolute86']['parentRoute'], - FileRoutesByPath['/(gen)/absolute86']['id'], - FileRoutesByPath['/(gen)/absolute86']['path'], - FileRoutesByPath['/(gen)/absolute86']['fullPath'] - > -} -declare module './routes/(gen)/absolute87' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute87', - FileRoutesByPath['/(gen)/absolute87']['parentRoute'], - FileRoutesByPath['/(gen)/absolute87']['id'], - FileRoutesByPath['/(gen)/absolute87']['path'], - FileRoutesByPath['/(gen)/absolute87']['fullPath'] - > -} -declare module './routes/(gen)/absolute88' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute88', - FileRoutesByPath['/(gen)/absolute88']['parentRoute'], - FileRoutesByPath['/(gen)/absolute88']['id'], - FileRoutesByPath['/(gen)/absolute88']['path'], - FileRoutesByPath['/(gen)/absolute88']['fullPath'] - > -} -declare module './routes/(gen)/absolute89' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute89', - FileRoutesByPath['/(gen)/absolute89']['parentRoute'], - FileRoutesByPath['/(gen)/absolute89']['id'], - FileRoutesByPath['/(gen)/absolute89']['path'], - FileRoutesByPath['/(gen)/absolute89']['fullPath'] - > -} -declare module './routes/(gen)/absolute9' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute9', - FileRoutesByPath['/(gen)/absolute9']['parentRoute'], - FileRoutesByPath['/(gen)/absolute9']['id'], - FileRoutesByPath['/(gen)/absolute9']['path'], - FileRoutesByPath['/(gen)/absolute9']['fullPath'] - > -} -declare module './routes/(gen)/absolute90' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute90', - FileRoutesByPath['/(gen)/absolute90']['parentRoute'], - FileRoutesByPath['/(gen)/absolute90']['id'], - FileRoutesByPath['/(gen)/absolute90']['path'], - FileRoutesByPath['/(gen)/absolute90']['fullPath'] - > -} -declare module './routes/(gen)/absolute91' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute91', - FileRoutesByPath['/(gen)/absolute91']['parentRoute'], - FileRoutesByPath['/(gen)/absolute91']['id'], - FileRoutesByPath['/(gen)/absolute91']['path'], - FileRoutesByPath['/(gen)/absolute91']['fullPath'] - > -} -declare module './routes/(gen)/absolute92' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute92', - FileRoutesByPath['/(gen)/absolute92']['parentRoute'], - FileRoutesByPath['/(gen)/absolute92']['id'], - FileRoutesByPath['/(gen)/absolute92']['path'], - FileRoutesByPath['/(gen)/absolute92']['fullPath'] - > -} -declare module './routes/(gen)/absolute93' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute93', - FileRoutesByPath['/(gen)/absolute93']['parentRoute'], - FileRoutesByPath['/(gen)/absolute93']['id'], - FileRoutesByPath['/(gen)/absolute93']['path'], - FileRoutesByPath['/(gen)/absolute93']['fullPath'] - > -} -declare module './routes/(gen)/absolute94' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute94', - FileRoutesByPath['/(gen)/absolute94']['parentRoute'], - FileRoutesByPath['/(gen)/absolute94']['id'], - FileRoutesByPath['/(gen)/absolute94']['path'], - FileRoutesByPath['/(gen)/absolute94']['fullPath'] - > -} -declare module './routes/(gen)/absolute95' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute95', - FileRoutesByPath['/(gen)/absolute95']['parentRoute'], - FileRoutesByPath['/(gen)/absolute95']['id'], - FileRoutesByPath['/(gen)/absolute95']['path'], - FileRoutesByPath['/(gen)/absolute95']['fullPath'] - > -} -declare module './routes/(gen)/absolute96' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute96', - FileRoutesByPath['/(gen)/absolute96']['parentRoute'], - FileRoutesByPath['/(gen)/absolute96']['id'], - FileRoutesByPath['/(gen)/absolute96']['path'], - FileRoutesByPath['/(gen)/absolute96']['fullPath'] - > -} -declare module './routes/(gen)/absolute97' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute97', - FileRoutesByPath['/(gen)/absolute97']['parentRoute'], - FileRoutesByPath['/(gen)/absolute97']['id'], - FileRoutesByPath['/(gen)/absolute97']['path'], - FileRoutesByPath['/(gen)/absolute97']['fullPath'] - > -} -declare module './routes/(gen)/absolute98' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute98', - FileRoutesByPath['/(gen)/absolute98']['parentRoute'], - FileRoutesByPath['/(gen)/absolute98']['id'], - FileRoutesByPath['/(gen)/absolute98']['path'], - FileRoutesByPath['/(gen)/absolute98']['fullPath'] - > -} -declare module './routes/(gen)/absolute99' { - const createFileRoute: CreateFileRoute< - '/(gen)/absolute99', - FileRoutesByPath['/(gen)/absolute99']['parentRoute'], - FileRoutesByPath['/(gen)/absolute99']['id'], - FileRoutesByPath['/(gen)/absolute99']['path'], - FileRoutesByPath['/(gen)/absolute99']['fullPath'] - > -} -declare module './routes/(gen)/relative0' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative0', - FileRoutesByPath['/(gen)/relative0']['parentRoute'], - FileRoutesByPath['/(gen)/relative0']['id'], - FileRoutesByPath['/(gen)/relative0']['path'], - FileRoutesByPath['/(gen)/relative0']['fullPath'] - > -} -declare module './routes/(gen)/relative1' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative1', - FileRoutesByPath['/(gen)/relative1']['parentRoute'], - FileRoutesByPath['/(gen)/relative1']['id'], - FileRoutesByPath['/(gen)/relative1']['path'], - FileRoutesByPath['/(gen)/relative1']['fullPath'] - > -} -declare module './routes/(gen)/relative10' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative10', - FileRoutesByPath['/(gen)/relative10']['parentRoute'], - FileRoutesByPath['/(gen)/relative10']['id'], - FileRoutesByPath['/(gen)/relative10']['path'], - FileRoutesByPath['/(gen)/relative10']['fullPath'] - > -} -declare module './routes/(gen)/relative11' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative11', - FileRoutesByPath['/(gen)/relative11']['parentRoute'], - FileRoutesByPath['/(gen)/relative11']['id'], - FileRoutesByPath['/(gen)/relative11']['path'], - FileRoutesByPath['/(gen)/relative11']['fullPath'] - > -} -declare module './routes/(gen)/relative12' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative12', - FileRoutesByPath['/(gen)/relative12']['parentRoute'], - FileRoutesByPath['/(gen)/relative12']['id'], - FileRoutesByPath['/(gen)/relative12']['path'], - FileRoutesByPath['/(gen)/relative12']['fullPath'] - > -} -declare module './routes/(gen)/relative13' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative13', - FileRoutesByPath['/(gen)/relative13']['parentRoute'], - FileRoutesByPath['/(gen)/relative13']['id'], - FileRoutesByPath['/(gen)/relative13']['path'], - FileRoutesByPath['/(gen)/relative13']['fullPath'] - > -} -declare module './routes/(gen)/relative14' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative14', - FileRoutesByPath['/(gen)/relative14']['parentRoute'], - FileRoutesByPath['/(gen)/relative14']['id'], - FileRoutesByPath['/(gen)/relative14']['path'], - FileRoutesByPath['/(gen)/relative14']['fullPath'] - > -} -declare module './routes/(gen)/relative15' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative15', - FileRoutesByPath['/(gen)/relative15']['parentRoute'], - FileRoutesByPath['/(gen)/relative15']['id'], - FileRoutesByPath['/(gen)/relative15']['path'], - FileRoutesByPath['/(gen)/relative15']['fullPath'] - > -} -declare module './routes/(gen)/relative16' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative16', - FileRoutesByPath['/(gen)/relative16']['parentRoute'], - FileRoutesByPath['/(gen)/relative16']['id'], - FileRoutesByPath['/(gen)/relative16']['path'], - FileRoutesByPath['/(gen)/relative16']['fullPath'] - > -} -declare module './routes/(gen)/relative17' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative17', - FileRoutesByPath['/(gen)/relative17']['parentRoute'], - FileRoutesByPath['/(gen)/relative17']['id'], - FileRoutesByPath['/(gen)/relative17']['path'], - FileRoutesByPath['/(gen)/relative17']['fullPath'] - > -} -declare module './routes/(gen)/relative18' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative18', - FileRoutesByPath['/(gen)/relative18']['parentRoute'], - FileRoutesByPath['/(gen)/relative18']['id'], - FileRoutesByPath['/(gen)/relative18']['path'], - FileRoutesByPath['/(gen)/relative18']['fullPath'] - > -} -declare module './routes/(gen)/relative19' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative19', - FileRoutesByPath['/(gen)/relative19']['parentRoute'], - FileRoutesByPath['/(gen)/relative19']['id'], - FileRoutesByPath['/(gen)/relative19']['path'], - FileRoutesByPath['/(gen)/relative19']['fullPath'] - > -} -declare module './routes/(gen)/relative2' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative2', - FileRoutesByPath['/(gen)/relative2']['parentRoute'], - FileRoutesByPath['/(gen)/relative2']['id'], - FileRoutesByPath['/(gen)/relative2']['path'], - FileRoutesByPath['/(gen)/relative2']['fullPath'] - > -} -declare module './routes/(gen)/relative20' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative20', - FileRoutesByPath['/(gen)/relative20']['parentRoute'], - FileRoutesByPath['/(gen)/relative20']['id'], - FileRoutesByPath['/(gen)/relative20']['path'], - FileRoutesByPath['/(gen)/relative20']['fullPath'] - > -} -declare module './routes/(gen)/relative21' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative21', - FileRoutesByPath['/(gen)/relative21']['parentRoute'], - FileRoutesByPath['/(gen)/relative21']['id'], - FileRoutesByPath['/(gen)/relative21']['path'], - FileRoutesByPath['/(gen)/relative21']['fullPath'] - > -} -declare module './routes/(gen)/relative22' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative22', - FileRoutesByPath['/(gen)/relative22']['parentRoute'], - FileRoutesByPath['/(gen)/relative22']['id'], - FileRoutesByPath['/(gen)/relative22']['path'], - FileRoutesByPath['/(gen)/relative22']['fullPath'] - > -} -declare module './routes/(gen)/relative23' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative23', - FileRoutesByPath['/(gen)/relative23']['parentRoute'], - FileRoutesByPath['/(gen)/relative23']['id'], - FileRoutesByPath['/(gen)/relative23']['path'], - FileRoutesByPath['/(gen)/relative23']['fullPath'] - > -} -declare module './routes/(gen)/relative24' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative24', - FileRoutesByPath['/(gen)/relative24']['parentRoute'], - FileRoutesByPath['/(gen)/relative24']['id'], - FileRoutesByPath['/(gen)/relative24']['path'], - FileRoutesByPath['/(gen)/relative24']['fullPath'] - > -} -declare module './routes/(gen)/relative25' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative25', - FileRoutesByPath['/(gen)/relative25']['parentRoute'], - FileRoutesByPath['/(gen)/relative25']['id'], - FileRoutesByPath['/(gen)/relative25']['path'], - FileRoutesByPath['/(gen)/relative25']['fullPath'] - > -} -declare module './routes/(gen)/relative26' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative26', - FileRoutesByPath['/(gen)/relative26']['parentRoute'], - FileRoutesByPath['/(gen)/relative26']['id'], - FileRoutesByPath['/(gen)/relative26']['path'], - FileRoutesByPath['/(gen)/relative26']['fullPath'] - > -} -declare module './routes/(gen)/relative27' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative27', - FileRoutesByPath['/(gen)/relative27']['parentRoute'], - FileRoutesByPath['/(gen)/relative27']['id'], - FileRoutesByPath['/(gen)/relative27']['path'], - FileRoutesByPath['/(gen)/relative27']['fullPath'] - > -} -declare module './routes/(gen)/relative28' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative28', - FileRoutesByPath['/(gen)/relative28']['parentRoute'], - FileRoutesByPath['/(gen)/relative28']['id'], - FileRoutesByPath['/(gen)/relative28']['path'], - FileRoutesByPath['/(gen)/relative28']['fullPath'] - > -} -declare module './routes/(gen)/relative29' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative29', - FileRoutesByPath['/(gen)/relative29']['parentRoute'], - FileRoutesByPath['/(gen)/relative29']['id'], - FileRoutesByPath['/(gen)/relative29']['path'], - FileRoutesByPath['/(gen)/relative29']['fullPath'] - > -} -declare module './routes/(gen)/relative3' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative3', - FileRoutesByPath['/(gen)/relative3']['parentRoute'], - FileRoutesByPath['/(gen)/relative3']['id'], - FileRoutesByPath['/(gen)/relative3']['path'], - FileRoutesByPath['/(gen)/relative3']['fullPath'] - > -} -declare module './routes/(gen)/relative30' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative30', - FileRoutesByPath['/(gen)/relative30']['parentRoute'], - FileRoutesByPath['/(gen)/relative30']['id'], - FileRoutesByPath['/(gen)/relative30']['path'], - FileRoutesByPath['/(gen)/relative30']['fullPath'] - > -} -declare module './routes/(gen)/relative31' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative31', - FileRoutesByPath['/(gen)/relative31']['parentRoute'], - FileRoutesByPath['/(gen)/relative31']['id'], - FileRoutesByPath['/(gen)/relative31']['path'], - FileRoutesByPath['/(gen)/relative31']['fullPath'] - > -} -declare module './routes/(gen)/relative32' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative32', - FileRoutesByPath['/(gen)/relative32']['parentRoute'], - FileRoutesByPath['/(gen)/relative32']['id'], - FileRoutesByPath['/(gen)/relative32']['path'], - FileRoutesByPath['/(gen)/relative32']['fullPath'] - > -} -declare module './routes/(gen)/relative33' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative33', - FileRoutesByPath['/(gen)/relative33']['parentRoute'], - FileRoutesByPath['/(gen)/relative33']['id'], - FileRoutesByPath['/(gen)/relative33']['path'], - FileRoutesByPath['/(gen)/relative33']['fullPath'] - > -} -declare module './routes/(gen)/relative34' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative34', - FileRoutesByPath['/(gen)/relative34']['parentRoute'], - FileRoutesByPath['/(gen)/relative34']['id'], - FileRoutesByPath['/(gen)/relative34']['path'], - FileRoutesByPath['/(gen)/relative34']['fullPath'] - > -} -declare module './routes/(gen)/relative35' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative35', - FileRoutesByPath['/(gen)/relative35']['parentRoute'], - FileRoutesByPath['/(gen)/relative35']['id'], - FileRoutesByPath['/(gen)/relative35']['path'], - FileRoutesByPath['/(gen)/relative35']['fullPath'] - > -} -declare module './routes/(gen)/relative36' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative36', - FileRoutesByPath['/(gen)/relative36']['parentRoute'], - FileRoutesByPath['/(gen)/relative36']['id'], - FileRoutesByPath['/(gen)/relative36']['path'], - FileRoutesByPath['/(gen)/relative36']['fullPath'] - > -} -declare module './routes/(gen)/relative37' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative37', - FileRoutesByPath['/(gen)/relative37']['parentRoute'], - FileRoutesByPath['/(gen)/relative37']['id'], - FileRoutesByPath['/(gen)/relative37']['path'], - FileRoutesByPath['/(gen)/relative37']['fullPath'] - > -} -declare module './routes/(gen)/relative38' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative38', - FileRoutesByPath['/(gen)/relative38']['parentRoute'], - FileRoutesByPath['/(gen)/relative38']['id'], - FileRoutesByPath['/(gen)/relative38']['path'], - FileRoutesByPath['/(gen)/relative38']['fullPath'] - > -} -declare module './routes/(gen)/relative39' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative39', - FileRoutesByPath['/(gen)/relative39']['parentRoute'], - FileRoutesByPath['/(gen)/relative39']['id'], - FileRoutesByPath['/(gen)/relative39']['path'], - FileRoutesByPath['/(gen)/relative39']['fullPath'] - > -} -declare module './routes/(gen)/relative4' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative4', - FileRoutesByPath['/(gen)/relative4']['parentRoute'], - FileRoutesByPath['/(gen)/relative4']['id'], - FileRoutesByPath['/(gen)/relative4']['path'], - FileRoutesByPath['/(gen)/relative4']['fullPath'] - > -} -declare module './routes/(gen)/relative40' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative40', - FileRoutesByPath['/(gen)/relative40']['parentRoute'], - FileRoutesByPath['/(gen)/relative40']['id'], - FileRoutesByPath['/(gen)/relative40']['path'], - FileRoutesByPath['/(gen)/relative40']['fullPath'] - > -} -declare module './routes/(gen)/relative41' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative41', - FileRoutesByPath['/(gen)/relative41']['parentRoute'], - FileRoutesByPath['/(gen)/relative41']['id'], - FileRoutesByPath['/(gen)/relative41']['path'], - FileRoutesByPath['/(gen)/relative41']['fullPath'] - > -} -declare module './routes/(gen)/relative42' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative42', - FileRoutesByPath['/(gen)/relative42']['parentRoute'], - FileRoutesByPath['/(gen)/relative42']['id'], - FileRoutesByPath['/(gen)/relative42']['path'], - FileRoutesByPath['/(gen)/relative42']['fullPath'] - > -} -declare module './routes/(gen)/relative43' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative43', - FileRoutesByPath['/(gen)/relative43']['parentRoute'], - FileRoutesByPath['/(gen)/relative43']['id'], - FileRoutesByPath['/(gen)/relative43']['path'], - FileRoutesByPath['/(gen)/relative43']['fullPath'] - > -} -declare module './routes/(gen)/relative44' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative44', - FileRoutesByPath['/(gen)/relative44']['parentRoute'], - FileRoutesByPath['/(gen)/relative44']['id'], - FileRoutesByPath['/(gen)/relative44']['path'], - FileRoutesByPath['/(gen)/relative44']['fullPath'] - > -} -declare module './routes/(gen)/relative45' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative45', - FileRoutesByPath['/(gen)/relative45']['parentRoute'], - FileRoutesByPath['/(gen)/relative45']['id'], - FileRoutesByPath['/(gen)/relative45']['path'], - FileRoutesByPath['/(gen)/relative45']['fullPath'] - > -} -declare module './routes/(gen)/relative46' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative46', - FileRoutesByPath['/(gen)/relative46']['parentRoute'], - FileRoutesByPath['/(gen)/relative46']['id'], - FileRoutesByPath['/(gen)/relative46']['path'], - FileRoutesByPath['/(gen)/relative46']['fullPath'] - > -} -declare module './routes/(gen)/relative47' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative47', - FileRoutesByPath['/(gen)/relative47']['parentRoute'], - FileRoutesByPath['/(gen)/relative47']['id'], - FileRoutesByPath['/(gen)/relative47']['path'], - FileRoutesByPath['/(gen)/relative47']['fullPath'] - > -} -declare module './routes/(gen)/relative48' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative48', - FileRoutesByPath['/(gen)/relative48']['parentRoute'], - FileRoutesByPath['/(gen)/relative48']['id'], - FileRoutesByPath['/(gen)/relative48']['path'], - FileRoutesByPath['/(gen)/relative48']['fullPath'] - > -} -declare module './routes/(gen)/relative49' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative49', - FileRoutesByPath['/(gen)/relative49']['parentRoute'], - FileRoutesByPath['/(gen)/relative49']['id'], - FileRoutesByPath['/(gen)/relative49']['path'], - FileRoutesByPath['/(gen)/relative49']['fullPath'] - > -} -declare module './routes/(gen)/relative5' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative5', - FileRoutesByPath['/(gen)/relative5']['parentRoute'], - FileRoutesByPath['/(gen)/relative5']['id'], - FileRoutesByPath['/(gen)/relative5']['path'], - FileRoutesByPath['/(gen)/relative5']['fullPath'] - > -} -declare module './routes/(gen)/relative50' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative50', - FileRoutesByPath['/(gen)/relative50']['parentRoute'], - FileRoutesByPath['/(gen)/relative50']['id'], - FileRoutesByPath['/(gen)/relative50']['path'], - FileRoutesByPath['/(gen)/relative50']['fullPath'] - > -} -declare module './routes/(gen)/relative51' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative51', - FileRoutesByPath['/(gen)/relative51']['parentRoute'], - FileRoutesByPath['/(gen)/relative51']['id'], - FileRoutesByPath['/(gen)/relative51']['path'], - FileRoutesByPath['/(gen)/relative51']['fullPath'] - > -} -declare module './routes/(gen)/relative52' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative52', - FileRoutesByPath['/(gen)/relative52']['parentRoute'], - FileRoutesByPath['/(gen)/relative52']['id'], - FileRoutesByPath['/(gen)/relative52']['path'], - FileRoutesByPath['/(gen)/relative52']['fullPath'] - > -} -declare module './routes/(gen)/relative53' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative53', - FileRoutesByPath['/(gen)/relative53']['parentRoute'], - FileRoutesByPath['/(gen)/relative53']['id'], - FileRoutesByPath['/(gen)/relative53']['path'], - FileRoutesByPath['/(gen)/relative53']['fullPath'] - > -} -declare module './routes/(gen)/relative54' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative54', - FileRoutesByPath['/(gen)/relative54']['parentRoute'], - FileRoutesByPath['/(gen)/relative54']['id'], - FileRoutesByPath['/(gen)/relative54']['path'], - FileRoutesByPath['/(gen)/relative54']['fullPath'] - > -} -declare module './routes/(gen)/relative55' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative55', - FileRoutesByPath['/(gen)/relative55']['parentRoute'], - FileRoutesByPath['/(gen)/relative55']['id'], - FileRoutesByPath['/(gen)/relative55']['path'], - FileRoutesByPath['/(gen)/relative55']['fullPath'] - > -} -declare module './routes/(gen)/relative56' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative56', - FileRoutesByPath['/(gen)/relative56']['parentRoute'], - FileRoutesByPath['/(gen)/relative56']['id'], - FileRoutesByPath['/(gen)/relative56']['path'], - FileRoutesByPath['/(gen)/relative56']['fullPath'] - > -} -declare module './routes/(gen)/relative57' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative57', - FileRoutesByPath['/(gen)/relative57']['parentRoute'], - FileRoutesByPath['/(gen)/relative57']['id'], - FileRoutesByPath['/(gen)/relative57']['path'], - FileRoutesByPath['/(gen)/relative57']['fullPath'] - > -} -declare module './routes/(gen)/relative58' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative58', - FileRoutesByPath['/(gen)/relative58']['parentRoute'], - FileRoutesByPath['/(gen)/relative58']['id'], - FileRoutesByPath['/(gen)/relative58']['path'], - FileRoutesByPath['/(gen)/relative58']['fullPath'] - > -} -declare module './routes/(gen)/relative59' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative59', - FileRoutesByPath['/(gen)/relative59']['parentRoute'], - FileRoutesByPath['/(gen)/relative59']['id'], - FileRoutesByPath['/(gen)/relative59']['path'], - FileRoutesByPath['/(gen)/relative59']['fullPath'] - > -} -declare module './routes/(gen)/relative6' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative6', - FileRoutesByPath['/(gen)/relative6']['parentRoute'], - FileRoutesByPath['/(gen)/relative6']['id'], - FileRoutesByPath['/(gen)/relative6']['path'], - FileRoutesByPath['/(gen)/relative6']['fullPath'] - > -} -declare module './routes/(gen)/relative60' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative60', - FileRoutesByPath['/(gen)/relative60']['parentRoute'], - FileRoutesByPath['/(gen)/relative60']['id'], - FileRoutesByPath['/(gen)/relative60']['path'], - FileRoutesByPath['/(gen)/relative60']['fullPath'] - > -} -declare module './routes/(gen)/relative61' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative61', - FileRoutesByPath['/(gen)/relative61']['parentRoute'], - FileRoutesByPath['/(gen)/relative61']['id'], - FileRoutesByPath['/(gen)/relative61']['path'], - FileRoutesByPath['/(gen)/relative61']['fullPath'] - > -} -declare module './routes/(gen)/relative62' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative62', - FileRoutesByPath['/(gen)/relative62']['parentRoute'], - FileRoutesByPath['/(gen)/relative62']['id'], - FileRoutesByPath['/(gen)/relative62']['path'], - FileRoutesByPath['/(gen)/relative62']['fullPath'] - > -} -declare module './routes/(gen)/relative63' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative63', - FileRoutesByPath['/(gen)/relative63']['parentRoute'], - FileRoutesByPath['/(gen)/relative63']['id'], - FileRoutesByPath['/(gen)/relative63']['path'], - FileRoutesByPath['/(gen)/relative63']['fullPath'] - > -} -declare module './routes/(gen)/relative64' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative64', - FileRoutesByPath['/(gen)/relative64']['parentRoute'], - FileRoutesByPath['/(gen)/relative64']['id'], - FileRoutesByPath['/(gen)/relative64']['path'], - FileRoutesByPath['/(gen)/relative64']['fullPath'] - > -} -declare module './routes/(gen)/relative65' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative65', - FileRoutesByPath['/(gen)/relative65']['parentRoute'], - FileRoutesByPath['/(gen)/relative65']['id'], - FileRoutesByPath['/(gen)/relative65']['path'], - FileRoutesByPath['/(gen)/relative65']['fullPath'] - > -} -declare module './routes/(gen)/relative66' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative66', - FileRoutesByPath['/(gen)/relative66']['parentRoute'], - FileRoutesByPath['/(gen)/relative66']['id'], - FileRoutesByPath['/(gen)/relative66']['path'], - FileRoutesByPath['/(gen)/relative66']['fullPath'] - > -} -declare module './routes/(gen)/relative67' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative67', - FileRoutesByPath['/(gen)/relative67']['parentRoute'], - FileRoutesByPath['/(gen)/relative67']['id'], - FileRoutesByPath['/(gen)/relative67']['path'], - FileRoutesByPath['/(gen)/relative67']['fullPath'] - > -} -declare module './routes/(gen)/relative68' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative68', - FileRoutesByPath['/(gen)/relative68']['parentRoute'], - FileRoutesByPath['/(gen)/relative68']['id'], - FileRoutesByPath['/(gen)/relative68']['path'], - FileRoutesByPath['/(gen)/relative68']['fullPath'] - > -} -declare module './routes/(gen)/relative69' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative69', - FileRoutesByPath['/(gen)/relative69']['parentRoute'], - FileRoutesByPath['/(gen)/relative69']['id'], - FileRoutesByPath['/(gen)/relative69']['path'], - FileRoutesByPath['/(gen)/relative69']['fullPath'] - > -} -declare module './routes/(gen)/relative7' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative7', - FileRoutesByPath['/(gen)/relative7']['parentRoute'], - FileRoutesByPath['/(gen)/relative7']['id'], - FileRoutesByPath['/(gen)/relative7']['path'], - FileRoutesByPath['/(gen)/relative7']['fullPath'] - > -} -declare module './routes/(gen)/relative70' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative70', - FileRoutesByPath['/(gen)/relative70']['parentRoute'], - FileRoutesByPath['/(gen)/relative70']['id'], - FileRoutesByPath['/(gen)/relative70']['path'], - FileRoutesByPath['/(gen)/relative70']['fullPath'] - > -} -declare module './routes/(gen)/relative71' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative71', - FileRoutesByPath['/(gen)/relative71']['parentRoute'], - FileRoutesByPath['/(gen)/relative71']['id'], - FileRoutesByPath['/(gen)/relative71']['path'], - FileRoutesByPath['/(gen)/relative71']['fullPath'] - > -} -declare module './routes/(gen)/relative72' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative72', - FileRoutesByPath['/(gen)/relative72']['parentRoute'], - FileRoutesByPath['/(gen)/relative72']['id'], - FileRoutesByPath['/(gen)/relative72']['path'], - FileRoutesByPath['/(gen)/relative72']['fullPath'] - > -} -declare module './routes/(gen)/relative73' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative73', - FileRoutesByPath['/(gen)/relative73']['parentRoute'], - FileRoutesByPath['/(gen)/relative73']['id'], - FileRoutesByPath['/(gen)/relative73']['path'], - FileRoutesByPath['/(gen)/relative73']['fullPath'] - > -} -declare module './routes/(gen)/relative74' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative74', - FileRoutesByPath['/(gen)/relative74']['parentRoute'], - FileRoutesByPath['/(gen)/relative74']['id'], - FileRoutesByPath['/(gen)/relative74']['path'], - FileRoutesByPath['/(gen)/relative74']['fullPath'] - > -} -declare module './routes/(gen)/relative75' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative75', - FileRoutesByPath['/(gen)/relative75']['parentRoute'], - FileRoutesByPath['/(gen)/relative75']['id'], - FileRoutesByPath['/(gen)/relative75']['path'], - FileRoutesByPath['/(gen)/relative75']['fullPath'] - > -} -declare module './routes/(gen)/relative76' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative76', - FileRoutesByPath['/(gen)/relative76']['parentRoute'], - FileRoutesByPath['/(gen)/relative76']['id'], - FileRoutesByPath['/(gen)/relative76']['path'], - FileRoutesByPath['/(gen)/relative76']['fullPath'] - > -} -declare module './routes/(gen)/relative77' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative77', - FileRoutesByPath['/(gen)/relative77']['parentRoute'], - FileRoutesByPath['/(gen)/relative77']['id'], - FileRoutesByPath['/(gen)/relative77']['path'], - FileRoutesByPath['/(gen)/relative77']['fullPath'] - > -} -declare module './routes/(gen)/relative78' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative78', - FileRoutesByPath['/(gen)/relative78']['parentRoute'], - FileRoutesByPath['/(gen)/relative78']['id'], - FileRoutesByPath['/(gen)/relative78']['path'], - FileRoutesByPath['/(gen)/relative78']['fullPath'] - > -} -declare module './routes/(gen)/relative79' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative79', - FileRoutesByPath['/(gen)/relative79']['parentRoute'], - FileRoutesByPath['/(gen)/relative79']['id'], - FileRoutesByPath['/(gen)/relative79']['path'], - FileRoutesByPath['/(gen)/relative79']['fullPath'] - > -} -declare module './routes/(gen)/relative8' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative8', - FileRoutesByPath['/(gen)/relative8']['parentRoute'], - FileRoutesByPath['/(gen)/relative8']['id'], - FileRoutesByPath['/(gen)/relative8']['path'], - FileRoutesByPath['/(gen)/relative8']['fullPath'] - > -} -declare module './routes/(gen)/relative80' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative80', - FileRoutesByPath['/(gen)/relative80']['parentRoute'], - FileRoutesByPath['/(gen)/relative80']['id'], - FileRoutesByPath['/(gen)/relative80']['path'], - FileRoutesByPath['/(gen)/relative80']['fullPath'] - > -} -declare module './routes/(gen)/relative81' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative81', - FileRoutesByPath['/(gen)/relative81']['parentRoute'], - FileRoutesByPath['/(gen)/relative81']['id'], - FileRoutesByPath['/(gen)/relative81']['path'], - FileRoutesByPath['/(gen)/relative81']['fullPath'] - > -} -declare module './routes/(gen)/relative82' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative82', - FileRoutesByPath['/(gen)/relative82']['parentRoute'], - FileRoutesByPath['/(gen)/relative82']['id'], - FileRoutesByPath['/(gen)/relative82']['path'], - FileRoutesByPath['/(gen)/relative82']['fullPath'] - > -} -declare module './routes/(gen)/relative83' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative83', - FileRoutesByPath['/(gen)/relative83']['parentRoute'], - FileRoutesByPath['/(gen)/relative83']['id'], - FileRoutesByPath['/(gen)/relative83']['path'], - FileRoutesByPath['/(gen)/relative83']['fullPath'] - > -} -declare module './routes/(gen)/relative84' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative84', - FileRoutesByPath['/(gen)/relative84']['parentRoute'], - FileRoutesByPath['/(gen)/relative84']['id'], - FileRoutesByPath['/(gen)/relative84']['path'], - FileRoutesByPath['/(gen)/relative84']['fullPath'] - > -} -declare module './routes/(gen)/relative85' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative85', - FileRoutesByPath['/(gen)/relative85']['parentRoute'], - FileRoutesByPath['/(gen)/relative85']['id'], - FileRoutesByPath['/(gen)/relative85']['path'], - FileRoutesByPath['/(gen)/relative85']['fullPath'] - > -} -declare module './routes/(gen)/relative86' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative86', - FileRoutesByPath['/(gen)/relative86']['parentRoute'], - FileRoutesByPath['/(gen)/relative86']['id'], - FileRoutesByPath['/(gen)/relative86']['path'], - FileRoutesByPath['/(gen)/relative86']['fullPath'] - > -} -declare module './routes/(gen)/relative87' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative87', - FileRoutesByPath['/(gen)/relative87']['parentRoute'], - FileRoutesByPath['/(gen)/relative87']['id'], - FileRoutesByPath['/(gen)/relative87']['path'], - FileRoutesByPath['/(gen)/relative87']['fullPath'] - > -} -declare module './routes/(gen)/relative88' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative88', - FileRoutesByPath['/(gen)/relative88']['parentRoute'], - FileRoutesByPath['/(gen)/relative88']['id'], - FileRoutesByPath['/(gen)/relative88']['path'], - FileRoutesByPath['/(gen)/relative88']['fullPath'] - > -} -declare module './routes/(gen)/relative89' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative89', - FileRoutesByPath['/(gen)/relative89']['parentRoute'], - FileRoutesByPath['/(gen)/relative89']['id'], - FileRoutesByPath['/(gen)/relative89']['path'], - FileRoutesByPath['/(gen)/relative89']['fullPath'] - > -} -declare module './routes/(gen)/relative9' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative9', - FileRoutesByPath['/(gen)/relative9']['parentRoute'], - FileRoutesByPath['/(gen)/relative9']['id'], - FileRoutesByPath['/(gen)/relative9']['path'], - FileRoutesByPath['/(gen)/relative9']['fullPath'] - > -} -declare module './routes/(gen)/relative90' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative90', - FileRoutesByPath['/(gen)/relative90']['parentRoute'], - FileRoutesByPath['/(gen)/relative90']['id'], - FileRoutesByPath['/(gen)/relative90']['path'], - FileRoutesByPath['/(gen)/relative90']['fullPath'] - > -} -declare module './routes/(gen)/relative91' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative91', - FileRoutesByPath['/(gen)/relative91']['parentRoute'], - FileRoutesByPath['/(gen)/relative91']['id'], - FileRoutesByPath['/(gen)/relative91']['path'], - FileRoutesByPath['/(gen)/relative91']['fullPath'] - > -} -declare module './routes/(gen)/relative92' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative92', - FileRoutesByPath['/(gen)/relative92']['parentRoute'], - FileRoutesByPath['/(gen)/relative92']['id'], - FileRoutesByPath['/(gen)/relative92']['path'], - FileRoutesByPath['/(gen)/relative92']['fullPath'] - > -} -declare module './routes/(gen)/relative93' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative93', - FileRoutesByPath['/(gen)/relative93']['parentRoute'], - FileRoutesByPath['/(gen)/relative93']['id'], - FileRoutesByPath['/(gen)/relative93']['path'], - FileRoutesByPath['/(gen)/relative93']['fullPath'] - > -} -declare module './routes/(gen)/relative94' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative94', - FileRoutesByPath['/(gen)/relative94']['parentRoute'], - FileRoutesByPath['/(gen)/relative94']['id'], - FileRoutesByPath['/(gen)/relative94']['path'], - FileRoutesByPath['/(gen)/relative94']['fullPath'] - > -} -declare module './routes/(gen)/relative95' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative95', - FileRoutesByPath['/(gen)/relative95']['parentRoute'], - FileRoutesByPath['/(gen)/relative95']['id'], - FileRoutesByPath['/(gen)/relative95']['path'], - FileRoutesByPath['/(gen)/relative95']['fullPath'] - > -} -declare module './routes/(gen)/relative96' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative96', - FileRoutesByPath['/(gen)/relative96']['parentRoute'], - FileRoutesByPath['/(gen)/relative96']['id'], - FileRoutesByPath['/(gen)/relative96']['path'], - FileRoutesByPath['/(gen)/relative96']['fullPath'] - > -} -declare module './routes/(gen)/relative97' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative97', - FileRoutesByPath['/(gen)/relative97']['parentRoute'], - FileRoutesByPath['/(gen)/relative97']['id'], - FileRoutesByPath['/(gen)/relative97']['path'], - FileRoutesByPath['/(gen)/relative97']['fullPath'] - > -} -declare module './routes/(gen)/relative98' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative98', - FileRoutesByPath['/(gen)/relative98']['parentRoute'], - FileRoutesByPath['/(gen)/relative98']['id'], - FileRoutesByPath['/(gen)/relative98']['path'], - FileRoutesByPath['/(gen)/relative98']['fullPath'] - > -} -declare module './routes/(gen)/relative99' { - const createFileRoute: CreateFileRoute< - '/(gen)/relative99', - FileRoutesByPath['/(gen)/relative99']['parentRoute'], - FileRoutesByPath['/(gen)/relative99']['id'], - FileRoutesByPath['/(gen)/relative99']['path'], - FileRoutesByPath['/(gen)/relative99']['fullPath'] - > -} -declare module './routes/params/$paramsPlaceholder' { - const createFileRoute: CreateFileRoute< - '/params/$paramsPlaceholder', - FileRoutesByPath['/params/$paramsPlaceholder']['parentRoute'], - FileRoutesByPath['/params/$paramsPlaceholder']['id'], - FileRoutesByPath['/params/$paramsPlaceholder']['path'], - FileRoutesByPath['/params/$paramsPlaceholder']['fullPath'] - > -} -declare module './routes/search/searchPlaceholder' { - const createFileRoute: CreateFileRoute< - '/search/searchPlaceholder', - FileRoutesByPath['/search/searchPlaceholder']['parentRoute'], - FileRoutesByPath['/search/searchPlaceholder']['id'], - FileRoutesByPath['/search/searchPlaceholder']['path'], - FileRoutesByPath['/search/searchPlaceholder']['fullPath'] - > -} -declare module './routes/(gen)/params/$param0' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param0', - FileRoutesByPath['/(gen)/params/$param0']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param0']['id'], - FileRoutesByPath['/(gen)/params/$param0']['path'], - FileRoutesByPath['/(gen)/params/$param0']['fullPath'] - > -} -declare module './routes/(gen)/params/$param1' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param1', - FileRoutesByPath['/(gen)/params/$param1']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param1']['id'], - FileRoutesByPath['/(gen)/params/$param1']['path'], - FileRoutesByPath['/(gen)/params/$param1']['fullPath'] - > -} -declare module './routes/(gen)/params/$param10' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param10', - FileRoutesByPath['/(gen)/params/$param10']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param10']['id'], - FileRoutesByPath['/(gen)/params/$param10']['path'], - FileRoutesByPath['/(gen)/params/$param10']['fullPath'] - > -} -declare module './routes/(gen)/params/$param11' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param11', - FileRoutesByPath['/(gen)/params/$param11']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param11']['id'], - FileRoutesByPath['/(gen)/params/$param11']['path'], - FileRoutesByPath['/(gen)/params/$param11']['fullPath'] - > -} -declare module './routes/(gen)/params/$param12' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param12', - FileRoutesByPath['/(gen)/params/$param12']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param12']['id'], - FileRoutesByPath['/(gen)/params/$param12']['path'], - FileRoutesByPath['/(gen)/params/$param12']['fullPath'] - > -} -declare module './routes/(gen)/params/$param13' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param13', - FileRoutesByPath['/(gen)/params/$param13']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param13']['id'], - FileRoutesByPath['/(gen)/params/$param13']['path'], - FileRoutesByPath['/(gen)/params/$param13']['fullPath'] - > -} -declare module './routes/(gen)/params/$param14' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param14', - FileRoutesByPath['/(gen)/params/$param14']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param14']['id'], - FileRoutesByPath['/(gen)/params/$param14']['path'], - FileRoutesByPath['/(gen)/params/$param14']['fullPath'] - > -} -declare module './routes/(gen)/params/$param15' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param15', - FileRoutesByPath['/(gen)/params/$param15']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param15']['id'], - FileRoutesByPath['/(gen)/params/$param15']['path'], - FileRoutesByPath['/(gen)/params/$param15']['fullPath'] - > -} -declare module './routes/(gen)/params/$param16' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param16', - FileRoutesByPath['/(gen)/params/$param16']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param16']['id'], - FileRoutesByPath['/(gen)/params/$param16']['path'], - FileRoutesByPath['/(gen)/params/$param16']['fullPath'] - > -} -declare module './routes/(gen)/params/$param17' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param17', - FileRoutesByPath['/(gen)/params/$param17']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param17']['id'], - FileRoutesByPath['/(gen)/params/$param17']['path'], - FileRoutesByPath['/(gen)/params/$param17']['fullPath'] - > -} -declare module './routes/(gen)/params/$param18' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param18', - FileRoutesByPath['/(gen)/params/$param18']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param18']['id'], - FileRoutesByPath['/(gen)/params/$param18']['path'], - FileRoutesByPath['/(gen)/params/$param18']['fullPath'] - > -} -declare module './routes/(gen)/params/$param19' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param19', - FileRoutesByPath['/(gen)/params/$param19']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param19']['id'], - FileRoutesByPath['/(gen)/params/$param19']['path'], - FileRoutesByPath['/(gen)/params/$param19']['fullPath'] - > -} -declare module './routes/(gen)/params/$param2' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param2', - FileRoutesByPath['/(gen)/params/$param2']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param2']['id'], - FileRoutesByPath['/(gen)/params/$param2']['path'], - FileRoutesByPath['/(gen)/params/$param2']['fullPath'] - > -} -declare module './routes/(gen)/params/$param20' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param20', - FileRoutesByPath['/(gen)/params/$param20']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param20']['id'], - FileRoutesByPath['/(gen)/params/$param20']['path'], - FileRoutesByPath['/(gen)/params/$param20']['fullPath'] - > -} -declare module './routes/(gen)/params/$param21' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param21', - FileRoutesByPath['/(gen)/params/$param21']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param21']['id'], - FileRoutesByPath['/(gen)/params/$param21']['path'], - FileRoutesByPath['/(gen)/params/$param21']['fullPath'] - > -} -declare module './routes/(gen)/params/$param22' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param22', - FileRoutesByPath['/(gen)/params/$param22']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param22']['id'], - FileRoutesByPath['/(gen)/params/$param22']['path'], - FileRoutesByPath['/(gen)/params/$param22']['fullPath'] - > -} -declare module './routes/(gen)/params/$param23' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param23', - FileRoutesByPath['/(gen)/params/$param23']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param23']['id'], - FileRoutesByPath['/(gen)/params/$param23']['path'], - FileRoutesByPath['/(gen)/params/$param23']['fullPath'] - > -} -declare module './routes/(gen)/params/$param24' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param24', - FileRoutesByPath['/(gen)/params/$param24']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param24']['id'], - FileRoutesByPath['/(gen)/params/$param24']['path'], - FileRoutesByPath['/(gen)/params/$param24']['fullPath'] - > -} -declare module './routes/(gen)/params/$param25' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param25', - FileRoutesByPath['/(gen)/params/$param25']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param25']['id'], - FileRoutesByPath['/(gen)/params/$param25']['path'], - FileRoutesByPath['/(gen)/params/$param25']['fullPath'] - > -} -declare module './routes/(gen)/params/$param26' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param26', - FileRoutesByPath['/(gen)/params/$param26']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param26']['id'], - FileRoutesByPath['/(gen)/params/$param26']['path'], - FileRoutesByPath['/(gen)/params/$param26']['fullPath'] - > -} -declare module './routes/(gen)/params/$param27' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param27', - FileRoutesByPath['/(gen)/params/$param27']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param27']['id'], - FileRoutesByPath['/(gen)/params/$param27']['path'], - FileRoutesByPath['/(gen)/params/$param27']['fullPath'] - > -} -declare module './routes/(gen)/params/$param28' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param28', - FileRoutesByPath['/(gen)/params/$param28']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param28']['id'], - FileRoutesByPath['/(gen)/params/$param28']['path'], - FileRoutesByPath['/(gen)/params/$param28']['fullPath'] - > -} -declare module './routes/(gen)/params/$param29' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param29', - FileRoutesByPath['/(gen)/params/$param29']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param29']['id'], - FileRoutesByPath['/(gen)/params/$param29']['path'], - FileRoutesByPath['/(gen)/params/$param29']['fullPath'] - > -} -declare module './routes/(gen)/params/$param3' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param3', - FileRoutesByPath['/(gen)/params/$param3']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param3']['id'], - FileRoutesByPath['/(gen)/params/$param3']['path'], - FileRoutesByPath['/(gen)/params/$param3']['fullPath'] - > -} -declare module './routes/(gen)/params/$param30' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param30', - FileRoutesByPath['/(gen)/params/$param30']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param30']['id'], - FileRoutesByPath['/(gen)/params/$param30']['path'], - FileRoutesByPath['/(gen)/params/$param30']['fullPath'] - > -} -declare module './routes/(gen)/params/$param31' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param31', - FileRoutesByPath['/(gen)/params/$param31']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param31']['id'], - FileRoutesByPath['/(gen)/params/$param31']['path'], - FileRoutesByPath['/(gen)/params/$param31']['fullPath'] - > -} -declare module './routes/(gen)/params/$param32' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param32', - FileRoutesByPath['/(gen)/params/$param32']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param32']['id'], - FileRoutesByPath['/(gen)/params/$param32']['path'], - FileRoutesByPath['/(gen)/params/$param32']['fullPath'] - > -} -declare module './routes/(gen)/params/$param33' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param33', - FileRoutesByPath['/(gen)/params/$param33']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param33']['id'], - FileRoutesByPath['/(gen)/params/$param33']['path'], - FileRoutesByPath['/(gen)/params/$param33']['fullPath'] - > -} -declare module './routes/(gen)/params/$param34' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param34', - FileRoutesByPath['/(gen)/params/$param34']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param34']['id'], - FileRoutesByPath['/(gen)/params/$param34']['path'], - FileRoutesByPath['/(gen)/params/$param34']['fullPath'] - > -} -declare module './routes/(gen)/params/$param35' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param35', - FileRoutesByPath['/(gen)/params/$param35']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param35']['id'], - FileRoutesByPath['/(gen)/params/$param35']['path'], - FileRoutesByPath['/(gen)/params/$param35']['fullPath'] - > -} -declare module './routes/(gen)/params/$param36' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param36', - FileRoutesByPath['/(gen)/params/$param36']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param36']['id'], - FileRoutesByPath['/(gen)/params/$param36']['path'], - FileRoutesByPath['/(gen)/params/$param36']['fullPath'] - > -} -declare module './routes/(gen)/params/$param37' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param37', - FileRoutesByPath['/(gen)/params/$param37']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param37']['id'], - FileRoutesByPath['/(gen)/params/$param37']['path'], - FileRoutesByPath['/(gen)/params/$param37']['fullPath'] - > -} -declare module './routes/(gen)/params/$param38' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param38', - FileRoutesByPath['/(gen)/params/$param38']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param38']['id'], - FileRoutesByPath['/(gen)/params/$param38']['path'], - FileRoutesByPath['/(gen)/params/$param38']['fullPath'] - > -} -declare module './routes/(gen)/params/$param39' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param39', - FileRoutesByPath['/(gen)/params/$param39']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param39']['id'], - FileRoutesByPath['/(gen)/params/$param39']['path'], - FileRoutesByPath['/(gen)/params/$param39']['fullPath'] - > -} -declare module './routes/(gen)/params/$param4' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param4', - FileRoutesByPath['/(gen)/params/$param4']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param4']['id'], - FileRoutesByPath['/(gen)/params/$param4']['path'], - FileRoutesByPath['/(gen)/params/$param4']['fullPath'] - > -} -declare module './routes/(gen)/params/$param40' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param40', - FileRoutesByPath['/(gen)/params/$param40']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param40']['id'], - FileRoutesByPath['/(gen)/params/$param40']['path'], - FileRoutesByPath['/(gen)/params/$param40']['fullPath'] - > -} -declare module './routes/(gen)/params/$param41' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param41', - FileRoutesByPath['/(gen)/params/$param41']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param41']['id'], - FileRoutesByPath['/(gen)/params/$param41']['path'], - FileRoutesByPath['/(gen)/params/$param41']['fullPath'] - > -} -declare module './routes/(gen)/params/$param42' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param42', - FileRoutesByPath['/(gen)/params/$param42']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param42']['id'], - FileRoutesByPath['/(gen)/params/$param42']['path'], - FileRoutesByPath['/(gen)/params/$param42']['fullPath'] - > -} -declare module './routes/(gen)/params/$param43' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param43', - FileRoutesByPath['/(gen)/params/$param43']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param43']['id'], - FileRoutesByPath['/(gen)/params/$param43']['path'], - FileRoutesByPath['/(gen)/params/$param43']['fullPath'] - > -} -declare module './routes/(gen)/params/$param44' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param44', - FileRoutesByPath['/(gen)/params/$param44']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param44']['id'], - FileRoutesByPath['/(gen)/params/$param44']['path'], - FileRoutesByPath['/(gen)/params/$param44']['fullPath'] - > -} -declare module './routes/(gen)/params/$param45' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param45', - FileRoutesByPath['/(gen)/params/$param45']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param45']['id'], - FileRoutesByPath['/(gen)/params/$param45']['path'], - FileRoutesByPath['/(gen)/params/$param45']['fullPath'] - > -} -declare module './routes/(gen)/params/$param46' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param46', - FileRoutesByPath['/(gen)/params/$param46']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param46']['id'], - FileRoutesByPath['/(gen)/params/$param46']['path'], - FileRoutesByPath['/(gen)/params/$param46']['fullPath'] - > -} -declare module './routes/(gen)/params/$param47' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param47', - FileRoutesByPath['/(gen)/params/$param47']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param47']['id'], - FileRoutesByPath['/(gen)/params/$param47']['path'], - FileRoutesByPath['/(gen)/params/$param47']['fullPath'] - > -} -declare module './routes/(gen)/params/$param48' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param48', - FileRoutesByPath['/(gen)/params/$param48']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param48']['id'], - FileRoutesByPath['/(gen)/params/$param48']['path'], - FileRoutesByPath['/(gen)/params/$param48']['fullPath'] - > -} -declare module './routes/(gen)/params/$param49' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param49', - FileRoutesByPath['/(gen)/params/$param49']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param49']['id'], - FileRoutesByPath['/(gen)/params/$param49']['path'], - FileRoutesByPath['/(gen)/params/$param49']['fullPath'] - > -} -declare module './routes/(gen)/params/$param5' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param5', - FileRoutesByPath['/(gen)/params/$param5']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param5']['id'], - FileRoutesByPath['/(gen)/params/$param5']['path'], - FileRoutesByPath['/(gen)/params/$param5']['fullPath'] - > -} -declare module './routes/(gen)/params/$param50' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param50', - FileRoutesByPath['/(gen)/params/$param50']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param50']['id'], - FileRoutesByPath['/(gen)/params/$param50']['path'], - FileRoutesByPath['/(gen)/params/$param50']['fullPath'] - > -} -declare module './routes/(gen)/params/$param51' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param51', - FileRoutesByPath['/(gen)/params/$param51']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param51']['id'], - FileRoutesByPath['/(gen)/params/$param51']['path'], - FileRoutesByPath['/(gen)/params/$param51']['fullPath'] - > -} -declare module './routes/(gen)/params/$param52' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param52', - FileRoutesByPath['/(gen)/params/$param52']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param52']['id'], - FileRoutesByPath['/(gen)/params/$param52']['path'], - FileRoutesByPath['/(gen)/params/$param52']['fullPath'] - > -} -declare module './routes/(gen)/params/$param53' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param53', - FileRoutesByPath['/(gen)/params/$param53']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param53']['id'], - FileRoutesByPath['/(gen)/params/$param53']['path'], - FileRoutesByPath['/(gen)/params/$param53']['fullPath'] - > -} -declare module './routes/(gen)/params/$param54' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param54', - FileRoutesByPath['/(gen)/params/$param54']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param54']['id'], - FileRoutesByPath['/(gen)/params/$param54']['path'], - FileRoutesByPath['/(gen)/params/$param54']['fullPath'] - > -} -declare module './routes/(gen)/params/$param55' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param55', - FileRoutesByPath['/(gen)/params/$param55']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param55']['id'], - FileRoutesByPath['/(gen)/params/$param55']['path'], - FileRoutesByPath['/(gen)/params/$param55']['fullPath'] - > -} -declare module './routes/(gen)/params/$param56' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param56', - FileRoutesByPath['/(gen)/params/$param56']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param56']['id'], - FileRoutesByPath['/(gen)/params/$param56']['path'], - FileRoutesByPath['/(gen)/params/$param56']['fullPath'] - > -} -declare module './routes/(gen)/params/$param57' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param57', - FileRoutesByPath['/(gen)/params/$param57']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param57']['id'], - FileRoutesByPath['/(gen)/params/$param57']['path'], - FileRoutesByPath['/(gen)/params/$param57']['fullPath'] - > -} -declare module './routes/(gen)/params/$param58' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param58', - FileRoutesByPath['/(gen)/params/$param58']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param58']['id'], - FileRoutesByPath['/(gen)/params/$param58']['path'], - FileRoutesByPath['/(gen)/params/$param58']['fullPath'] - > -} -declare module './routes/(gen)/params/$param59' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param59', - FileRoutesByPath['/(gen)/params/$param59']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param59']['id'], - FileRoutesByPath['/(gen)/params/$param59']['path'], - FileRoutesByPath['/(gen)/params/$param59']['fullPath'] - > -} -declare module './routes/(gen)/params/$param6' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param6', - FileRoutesByPath['/(gen)/params/$param6']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param6']['id'], - FileRoutesByPath['/(gen)/params/$param6']['path'], - FileRoutesByPath['/(gen)/params/$param6']['fullPath'] - > -} -declare module './routes/(gen)/params/$param60' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param60', - FileRoutesByPath['/(gen)/params/$param60']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param60']['id'], - FileRoutesByPath['/(gen)/params/$param60']['path'], - FileRoutesByPath['/(gen)/params/$param60']['fullPath'] - > -} -declare module './routes/(gen)/params/$param61' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param61', - FileRoutesByPath['/(gen)/params/$param61']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param61']['id'], - FileRoutesByPath['/(gen)/params/$param61']['path'], - FileRoutesByPath['/(gen)/params/$param61']['fullPath'] - > -} -declare module './routes/(gen)/params/$param62' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param62', - FileRoutesByPath['/(gen)/params/$param62']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param62']['id'], - FileRoutesByPath['/(gen)/params/$param62']['path'], - FileRoutesByPath['/(gen)/params/$param62']['fullPath'] - > -} -declare module './routes/(gen)/params/$param63' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param63', - FileRoutesByPath['/(gen)/params/$param63']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param63']['id'], - FileRoutesByPath['/(gen)/params/$param63']['path'], - FileRoutesByPath['/(gen)/params/$param63']['fullPath'] - > -} -declare module './routes/(gen)/params/$param64' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param64', - FileRoutesByPath['/(gen)/params/$param64']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param64']['id'], - FileRoutesByPath['/(gen)/params/$param64']['path'], - FileRoutesByPath['/(gen)/params/$param64']['fullPath'] - > -} -declare module './routes/(gen)/params/$param65' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param65', - FileRoutesByPath['/(gen)/params/$param65']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param65']['id'], - FileRoutesByPath['/(gen)/params/$param65']['path'], - FileRoutesByPath['/(gen)/params/$param65']['fullPath'] - > -} -declare module './routes/(gen)/params/$param66' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param66', - FileRoutesByPath['/(gen)/params/$param66']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param66']['id'], - FileRoutesByPath['/(gen)/params/$param66']['path'], - FileRoutesByPath['/(gen)/params/$param66']['fullPath'] - > -} -declare module './routes/(gen)/params/$param67' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param67', - FileRoutesByPath['/(gen)/params/$param67']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param67']['id'], - FileRoutesByPath['/(gen)/params/$param67']['path'], - FileRoutesByPath['/(gen)/params/$param67']['fullPath'] - > -} -declare module './routes/(gen)/params/$param68' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param68', - FileRoutesByPath['/(gen)/params/$param68']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param68']['id'], - FileRoutesByPath['/(gen)/params/$param68']['path'], - FileRoutesByPath['/(gen)/params/$param68']['fullPath'] - > -} -declare module './routes/(gen)/params/$param69' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param69', - FileRoutesByPath['/(gen)/params/$param69']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param69']['id'], - FileRoutesByPath['/(gen)/params/$param69']['path'], - FileRoutesByPath['/(gen)/params/$param69']['fullPath'] - > -} -declare module './routes/(gen)/params/$param7' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param7', - FileRoutesByPath['/(gen)/params/$param7']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param7']['id'], - FileRoutesByPath['/(gen)/params/$param7']['path'], - FileRoutesByPath['/(gen)/params/$param7']['fullPath'] - > -} -declare module './routes/(gen)/params/$param70' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param70', - FileRoutesByPath['/(gen)/params/$param70']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param70']['id'], - FileRoutesByPath['/(gen)/params/$param70']['path'], - FileRoutesByPath['/(gen)/params/$param70']['fullPath'] - > -} -declare module './routes/(gen)/params/$param71' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param71', - FileRoutesByPath['/(gen)/params/$param71']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param71']['id'], - FileRoutesByPath['/(gen)/params/$param71']['path'], - FileRoutesByPath['/(gen)/params/$param71']['fullPath'] - > -} -declare module './routes/(gen)/params/$param72' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param72', - FileRoutesByPath['/(gen)/params/$param72']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param72']['id'], - FileRoutesByPath['/(gen)/params/$param72']['path'], - FileRoutesByPath['/(gen)/params/$param72']['fullPath'] - > -} -declare module './routes/(gen)/params/$param73' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param73', - FileRoutesByPath['/(gen)/params/$param73']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param73']['id'], - FileRoutesByPath['/(gen)/params/$param73']['path'], - FileRoutesByPath['/(gen)/params/$param73']['fullPath'] - > -} -declare module './routes/(gen)/params/$param74' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param74', - FileRoutesByPath['/(gen)/params/$param74']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param74']['id'], - FileRoutesByPath['/(gen)/params/$param74']['path'], - FileRoutesByPath['/(gen)/params/$param74']['fullPath'] - > -} -declare module './routes/(gen)/params/$param75' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param75', - FileRoutesByPath['/(gen)/params/$param75']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param75']['id'], - FileRoutesByPath['/(gen)/params/$param75']['path'], - FileRoutesByPath['/(gen)/params/$param75']['fullPath'] - > -} -declare module './routes/(gen)/params/$param76' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param76', - FileRoutesByPath['/(gen)/params/$param76']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param76']['id'], - FileRoutesByPath['/(gen)/params/$param76']['path'], - FileRoutesByPath['/(gen)/params/$param76']['fullPath'] - > -} -declare module './routes/(gen)/params/$param77' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param77', - FileRoutesByPath['/(gen)/params/$param77']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param77']['id'], - FileRoutesByPath['/(gen)/params/$param77']['path'], - FileRoutesByPath['/(gen)/params/$param77']['fullPath'] - > -} -declare module './routes/(gen)/params/$param78' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param78', - FileRoutesByPath['/(gen)/params/$param78']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param78']['id'], - FileRoutesByPath['/(gen)/params/$param78']['path'], - FileRoutesByPath['/(gen)/params/$param78']['fullPath'] - > -} -declare module './routes/(gen)/params/$param79' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param79', - FileRoutesByPath['/(gen)/params/$param79']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param79']['id'], - FileRoutesByPath['/(gen)/params/$param79']['path'], - FileRoutesByPath['/(gen)/params/$param79']['fullPath'] - > -} -declare module './routes/(gen)/params/$param8' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param8', - FileRoutesByPath['/(gen)/params/$param8']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param8']['id'], - FileRoutesByPath['/(gen)/params/$param8']['path'], - FileRoutesByPath['/(gen)/params/$param8']['fullPath'] - > -} -declare module './routes/(gen)/params/$param80' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param80', - FileRoutesByPath['/(gen)/params/$param80']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param80']['id'], - FileRoutesByPath['/(gen)/params/$param80']['path'], - FileRoutesByPath['/(gen)/params/$param80']['fullPath'] - > -} -declare module './routes/(gen)/params/$param81' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param81', - FileRoutesByPath['/(gen)/params/$param81']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param81']['id'], - FileRoutesByPath['/(gen)/params/$param81']['path'], - FileRoutesByPath['/(gen)/params/$param81']['fullPath'] - > -} -declare module './routes/(gen)/params/$param82' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param82', - FileRoutesByPath['/(gen)/params/$param82']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param82']['id'], - FileRoutesByPath['/(gen)/params/$param82']['path'], - FileRoutesByPath['/(gen)/params/$param82']['fullPath'] - > -} -declare module './routes/(gen)/params/$param83' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param83', - FileRoutesByPath['/(gen)/params/$param83']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param83']['id'], - FileRoutesByPath['/(gen)/params/$param83']['path'], - FileRoutesByPath['/(gen)/params/$param83']['fullPath'] - > -} -declare module './routes/(gen)/params/$param84' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param84', - FileRoutesByPath['/(gen)/params/$param84']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param84']['id'], - FileRoutesByPath['/(gen)/params/$param84']['path'], - FileRoutesByPath['/(gen)/params/$param84']['fullPath'] - > -} -declare module './routes/(gen)/params/$param85' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param85', - FileRoutesByPath['/(gen)/params/$param85']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param85']['id'], - FileRoutesByPath['/(gen)/params/$param85']['path'], - FileRoutesByPath['/(gen)/params/$param85']['fullPath'] - > -} -declare module './routes/(gen)/params/$param86' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param86', - FileRoutesByPath['/(gen)/params/$param86']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param86']['id'], - FileRoutesByPath['/(gen)/params/$param86']['path'], - FileRoutesByPath['/(gen)/params/$param86']['fullPath'] - > -} -declare module './routes/(gen)/params/$param87' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param87', - FileRoutesByPath['/(gen)/params/$param87']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param87']['id'], - FileRoutesByPath['/(gen)/params/$param87']['path'], - FileRoutesByPath['/(gen)/params/$param87']['fullPath'] - > -} -declare module './routes/(gen)/params/$param88' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param88', - FileRoutesByPath['/(gen)/params/$param88']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param88']['id'], - FileRoutesByPath['/(gen)/params/$param88']['path'], - FileRoutesByPath['/(gen)/params/$param88']['fullPath'] - > -} -declare module './routes/(gen)/params/$param89' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param89', - FileRoutesByPath['/(gen)/params/$param89']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param89']['id'], - FileRoutesByPath['/(gen)/params/$param89']['path'], - FileRoutesByPath['/(gen)/params/$param89']['fullPath'] - > -} -declare module './routes/(gen)/params/$param9' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param9', - FileRoutesByPath['/(gen)/params/$param9']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param9']['id'], - FileRoutesByPath['/(gen)/params/$param9']['path'], - FileRoutesByPath['/(gen)/params/$param9']['fullPath'] - > -} -declare module './routes/(gen)/params/$param90' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param90', - FileRoutesByPath['/(gen)/params/$param90']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param90']['id'], - FileRoutesByPath['/(gen)/params/$param90']['path'], - FileRoutesByPath['/(gen)/params/$param90']['fullPath'] - > -} -declare module './routes/(gen)/params/$param91' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param91', - FileRoutesByPath['/(gen)/params/$param91']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param91']['id'], - FileRoutesByPath['/(gen)/params/$param91']['path'], - FileRoutesByPath['/(gen)/params/$param91']['fullPath'] - > -} -declare module './routes/(gen)/params/$param92' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param92', - FileRoutesByPath['/(gen)/params/$param92']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param92']['id'], - FileRoutesByPath['/(gen)/params/$param92']['path'], - FileRoutesByPath['/(gen)/params/$param92']['fullPath'] - > -} -declare module './routes/(gen)/params/$param93' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param93', - FileRoutesByPath['/(gen)/params/$param93']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param93']['id'], - FileRoutesByPath['/(gen)/params/$param93']['path'], - FileRoutesByPath['/(gen)/params/$param93']['fullPath'] - > -} -declare module './routes/(gen)/params/$param94' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param94', - FileRoutesByPath['/(gen)/params/$param94']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param94']['id'], - FileRoutesByPath['/(gen)/params/$param94']['path'], - FileRoutesByPath['/(gen)/params/$param94']['fullPath'] - > -} -declare module './routes/(gen)/params/$param95' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param95', - FileRoutesByPath['/(gen)/params/$param95']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param95']['id'], - FileRoutesByPath['/(gen)/params/$param95']['path'], - FileRoutesByPath['/(gen)/params/$param95']['fullPath'] - > -} -declare module './routes/(gen)/params/$param96' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param96', - FileRoutesByPath['/(gen)/params/$param96']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param96']['id'], - FileRoutesByPath['/(gen)/params/$param96']['path'], - FileRoutesByPath['/(gen)/params/$param96']['fullPath'] - > -} -declare module './routes/(gen)/params/$param97' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param97', - FileRoutesByPath['/(gen)/params/$param97']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param97']['id'], - FileRoutesByPath['/(gen)/params/$param97']['path'], - FileRoutesByPath['/(gen)/params/$param97']['fullPath'] - > -} -declare module './routes/(gen)/params/$param98' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param98', - FileRoutesByPath['/(gen)/params/$param98']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param98']['id'], - FileRoutesByPath['/(gen)/params/$param98']['path'], - FileRoutesByPath['/(gen)/params/$param98']['fullPath'] - > -} -declare module './routes/(gen)/params/$param99' { - const createFileRoute: CreateFileRoute< - '/(gen)/params/$param99', - FileRoutesByPath['/(gen)/params/$param99']['parentRoute'], - FileRoutesByPath['/(gen)/params/$param99']['id'], - FileRoutesByPath['/(gen)/params/$param99']['path'], - FileRoutesByPath['/(gen)/params/$param99']['fullPath'] - > -} -declare module './routes/(gen)/search/search0' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search0', - FileRoutesByPath['/(gen)/search/search0']['parentRoute'], - FileRoutesByPath['/(gen)/search/search0']['id'], - FileRoutesByPath['/(gen)/search/search0']['path'], - FileRoutesByPath['/(gen)/search/search0']['fullPath'] - > -} -declare module './routes/(gen)/search/search1' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search1', - FileRoutesByPath['/(gen)/search/search1']['parentRoute'], - FileRoutesByPath['/(gen)/search/search1']['id'], - FileRoutesByPath['/(gen)/search/search1']['path'], - FileRoutesByPath['/(gen)/search/search1']['fullPath'] - > -} -declare module './routes/(gen)/search/search10' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search10', - FileRoutesByPath['/(gen)/search/search10']['parentRoute'], - FileRoutesByPath['/(gen)/search/search10']['id'], - FileRoutesByPath['/(gen)/search/search10']['path'], - FileRoutesByPath['/(gen)/search/search10']['fullPath'] - > -} -declare module './routes/(gen)/search/search11' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search11', - FileRoutesByPath['/(gen)/search/search11']['parentRoute'], - FileRoutesByPath['/(gen)/search/search11']['id'], - FileRoutesByPath['/(gen)/search/search11']['path'], - FileRoutesByPath['/(gen)/search/search11']['fullPath'] - > -} -declare module './routes/(gen)/search/search12' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search12', - FileRoutesByPath['/(gen)/search/search12']['parentRoute'], - FileRoutesByPath['/(gen)/search/search12']['id'], - FileRoutesByPath['/(gen)/search/search12']['path'], - FileRoutesByPath['/(gen)/search/search12']['fullPath'] - > -} -declare module './routes/(gen)/search/search13' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search13', - FileRoutesByPath['/(gen)/search/search13']['parentRoute'], - FileRoutesByPath['/(gen)/search/search13']['id'], - FileRoutesByPath['/(gen)/search/search13']['path'], - FileRoutesByPath['/(gen)/search/search13']['fullPath'] - > -} -declare module './routes/(gen)/search/search14' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search14', - FileRoutesByPath['/(gen)/search/search14']['parentRoute'], - FileRoutesByPath['/(gen)/search/search14']['id'], - FileRoutesByPath['/(gen)/search/search14']['path'], - FileRoutesByPath['/(gen)/search/search14']['fullPath'] - > -} -declare module './routes/(gen)/search/search15' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search15', - FileRoutesByPath['/(gen)/search/search15']['parentRoute'], - FileRoutesByPath['/(gen)/search/search15']['id'], - FileRoutesByPath['/(gen)/search/search15']['path'], - FileRoutesByPath['/(gen)/search/search15']['fullPath'] - > -} -declare module './routes/(gen)/search/search16' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search16', - FileRoutesByPath['/(gen)/search/search16']['parentRoute'], - FileRoutesByPath['/(gen)/search/search16']['id'], - FileRoutesByPath['/(gen)/search/search16']['path'], - FileRoutesByPath['/(gen)/search/search16']['fullPath'] - > -} -declare module './routes/(gen)/search/search17' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search17', - FileRoutesByPath['/(gen)/search/search17']['parentRoute'], - FileRoutesByPath['/(gen)/search/search17']['id'], - FileRoutesByPath['/(gen)/search/search17']['path'], - FileRoutesByPath['/(gen)/search/search17']['fullPath'] - > -} -declare module './routes/(gen)/search/search18' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search18', - FileRoutesByPath['/(gen)/search/search18']['parentRoute'], - FileRoutesByPath['/(gen)/search/search18']['id'], - FileRoutesByPath['/(gen)/search/search18']['path'], - FileRoutesByPath['/(gen)/search/search18']['fullPath'] - > -} -declare module './routes/(gen)/search/search19' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search19', - FileRoutesByPath['/(gen)/search/search19']['parentRoute'], - FileRoutesByPath['/(gen)/search/search19']['id'], - FileRoutesByPath['/(gen)/search/search19']['path'], - FileRoutesByPath['/(gen)/search/search19']['fullPath'] - > -} -declare module './routes/(gen)/search/search2' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search2', - FileRoutesByPath['/(gen)/search/search2']['parentRoute'], - FileRoutesByPath['/(gen)/search/search2']['id'], - FileRoutesByPath['/(gen)/search/search2']['path'], - FileRoutesByPath['/(gen)/search/search2']['fullPath'] - > -} -declare module './routes/(gen)/search/search20' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search20', - FileRoutesByPath['/(gen)/search/search20']['parentRoute'], - FileRoutesByPath['/(gen)/search/search20']['id'], - FileRoutesByPath['/(gen)/search/search20']['path'], - FileRoutesByPath['/(gen)/search/search20']['fullPath'] - > -} -declare module './routes/(gen)/search/search21' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search21', - FileRoutesByPath['/(gen)/search/search21']['parentRoute'], - FileRoutesByPath['/(gen)/search/search21']['id'], - FileRoutesByPath['/(gen)/search/search21']['path'], - FileRoutesByPath['/(gen)/search/search21']['fullPath'] - > -} -declare module './routes/(gen)/search/search22' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search22', - FileRoutesByPath['/(gen)/search/search22']['parentRoute'], - FileRoutesByPath['/(gen)/search/search22']['id'], - FileRoutesByPath['/(gen)/search/search22']['path'], - FileRoutesByPath['/(gen)/search/search22']['fullPath'] - > -} -declare module './routes/(gen)/search/search23' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search23', - FileRoutesByPath['/(gen)/search/search23']['parentRoute'], - FileRoutesByPath['/(gen)/search/search23']['id'], - FileRoutesByPath['/(gen)/search/search23']['path'], - FileRoutesByPath['/(gen)/search/search23']['fullPath'] - > -} -declare module './routes/(gen)/search/search24' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search24', - FileRoutesByPath['/(gen)/search/search24']['parentRoute'], - FileRoutesByPath['/(gen)/search/search24']['id'], - FileRoutesByPath['/(gen)/search/search24']['path'], - FileRoutesByPath['/(gen)/search/search24']['fullPath'] - > -} -declare module './routes/(gen)/search/search25' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search25', - FileRoutesByPath['/(gen)/search/search25']['parentRoute'], - FileRoutesByPath['/(gen)/search/search25']['id'], - FileRoutesByPath['/(gen)/search/search25']['path'], - FileRoutesByPath['/(gen)/search/search25']['fullPath'] - > -} -declare module './routes/(gen)/search/search26' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search26', - FileRoutesByPath['/(gen)/search/search26']['parentRoute'], - FileRoutesByPath['/(gen)/search/search26']['id'], - FileRoutesByPath['/(gen)/search/search26']['path'], - FileRoutesByPath['/(gen)/search/search26']['fullPath'] - > -} -declare module './routes/(gen)/search/search27' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search27', - FileRoutesByPath['/(gen)/search/search27']['parentRoute'], - FileRoutesByPath['/(gen)/search/search27']['id'], - FileRoutesByPath['/(gen)/search/search27']['path'], - FileRoutesByPath['/(gen)/search/search27']['fullPath'] - > -} -declare module './routes/(gen)/search/search28' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search28', - FileRoutesByPath['/(gen)/search/search28']['parentRoute'], - FileRoutesByPath['/(gen)/search/search28']['id'], - FileRoutesByPath['/(gen)/search/search28']['path'], - FileRoutesByPath['/(gen)/search/search28']['fullPath'] - > -} -declare module './routes/(gen)/search/search29' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search29', - FileRoutesByPath['/(gen)/search/search29']['parentRoute'], - FileRoutesByPath['/(gen)/search/search29']['id'], - FileRoutesByPath['/(gen)/search/search29']['path'], - FileRoutesByPath['/(gen)/search/search29']['fullPath'] - > -} -declare module './routes/(gen)/search/search3' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search3', - FileRoutesByPath['/(gen)/search/search3']['parentRoute'], - FileRoutesByPath['/(gen)/search/search3']['id'], - FileRoutesByPath['/(gen)/search/search3']['path'], - FileRoutesByPath['/(gen)/search/search3']['fullPath'] - > -} -declare module './routes/(gen)/search/search30' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search30', - FileRoutesByPath['/(gen)/search/search30']['parentRoute'], - FileRoutesByPath['/(gen)/search/search30']['id'], - FileRoutesByPath['/(gen)/search/search30']['path'], - FileRoutesByPath['/(gen)/search/search30']['fullPath'] - > -} -declare module './routes/(gen)/search/search31' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search31', - FileRoutesByPath['/(gen)/search/search31']['parentRoute'], - FileRoutesByPath['/(gen)/search/search31']['id'], - FileRoutesByPath['/(gen)/search/search31']['path'], - FileRoutesByPath['/(gen)/search/search31']['fullPath'] - > -} -declare module './routes/(gen)/search/search32' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search32', - FileRoutesByPath['/(gen)/search/search32']['parentRoute'], - FileRoutesByPath['/(gen)/search/search32']['id'], - FileRoutesByPath['/(gen)/search/search32']['path'], - FileRoutesByPath['/(gen)/search/search32']['fullPath'] - > -} -declare module './routes/(gen)/search/search33' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search33', - FileRoutesByPath['/(gen)/search/search33']['parentRoute'], - FileRoutesByPath['/(gen)/search/search33']['id'], - FileRoutesByPath['/(gen)/search/search33']['path'], - FileRoutesByPath['/(gen)/search/search33']['fullPath'] - > -} -declare module './routes/(gen)/search/search34' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search34', - FileRoutesByPath['/(gen)/search/search34']['parentRoute'], - FileRoutesByPath['/(gen)/search/search34']['id'], - FileRoutesByPath['/(gen)/search/search34']['path'], - FileRoutesByPath['/(gen)/search/search34']['fullPath'] - > -} -declare module './routes/(gen)/search/search35' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search35', - FileRoutesByPath['/(gen)/search/search35']['parentRoute'], - FileRoutesByPath['/(gen)/search/search35']['id'], - FileRoutesByPath['/(gen)/search/search35']['path'], - FileRoutesByPath['/(gen)/search/search35']['fullPath'] - > -} -declare module './routes/(gen)/search/search36' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search36', - FileRoutesByPath['/(gen)/search/search36']['parentRoute'], - FileRoutesByPath['/(gen)/search/search36']['id'], - FileRoutesByPath['/(gen)/search/search36']['path'], - FileRoutesByPath['/(gen)/search/search36']['fullPath'] - > -} -declare module './routes/(gen)/search/search37' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search37', - FileRoutesByPath['/(gen)/search/search37']['parentRoute'], - FileRoutesByPath['/(gen)/search/search37']['id'], - FileRoutesByPath['/(gen)/search/search37']['path'], - FileRoutesByPath['/(gen)/search/search37']['fullPath'] - > -} -declare module './routes/(gen)/search/search38' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search38', - FileRoutesByPath['/(gen)/search/search38']['parentRoute'], - FileRoutesByPath['/(gen)/search/search38']['id'], - FileRoutesByPath['/(gen)/search/search38']['path'], - FileRoutesByPath['/(gen)/search/search38']['fullPath'] - > -} -declare module './routes/(gen)/search/search39' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search39', - FileRoutesByPath['/(gen)/search/search39']['parentRoute'], - FileRoutesByPath['/(gen)/search/search39']['id'], - FileRoutesByPath['/(gen)/search/search39']['path'], - FileRoutesByPath['/(gen)/search/search39']['fullPath'] - > -} -declare module './routes/(gen)/search/search4' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search4', - FileRoutesByPath['/(gen)/search/search4']['parentRoute'], - FileRoutesByPath['/(gen)/search/search4']['id'], - FileRoutesByPath['/(gen)/search/search4']['path'], - FileRoutesByPath['/(gen)/search/search4']['fullPath'] - > -} -declare module './routes/(gen)/search/search40' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search40', - FileRoutesByPath['/(gen)/search/search40']['parentRoute'], - FileRoutesByPath['/(gen)/search/search40']['id'], - FileRoutesByPath['/(gen)/search/search40']['path'], - FileRoutesByPath['/(gen)/search/search40']['fullPath'] - > -} -declare module './routes/(gen)/search/search41' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search41', - FileRoutesByPath['/(gen)/search/search41']['parentRoute'], - FileRoutesByPath['/(gen)/search/search41']['id'], - FileRoutesByPath['/(gen)/search/search41']['path'], - FileRoutesByPath['/(gen)/search/search41']['fullPath'] - > -} -declare module './routes/(gen)/search/search42' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search42', - FileRoutesByPath['/(gen)/search/search42']['parentRoute'], - FileRoutesByPath['/(gen)/search/search42']['id'], - FileRoutesByPath['/(gen)/search/search42']['path'], - FileRoutesByPath['/(gen)/search/search42']['fullPath'] - > -} -declare module './routes/(gen)/search/search43' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search43', - FileRoutesByPath['/(gen)/search/search43']['parentRoute'], - FileRoutesByPath['/(gen)/search/search43']['id'], - FileRoutesByPath['/(gen)/search/search43']['path'], - FileRoutesByPath['/(gen)/search/search43']['fullPath'] - > -} -declare module './routes/(gen)/search/search44' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search44', - FileRoutesByPath['/(gen)/search/search44']['parentRoute'], - FileRoutesByPath['/(gen)/search/search44']['id'], - FileRoutesByPath['/(gen)/search/search44']['path'], - FileRoutesByPath['/(gen)/search/search44']['fullPath'] - > -} -declare module './routes/(gen)/search/search45' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search45', - FileRoutesByPath['/(gen)/search/search45']['parentRoute'], - FileRoutesByPath['/(gen)/search/search45']['id'], - FileRoutesByPath['/(gen)/search/search45']['path'], - FileRoutesByPath['/(gen)/search/search45']['fullPath'] - > -} -declare module './routes/(gen)/search/search46' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search46', - FileRoutesByPath['/(gen)/search/search46']['parentRoute'], - FileRoutesByPath['/(gen)/search/search46']['id'], - FileRoutesByPath['/(gen)/search/search46']['path'], - FileRoutesByPath['/(gen)/search/search46']['fullPath'] - > -} -declare module './routes/(gen)/search/search47' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search47', - FileRoutesByPath['/(gen)/search/search47']['parentRoute'], - FileRoutesByPath['/(gen)/search/search47']['id'], - FileRoutesByPath['/(gen)/search/search47']['path'], - FileRoutesByPath['/(gen)/search/search47']['fullPath'] - > -} -declare module './routes/(gen)/search/search48' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search48', - FileRoutesByPath['/(gen)/search/search48']['parentRoute'], - FileRoutesByPath['/(gen)/search/search48']['id'], - FileRoutesByPath['/(gen)/search/search48']['path'], - FileRoutesByPath['/(gen)/search/search48']['fullPath'] - > -} -declare module './routes/(gen)/search/search49' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search49', - FileRoutesByPath['/(gen)/search/search49']['parentRoute'], - FileRoutesByPath['/(gen)/search/search49']['id'], - FileRoutesByPath['/(gen)/search/search49']['path'], - FileRoutesByPath['/(gen)/search/search49']['fullPath'] - > -} -declare module './routes/(gen)/search/search5' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search5', - FileRoutesByPath['/(gen)/search/search5']['parentRoute'], - FileRoutesByPath['/(gen)/search/search5']['id'], - FileRoutesByPath['/(gen)/search/search5']['path'], - FileRoutesByPath['/(gen)/search/search5']['fullPath'] - > -} -declare module './routes/(gen)/search/search50' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search50', - FileRoutesByPath['/(gen)/search/search50']['parentRoute'], - FileRoutesByPath['/(gen)/search/search50']['id'], - FileRoutesByPath['/(gen)/search/search50']['path'], - FileRoutesByPath['/(gen)/search/search50']['fullPath'] - > -} -declare module './routes/(gen)/search/search51' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search51', - FileRoutesByPath['/(gen)/search/search51']['parentRoute'], - FileRoutesByPath['/(gen)/search/search51']['id'], - FileRoutesByPath['/(gen)/search/search51']['path'], - FileRoutesByPath['/(gen)/search/search51']['fullPath'] - > -} -declare module './routes/(gen)/search/search52' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search52', - FileRoutesByPath['/(gen)/search/search52']['parentRoute'], - FileRoutesByPath['/(gen)/search/search52']['id'], - FileRoutesByPath['/(gen)/search/search52']['path'], - FileRoutesByPath['/(gen)/search/search52']['fullPath'] - > -} -declare module './routes/(gen)/search/search53' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search53', - FileRoutesByPath['/(gen)/search/search53']['parentRoute'], - FileRoutesByPath['/(gen)/search/search53']['id'], - FileRoutesByPath['/(gen)/search/search53']['path'], - FileRoutesByPath['/(gen)/search/search53']['fullPath'] - > -} -declare module './routes/(gen)/search/search54' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search54', - FileRoutesByPath['/(gen)/search/search54']['parentRoute'], - FileRoutesByPath['/(gen)/search/search54']['id'], - FileRoutesByPath['/(gen)/search/search54']['path'], - FileRoutesByPath['/(gen)/search/search54']['fullPath'] - > -} -declare module './routes/(gen)/search/search55' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search55', - FileRoutesByPath['/(gen)/search/search55']['parentRoute'], - FileRoutesByPath['/(gen)/search/search55']['id'], - FileRoutesByPath['/(gen)/search/search55']['path'], - FileRoutesByPath['/(gen)/search/search55']['fullPath'] - > -} -declare module './routes/(gen)/search/search56' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search56', - FileRoutesByPath['/(gen)/search/search56']['parentRoute'], - FileRoutesByPath['/(gen)/search/search56']['id'], - FileRoutesByPath['/(gen)/search/search56']['path'], - FileRoutesByPath['/(gen)/search/search56']['fullPath'] - > -} -declare module './routes/(gen)/search/search57' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search57', - FileRoutesByPath['/(gen)/search/search57']['parentRoute'], - FileRoutesByPath['/(gen)/search/search57']['id'], - FileRoutesByPath['/(gen)/search/search57']['path'], - FileRoutesByPath['/(gen)/search/search57']['fullPath'] - > -} -declare module './routes/(gen)/search/search58' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search58', - FileRoutesByPath['/(gen)/search/search58']['parentRoute'], - FileRoutesByPath['/(gen)/search/search58']['id'], - FileRoutesByPath['/(gen)/search/search58']['path'], - FileRoutesByPath['/(gen)/search/search58']['fullPath'] - > -} -declare module './routes/(gen)/search/search59' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search59', - FileRoutesByPath['/(gen)/search/search59']['parentRoute'], - FileRoutesByPath['/(gen)/search/search59']['id'], - FileRoutesByPath['/(gen)/search/search59']['path'], - FileRoutesByPath['/(gen)/search/search59']['fullPath'] - > -} -declare module './routes/(gen)/search/search6' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search6', - FileRoutesByPath['/(gen)/search/search6']['parentRoute'], - FileRoutesByPath['/(gen)/search/search6']['id'], - FileRoutesByPath['/(gen)/search/search6']['path'], - FileRoutesByPath['/(gen)/search/search6']['fullPath'] - > -} -declare module './routes/(gen)/search/search60' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search60', - FileRoutesByPath['/(gen)/search/search60']['parentRoute'], - FileRoutesByPath['/(gen)/search/search60']['id'], - FileRoutesByPath['/(gen)/search/search60']['path'], - FileRoutesByPath['/(gen)/search/search60']['fullPath'] - > -} -declare module './routes/(gen)/search/search61' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search61', - FileRoutesByPath['/(gen)/search/search61']['parentRoute'], - FileRoutesByPath['/(gen)/search/search61']['id'], - FileRoutesByPath['/(gen)/search/search61']['path'], - FileRoutesByPath['/(gen)/search/search61']['fullPath'] - > -} -declare module './routes/(gen)/search/search62' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search62', - FileRoutesByPath['/(gen)/search/search62']['parentRoute'], - FileRoutesByPath['/(gen)/search/search62']['id'], - FileRoutesByPath['/(gen)/search/search62']['path'], - FileRoutesByPath['/(gen)/search/search62']['fullPath'] - > -} -declare module './routes/(gen)/search/search63' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search63', - FileRoutesByPath['/(gen)/search/search63']['parentRoute'], - FileRoutesByPath['/(gen)/search/search63']['id'], - FileRoutesByPath['/(gen)/search/search63']['path'], - FileRoutesByPath['/(gen)/search/search63']['fullPath'] - > -} -declare module './routes/(gen)/search/search64' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search64', - FileRoutesByPath['/(gen)/search/search64']['parentRoute'], - FileRoutesByPath['/(gen)/search/search64']['id'], - FileRoutesByPath['/(gen)/search/search64']['path'], - FileRoutesByPath['/(gen)/search/search64']['fullPath'] - > -} -declare module './routes/(gen)/search/search65' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search65', - FileRoutesByPath['/(gen)/search/search65']['parentRoute'], - FileRoutesByPath['/(gen)/search/search65']['id'], - FileRoutesByPath['/(gen)/search/search65']['path'], - FileRoutesByPath['/(gen)/search/search65']['fullPath'] - > -} -declare module './routes/(gen)/search/search66' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search66', - FileRoutesByPath['/(gen)/search/search66']['parentRoute'], - FileRoutesByPath['/(gen)/search/search66']['id'], - FileRoutesByPath['/(gen)/search/search66']['path'], - FileRoutesByPath['/(gen)/search/search66']['fullPath'] - > -} -declare module './routes/(gen)/search/search67' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search67', - FileRoutesByPath['/(gen)/search/search67']['parentRoute'], - FileRoutesByPath['/(gen)/search/search67']['id'], - FileRoutesByPath['/(gen)/search/search67']['path'], - FileRoutesByPath['/(gen)/search/search67']['fullPath'] - > -} -declare module './routes/(gen)/search/search68' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search68', - FileRoutesByPath['/(gen)/search/search68']['parentRoute'], - FileRoutesByPath['/(gen)/search/search68']['id'], - FileRoutesByPath['/(gen)/search/search68']['path'], - FileRoutesByPath['/(gen)/search/search68']['fullPath'] - > -} -declare module './routes/(gen)/search/search69' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search69', - FileRoutesByPath['/(gen)/search/search69']['parentRoute'], - FileRoutesByPath['/(gen)/search/search69']['id'], - FileRoutesByPath['/(gen)/search/search69']['path'], - FileRoutesByPath['/(gen)/search/search69']['fullPath'] - > -} -declare module './routes/(gen)/search/search7' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search7', - FileRoutesByPath['/(gen)/search/search7']['parentRoute'], - FileRoutesByPath['/(gen)/search/search7']['id'], - FileRoutesByPath['/(gen)/search/search7']['path'], - FileRoutesByPath['/(gen)/search/search7']['fullPath'] - > -} -declare module './routes/(gen)/search/search70' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search70', - FileRoutesByPath['/(gen)/search/search70']['parentRoute'], - FileRoutesByPath['/(gen)/search/search70']['id'], - FileRoutesByPath['/(gen)/search/search70']['path'], - FileRoutesByPath['/(gen)/search/search70']['fullPath'] - > -} -declare module './routes/(gen)/search/search71' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search71', - FileRoutesByPath['/(gen)/search/search71']['parentRoute'], - FileRoutesByPath['/(gen)/search/search71']['id'], - FileRoutesByPath['/(gen)/search/search71']['path'], - FileRoutesByPath['/(gen)/search/search71']['fullPath'] - > -} -declare module './routes/(gen)/search/search72' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search72', - FileRoutesByPath['/(gen)/search/search72']['parentRoute'], - FileRoutesByPath['/(gen)/search/search72']['id'], - FileRoutesByPath['/(gen)/search/search72']['path'], - FileRoutesByPath['/(gen)/search/search72']['fullPath'] - > -} -declare module './routes/(gen)/search/search73' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search73', - FileRoutesByPath['/(gen)/search/search73']['parentRoute'], - FileRoutesByPath['/(gen)/search/search73']['id'], - FileRoutesByPath['/(gen)/search/search73']['path'], - FileRoutesByPath['/(gen)/search/search73']['fullPath'] - > -} -declare module './routes/(gen)/search/search74' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search74', - FileRoutesByPath['/(gen)/search/search74']['parentRoute'], - FileRoutesByPath['/(gen)/search/search74']['id'], - FileRoutesByPath['/(gen)/search/search74']['path'], - FileRoutesByPath['/(gen)/search/search74']['fullPath'] - > -} -declare module './routes/(gen)/search/search75' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search75', - FileRoutesByPath['/(gen)/search/search75']['parentRoute'], - FileRoutesByPath['/(gen)/search/search75']['id'], - FileRoutesByPath['/(gen)/search/search75']['path'], - FileRoutesByPath['/(gen)/search/search75']['fullPath'] - > -} -declare module './routes/(gen)/search/search76' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search76', - FileRoutesByPath['/(gen)/search/search76']['parentRoute'], - FileRoutesByPath['/(gen)/search/search76']['id'], - FileRoutesByPath['/(gen)/search/search76']['path'], - FileRoutesByPath['/(gen)/search/search76']['fullPath'] - > -} -declare module './routes/(gen)/search/search77' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search77', - FileRoutesByPath['/(gen)/search/search77']['parentRoute'], - FileRoutesByPath['/(gen)/search/search77']['id'], - FileRoutesByPath['/(gen)/search/search77']['path'], - FileRoutesByPath['/(gen)/search/search77']['fullPath'] - > -} -declare module './routes/(gen)/search/search78' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search78', - FileRoutesByPath['/(gen)/search/search78']['parentRoute'], - FileRoutesByPath['/(gen)/search/search78']['id'], - FileRoutesByPath['/(gen)/search/search78']['path'], - FileRoutesByPath['/(gen)/search/search78']['fullPath'] - > -} -declare module './routes/(gen)/search/search79' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search79', - FileRoutesByPath['/(gen)/search/search79']['parentRoute'], - FileRoutesByPath['/(gen)/search/search79']['id'], - FileRoutesByPath['/(gen)/search/search79']['path'], - FileRoutesByPath['/(gen)/search/search79']['fullPath'] - > -} -declare module './routes/(gen)/search/search8' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search8', - FileRoutesByPath['/(gen)/search/search8']['parentRoute'], - FileRoutesByPath['/(gen)/search/search8']['id'], - FileRoutesByPath['/(gen)/search/search8']['path'], - FileRoutesByPath['/(gen)/search/search8']['fullPath'] - > -} -declare module './routes/(gen)/search/search80' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search80', - FileRoutesByPath['/(gen)/search/search80']['parentRoute'], - FileRoutesByPath['/(gen)/search/search80']['id'], - FileRoutesByPath['/(gen)/search/search80']['path'], - FileRoutesByPath['/(gen)/search/search80']['fullPath'] - > -} -declare module './routes/(gen)/search/search81' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search81', - FileRoutesByPath['/(gen)/search/search81']['parentRoute'], - FileRoutesByPath['/(gen)/search/search81']['id'], - FileRoutesByPath['/(gen)/search/search81']['path'], - FileRoutesByPath['/(gen)/search/search81']['fullPath'] - > -} -declare module './routes/(gen)/search/search82' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search82', - FileRoutesByPath['/(gen)/search/search82']['parentRoute'], - FileRoutesByPath['/(gen)/search/search82']['id'], - FileRoutesByPath['/(gen)/search/search82']['path'], - FileRoutesByPath['/(gen)/search/search82']['fullPath'] - > -} -declare module './routes/(gen)/search/search83' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search83', - FileRoutesByPath['/(gen)/search/search83']['parentRoute'], - FileRoutesByPath['/(gen)/search/search83']['id'], - FileRoutesByPath['/(gen)/search/search83']['path'], - FileRoutesByPath['/(gen)/search/search83']['fullPath'] - > -} -declare module './routes/(gen)/search/search84' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search84', - FileRoutesByPath['/(gen)/search/search84']['parentRoute'], - FileRoutesByPath['/(gen)/search/search84']['id'], - FileRoutesByPath['/(gen)/search/search84']['path'], - FileRoutesByPath['/(gen)/search/search84']['fullPath'] - > -} -declare module './routes/(gen)/search/search85' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search85', - FileRoutesByPath['/(gen)/search/search85']['parentRoute'], - FileRoutesByPath['/(gen)/search/search85']['id'], - FileRoutesByPath['/(gen)/search/search85']['path'], - FileRoutesByPath['/(gen)/search/search85']['fullPath'] - > -} -declare module './routes/(gen)/search/search86' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search86', - FileRoutesByPath['/(gen)/search/search86']['parentRoute'], - FileRoutesByPath['/(gen)/search/search86']['id'], - FileRoutesByPath['/(gen)/search/search86']['path'], - FileRoutesByPath['/(gen)/search/search86']['fullPath'] - > -} -declare module './routes/(gen)/search/search87' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search87', - FileRoutesByPath['/(gen)/search/search87']['parentRoute'], - FileRoutesByPath['/(gen)/search/search87']['id'], - FileRoutesByPath['/(gen)/search/search87']['path'], - FileRoutesByPath['/(gen)/search/search87']['fullPath'] - > -} -declare module './routes/(gen)/search/search88' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search88', - FileRoutesByPath['/(gen)/search/search88']['parentRoute'], - FileRoutesByPath['/(gen)/search/search88']['id'], - FileRoutesByPath['/(gen)/search/search88']['path'], - FileRoutesByPath['/(gen)/search/search88']['fullPath'] - > -} -declare module './routes/(gen)/search/search89' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search89', - FileRoutesByPath['/(gen)/search/search89']['parentRoute'], - FileRoutesByPath['/(gen)/search/search89']['id'], - FileRoutesByPath['/(gen)/search/search89']['path'], - FileRoutesByPath['/(gen)/search/search89']['fullPath'] - > -} -declare module './routes/(gen)/search/search9' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search9', - FileRoutesByPath['/(gen)/search/search9']['parentRoute'], - FileRoutesByPath['/(gen)/search/search9']['id'], - FileRoutesByPath['/(gen)/search/search9']['path'], - FileRoutesByPath['/(gen)/search/search9']['fullPath'] - > -} -declare module './routes/(gen)/search/search90' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search90', - FileRoutesByPath['/(gen)/search/search90']['parentRoute'], - FileRoutesByPath['/(gen)/search/search90']['id'], - FileRoutesByPath['/(gen)/search/search90']['path'], - FileRoutesByPath['/(gen)/search/search90']['fullPath'] - > -} -declare module './routes/(gen)/search/search91' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search91', - FileRoutesByPath['/(gen)/search/search91']['parentRoute'], - FileRoutesByPath['/(gen)/search/search91']['id'], - FileRoutesByPath['/(gen)/search/search91']['path'], - FileRoutesByPath['/(gen)/search/search91']['fullPath'] - > -} -declare module './routes/(gen)/search/search92' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search92', - FileRoutesByPath['/(gen)/search/search92']['parentRoute'], - FileRoutesByPath['/(gen)/search/search92']['id'], - FileRoutesByPath['/(gen)/search/search92']['path'], - FileRoutesByPath['/(gen)/search/search92']['fullPath'] - > -} -declare module './routes/(gen)/search/search93' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search93', - FileRoutesByPath['/(gen)/search/search93']['parentRoute'], - FileRoutesByPath['/(gen)/search/search93']['id'], - FileRoutesByPath['/(gen)/search/search93']['path'], - FileRoutesByPath['/(gen)/search/search93']['fullPath'] - > -} -declare module './routes/(gen)/search/search94' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search94', - FileRoutesByPath['/(gen)/search/search94']['parentRoute'], - FileRoutesByPath['/(gen)/search/search94']['id'], - FileRoutesByPath['/(gen)/search/search94']['path'], - FileRoutesByPath['/(gen)/search/search94']['fullPath'] - > -} -declare module './routes/(gen)/search/search95' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search95', - FileRoutesByPath['/(gen)/search/search95']['parentRoute'], - FileRoutesByPath['/(gen)/search/search95']['id'], - FileRoutesByPath['/(gen)/search/search95']['path'], - FileRoutesByPath['/(gen)/search/search95']['fullPath'] - > -} -declare module './routes/(gen)/search/search96' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search96', - FileRoutesByPath['/(gen)/search/search96']['parentRoute'], - FileRoutesByPath['/(gen)/search/search96']['id'], - FileRoutesByPath['/(gen)/search/search96']['path'], - FileRoutesByPath['/(gen)/search/search96']['fullPath'] - > -} -declare module './routes/(gen)/search/search97' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search97', - FileRoutesByPath['/(gen)/search/search97']['parentRoute'], - FileRoutesByPath['/(gen)/search/search97']['id'], - FileRoutesByPath['/(gen)/search/search97']['path'], - FileRoutesByPath['/(gen)/search/search97']['fullPath'] - > -} -declare module './routes/(gen)/search/search98' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search98', - FileRoutesByPath['/(gen)/search/search98']['parentRoute'], - FileRoutesByPath['/(gen)/search/search98']['id'], - FileRoutesByPath['/(gen)/search/search98']['path'], - FileRoutesByPath['/(gen)/search/search98']['fullPath'] - > -} -declare module './routes/(gen)/search/search99' { - const createFileRoute: CreateFileRoute< - '/(gen)/search/search99', - FileRoutesByPath['/(gen)/search/search99']['parentRoute'], - FileRoutesByPath['/(gen)/search/search99']['id'], - FileRoutesByPath['/(gen)/search/search99']['path'], - FileRoutesByPath['/(gen)/search/search99']['fullPath'] - > -} - -// Create and export the route tree - -interface ParamsRouteRouteChildren { - ParamsParamsPlaceholderRoute: typeof ParamsParamsPlaceholderRoute -} - -const ParamsRouteRouteChildren: ParamsRouteRouteChildren = { - ParamsParamsPlaceholderRoute: ParamsParamsPlaceholderRoute, -} - -const ParamsRouteRouteWithChildren = ParamsRouteRoute._addFileChildren( - ParamsRouteRouteChildren, -) - -interface SearchRouteRouteChildren { - SearchSearchPlaceholderRoute: typeof SearchSearchPlaceholderRoute -} - -const SearchRouteRouteChildren: SearchRouteRouteChildren = { - SearchSearchPlaceholderRoute: SearchSearchPlaceholderRoute, -} - -const SearchRouteRouteWithChildren = SearchRouteRoute._addFileChildren( - SearchRouteRouteChildren, -) - -interface genParamsRouteRouteChildren { - genParamsParam0Route: typeof genParamsParam0Route - genParamsParam1Route: typeof genParamsParam1Route - genParamsParam10Route: typeof genParamsParam10Route - genParamsParam11Route: typeof genParamsParam11Route - genParamsParam12Route: typeof genParamsParam12Route - genParamsParam13Route: typeof genParamsParam13Route - genParamsParam14Route: typeof genParamsParam14Route - genParamsParam15Route: typeof genParamsParam15Route - genParamsParam16Route: typeof genParamsParam16Route - genParamsParam17Route: typeof genParamsParam17Route - genParamsParam18Route: typeof genParamsParam18Route - genParamsParam19Route: typeof genParamsParam19Route - genParamsParam2Route: typeof genParamsParam2Route - genParamsParam20Route: typeof genParamsParam20Route - genParamsParam21Route: typeof genParamsParam21Route - genParamsParam22Route: typeof genParamsParam22Route - genParamsParam23Route: typeof genParamsParam23Route - genParamsParam24Route: typeof genParamsParam24Route - genParamsParam25Route: typeof genParamsParam25Route - genParamsParam26Route: typeof genParamsParam26Route - genParamsParam27Route: typeof genParamsParam27Route - genParamsParam28Route: typeof genParamsParam28Route - genParamsParam29Route: typeof genParamsParam29Route - genParamsParam3Route: typeof genParamsParam3Route - genParamsParam30Route: typeof genParamsParam30Route - genParamsParam31Route: typeof genParamsParam31Route - genParamsParam32Route: typeof genParamsParam32Route - genParamsParam33Route: typeof genParamsParam33Route - genParamsParam34Route: typeof genParamsParam34Route - genParamsParam35Route: typeof genParamsParam35Route - genParamsParam36Route: typeof genParamsParam36Route - genParamsParam37Route: typeof genParamsParam37Route - genParamsParam38Route: typeof genParamsParam38Route - genParamsParam39Route: typeof genParamsParam39Route - genParamsParam4Route: typeof genParamsParam4Route - genParamsParam40Route: typeof genParamsParam40Route - genParamsParam41Route: typeof genParamsParam41Route - genParamsParam42Route: typeof genParamsParam42Route - genParamsParam43Route: typeof genParamsParam43Route - genParamsParam44Route: typeof genParamsParam44Route - genParamsParam45Route: typeof genParamsParam45Route - genParamsParam46Route: typeof genParamsParam46Route - genParamsParam47Route: typeof genParamsParam47Route - genParamsParam48Route: typeof genParamsParam48Route - genParamsParam49Route: typeof genParamsParam49Route - genParamsParam5Route: typeof genParamsParam5Route - genParamsParam50Route: typeof genParamsParam50Route - genParamsParam51Route: typeof genParamsParam51Route - genParamsParam52Route: typeof genParamsParam52Route - genParamsParam53Route: typeof genParamsParam53Route - genParamsParam54Route: typeof genParamsParam54Route - genParamsParam55Route: typeof genParamsParam55Route - genParamsParam56Route: typeof genParamsParam56Route - genParamsParam57Route: typeof genParamsParam57Route - genParamsParam58Route: typeof genParamsParam58Route - genParamsParam59Route: typeof genParamsParam59Route - genParamsParam6Route: typeof genParamsParam6Route - genParamsParam60Route: typeof genParamsParam60Route - genParamsParam61Route: typeof genParamsParam61Route - genParamsParam62Route: typeof genParamsParam62Route - genParamsParam63Route: typeof genParamsParam63Route - genParamsParam64Route: typeof genParamsParam64Route - genParamsParam65Route: typeof genParamsParam65Route - genParamsParam66Route: typeof genParamsParam66Route - genParamsParam67Route: typeof genParamsParam67Route - genParamsParam68Route: typeof genParamsParam68Route - genParamsParam69Route: typeof genParamsParam69Route - genParamsParam7Route: typeof genParamsParam7Route - genParamsParam70Route: typeof genParamsParam70Route - genParamsParam71Route: typeof genParamsParam71Route - genParamsParam72Route: typeof genParamsParam72Route - genParamsParam73Route: typeof genParamsParam73Route - genParamsParam74Route: typeof genParamsParam74Route - genParamsParam75Route: typeof genParamsParam75Route - genParamsParam76Route: typeof genParamsParam76Route - genParamsParam77Route: typeof genParamsParam77Route - genParamsParam78Route: typeof genParamsParam78Route - genParamsParam79Route: typeof genParamsParam79Route - genParamsParam8Route: typeof genParamsParam8Route - genParamsParam80Route: typeof genParamsParam80Route - genParamsParam81Route: typeof genParamsParam81Route - genParamsParam82Route: typeof genParamsParam82Route - genParamsParam83Route: typeof genParamsParam83Route - genParamsParam84Route: typeof genParamsParam84Route - genParamsParam85Route: typeof genParamsParam85Route - genParamsParam86Route: typeof genParamsParam86Route - genParamsParam87Route: typeof genParamsParam87Route - genParamsParam88Route: typeof genParamsParam88Route - genParamsParam89Route: typeof genParamsParam89Route - genParamsParam9Route: typeof genParamsParam9Route - genParamsParam90Route: typeof genParamsParam90Route - genParamsParam91Route: typeof genParamsParam91Route - genParamsParam92Route: typeof genParamsParam92Route - genParamsParam93Route: typeof genParamsParam93Route - genParamsParam94Route: typeof genParamsParam94Route - genParamsParam95Route: typeof genParamsParam95Route - genParamsParam96Route: typeof genParamsParam96Route - genParamsParam97Route: typeof genParamsParam97Route - genParamsParam98Route: typeof genParamsParam98Route - genParamsParam99Route: typeof genParamsParam99Route -} - -const genParamsRouteRouteChildren: genParamsRouteRouteChildren = { - genParamsParam0Route: genParamsParam0Route, - genParamsParam1Route: genParamsParam1Route, - genParamsParam10Route: genParamsParam10Route, - genParamsParam11Route: genParamsParam11Route, - genParamsParam12Route: genParamsParam12Route, - genParamsParam13Route: genParamsParam13Route, - genParamsParam14Route: genParamsParam14Route, - genParamsParam15Route: genParamsParam15Route, - genParamsParam16Route: genParamsParam16Route, - genParamsParam17Route: genParamsParam17Route, - genParamsParam18Route: genParamsParam18Route, - genParamsParam19Route: genParamsParam19Route, - genParamsParam2Route: genParamsParam2Route, - genParamsParam20Route: genParamsParam20Route, - genParamsParam21Route: genParamsParam21Route, - genParamsParam22Route: genParamsParam22Route, - genParamsParam23Route: genParamsParam23Route, - genParamsParam24Route: genParamsParam24Route, - genParamsParam25Route: genParamsParam25Route, - genParamsParam26Route: genParamsParam26Route, - genParamsParam27Route: genParamsParam27Route, - genParamsParam28Route: genParamsParam28Route, - genParamsParam29Route: genParamsParam29Route, - genParamsParam3Route: genParamsParam3Route, - genParamsParam30Route: genParamsParam30Route, - genParamsParam31Route: genParamsParam31Route, - genParamsParam32Route: genParamsParam32Route, - genParamsParam33Route: genParamsParam33Route, - genParamsParam34Route: genParamsParam34Route, - genParamsParam35Route: genParamsParam35Route, - genParamsParam36Route: genParamsParam36Route, - genParamsParam37Route: genParamsParam37Route, - genParamsParam38Route: genParamsParam38Route, - genParamsParam39Route: genParamsParam39Route, - genParamsParam4Route: genParamsParam4Route, - genParamsParam40Route: genParamsParam40Route, - genParamsParam41Route: genParamsParam41Route, - genParamsParam42Route: genParamsParam42Route, - genParamsParam43Route: genParamsParam43Route, - genParamsParam44Route: genParamsParam44Route, - genParamsParam45Route: genParamsParam45Route, - genParamsParam46Route: genParamsParam46Route, - genParamsParam47Route: genParamsParam47Route, - genParamsParam48Route: genParamsParam48Route, - genParamsParam49Route: genParamsParam49Route, - genParamsParam5Route: genParamsParam5Route, - genParamsParam50Route: genParamsParam50Route, - genParamsParam51Route: genParamsParam51Route, - genParamsParam52Route: genParamsParam52Route, - genParamsParam53Route: genParamsParam53Route, - genParamsParam54Route: genParamsParam54Route, - genParamsParam55Route: genParamsParam55Route, - genParamsParam56Route: genParamsParam56Route, - genParamsParam57Route: genParamsParam57Route, - genParamsParam58Route: genParamsParam58Route, - genParamsParam59Route: genParamsParam59Route, - genParamsParam6Route: genParamsParam6Route, - genParamsParam60Route: genParamsParam60Route, - genParamsParam61Route: genParamsParam61Route, - genParamsParam62Route: genParamsParam62Route, - genParamsParam63Route: genParamsParam63Route, - genParamsParam64Route: genParamsParam64Route, - genParamsParam65Route: genParamsParam65Route, - genParamsParam66Route: genParamsParam66Route, - genParamsParam67Route: genParamsParam67Route, - genParamsParam68Route: genParamsParam68Route, - genParamsParam69Route: genParamsParam69Route, - genParamsParam7Route: genParamsParam7Route, - genParamsParam70Route: genParamsParam70Route, - genParamsParam71Route: genParamsParam71Route, - genParamsParam72Route: genParamsParam72Route, - genParamsParam73Route: genParamsParam73Route, - genParamsParam74Route: genParamsParam74Route, - genParamsParam75Route: genParamsParam75Route, - genParamsParam76Route: genParamsParam76Route, - genParamsParam77Route: genParamsParam77Route, - genParamsParam78Route: genParamsParam78Route, - genParamsParam79Route: genParamsParam79Route, - genParamsParam8Route: genParamsParam8Route, - genParamsParam80Route: genParamsParam80Route, - genParamsParam81Route: genParamsParam81Route, - genParamsParam82Route: genParamsParam82Route, - genParamsParam83Route: genParamsParam83Route, - genParamsParam84Route: genParamsParam84Route, - genParamsParam85Route: genParamsParam85Route, - genParamsParam86Route: genParamsParam86Route, - genParamsParam87Route: genParamsParam87Route, - genParamsParam88Route: genParamsParam88Route, - genParamsParam89Route: genParamsParam89Route, - genParamsParam9Route: genParamsParam9Route, - genParamsParam90Route: genParamsParam90Route, - genParamsParam91Route: genParamsParam91Route, - genParamsParam92Route: genParamsParam92Route, - genParamsParam93Route: genParamsParam93Route, - genParamsParam94Route: genParamsParam94Route, - genParamsParam95Route: genParamsParam95Route, - genParamsParam96Route: genParamsParam96Route, - genParamsParam97Route: genParamsParam97Route, - genParamsParam98Route: genParamsParam98Route, - genParamsParam99Route: genParamsParam99Route, -} - -const genParamsRouteRouteWithChildren = genParamsRouteRoute._addFileChildren( - genParamsRouteRouteChildren, -) - -interface genSearchRouteRouteChildren { - genSearchSearch0Route: typeof genSearchSearch0Route - genSearchSearch1Route: typeof genSearchSearch1Route - genSearchSearch10Route: typeof genSearchSearch10Route - genSearchSearch11Route: typeof genSearchSearch11Route - genSearchSearch12Route: typeof genSearchSearch12Route - genSearchSearch13Route: typeof genSearchSearch13Route - genSearchSearch14Route: typeof genSearchSearch14Route - genSearchSearch15Route: typeof genSearchSearch15Route - genSearchSearch16Route: typeof genSearchSearch16Route - genSearchSearch17Route: typeof genSearchSearch17Route - genSearchSearch18Route: typeof genSearchSearch18Route - genSearchSearch19Route: typeof genSearchSearch19Route - genSearchSearch2Route: typeof genSearchSearch2Route - genSearchSearch20Route: typeof genSearchSearch20Route - genSearchSearch21Route: typeof genSearchSearch21Route - genSearchSearch22Route: typeof genSearchSearch22Route - genSearchSearch23Route: typeof genSearchSearch23Route - genSearchSearch24Route: typeof genSearchSearch24Route - genSearchSearch25Route: typeof genSearchSearch25Route - genSearchSearch26Route: typeof genSearchSearch26Route - genSearchSearch27Route: typeof genSearchSearch27Route - genSearchSearch28Route: typeof genSearchSearch28Route - genSearchSearch29Route: typeof genSearchSearch29Route - genSearchSearch3Route: typeof genSearchSearch3Route - genSearchSearch30Route: typeof genSearchSearch30Route - genSearchSearch31Route: typeof genSearchSearch31Route - genSearchSearch32Route: typeof genSearchSearch32Route - genSearchSearch33Route: typeof genSearchSearch33Route - genSearchSearch34Route: typeof genSearchSearch34Route - genSearchSearch35Route: typeof genSearchSearch35Route - genSearchSearch36Route: typeof genSearchSearch36Route - genSearchSearch37Route: typeof genSearchSearch37Route - genSearchSearch38Route: typeof genSearchSearch38Route - genSearchSearch39Route: typeof genSearchSearch39Route - genSearchSearch4Route: typeof genSearchSearch4Route - genSearchSearch40Route: typeof genSearchSearch40Route - genSearchSearch41Route: typeof genSearchSearch41Route - genSearchSearch42Route: typeof genSearchSearch42Route - genSearchSearch43Route: typeof genSearchSearch43Route - genSearchSearch44Route: typeof genSearchSearch44Route - genSearchSearch45Route: typeof genSearchSearch45Route - genSearchSearch46Route: typeof genSearchSearch46Route - genSearchSearch47Route: typeof genSearchSearch47Route - genSearchSearch48Route: typeof genSearchSearch48Route - genSearchSearch49Route: typeof genSearchSearch49Route - genSearchSearch5Route: typeof genSearchSearch5Route - genSearchSearch50Route: typeof genSearchSearch50Route - genSearchSearch51Route: typeof genSearchSearch51Route - genSearchSearch52Route: typeof genSearchSearch52Route - genSearchSearch53Route: typeof genSearchSearch53Route - genSearchSearch54Route: typeof genSearchSearch54Route - genSearchSearch55Route: typeof genSearchSearch55Route - genSearchSearch56Route: typeof genSearchSearch56Route - genSearchSearch57Route: typeof genSearchSearch57Route - genSearchSearch58Route: typeof genSearchSearch58Route - genSearchSearch59Route: typeof genSearchSearch59Route - genSearchSearch6Route: typeof genSearchSearch6Route - genSearchSearch60Route: typeof genSearchSearch60Route - genSearchSearch61Route: typeof genSearchSearch61Route - genSearchSearch62Route: typeof genSearchSearch62Route - genSearchSearch63Route: typeof genSearchSearch63Route - genSearchSearch64Route: typeof genSearchSearch64Route - genSearchSearch65Route: typeof genSearchSearch65Route - genSearchSearch66Route: typeof genSearchSearch66Route - genSearchSearch67Route: typeof genSearchSearch67Route - genSearchSearch68Route: typeof genSearchSearch68Route - genSearchSearch69Route: typeof genSearchSearch69Route - genSearchSearch7Route: typeof genSearchSearch7Route - genSearchSearch70Route: typeof genSearchSearch70Route - genSearchSearch71Route: typeof genSearchSearch71Route - genSearchSearch72Route: typeof genSearchSearch72Route - genSearchSearch73Route: typeof genSearchSearch73Route - genSearchSearch74Route: typeof genSearchSearch74Route - genSearchSearch75Route: typeof genSearchSearch75Route - genSearchSearch76Route: typeof genSearchSearch76Route - genSearchSearch77Route: typeof genSearchSearch77Route - genSearchSearch78Route: typeof genSearchSearch78Route - genSearchSearch79Route: typeof genSearchSearch79Route - genSearchSearch8Route: typeof genSearchSearch8Route - genSearchSearch80Route: typeof genSearchSearch80Route - genSearchSearch81Route: typeof genSearchSearch81Route - genSearchSearch82Route: typeof genSearchSearch82Route - genSearchSearch83Route: typeof genSearchSearch83Route - genSearchSearch84Route: typeof genSearchSearch84Route - genSearchSearch85Route: typeof genSearchSearch85Route - genSearchSearch86Route: typeof genSearchSearch86Route - genSearchSearch87Route: typeof genSearchSearch87Route - genSearchSearch88Route: typeof genSearchSearch88Route - genSearchSearch89Route: typeof genSearchSearch89Route - genSearchSearch9Route: typeof genSearchSearch9Route - genSearchSearch90Route: typeof genSearchSearch90Route - genSearchSearch91Route: typeof genSearchSearch91Route - genSearchSearch92Route: typeof genSearchSearch92Route - genSearchSearch93Route: typeof genSearchSearch93Route - genSearchSearch94Route: typeof genSearchSearch94Route - genSearchSearch95Route: typeof genSearchSearch95Route - genSearchSearch96Route: typeof genSearchSearch96Route - genSearchSearch97Route: typeof genSearchSearch97Route - genSearchSearch98Route: typeof genSearchSearch98Route - genSearchSearch99Route: typeof genSearchSearch99Route -} - -const genSearchRouteRouteChildren: genSearchRouteRouteChildren = { - genSearchSearch0Route: genSearchSearch0Route, - genSearchSearch1Route: genSearchSearch1Route, - genSearchSearch10Route: genSearchSearch10Route, - genSearchSearch11Route: genSearchSearch11Route, - genSearchSearch12Route: genSearchSearch12Route, - genSearchSearch13Route: genSearchSearch13Route, - genSearchSearch14Route: genSearchSearch14Route, - genSearchSearch15Route: genSearchSearch15Route, - genSearchSearch16Route: genSearchSearch16Route, - genSearchSearch17Route: genSearchSearch17Route, - genSearchSearch18Route: genSearchSearch18Route, - genSearchSearch19Route: genSearchSearch19Route, - genSearchSearch2Route: genSearchSearch2Route, - genSearchSearch20Route: genSearchSearch20Route, - genSearchSearch21Route: genSearchSearch21Route, - genSearchSearch22Route: genSearchSearch22Route, - genSearchSearch23Route: genSearchSearch23Route, - genSearchSearch24Route: genSearchSearch24Route, - genSearchSearch25Route: genSearchSearch25Route, - genSearchSearch26Route: genSearchSearch26Route, - genSearchSearch27Route: genSearchSearch27Route, - genSearchSearch28Route: genSearchSearch28Route, - genSearchSearch29Route: genSearchSearch29Route, - genSearchSearch3Route: genSearchSearch3Route, - genSearchSearch30Route: genSearchSearch30Route, - genSearchSearch31Route: genSearchSearch31Route, - genSearchSearch32Route: genSearchSearch32Route, - genSearchSearch33Route: genSearchSearch33Route, - genSearchSearch34Route: genSearchSearch34Route, - genSearchSearch35Route: genSearchSearch35Route, - genSearchSearch36Route: genSearchSearch36Route, - genSearchSearch37Route: genSearchSearch37Route, - genSearchSearch38Route: genSearchSearch38Route, - genSearchSearch39Route: genSearchSearch39Route, - genSearchSearch4Route: genSearchSearch4Route, - genSearchSearch40Route: genSearchSearch40Route, - genSearchSearch41Route: genSearchSearch41Route, - genSearchSearch42Route: genSearchSearch42Route, - genSearchSearch43Route: genSearchSearch43Route, - genSearchSearch44Route: genSearchSearch44Route, - genSearchSearch45Route: genSearchSearch45Route, - genSearchSearch46Route: genSearchSearch46Route, - genSearchSearch47Route: genSearchSearch47Route, - genSearchSearch48Route: genSearchSearch48Route, - genSearchSearch49Route: genSearchSearch49Route, - genSearchSearch5Route: genSearchSearch5Route, - genSearchSearch50Route: genSearchSearch50Route, - genSearchSearch51Route: genSearchSearch51Route, - genSearchSearch52Route: genSearchSearch52Route, - genSearchSearch53Route: genSearchSearch53Route, - genSearchSearch54Route: genSearchSearch54Route, - genSearchSearch55Route: genSearchSearch55Route, - genSearchSearch56Route: genSearchSearch56Route, - genSearchSearch57Route: genSearchSearch57Route, - genSearchSearch58Route: genSearchSearch58Route, - genSearchSearch59Route: genSearchSearch59Route, - genSearchSearch6Route: genSearchSearch6Route, - genSearchSearch60Route: genSearchSearch60Route, - genSearchSearch61Route: genSearchSearch61Route, - genSearchSearch62Route: genSearchSearch62Route, - genSearchSearch63Route: genSearchSearch63Route, - genSearchSearch64Route: genSearchSearch64Route, - genSearchSearch65Route: genSearchSearch65Route, - genSearchSearch66Route: genSearchSearch66Route, - genSearchSearch67Route: genSearchSearch67Route, - genSearchSearch68Route: genSearchSearch68Route, - genSearchSearch69Route: genSearchSearch69Route, - genSearchSearch7Route: genSearchSearch7Route, - genSearchSearch70Route: genSearchSearch70Route, - genSearchSearch71Route: genSearchSearch71Route, - genSearchSearch72Route: genSearchSearch72Route, - genSearchSearch73Route: genSearchSearch73Route, - genSearchSearch74Route: genSearchSearch74Route, - genSearchSearch75Route: genSearchSearch75Route, - genSearchSearch76Route: genSearchSearch76Route, - genSearchSearch77Route: genSearchSearch77Route, - genSearchSearch78Route: genSearchSearch78Route, - genSearchSearch79Route: genSearchSearch79Route, - genSearchSearch8Route: genSearchSearch8Route, - genSearchSearch80Route: genSearchSearch80Route, - genSearchSearch81Route: genSearchSearch81Route, - genSearchSearch82Route: genSearchSearch82Route, - genSearchSearch83Route: genSearchSearch83Route, - genSearchSearch84Route: genSearchSearch84Route, - genSearchSearch85Route: genSearchSearch85Route, - genSearchSearch86Route: genSearchSearch86Route, - genSearchSearch87Route: genSearchSearch87Route, - genSearchSearch88Route: genSearchSearch88Route, - genSearchSearch89Route: genSearchSearch89Route, - genSearchSearch9Route: genSearchSearch9Route, - genSearchSearch90Route: genSearchSearch90Route, - genSearchSearch91Route: genSearchSearch91Route, - genSearchSearch92Route: genSearchSearch92Route, - genSearchSearch93Route: genSearchSearch93Route, - genSearchSearch94Route: genSearchSearch94Route, - genSearchSearch95Route: genSearchSearch95Route, - genSearchSearch96Route: genSearchSearch96Route, - genSearchSearch97Route: genSearchSearch97Route, - genSearchSearch98Route: genSearchSearch98Route, - genSearchSearch99Route: genSearchSearch99Route, -} - -const genSearchRouteRouteWithChildren = genSearchRouteRoute._addFileChildren( - genSearchRouteRouteChildren, -) - -export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/params': typeof genParamsRouteRouteWithChildren - '/search': typeof genSearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/absolute0': typeof genAbsolute0Route - '/absolute1': typeof genAbsolute1Route - '/absolute10': typeof genAbsolute10Route - '/absolute11': typeof genAbsolute11Route - '/absolute12': typeof genAbsolute12Route - '/absolute13': typeof genAbsolute13Route - '/absolute14': typeof genAbsolute14Route - '/absolute15': typeof genAbsolute15Route - '/absolute16': typeof genAbsolute16Route - '/absolute17': typeof genAbsolute17Route - '/absolute18': typeof genAbsolute18Route - '/absolute19': typeof genAbsolute19Route - '/absolute2': typeof genAbsolute2Route - '/absolute20': typeof genAbsolute20Route - '/absolute21': typeof genAbsolute21Route - '/absolute22': typeof genAbsolute22Route - '/absolute23': typeof genAbsolute23Route - '/absolute24': typeof genAbsolute24Route - '/absolute25': typeof genAbsolute25Route - '/absolute26': typeof genAbsolute26Route - '/absolute27': typeof genAbsolute27Route - '/absolute28': typeof genAbsolute28Route - '/absolute29': typeof genAbsolute29Route - '/absolute3': typeof genAbsolute3Route - '/absolute30': typeof genAbsolute30Route - '/absolute31': typeof genAbsolute31Route - '/absolute32': typeof genAbsolute32Route - '/absolute33': typeof genAbsolute33Route - '/absolute34': typeof genAbsolute34Route - '/absolute35': typeof genAbsolute35Route - '/absolute36': typeof genAbsolute36Route - '/absolute37': typeof genAbsolute37Route - '/absolute38': typeof genAbsolute38Route - '/absolute39': typeof genAbsolute39Route - '/absolute4': typeof genAbsolute4Route - '/absolute40': typeof genAbsolute40Route - '/absolute41': typeof genAbsolute41Route - '/absolute42': typeof genAbsolute42Route - '/absolute43': typeof genAbsolute43Route - '/absolute44': typeof genAbsolute44Route - '/absolute45': typeof genAbsolute45Route - '/absolute46': typeof genAbsolute46Route - '/absolute47': typeof genAbsolute47Route - '/absolute48': typeof genAbsolute48Route - '/absolute49': typeof genAbsolute49Route - '/absolute5': typeof genAbsolute5Route - '/absolute50': typeof genAbsolute50Route - '/absolute51': typeof genAbsolute51Route - '/absolute52': typeof genAbsolute52Route - '/absolute53': typeof genAbsolute53Route - '/absolute54': typeof genAbsolute54Route - '/absolute55': typeof genAbsolute55Route - '/absolute56': typeof genAbsolute56Route - '/absolute57': typeof genAbsolute57Route - '/absolute58': typeof genAbsolute58Route - '/absolute59': typeof genAbsolute59Route - '/absolute6': typeof genAbsolute6Route - '/absolute60': typeof genAbsolute60Route - '/absolute61': typeof genAbsolute61Route - '/absolute62': typeof genAbsolute62Route - '/absolute63': typeof genAbsolute63Route - '/absolute64': typeof genAbsolute64Route - '/absolute65': typeof genAbsolute65Route - '/absolute66': typeof genAbsolute66Route - '/absolute67': typeof genAbsolute67Route - '/absolute68': typeof genAbsolute68Route - '/absolute69': typeof genAbsolute69Route - '/absolute7': typeof genAbsolute7Route - '/absolute70': typeof genAbsolute70Route - '/absolute71': typeof genAbsolute71Route - '/absolute72': typeof genAbsolute72Route - '/absolute73': typeof genAbsolute73Route - '/absolute74': typeof genAbsolute74Route - '/absolute75': typeof genAbsolute75Route - '/absolute76': typeof genAbsolute76Route - '/absolute77': typeof genAbsolute77Route - '/absolute78': typeof genAbsolute78Route - '/absolute79': typeof genAbsolute79Route - '/absolute8': typeof genAbsolute8Route - '/absolute80': typeof genAbsolute80Route - '/absolute81': typeof genAbsolute81Route - '/absolute82': typeof genAbsolute82Route - '/absolute83': typeof genAbsolute83Route - '/absolute84': typeof genAbsolute84Route - '/absolute85': typeof genAbsolute85Route - '/absolute86': typeof genAbsolute86Route - '/absolute87': typeof genAbsolute87Route - '/absolute88': typeof genAbsolute88Route - '/absolute89': typeof genAbsolute89Route - '/absolute9': typeof genAbsolute9Route - '/absolute90': typeof genAbsolute90Route - '/absolute91': typeof genAbsolute91Route - '/absolute92': typeof genAbsolute92Route - '/absolute93': typeof genAbsolute93Route - '/absolute94': typeof genAbsolute94Route - '/absolute95': typeof genAbsolute95Route - '/absolute96': typeof genAbsolute96Route - '/absolute97': typeof genAbsolute97Route - '/absolute98': typeof genAbsolute98Route - '/absolute99': typeof genAbsolute99Route - '/relative0': typeof genRelative0Route - '/relative1': typeof genRelative1Route - '/relative10': typeof genRelative10Route - '/relative11': typeof genRelative11Route - '/relative12': typeof genRelative12Route - '/relative13': typeof genRelative13Route - '/relative14': typeof genRelative14Route - '/relative15': typeof genRelative15Route - '/relative16': typeof genRelative16Route - '/relative17': typeof genRelative17Route - '/relative18': typeof genRelative18Route - '/relative19': typeof genRelative19Route - '/relative2': typeof genRelative2Route - '/relative20': typeof genRelative20Route - '/relative21': typeof genRelative21Route - '/relative22': typeof genRelative22Route - '/relative23': typeof genRelative23Route - '/relative24': typeof genRelative24Route - '/relative25': typeof genRelative25Route - '/relative26': typeof genRelative26Route - '/relative27': typeof genRelative27Route - '/relative28': typeof genRelative28Route - '/relative29': typeof genRelative29Route - '/relative3': typeof genRelative3Route - '/relative30': typeof genRelative30Route - '/relative31': typeof genRelative31Route - '/relative32': typeof genRelative32Route - '/relative33': typeof genRelative33Route - '/relative34': typeof genRelative34Route - '/relative35': typeof genRelative35Route - '/relative36': typeof genRelative36Route - '/relative37': typeof genRelative37Route - '/relative38': typeof genRelative38Route - '/relative39': typeof genRelative39Route - '/relative4': typeof genRelative4Route - '/relative40': typeof genRelative40Route - '/relative41': typeof genRelative41Route - '/relative42': typeof genRelative42Route - '/relative43': typeof genRelative43Route - '/relative44': typeof genRelative44Route - '/relative45': typeof genRelative45Route - '/relative46': typeof genRelative46Route - '/relative47': typeof genRelative47Route - '/relative48': typeof genRelative48Route - '/relative49': typeof genRelative49Route - '/relative5': typeof genRelative5Route - '/relative50': typeof genRelative50Route - '/relative51': typeof genRelative51Route - '/relative52': typeof genRelative52Route - '/relative53': typeof genRelative53Route - '/relative54': typeof genRelative54Route - '/relative55': typeof genRelative55Route - '/relative56': typeof genRelative56Route - '/relative57': typeof genRelative57Route - '/relative58': typeof genRelative58Route - '/relative59': typeof genRelative59Route - '/relative6': typeof genRelative6Route - '/relative60': typeof genRelative60Route - '/relative61': typeof genRelative61Route - '/relative62': typeof genRelative62Route - '/relative63': typeof genRelative63Route - '/relative64': typeof genRelative64Route - '/relative65': typeof genRelative65Route - '/relative66': typeof genRelative66Route - '/relative67': typeof genRelative67Route - '/relative68': typeof genRelative68Route - '/relative69': typeof genRelative69Route - '/relative7': typeof genRelative7Route - '/relative70': typeof genRelative70Route - '/relative71': typeof genRelative71Route - '/relative72': typeof genRelative72Route - '/relative73': typeof genRelative73Route - '/relative74': typeof genRelative74Route - '/relative75': typeof genRelative75Route - '/relative76': typeof genRelative76Route - '/relative77': typeof genRelative77Route - '/relative78': typeof genRelative78Route - '/relative79': typeof genRelative79Route - '/relative8': typeof genRelative8Route - '/relative80': typeof genRelative80Route - '/relative81': typeof genRelative81Route - '/relative82': typeof genRelative82Route - '/relative83': typeof genRelative83Route - '/relative84': typeof genRelative84Route - '/relative85': typeof genRelative85Route - '/relative86': typeof genRelative86Route - '/relative87': typeof genRelative87Route - '/relative88': typeof genRelative88Route - '/relative89': typeof genRelative89Route - '/relative9': typeof genRelative9Route - '/relative90': typeof genRelative90Route - '/relative91': typeof genRelative91Route - '/relative92': typeof genRelative92Route - '/relative93': typeof genRelative93Route - '/relative94': typeof genRelative94Route - '/relative95': typeof genRelative95Route - '/relative96': typeof genRelative96Route - '/relative97': typeof genRelative97Route - '/relative98': typeof genRelative98Route - '/relative99': typeof genRelative99Route - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/params/$param0': typeof genParamsParam0Route - '/params/$param1': typeof genParamsParam1Route - '/params/$param10': typeof genParamsParam10Route - '/params/$param11': typeof genParamsParam11Route - '/params/$param12': typeof genParamsParam12Route - '/params/$param13': typeof genParamsParam13Route - '/params/$param14': typeof genParamsParam14Route - '/params/$param15': typeof genParamsParam15Route - '/params/$param16': typeof genParamsParam16Route - '/params/$param17': typeof genParamsParam17Route - '/params/$param18': typeof genParamsParam18Route - '/params/$param19': typeof genParamsParam19Route - '/params/$param2': typeof genParamsParam2Route - '/params/$param20': typeof genParamsParam20Route - '/params/$param21': typeof genParamsParam21Route - '/params/$param22': typeof genParamsParam22Route - '/params/$param23': typeof genParamsParam23Route - '/params/$param24': typeof genParamsParam24Route - '/params/$param25': typeof genParamsParam25Route - '/params/$param26': typeof genParamsParam26Route - '/params/$param27': typeof genParamsParam27Route - '/params/$param28': typeof genParamsParam28Route - '/params/$param29': typeof genParamsParam29Route - '/params/$param3': typeof genParamsParam3Route - '/params/$param30': typeof genParamsParam30Route - '/params/$param31': typeof genParamsParam31Route - '/params/$param32': typeof genParamsParam32Route - '/params/$param33': typeof genParamsParam33Route - '/params/$param34': typeof genParamsParam34Route - '/params/$param35': typeof genParamsParam35Route - '/params/$param36': typeof genParamsParam36Route - '/params/$param37': typeof genParamsParam37Route - '/params/$param38': typeof genParamsParam38Route - '/params/$param39': typeof genParamsParam39Route - '/params/$param4': typeof genParamsParam4Route - '/params/$param40': typeof genParamsParam40Route - '/params/$param41': typeof genParamsParam41Route - '/params/$param42': typeof genParamsParam42Route - '/params/$param43': typeof genParamsParam43Route - '/params/$param44': typeof genParamsParam44Route - '/params/$param45': typeof genParamsParam45Route - '/params/$param46': typeof genParamsParam46Route - '/params/$param47': typeof genParamsParam47Route - '/params/$param48': typeof genParamsParam48Route - '/params/$param49': typeof genParamsParam49Route - '/params/$param5': typeof genParamsParam5Route - '/params/$param50': typeof genParamsParam50Route - '/params/$param51': typeof genParamsParam51Route - '/params/$param52': typeof genParamsParam52Route - '/params/$param53': typeof genParamsParam53Route - '/params/$param54': typeof genParamsParam54Route - '/params/$param55': typeof genParamsParam55Route - '/params/$param56': typeof genParamsParam56Route - '/params/$param57': typeof genParamsParam57Route - '/params/$param58': typeof genParamsParam58Route - '/params/$param59': typeof genParamsParam59Route - '/params/$param6': typeof genParamsParam6Route - '/params/$param60': typeof genParamsParam60Route - '/params/$param61': typeof genParamsParam61Route - '/params/$param62': typeof genParamsParam62Route - '/params/$param63': typeof genParamsParam63Route - '/params/$param64': typeof genParamsParam64Route - '/params/$param65': typeof genParamsParam65Route - '/params/$param66': typeof genParamsParam66Route - '/params/$param67': typeof genParamsParam67Route - '/params/$param68': typeof genParamsParam68Route - '/params/$param69': typeof genParamsParam69Route - '/params/$param7': typeof genParamsParam7Route - '/params/$param70': typeof genParamsParam70Route - '/params/$param71': typeof genParamsParam71Route - '/params/$param72': typeof genParamsParam72Route - '/params/$param73': typeof genParamsParam73Route - '/params/$param74': typeof genParamsParam74Route - '/params/$param75': typeof genParamsParam75Route - '/params/$param76': typeof genParamsParam76Route - '/params/$param77': typeof genParamsParam77Route - '/params/$param78': typeof genParamsParam78Route - '/params/$param79': typeof genParamsParam79Route - '/params/$param8': typeof genParamsParam8Route - '/params/$param80': typeof genParamsParam80Route - '/params/$param81': typeof genParamsParam81Route - '/params/$param82': typeof genParamsParam82Route - '/params/$param83': typeof genParamsParam83Route - '/params/$param84': typeof genParamsParam84Route - '/params/$param85': typeof genParamsParam85Route - '/params/$param86': typeof genParamsParam86Route - '/params/$param87': typeof genParamsParam87Route - '/params/$param88': typeof genParamsParam88Route - '/params/$param89': typeof genParamsParam89Route - '/params/$param9': typeof genParamsParam9Route - '/params/$param90': typeof genParamsParam90Route - '/params/$param91': typeof genParamsParam91Route - '/params/$param92': typeof genParamsParam92Route - '/params/$param93': typeof genParamsParam93Route - '/params/$param94': typeof genParamsParam94Route - '/params/$param95': typeof genParamsParam95Route - '/params/$param96': typeof genParamsParam96Route - '/params/$param97': typeof genParamsParam97Route - '/params/$param98': typeof genParamsParam98Route - '/params/$param99': typeof genParamsParam99Route - '/search/search0': typeof genSearchSearch0Route - '/search/search1': typeof genSearchSearch1Route - '/search/search10': typeof genSearchSearch10Route - '/search/search11': typeof genSearchSearch11Route - '/search/search12': typeof genSearchSearch12Route - '/search/search13': typeof genSearchSearch13Route - '/search/search14': typeof genSearchSearch14Route - '/search/search15': typeof genSearchSearch15Route - '/search/search16': typeof genSearchSearch16Route - '/search/search17': typeof genSearchSearch17Route - '/search/search18': typeof genSearchSearch18Route - '/search/search19': typeof genSearchSearch19Route - '/search/search2': typeof genSearchSearch2Route - '/search/search20': typeof genSearchSearch20Route - '/search/search21': typeof genSearchSearch21Route - '/search/search22': typeof genSearchSearch22Route - '/search/search23': typeof genSearchSearch23Route - '/search/search24': typeof genSearchSearch24Route - '/search/search25': typeof genSearchSearch25Route - '/search/search26': typeof genSearchSearch26Route - '/search/search27': typeof genSearchSearch27Route - '/search/search28': typeof genSearchSearch28Route - '/search/search29': typeof genSearchSearch29Route - '/search/search3': typeof genSearchSearch3Route - '/search/search30': typeof genSearchSearch30Route - '/search/search31': typeof genSearchSearch31Route - '/search/search32': typeof genSearchSearch32Route - '/search/search33': typeof genSearchSearch33Route - '/search/search34': typeof genSearchSearch34Route - '/search/search35': typeof genSearchSearch35Route - '/search/search36': typeof genSearchSearch36Route - '/search/search37': typeof genSearchSearch37Route - '/search/search38': typeof genSearchSearch38Route - '/search/search39': typeof genSearchSearch39Route - '/search/search4': typeof genSearchSearch4Route - '/search/search40': typeof genSearchSearch40Route - '/search/search41': typeof genSearchSearch41Route - '/search/search42': typeof genSearchSearch42Route - '/search/search43': typeof genSearchSearch43Route - '/search/search44': typeof genSearchSearch44Route - '/search/search45': typeof genSearchSearch45Route - '/search/search46': typeof genSearchSearch46Route - '/search/search47': typeof genSearchSearch47Route - '/search/search48': typeof genSearchSearch48Route - '/search/search49': typeof genSearchSearch49Route - '/search/search5': typeof genSearchSearch5Route - '/search/search50': typeof genSearchSearch50Route - '/search/search51': typeof genSearchSearch51Route - '/search/search52': typeof genSearchSearch52Route - '/search/search53': typeof genSearchSearch53Route - '/search/search54': typeof genSearchSearch54Route - '/search/search55': typeof genSearchSearch55Route - '/search/search56': typeof genSearchSearch56Route - '/search/search57': typeof genSearchSearch57Route - '/search/search58': typeof genSearchSearch58Route - '/search/search59': typeof genSearchSearch59Route - '/search/search6': typeof genSearchSearch6Route - '/search/search60': typeof genSearchSearch60Route - '/search/search61': typeof genSearchSearch61Route - '/search/search62': typeof genSearchSearch62Route - '/search/search63': typeof genSearchSearch63Route - '/search/search64': typeof genSearchSearch64Route - '/search/search65': typeof genSearchSearch65Route - '/search/search66': typeof genSearchSearch66Route - '/search/search67': typeof genSearchSearch67Route - '/search/search68': typeof genSearchSearch68Route - '/search/search69': typeof genSearchSearch69Route - '/search/search7': typeof genSearchSearch7Route - '/search/search70': typeof genSearchSearch70Route - '/search/search71': typeof genSearchSearch71Route - '/search/search72': typeof genSearchSearch72Route - '/search/search73': typeof genSearchSearch73Route - '/search/search74': typeof genSearchSearch74Route - '/search/search75': typeof genSearchSearch75Route - '/search/search76': typeof genSearchSearch76Route - '/search/search77': typeof genSearchSearch77Route - '/search/search78': typeof genSearchSearch78Route - '/search/search79': typeof genSearchSearch79Route - '/search/search8': typeof genSearchSearch8Route - '/search/search80': typeof genSearchSearch80Route - '/search/search81': typeof genSearchSearch81Route - '/search/search82': typeof genSearchSearch82Route - '/search/search83': typeof genSearchSearch83Route - '/search/search84': typeof genSearchSearch84Route - '/search/search85': typeof genSearchSearch85Route - '/search/search86': typeof genSearchSearch86Route - '/search/search87': typeof genSearchSearch87Route - '/search/search88': typeof genSearchSearch88Route - '/search/search89': typeof genSearchSearch89Route - '/search/search9': typeof genSearchSearch9Route - '/search/search90': typeof genSearchSearch90Route - '/search/search91': typeof genSearchSearch91Route - '/search/search92': typeof genSearchSearch92Route - '/search/search93': typeof genSearchSearch93Route - '/search/search94': typeof genSearchSearch94Route - '/search/search95': typeof genSearchSearch95Route - '/search/search96': typeof genSearchSearch96Route - '/search/search97': typeof genSearchSearch97Route - '/search/search98': typeof genSearchSearch98Route - '/search/search99': typeof genSearchSearch99Route -} - -export interface FileRoutesByTo { - '/': typeof IndexRoute - '/params': typeof genParamsRouteRouteWithChildren - '/search': typeof genSearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/absolute0': typeof genAbsolute0Route - '/absolute1': typeof genAbsolute1Route - '/absolute10': typeof genAbsolute10Route - '/absolute11': typeof genAbsolute11Route - '/absolute12': typeof genAbsolute12Route - '/absolute13': typeof genAbsolute13Route - '/absolute14': typeof genAbsolute14Route - '/absolute15': typeof genAbsolute15Route - '/absolute16': typeof genAbsolute16Route - '/absolute17': typeof genAbsolute17Route - '/absolute18': typeof genAbsolute18Route - '/absolute19': typeof genAbsolute19Route - '/absolute2': typeof genAbsolute2Route - '/absolute20': typeof genAbsolute20Route - '/absolute21': typeof genAbsolute21Route - '/absolute22': typeof genAbsolute22Route - '/absolute23': typeof genAbsolute23Route - '/absolute24': typeof genAbsolute24Route - '/absolute25': typeof genAbsolute25Route - '/absolute26': typeof genAbsolute26Route - '/absolute27': typeof genAbsolute27Route - '/absolute28': typeof genAbsolute28Route - '/absolute29': typeof genAbsolute29Route - '/absolute3': typeof genAbsolute3Route - '/absolute30': typeof genAbsolute30Route - '/absolute31': typeof genAbsolute31Route - '/absolute32': typeof genAbsolute32Route - '/absolute33': typeof genAbsolute33Route - '/absolute34': typeof genAbsolute34Route - '/absolute35': typeof genAbsolute35Route - '/absolute36': typeof genAbsolute36Route - '/absolute37': typeof genAbsolute37Route - '/absolute38': typeof genAbsolute38Route - '/absolute39': typeof genAbsolute39Route - '/absolute4': typeof genAbsolute4Route - '/absolute40': typeof genAbsolute40Route - '/absolute41': typeof genAbsolute41Route - '/absolute42': typeof genAbsolute42Route - '/absolute43': typeof genAbsolute43Route - '/absolute44': typeof genAbsolute44Route - '/absolute45': typeof genAbsolute45Route - '/absolute46': typeof genAbsolute46Route - '/absolute47': typeof genAbsolute47Route - '/absolute48': typeof genAbsolute48Route - '/absolute49': typeof genAbsolute49Route - '/absolute5': typeof genAbsolute5Route - '/absolute50': typeof genAbsolute50Route - '/absolute51': typeof genAbsolute51Route - '/absolute52': typeof genAbsolute52Route - '/absolute53': typeof genAbsolute53Route - '/absolute54': typeof genAbsolute54Route - '/absolute55': typeof genAbsolute55Route - '/absolute56': typeof genAbsolute56Route - '/absolute57': typeof genAbsolute57Route - '/absolute58': typeof genAbsolute58Route - '/absolute59': typeof genAbsolute59Route - '/absolute6': typeof genAbsolute6Route - '/absolute60': typeof genAbsolute60Route - '/absolute61': typeof genAbsolute61Route - '/absolute62': typeof genAbsolute62Route - '/absolute63': typeof genAbsolute63Route - '/absolute64': typeof genAbsolute64Route - '/absolute65': typeof genAbsolute65Route - '/absolute66': typeof genAbsolute66Route - '/absolute67': typeof genAbsolute67Route - '/absolute68': typeof genAbsolute68Route - '/absolute69': typeof genAbsolute69Route - '/absolute7': typeof genAbsolute7Route - '/absolute70': typeof genAbsolute70Route - '/absolute71': typeof genAbsolute71Route - '/absolute72': typeof genAbsolute72Route - '/absolute73': typeof genAbsolute73Route - '/absolute74': typeof genAbsolute74Route - '/absolute75': typeof genAbsolute75Route - '/absolute76': typeof genAbsolute76Route - '/absolute77': typeof genAbsolute77Route - '/absolute78': typeof genAbsolute78Route - '/absolute79': typeof genAbsolute79Route - '/absolute8': typeof genAbsolute8Route - '/absolute80': typeof genAbsolute80Route - '/absolute81': typeof genAbsolute81Route - '/absolute82': typeof genAbsolute82Route - '/absolute83': typeof genAbsolute83Route - '/absolute84': typeof genAbsolute84Route - '/absolute85': typeof genAbsolute85Route - '/absolute86': typeof genAbsolute86Route - '/absolute87': typeof genAbsolute87Route - '/absolute88': typeof genAbsolute88Route - '/absolute89': typeof genAbsolute89Route - '/absolute9': typeof genAbsolute9Route - '/absolute90': typeof genAbsolute90Route - '/absolute91': typeof genAbsolute91Route - '/absolute92': typeof genAbsolute92Route - '/absolute93': typeof genAbsolute93Route - '/absolute94': typeof genAbsolute94Route - '/absolute95': typeof genAbsolute95Route - '/absolute96': typeof genAbsolute96Route - '/absolute97': typeof genAbsolute97Route - '/absolute98': typeof genAbsolute98Route - '/absolute99': typeof genAbsolute99Route - '/relative0': typeof genRelative0Route - '/relative1': typeof genRelative1Route - '/relative10': typeof genRelative10Route - '/relative11': typeof genRelative11Route - '/relative12': typeof genRelative12Route - '/relative13': typeof genRelative13Route - '/relative14': typeof genRelative14Route - '/relative15': typeof genRelative15Route - '/relative16': typeof genRelative16Route - '/relative17': typeof genRelative17Route - '/relative18': typeof genRelative18Route - '/relative19': typeof genRelative19Route - '/relative2': typeof genRelative2Route - '/relative20': typeof genRelative20Route - '/relative21': typeof genRelative21Route - '/relative22': typeof genRelative22Route - '/relative23': typeof genRelative23Route - '/relative24': typeof genRelative24Route - '/relative25': typeof genRelative25Route - '/relative26': typeof genRelative26Route - '/relative27': typeof genRelative27Route - '/relative28': typeof genRelative28Route - '/relative29': typeof genRelative29Route - '/relative3': typeof genRelative3Route - '/relative30': typeof genRelative30Route - '/relative31': typeof genRelative31Route - '/relative32': typeof genRelative32Route - '/relative33': typeof genRelative33Route - '/relative34': typeof genRelative34Route - '/relative35': typeof genRelative35Route - '/relative36': typeof genRelative36Route - '/relative37': typeof genRelative37Route - '/relative38': typeof genRelative38Route - '/relative39': typeof genRelative39Route - '/relative4': typeof genRelative4Route - '/relative40': typeof genRelative40Route - '/relative41': typeof genRelative41Route - '/relative42': typeof genRelative42Route - '/relative43': typeof genRelative43Route - '/relative44': typeof genRelative44Route - '/relative45': typeof genRelative45Route - '/relative46': typeof genRelative46Route - '/relative47': typeof genRelative47Route - '/relative48': typeof genRelative48Route - '/relative49': typeof genRelative49Route - '/relative5': typeof genRelative5Route - '/relative50': typeof genRelative50Route - '/relative51': typeof genRelative51Route - '/relative52': typeof genRelative52Route - '/relative53': typeof genRelative53Route - '/relative54': typeof genRelative54Route - '/relative55': typeof genRelative55Route - '/relative56': typeof genRelative56Route - '/relative57': typeof genRelative57Route - '/relative58': typeof genRelative58Route - '/relative59': typeof genRelative59Route - '/relative6': typeof genRelative6Route - '/relative60': typeof genRelative60Route - '/relative61': typeof genRelative61Route - '/relative62': typeof genRelative62Route - '/relative63': typeof genRelative63Route - '/relative64': typeof genRelative64Route - '/relative65': typeof genRelative65Route - '/relative66': typeof genRelative66Route - '/relative67': typeof genRelative67Route - '/relative68': typeof genRelative68Route - '/relative69': typeof genRelative69Route - '/relative7': typeof genRelative7Route - '/relative70': typeof genRelative70Route - '/relative71': typeof genRelative71Route - '/relative72': typeof genRelative72Route - '/relative73': typeof genRelative73Route - '/relative74': typeof genRelative74Route - '/relative75': typeof genRelative75Route - '/relative76': typeof genRelative76Route - '/relative77': typeof genRelative77Route - '/relative78': typeof genRelative78Route - '/relative79': typeof genRelative79Route - '/relative8': typeof genRelative8Route - '/relative80': typeof genRelative80Route - '/relative81': typeof genRelative81Route - '/relative82': typeof genRelative82Route - '/relative83': typeof genRelative83Route - '/relative84': typeof genRelative84Route - '/relative85': typeof genRelative85Route - '/relative86': typeof genRelative86Route - '/relative87': typeof genRelative87Route - '/relative88': typeof genRelative88Route - '/relative89': typeof genRelative89Route - '/relative9': typeof genRelative9Route - '/relative90': typeof genRelative90Route - '/relative91': typeof genRelative91Route - '/relative92': typeof genRelative92Route - '/relative93': typeof genRelative93Route - '/relative94': typeof genRelative94Route - '/relative95': typeof genRelative95Route - '/relative96': typeof genRelative96Route - '/relative97': typeof genRelative97Route - '/relative98': typeof genRelative98Route - '/relative99': typeof genRelative99Route - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/params/$param0': typeof genParamsParam0Route - '/params/$param1': typeof genParamsParam1Route - '/params/$param10': typeof genParamsParam10Route - '/params/$param11': typeof genParamsParam11Route - '/params/$param12': typeof genParamsParam12Route - '/params/$param13': typeof genParamsParam13Route - '/params/$param14': typeof genParamsParam14Route - '/params/$param15': typeof genParamsParam15Route - '/params/$param16': typeof genParamsParam16Route - '/params/$param17': typeof genParamsParam17Route - '/params/$param18': typeof genParamsParam18Route - '/params/$param19': typeof genParamsParam19Route - '/params/$param2': typeof genParamsParam2Route - '/params/$param20': typeof genParamsParam20Route - '/params/$param21': typeof genParamsParam21Route - '/params/$param22': typeof genParamsParam22Route - '/params/$param23': typeof genParamsParam23Route - '/params/$param24': typeof genParamsParam24Route - '/params/$param25': typeof genParamsParam25Route - '/params/$param26': typeof genParamsParam26Route - '/params/$param27': typeof genParamsParam27Route - '/params/$param28': typeof genParamsParam28Route - '/params/$param29': typeof genParamsParam29Route - '/params/$param3': typeof genParamsParam3Route - '/params/$param30': typeof genParamsParam30Route - '/params/$param31': typeof genParamsParam31Route - '/params/$param32': typeof genParamsParam32Route - '/params/$param33': typeof genParamsParam33Route - '/params/$param34': typeof genParamsParam34Route - '/params/$param35': typeof genParamsParam35Route - '/params/$param36': typeof genParamsParam36Route - '/params/$param37': typeof genParamsParam37Route - '/params/$param38': typeof genParamsParam38Route - '/params/$param39': typeof genParamsParam39Route - '/params/$param4': typeof genParamsParam4Route - '/params/$param40': typeof genParamsParam40Route - '/params/$param41': typeof genParamsParam41Route - '/params/$param42': typeof genParamsParam42Route - '/params/$param43': typeof genParamsParam43Route - '/params/$param44': typeof genParamsParam44Route - '/params/$param45': typeof genParamsParam45Route - '/params/$param46': typeof genParamsParam46Route - '/params/$param47': typeof genParamsParam47Route - '/params/$param48': typeof genParamsParam48Route - '/params/$param49': typeof genParamsParam49Route - '/params/$param5': typeof genParamsParam5Route - '/params/$param50': typeof genParamsParam50Route - '/params/$param51': typeof genParamsParam51Route - '/params/$param52': typeof genParamsParam52Route - '/params/$param53': typeof genParamsParam53Route - '/params/$param54': typeof genParamsParam54Route - '/params/$param55': typeof genParamsParam55Route - '/params/$param56': typeof genParamsParam56Route - '/params/$param57': typeof genParamsParam57Route - '/params/$param58': typeof genParamsParam58Route - '/params/$param59': typeof genParamsParam59Route - '/params/$param6': typeof genParamsParam6Route - '/params/$param60': typeof genParamsParam60Route - '/params/$param61': typeof genParamsParam61Route - '/params/$param62': typeof genParamsParam62Route - '/params/$param63': typeof genParamsParam63Route - '/params/$param64': typeof genParamsParam64Route - '/params/$param65': typeof genParamsParam65Route - '/params/$param66': typeof genParamsParam66Route - '/params/$param67': typeof genParamsParam67Route - '/params/$param68': typeof genParamsParam68Route - '/params/$param69': typeof genParamsParam69Route - '/params/$param7': typeof genParamsParam7Route - '/params/$param70': typeof genParamsParam70Route - '/params/$param71': typeof genParamsParam71Route - '/params/$param72': typeof genParamsParam72Route - '/params/$param73': typeof genParamsParam73Route - '/params/$param74': typeof genParamsParam74Route - '/params/$param75': typeof genParamsParam75Route - '/params/$param76': typeof genParamsParam76Route - '/params/$param77': typeof genParamsParam77Route - '/params/$param78': typeof genParamsParam78Route - '/params/$param79': typeof genParamsParam79Route - '/params/$param8': typeof genParamsParam8Route - '/params/$param80': typeof genParamsParam80Route - '/params/$param81': typeof genParamsParam81Route - '/params/$param82': typeof genParamsParam82Route - '/params/$param83': typeof genParamsParam83Route - '/params/$param84': typeof genParamsParam84Route - '/params/$param85': typeof genParamsParam85Route - '/params/$param86': typeof genParamsParam86Route - '/params/$param87': typeof genParamsParam87Route - '/params/$param88': typeof genParamsParam88Route - '/params/$param89': typeof genParamsParam89Route - '/params/$param9': typeof genParamsParam9Route - '/params/$param90': typeof genParamsParam90Route - '/params/$param91': typeof genParamsParam91Route - '/params/$param92': typeof genParamsParam92Route - '/params/$param93': typeof genParamsParam93Route - '/params/$param94': typeof genParamsParam94Route - '/params/$param95': typeof genParamsParam95Route - '/params/$param96': typeof genParamsParam96Route - '/params/$param97': typeof genParamsParam97Route - '/params/$param98': typeof genParamsParam98Route - '/params/$param99': typeof genParamsParam99Route - '/search/search0': typeof genSearchSearch0Route - '/search/search1': typeof genSearchSearch1Route - '/search/search10': typeof genSearchSearch10Route - '/search/search11': typeof genSearchSearch11Route - '/search/search12': typeof genSearchSearch12Route - '/search/search13': typeof genSearchSearch13Route - '/search/search14': typeof genSearchSearch14Route - '/search/search15': typeof genSearchSearch15Route - '/search/search16': typeof genSearchSearch16Route - '/search/search17': typeof genSearchSearch17Route - '/search/search18': typeof genSearchSearch18Route - '/search/search19': typeof genSearchSearch19Route - '/search/search2': typeof genSearchSearch2Route - '/search/search20': typeof genSearchSearch20Route - '/search/search21': typeof genSearchSearch21Route - '/search/search22': typeof genSearchSearch22Route - '/search/search23': typeof genSearchSearch23Route - '/search/search24': typeof genSearchSearch24Route - '/search/search25': typeof genSearchSearch25Route - '/search/search26': typeof genSearchSearch26Route - '/search/search27': typeof genSearchSearch27Route - '/search/search28': typeof genSearchSearch28Route - '/search/search29': typeof genSearchSearch29Route - '/search/search3': typeof genSearchSearch3Route - '/search/search30': typeof genSearchSearch30Route - '/search/search31': typeof genSearchSearch31Route - '/search/search32': typeof genSearchSearch32Route - '/search/search33': typeof genSearchSearch33Route - '/search/search34': typeof genSearchSearch34Route - '/search/search35': typeof genSearchSearch35Route - '/search/search36': typeof genSearchSearch36Route - '/search/search37': typeof genSearchSearch37Route - '/search/search38': typeof genSearchSearch38Route - '/search/search39': typeof genSearchSearch39Route - '/search/search4': typeof genSearchSearch4Route - '/search/search40': typeof genSearchSearch40Route - '/search/search41': typeof genSearchSearch41Route - '/search/search42': typeof genSearchSearch42Route - '/search/search43': typeof genSearchSearch43Route - '/search/search44': typeof genSearchSearch44Route - '/search/search45': typeof genSearchSearch45Route - '/search/search46': typeof genSearchSearch46Route - '/search/search47': typeof genSearchSearch47Route - '/search/search48': typeof genSearchSearch48Route - '/search/search49': typeof genSearchSearch49Route - '/search/search5': typeof genSearchSearch5Route - '/search/search50': typeof genSearchSearch50Route - '/search/search51': typeof genSearchSearch51Route - '/search/search52': typeof genSearchSearch52Route - '/search/search53': typeof genSearchSearch53Route - '/search/search54': typeof genSearchSearch54Route - '/search/search55': typeof genSearchSearch55Route - '/search/search56': typeof genSearchSearch56Route - '/search/search57': typeof genSearchSearch57Route - '/search/search58': typeof genSearchSearch58Route - '/search/search59': typeof genSearchSearch59Route - '/search/search6': typeof genSearchSearch6Route - '/search/search60': typeof genSearchSearch60Route - '/search/search61': typeof genSearchSearch61Route - '/search/search62': typeof genSearchSearch62Route - '/search/search63': typeof genSearchSearch63Route - '/search/search64': typeof genSearchSearch64Route - '/search/search65': typeof genSearchSearch65Route - '/search/search66': typeof genSearchSearch66Route - '/search/search67': typeof genSearchSearch67Route - '/search/search68': typeof genSearchSearch68Route - '/search/search69': typeof genSearchSearch69Route - '/search/search7': typeof genSearchSearch7Route - '/search/search70': typeof genSearchSearch70Route - '/search/search71': typeof genSearchSearch71Route - '/search/search72': typeof genSearchSearch72Route - '/search/search73': typeof genSearchSearch73Route - '/search/search74': typeof genSearchSearch74Route - '/search/search75': typeof genSearchSearch75Route - '/search/search76': typeof genSearchSearch76Route - '/search/search77': typeof genSearchSearch77Route - '/search/search78': typeof genSearchSearch78Route - '/search/search79': typeof genSearchSearch79Route - '/search/search8': typeof genSearchSearch8Route - '/search/search80': typeof genSearchSearch80Route - '/search/search81': typeof genSearchSearch81Route - '/search/search82': typeof genSearchSearch82Route - '/search/search83': typeof genSearchSearch83Route - '/search/search84': typeof genSearchSearch84Route - '/search/search85': typeof genSearchSearch85Route - '/search/search86': typeof genSearchSearch86Route - '/search/search87': typeof genSearchSearch87Route - '/search/search88': typeof genSearchSearch88Route - '/search/search89': typeof genSearchSearch89Route - '/search/search9': typeof genSearchSearch9Route - '/search/search90': typeof genSearchSearch90Route - '/search/search91': typeof genSearchSearch91Route - '/search/search92': typeof genSearchSearch92Route - '/search/search93': typeof genSearchSearch93Route - '/search/search94': typeof genSearchSearch94Route - '/search/search95': typeof genSearchSearch95Route - '/search/search96': typeof genSearchSearch96Route - '/search/search97': typeof genSearchSearch97Route - '/search/search98': typeof genSearchSearch98Route - '/search/search99': typeof genSearchSearch99Route -} - -export interface FileRoutesById { - __root__: typeof rootRoute - '/': typeof IndexRoute - '/params': typeof ParamsRouteRouteWithChildren - '/search': typeof SearchRouteRouteWithChildren - '/absolute': typeof AbsoluteRoute - '/linkProps': typeof LinkPropsRoute - '/relative': typeof RelativeRoute - '/(gen)/params': typeof genParamsRouteRouteWithChildren - '/(gen)/search': typeof genSearchRouteRouteWithChildren - '/(gen)/absolute0': typeof genAbsolute0Route - '/(gen)/absolute1': typeof genAbsolute1Route - '/(gen)/absolute10': typeof genAbsolute10Route - '/(gen)/absolute11': typeof genAbsolute11Route - '/(gen)/absolute12': typeof genAbsolute12Route - '/(gen)/absolute13': typeof genAbsolute13Route - '/(gen)/absolute14': typeof genAbsolute14Route - '/(gen)/absolute15': typeof genAbsolute15Route - '/(gen)/absolute16': typeof genAbsolute16Route - '/(gen)/absolute17': typeof genAbsolute17Route - '/(gen)/absolute18': typeof genAbsolute18Route - '/(gen)/absolute19': typeof genAbsolute19Route - '/(gen)/absolute2': typeof genAbsolute2Route - '/(gen)/absolute20': typeof genAbsolute20Route - '/(gen)/absolute21': typeof genAbsolute21Route - '/(gen)/absolute22': typeof genAbsolute22Route - '/(gen)/absolute23': typeof genAbsolute23Route - '/(gen)/absolute24': typeof genAbsolute24Route - '/(gen)/absolute25': typeof genAbsolute25Route - '/(gen)/absolute26': typeof genAbsolute26Route - '/(gen)/absolute27': typeof genAbsolute27Route - '/(gen)/absolute28': typeof genAbsolute28Route - '/(gen)/absolute29': typeof genAbsolute29Route - '/(gen)/absolute3': typeof genAbsolute3Route - '/(gen)/absolute30': typeof genAbsolute30Route - '/(gen)/absolute31': typeof genAbsolute31Route - '/(gen)/absolute32': typeof genAbsolute32Route - '/(gen)/absolute33': typeof genAbsolute33Route - '/(gen)/absolute34': typeof genAbsolute34Route - '/(gen)/absolute35': typeof genAbsolute35Route - '/(gen)/absolute36': typeof genAbsolute36Route - '/(gen)/absolute37': typeof genAbsolute37Route - '/(gen)/absolute38': typeof genAbsolute38Route - '/(gen)/absolute39': typeof genAbsolute39Route - '/(gen)/absolute4': typeof genAbsolute4Route - '/(gen)/absolute40': typeof genAbsolute40Route - '/(gen)/absolute41': typeof genAbsolute41Route - '/(gen)/absolute42': typeof genAbsolute42Route - '/(gen)/absolute43': typeof genAbsolute43Route - '/(gen)/absolute44': typeof genAbsolute44Route - '/(gen)/absolute45': typeof genAbsolute45Route - '/(gen)/absolute46': typeof genAbsolute46Route - '/(gen)/absolute47': typeof genAbsolute47Route - '/(gen)/absolute48': typeof genAbsolute48Route - '/(gen)/absolute49': typeof genAbsolute49Route - '/(gen)/absolute5': typeof genAbsolute5Route - '/(gen)/absolute50': typeof genAbsolute50Route - '/(gen)/absolute51': typeof genAbsolute51Route - '/(gen)/absolute52': typeof genAbsolute52Route - '/(gen)/absolute53': typeof genAbsolute53Route - '/(gen)/absolute54': typeof genAbsolute54Route - '/(gen)/absolute55': typeof genAbsolute55Route - '/(gen)/absolute56': typeof genAbsolute56Route - '/(gen)/absolute57': typeof genAbsolute57Route - '/(gen)/absolute58': typeof genAbsolute58Route - '/(gen)/absolute59': typeof genAbsolute59Route - '/(gen)/absolute6': typeof genAbsolute6Route - '/(gen)/absolute60': typeof genAbsolute60Route - '/(gen)/absolute61': typeof genAbsolute61Route - '/(gen)/absolute62': typeof genAbsolute62Route - '/(gen)/absolute63': typeof genAbsolute63Route - '/(gen)/absolute64': typeof genAbsolute64Route - '/(gen)/absolute65': typeof genAbsolute65Route - '/(gen)/absolute66': typeof genAbsolute66Route - '/(gen)/absolute67': typeof genAbsolute67Route - '/(gen)/absolute68': typeof genAbsolute68Route - '/(gen)/absolute69': typeof genAbsolute69Route - '/(gen)/absolute7': typeof genAbsolute7Route - '/(gen)/absolute70': typeof genAbsolute70Route - '/(gen)/absolute71': typeof genAbsolute71Route - '/(gen)/absolute72': typeof genAbsolute72Route - '/(gen)/absolute73': typeof genAbsolute73Route - '/(gen)/absolute74': typeof genAbsolute74Route - '/(gen)/absolute75': typeof genAbsolute75Route - '/(gen)/absolute76': typeof genAbsolute76Route - '/(gen)/absolute77': typeof genAbsolute77Route - '/(gen)/absolute78': typeof genAbsolute78Route - '/(gen)/absolute79': typeof genAbsolute79Route - '/(gen)/absolute8': typeof genAbsolute8Route - '/(gen)/absolute80': typeof genAbsolute80Route - '/(gen)/absolute81': typeof genAbsolute81Route - '/(gen)/absolute82': typeof genAbsolute82Route - '/(gen)/absolute83': typeof genAbsolute83Route - '/(gen)/absolute84': typeof genAbsolute84Route - '/(gen)/absolute85': typeof genAbsolute85Route - '/(gen)/absolute86': typeof genAbsolute86Route - '/(gen)/absolute87': typeof genAbsolute87Route - '/(gen)/absolute88': typeof genAbsolute88Route - '/(gen)/absolute89': typeof genAbsolute89Route - '/(gen)/absolute9': typeof genAbsolute9Route - '/(gen)/absolute90': typeof genAbsolute90Route - '/(gen)/absolute91': typeof genAbsolute91Route - '/(gen)/absolute92': typeof genAbsolute92Route - '/(gen)/absolute93': typeof genAbsolute93Route - '/(gen)/absolute94': typeof genAbsolute94Route - '/(gen)/absolute95': typeof genAbsolute95Route - '/(gen)/absolute96': typeof genAbsolute96Route - '/(gen)/absolute97': typeof genAbsolute97Route - '/(gen)/absolute98': typeof genAbsolute98Route - '/(gen)/absolute99': typeof genAbsolute99Route - '/(gen)/relative0': typeof genRelative0Route - '/(gen)/relative1': typeof genRelative1Route - '/(gen)/relative10': typeof genRelative10Route - '/(gen)/relative11': typeof genRelative11Route - '/(gen)/relative12': typeof genRelative12Route - '/(gen)/relative13': typeof genRelative13Route - '/(gen)/relative14': typeof genRelative14Route - '/(gen)/relative15': typeof genRelative15Route - '/(gen)/relative16': typeof genRelative16Route - '/(gen)/relative17': typeof genRelative17Route - '/(gen)/relative18': typeof genRelative18Route - '/(gen)/relative19': typeof genRelative19Route - '/(gen)/relative2': typeof genRelative2Route - '/(gen)/relative20': typeof genRelative20Route - '/(gen)/relative21': typeof genRelative21Route - '/(gen)/relative22': typeof genRelative22Route - '/(gen)/relative23': typeof genRelative23Route - '/(gen)/relative24': typeof genRelative24Route - '/(gen)/relative25': typeof genRelative25Route - '/(gen)/relative26': typeof genRelative26Route - '/(gen)/relative27': typeof genRelative27Route - '/(gen)/relative28': typeof genRelative28Route - '/(gen)/relative29': typeof genRelative29Route - '/(gen)/relative3': typeof genRelative3Route - '/(gen)/relative30': typeof genRelative30Route - '/(gen)/relative31': typeof genRelative31Route - '/(gen)/relative32': typeof genRelative32Route - '/(gen)/relative33': typeof genRelative33Route - '/(gen)/relative34': typeof genRelative34Route - '/(gen)/relative35': typeof genRelative35Route - '/(gen)/relative36': typeof genRelative36Route - '/(gen)/relative37': typeof genRelative37Route - '/(gen)/relative38': typeof genRelative38Route - '/(gen)/relative39': typeof genRelative39Route - '/(gen)/relative4': typeof genRelative4Route - '/(gen)/relative40': typeof genRelative40Route - '/(gen)/relative41': typeof genRelative41Route - '/(gen)/relative42': typeof genRelative42Route - '/(gen)/relative43': typeof genRelative43Route - '/(gen)/relative44': typeof genRelative44Route - '/(gen)/relative45': typeof genRelative45Route - '/(gen)/relative46': typeof genRelative46Route - '/(gen)/relative47': typeof genRelative47Route - '/(gen)/relative48': typeof genRelative48Route - '/(gen)/relative49': typeof genRelative49Route - '/(gen)/relative5': typeof genRelative5Route - '/(gen)/relative50': typeof genRelative50Route - '/(gen)/relative51': typeof genRelative51Route - '/(gen)/relative52': typeof genRelative52Route - '/(gen)/relative53': typeof genRelative53Route - '/(gen)/relative54': typeof genRelative54Route - '/(gen)/relative55': typeof genRelative55Route - '/(gen)/relative56': typeof genRelative56Route - '/(gen)/relative57': typeof genRelative57Route - '/(gen)/relative58': typeof genRelative58Route - '/(gen)/relative59': typeof genRelative59Route - '/(gen)/relative6': typeof genRelative6Route - '/(gen)/relative60': typeof genRelative60Route - '/(gen)/relative61': typeof genRelative61Route - '/(gen)/relative62': typeof genRelative62Route - '/(gen)/relative63': typeof genRelative63Route - '/(gen)/relative64': typeof genRelative64Route - '/(gen)/relative65': typeof genRelative65Route - '/(gen)/relative66': typeof genRelative66Route - '/(gen)/relative67': typeof genRelative67Route - '/(gen)/relative68': typeof genRelative68Route - '/(gen)/relative69': typeof genRelative69Route - '/(gen)/relative7': typeof genRelative7Route - '/(gen)/relative70': typeof genRelative70Route - '/(gen)/relative71': typeof genRelative71Route - '/(gen)/relative72': typeof genRelative72Route - '/(gen)/relative73': typeof genRelative73Route - '/(gen)/relative74': typeof genRelative74Route - '/(gen)/relative75': typeof genRelative75Route - '/(gen)/relative76': typeof genRelative76Route - '/(gen)/relative77': typeof genRelative77Route - '/(gen)/relative78': typeof genRelative78Route - '/(gen)/relative79': typeof genRelative79Route - '/(gen)/relative8': typeof genRelative8Route - '/(gen)/relative80': typeof genRelative80Route - '/(gen)/relative81': typeof genRelative81Route - '/(gen)/relative82': typeof genRelative82Route - '/(gen)/relative83': typeof genRelative83Route - '/(gen)/relative84': typeof genRelative84Route - '/(gen)/relative85': typeof genRelative85Route - '/(gen)/relative86': typeof genRelative86Route - '/(gen)/relative87': typeof genRelative87Route - '/(gen)/relative88': typeof genRelative88Route - '/(gen)/relative89': typeof genRelative89Route - '/(gen)/relative9': typeof genRelative9Route - '/(gen)/relative90': typeof genRelative90Route - '/(gen)/relative91': typeof genRelative91Route - '/(gen)/relative92': typeof genRelative92Route - '/(gen)/relative93': typeof genRelative93Route - '/(gen)/relative94': typeof genRelative94Route - '/(gen)/relative95': typeof genRelative95Route - '/(gen)/relative96': typeof genRelative96Route - '/(gen)/relative97': typeof genRelative97Route - '/(gen)/relative98': typeof genRelative98Route - '/(gen)/relative99': typeof genRelative99Route - '/params/$paramsPlaceholder': typeof ParamsParamsPlaceholderRoute - '/search/searchPlaceholder': typeof SearchSearchPlaceholderRoute - '/(gen)/params/$param0': typeof genParamsParam0Route - '/(gen)/params/$param1': typeof genParamsParam1Route - '/(gen)/params/$param10': typeof genParamsParam10Route - '/(gen)/params/$param11': typeof genParamsParam11Route - '/(gen)/params/$param12': typeof genParamsParam12Route - '/(gen)/params/$param13': typeof genParamsParam13Route - '/(gen)/params/$param14': typeof genParamsParam14Route - '/(gen)/params/$param15': typeof genParamsParam15Route - '/(gen)/params/$param16': typeof genParamsParam16Route - '/(gen)/params/$param17': typeof genParamsParam17Route - '/(gen)/params/$param18': typeof genParamsParam18Route - '/(gen)/params/$param19': typeof genParamsParam19Route - '/(gen)/params/$param2': typeof genParamsParam2Route - '/(gen)/params/$param20': typeof genParamsParam20Route - '/(gen)/params/$param21': typeof genParamsParam21Route - '/(gen)/params/$param22': typeof genParamsParam22Route - '/(gen)/params/$param23': typeof genParamsParam23Route - '/(gen)/params/$param24': typeof genParamsParam24Route - '/(gen)/params/$param25': typeof genParamsParam25Route - '/(gen)/params/$param26': typeof genParamsParam26Route - '/(gen)/params/$param27': typeof genParamsParam27Route - '/(gen)/params/$param28': typeof genParamsParam28Route - '/(gen)/params/$param29': typeof genParamsParam29Route - '/(gen)/params/$param3': typeof genParamsParam3Route - '/(gen)/params/$param30': typeof genParamsParam30Route - '/(gen)/params/$param31': typeof genParamsParam31Route - '/(gen)/params/$param32': typeof genParamsParam32Route - '/(gen)/params/$param33': typeof genParamsParam33Route - '/(gen)/params/$param34': typeof genParamsParam34Route - '/(gen)/params/$param35': typeof genParamsParam35Route - '/(gen)/params/$param36': typeof genParamsParam36Route - '/(gen)/params/$param37': typeof genParamsParam37Route - '/(gen)/params/$param38': typeof genParamsParam38Route - '/(gen)/params/$param39': typeof genParamsParam39Route - '/(gen)/params/$param4': typeof genParamsParam4Route - '/(gen)/params/$param40': typeof genParamsParam40Route - '/(gen)/params/$param41': typeof genParamsParam41Route - '/(gen)/params/$param42': typeof genParamsParam42Route - '/(gen)/params/$param43': typeof genParamsParam43Route - '/(gen)/params/$param44': typeof genParamsParam44Route - '/(gen)/params/$param45': typeof genParamsParam45Route - '/(gen)/params/$param46': typeof genParamsParam46Route - '/(gen)/params/$param47': typeof genParamsParam47Route - '/(gen)/params/$param48': typeof genParamsParam48Route - '/(gen)/params/$param49': typeof genParamsParam49Route - '/(gen)/params/$param5': typeof genParamsParam5Route - '/(gen)/params/$param50': typeof genParamsParam50Route - '/(gen)/params/$param51': typeof genParamsParam51Route - '/(gen)/params/$param52': typeof genParamsParam52Route - '/(gen)/params/$param53': typeof genParamsParam53Route - '/(gen)/params/$param54': typeof genParamsParam54Route - '/(gen)/params/$param55': typeof genParamsParam55Route - '/(gen)/params/$param56': typeof genParamsParam56Route - '/(gen)/params/$param57': typeof genParamsParam57Route - '/(gen)/params/$param58': typeof genParamsParam58Route - '/(gen)/params/$param59': typeof genParamsParam59Route - '/(gen)/params/$param6': typeof genParamsParam6Route - '/(gen)/params/$param60': typeof genParamsParam60Route - '/(gen)/params/$param61': typeof genParamsParam61Route - '/(gen)/params/$param62': typeof genParamsParam62Route - '/(gen)/params/$param63': typeof genParamsParam63Route - '/(gen)/params/$param64': typeof genParamsParam64Route - '/(gen)/params/$param65': typeof genParamsParam65Route - '/(gen)/params/$param66': typeof genParamsParam66Route - '/(gen)/params/$param67': typeof genParamsParam67Route - '/(gen)/params/$param68': typeof genParamsParam68Route - '/(gen)/params/$param69': typeof genParamsParam69Route - '/(gen)/params/$param7': typeof genParamsParam7Route - '/(gen)/params/$param70': typeof genParamsParam70Route - '/(gen)/params/$param71': typeof genParamsParam71Route - '/(gen)/params/$param72': typeof genParamsParam72Route - '/(gen)/params/$param73': typeof genParamsParam73Route - '/(gen)/params/$param74': typeof genParamsParam74Route - '/(gen)/params/$param75': typeof genParamsParam75Route - '/(gen)/params/$param76': typeof genParamsParam76Route - '/(gen)/params/$param77': typeof genParamsParam77Route - '/(gen)/params/$param78': typeof genParamsParam78Route - '/(gen)/params/$param79': typeof genParamsParam79Route - '/(gen)/params/$param8': typeof genParamsParam8Route - '/(gen)/params/$param80': typeof genParamsParam80Route - '/(gen)/params/$param81': typeof genParamsParam81Route - '/(gen)/params/$param82': typeof genParamsParam82Route - '/(gen)/params/$param83': typeof genParamsParam83Route - '/(gen)/params/$param84': typeof genParamsParam84Route - '/(gen)/params/$param85': typeof genParamsParam85Route - '/(gen)/params/$param86': typeof genParamsParam86Route - '/(gen)/params/$param87': typeof genParamsParam87Route - '/(gen)/params/$param88': typeof genParamsParam88Route - '/(gen)/params/$param89': typeof genParamsParam89Route - '/(gen)/params/$param9': typeof genParamsParam9Route - '/(gen)/params/$param90': typeof genParamsParam90Route - '/(gen)/params/$param91': typeof genParamsParam91Route - '/(gen)/params/$param92': typeof genParamsParam92Route - '/(gen)/params/$param93': typeof genParamsParam93Route - '/(gen)/params/$param94': typeof genParamsParam94Route - '/(gen)/params/$param95': typeof genParamsParam95Route - '/(gen)/params/$param96': typeof genParamsParam96Route - '/(gen)/params/$param97': typeof genParamsParam97Route - '/(gen)/params/$param98': typeof genParamsParam98Route - '/(gen)/params/$param99': typeof genParamsParam99Route - '/(gen)/search/search0': typeof genSearchSearch0Route - '/(gen)/search/search1': typeof genSearchSearch1Route - '/(gen)/search/search10': typeof genSearchSearch10Route - '/(gen)/search/search11': typeof genSearchSearch11Route - '/(gen)/search/search12': typeof genSearchSearch12Route - '/(gen)/search/search13': typeof genSearchSearch13Route - '/(gen)/search/search14': typeof genSearchSearch14Route - '/(gen)/search/search15': typeof genSearchSearch15Route - '/(gen)/search/search16': typeof genSearchSearch16Route - '/(gen)/search/search17': typeof genSearchSearch17Route - '/(gen)/search/search18': typeof genSearchSearch18Route - '/(gen)/search/search19': typeof genSearchSearch19Route - '/(gen)/search/search2': typeof genSearchSearch2Route - '/(gen)/search/search20': typeof genSearchSearch20Route - '/(gen)/search/search21': typeof genSearchSearch21Route - '/(gen)/search/search22': typeof genSearchSearch22Route - '/(gen)/search/search23': typeof genSearchSearch23Route - '/(gen)/search/search24': typeof genSearchSearch24Route - '/(gen)/search/search25': typeof genSearchSearch25Route - '/(gen)/search/search26': typeof genSearchSearch26Route - '/(gen)/search/search27': typeof genSearchSearch27Route - '/(gen)/search/search28': typeof genSearchSearch28Route - '/(gen)/search/search29': typeof genSearchSearch29Route - '/(gen)/search/search3': typeof genSearchSearch3Route - '/(gen)/search/search30': typeof genSearchSearch30Route - '/(gen)/search/search31': typeof genSearchSearch31Route - '/(gen)/search/search32': typeof genSearchSearch32Route - '/(gen)/search/search33': typeof genSearchSearch33Route - '/(gen)/search/search34': typeof genSearchSearch34Route - '/(gen)/search/search35': typeof genSearchSearch35Route - '/(gen)/search/search36': typeof genSearchSearch36Route - '/(gen)/search/search37': typeof genSearchSearch37Route - '/(gen)/search/search38': typeof genSearchSearch38Route - '/(gen)/search/search39': typeof genSearchSearch39Route - '/(gen)/search/search4': typeof genSearchSearch4Route - '/(gen)/search/search40': typeof genSearchSearch40Route - '/(gen)/search/search41': typeof genSearchSearch41Route - '/(gen)/search/search42': typeof genSearchSearch42Route - '/(gen)/search/search43': typeof genSearchSearch43Route - '/(gen)/search/search44': typeof genSearchSearch44Route - '/(gen)/search/search45': typeof genSearchSearch45Route - '/(gen)/search/search46': typeof genSearchSearch46Route - '/(gen)/search/search47': typeof genSearchSearch47Route - '/(gen)/search/search48': typeof genSearchSearch48Route - '/(gen)/search/search49': typeof genSearchSearch49Route - '/(gen)/search/search5': typeof genSearchSearch5Route - '/(gen)/search/search50': typeof genSearchSearch50Route - '/(gen)/search/search51': typeof genSearchSearch51Route - '/(gen)/search/search52': typeof genSearchSearch52Route - '/(gen)/search/search53': typeof genSearchSearch53Route - '/(gen)/search/search54': typeof genSearchSearch54Route - '/(gen)/search/search55': typeof genSearchSearch55Route - '/(gen)/search/search56': typeof genSearchSearch56Route - '/(gen)/search/search57': typeof genSearchSearch57Route - '/(gen)/search/search58': typeof genSearchSearch58Route - '/(gen)/search/search59': typeof genSearchSearch59Route - '/(gen)/search/search6': typeof genSearchSearch6Route - '/(gen)/search/search60': typeof genSearchSearch60Route - '/(gen)/search/search61': typeof genSearchSearch61Route - '/(gen)/search/search62': typeof genSearchSearch62Route - '/(gen)/search/search63': typeof genSearchSearch63Route - '/(gen)/search/search64': typeof genSearchSearch64Route - '/(gen)/search/search65': typeof genSearchSearch65Route - '/(gen)/search/search66': typeof genSearchSearch66Route - '/(gen)/search/search67': typeof genSearchSearch67Route - '/(gen)/search/search68': typeof genSearchSearch68Route - '/(gen)/search/search69': typeof genSearchSearch69Route - '/(gen)/search/search7': typeof genSearchSearch7Route - '/(gen)/search/search70': typeof genSearchSearch70Route - '/(gen)/search/search71': typeof genSearchSearch71Route - '/(gen)/search/search72': typeof genSearchSearch72Route - '/(gen)/search/search73': typeof genSearchSearch73Route - '/(gen)/search/search74': typeof genSearchSearch74Route - '/(gen)/search/search75': typeof genSearchSearch75Route - '/(gen)/search/search76': typeof genSearchSearch76Route - '/(gen)/search/search77': typeof genSearchSearch77Route - '/(gen)/search/search78': typeof genSearchSearch78Route - '/(gen)/search/search79': typeof genSearchSearch79Route - '/(gen)/search/search8': typeof genSearchSearch8Route - '/(gen)/search/search80': typeof genSearchSearch80Route - '/(gen)/search/search81': typeof genSearchSearch81Route - '/(gen)/search/search82': typeof genSearchSearch82Route - '/(gen)/search/search83': typeof genSearchSearch83Route - '/(gen)/search/search84': typeof genSearchSearch84Route - '/(gen)/search/search85': typeof genSearchSearch85Route - '/(gen)/search/search86': typeof genSearchSearch86Route - '/(gen)/search/search87': typeof genSearchSearch87Route - '/(gen)/search/search88': typeof genSearchSearch88Route - '/(gen)/search/search89': typeof genSearchSearch89Route - '/(gen)/search/search9': typeof genSearchSearch9Route - '/(gen)/search/search90': typeof genSearchSearch90Route - '/(gen)/search/search91': typeof genSearchSearch91Route - '/(gen)/search/search92': typeof genSearchSearch92Route - '/(gen)/search/search93': typeof genSearchSearch93Route - '/(gen)/search/search94': typeof genSearchSearch94Route - '/(gen)/search/search95': typeof genSearchSearch95Route - '/(gen)/search/search96': typeof genSearchSearch96Route - '/(gen)/search/search97': typeof genSearchSearch97Route - '/(gen)/search/search98': typeof genSearchSearch98Route - '/(gen)/search/search99': typeof genSearchSearch99Route -} - -export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/absolute0' - | '/absolute1' - | '/absolute10' - | '/absolute11' - | '/absolute12' - | '/absolute13' - | '/absolute14' - | '/absolute15' - | '/absolute16' - | '/absolute17' - | '/absolute18' - | '/absolute19' - | '/absolute2' - | '/absolute20' - | '/absolute21' - | '/absolute22' - | '/absolute23' - | '/absolute24' - | '/absolute25' - | '/absolute26' - | '/absolute27' - | '/absolute28' - | '/absolute29' - | '/absolute3' - | '/absolute30' - | '/absolute31' - | '/absolute32' - | '/absolute33' - | '/absolute34' - | '/absolute35' - | '/absolute36' - | '/absolute37' - | '/absolute38' - | '/absolute39' - | '/absolute4' - | '/absolute40' - | '/absolute41' - | '/absolute42' - | '/absolute43' - | '/absolute44' - | '/absolute45' - | '/absolute46' - | '/absolute47' - | '/absolute48' - | '/absolute49' - | '/absolute5' - | '/absolute50' - | '/absolute51' - | '/absolute52' - | '/absolute53' - | '/absolute54' - | '/absolute55' - | '/absolute56' - | '/absolute57' - | '/absolute58' - | '/absolute59' - | '/absolute6' - | '/absolute60' - | '/absolute61' - | '/absolute62' - | '/absolute63' - | '/absolute64' - | '/absolute65' - | '/absolute66' - | '/absolute67' - | '/absolute68' - | '/absolute69' - | '/absolute7' - | '/absolute70' - | '/absolute71' - | '/absolute72' - | '/absolute73' - | '/absolute74' - | '/absolute75' - | '/absolute76' - | '/absolute77' - | '/absolute78' - | '/absolute79' - | '/absolute8' - | '/absolute80' - | '/absolute81' - | '/absolute82' - | '/absolute83' - | '/absolute84' - | '/absolute85' - | '/absolute86' - | '/absolute87' - | '/absolute88' - | '/absolute89' - | '/absolute9' - | '/absolute90' - | '/absolute91' - | '/absolute92' - | '/absolute93' - | '/absolute94' - | '/absolute95' - | '/absolute96' - | '/absolute97' - | '/absolute98' - | '/absolute99' - | '/relative0' - | '/relative1' - | '/relative10' - | '/relative11' - | '/relative12' - | '/relative13' - | '/relative14' - | '/relative15' - | '/relative16' - | '/relative17' - | '/relative18' - | '/relative19' - | '/relative2' - | '/relative20' - | '/relative21' - | '/relative22' - | '/relative23' - | '/relative24' - | '/relative25' - | '/relative26' - | '/relative27' - | '/relative28' - | '/relative29' - | '/relative3' - | '/relative30' - | '/relative31' - | '/relative32' - | '/relative33' - | '/relative34' - | '/relative35' - | '/relative36' - | '/relative37' - | '/relative38' - | '/relative39' - | '/relative4' - | '/relative40' - | '/relative41' - | '/relative42' - | '/relative43' - | '/relative44' - | '/relative45' - | '/relative46' - | '/relative47' - | '/relative48' - | '/relative49' - | '/relative5' - | '/relative50' - | '/relative51' - | '/relative52' - | '/relative53' - | '/relative54' - | '/relative55' - | '/relative56' - | '/relative57' - | '/relative58' - | '/relative59' - | '/relative6' - | '/relative60' - | '/relative61' - | '/relative62' - | '/relative63' - | '/relative64' - | '/relative65' - | '/relative66' - | '/relative67' - | '/relative68' - | '/relative69' - | '/relative7' - | '/relative70' - | '/relative71' - | '/relative72' - | '/relative73' - | '/relative74' - | '/relative75' - | '/relative76' - | '/relative77' - | '/relative78' - | '/relative79' - | '/relative8' - | '/relative80' - | '/relative81' - | '/relative82' - | '/relative83' - | '/relative84' - | '/relative85' - | '/relative86' - | '/relative87' - | '/relative88' - | '/relative89' - | '/relative9' - | '/relative90' - | '/relative91' - | '/relative92' - | '/relative93' - | '/relative94' - | '/relative95' - | '/relative96' - | '/relative97' - | '/relative98' - | '/relative99' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - | '/params/$param0' - | '/params/$param1' - | '/params/$param10' - | '/params/$param11' - | '/params/$param12' - | '/params/$param13' - | '/params/$param14' - | '/params/$param15' - | '/params/$param16' - | '/params/$param17' - | '/params/$param18' - | '/params/$param19' - | '/params/$param2' - | '/params/$param20' - | '/params/$param21' - | '/params/$param22' - | '/params/$param23' - | '/params/$param24' - | '/params/$param25' - | '/params/$param26' - | '/params/$param27' - | '/params/$param28' - | '/params/$param29' - | '/params/$param3' - | '/params/$param30' - | '/params/$param31' - | '/params/$param32' - | '/params/$param33' - | '/params/$param34' - | '/params/$param35' - | '/params/$param36' - | '/params/$param37' - | '/params/$param38' - | '/params/$param39' - | '/params/$param4' - | '/params/$param40' - | '/params/$param41' - | '/params/$param42' - | '/params/$param43' - | '/params/$param44' - | '/params/$param45' - | '/params/$param46' - | '/params/$param47' - | '/params/$param48' - | '/params/$param49' - | '/params/$param5' - | '/params/$param50' - | '/params/$param51' - | '/params/$param52' - | '/params/$param53' - | '/params/$param54' - | '/params/$param55' - | '/params/$param56' - | '/params/$param57' - | '/params/$param58' - | '/params/$param59' - | '/params/$param6' - | '/params/$param60' - | '/params/$param61' - | '/params/$param62' - | '/params/$param63' - | '/params/$param64' - | '/params/$param65' - | '/params/$param66' - | '/params/$param67' - | '/params/$param68' - | '/params/$param69' - | '/params/$param7' - | '/params/$param70' - | '/params/$param71' - | '/params/$param72' - | '/params/$param73' - | '/params/$param74' - | '/params/$param75' - | '/params/$param76' - | '/params/$param77' - | '/params/$param78' - | '/params/$param79' - | '/params/$param8' - | '/params/$param80' - | '/params/$param81' - | '/params/$param82' - | '/params/$param83' - | '/params/$param84' - | '/params/$param85' - | '/params/$param86' - | '/params/$param87' - | '/params/$param88' - | '/params/$param89' - | '/params/$param9' - | '/params/$param90' - | '/params/$param91' - | '/params/$param92' - | '/params/$param93' - | '/params/$param94' - | '/params/$param95' - | '/params/$param96' - | '/params/$param97' - | '/params/$param98' - | '/params/$param99' - | '/search/search0' - | '/search/search1' - | '/search/search10' - | '/search/search11' - | '/search/search12' - | '/search/search13' - | '/search/search14' - | '/search/search15' - | '/search/search16' - | '/search/search17' - | '/search/search18' - | '/search/search19' - | '/search/search2' - | '/search/search20' - | '/search/search21' - | '/search/search22' - | '/search/search23' - | '/search/search24' - | '/search/search25' - | '/search/search26' - | '/search/search27' - | '/search/search28' - | '/search/search29' - | '/search/search3' - | '/search/search30' - | '/search/search31' - | '/search/search32' - | '/search/search33' - | '/search/search34' - | '/search/search35' - | '/search/search36' - | '/search/search37' - | '/search/search38' - | '/search/search39' - | '/search/search4' - | '/search/search40' - | '/search/search41' - | '/search/search42' - | '/search/search43' - | '/search/search44' - | '/search/search45' - | '/search/search46' - | '/search/search47' - | '/search/search48' - | '/search/search49' - | '/search/search5' - | '/search/search50' - | '/search/search51' - | '/search/search52' - | '/search/search53' - | '/search/search54' - | '/search/search55' - | '/search/search56' - | '/search/search57' - | '/search/search58' - | '/search/search59' - | '/search/search6' - | '/search/search60' - | '/search/search61' - | '/search/search62' - | '/search/search63' - | '/search/search64' - | '/search/search65' - | '/search/search66' - | '/search/search67' - | '/search/search68' - | '/search/search69' - | '/search/search7' - | '/search/search70' - | '/search/search71' - | '/search/search72' - | '/search/search73' - | '/search/search74' - | '/search/search75' - | '/search/search76' - | '/search/search77' - | '/search/search78' - | '/search/search79' - | '/search/search8' - | '/search/search80' - | '/search/search81' - | '/search/search82' - | '/search/search83' - | '/search/search84' - | '/search/search85' - | '/search/search86' - | '/search/search87' - | '/search/search88' - | '/search/search89' - | '/search/search9' - | '/search/search90' - | '/search/search91' - | '/search/search92' - | '/search/search93' - | '/search/search94' - | '/search/search95' - | '/search/search96' - | '/search/search97' - | '/search/search98' - | '/search/search99' - fileRoutesByTo: FileRoutesByTo - to: - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/absolute0' - | '/absolute1' - | '/absolute10' - | '/absolute11' - | '/absolute12' - | '/absolute13' - | '/absolute14' - | '/absolute15' - | '/absolute16' - | '/absolute17' - | '/absolute18' - | '/absolute19' - | '/absolute2' - | '/absolute20' - | '/absolute21' - | '/absolute22' - | '/absolute23' - | '/absolute24' - | '/absolute25' - | '/absolute26' - | '/absolute27' - | '/absolute28' - | '/absolute29' - | '/absolute3' - | '/absolute30' - | '/absolute31' - | '/absolute32' - | '/absolute33' - | '/absolute34' - | '/absolute35' - | '/absolute36' - | '/absolute37' - | '/absolute38' - | '/absolute39' - | '/absolute4' - | '/absolute40' - | '/absolute41' - | '/absolute42' - | '/absolute43' - | '/absolute44' - | '/absolute45' - | '/absolute46' - | '/absolute47' - | '/absolute48' - | '/absolute49' - | '/absolute5' - | '/absolute50' - | '/absolute51' - | '/absolute52' - | '/absolute53' - | '/absolute54' - | '/absolute55' - | '/absolute56' - | '/absolute57' - | '/absolute58' - | '/absolute59' - | '/absolute6' - | '/absolute60' - | '/absolute61' - | '/absolute62' - | '/absolute63' - | '/absolute64' - | '/absolute65' - | '/absolute66' - | '/absolute67' - | '/absolute68' - | '/absolute69' - | '/absolute7' - | '/absolute70' - | '/absolute71' - | '/absolute72' - | '/absolute73' - | '/absolute74' - | '/absolute75' - | '/absolute76' - | '/absolute77' - | '/absolute78' - | '/absolute79' - | '/absolute8' - | '/absolute80' - | '/absolute81' - | '/absolute82' - | '/absolute83' - | '/absolute84' - | '/absolute85' - | '/absolute86' - | '/absolute87' - | '/absolute88' - | '/absolute89' - | '/absolute9' - | '/absolute90' - | '/absolute91' - | '/absolute92' - | '/absolute93' - | '/absolute94' - | '/absolute95' - | '/absolute96' - | '/absolute97' - | '/absolute98' - | '/absolute99' - | '/relative0' - | '/relative1' - | '/relative10' - | '/relative11' - | '/relative12' - | '/relative13' - | '/relative14' - | '/relative15' - | '/relative16' - | '/relative17' - | '/relative18' - | '/relative19' - | '/relative2' - | '/relative20' - | '/relative21' - | '/relative22' - | '/relative23' - | '/relative24' - | '/relative25' - | '/relative26' - | '/relative27' - | '/relative28' - | '/relative29' - | '/relative3' - | '/relative30' - | '/relative31' - | '/relative32' - | '/relative33' - | '/relative34' - | '/relative35' - | '/relative36' - | '/relative37' - | '/relative38' - | '/relative39' - | '/relative4' - | '/relative40' - | '/relative41' - | '/relative42' - | '/relative43' - | '/relative44' - | '/relative45' - | '/relative46' - | '/relative47' - | '/relative48' - | '/relative49' - | '/relative5' - | '/relative50' - | '/relative51' - | '/relative52' - | '/relative53' - | '/relative54' - | '/relative55' - | '/relative56' - | '/relative57' - | '/relative58' - | '/relative59' - | '/relative6' - | '/relative60' - | '/relative61' - | '/relative62' - | '/relative63' - | '/relative64' - | '/relative65' - | '/relative66' - | '/relative67' - | '/relative68' - | '/relative69' - | '/relative7' - | '/relative70' - | '/relative71' - | '/relative72' - | '/relative73' - | '/relative74' - | '/relative75' - | '/relative76' - | '/relative77' - | '/relative78' - | '/relative79' - | '/relative8' - | '/relative80' - | '/relative81' - | '/relative82' - | '/relative83' - | '/relative84' - | '/relative85' - | '/relative86' - | '/relative87' - | '/relative88' - | '/relative89' - | '/relative9' - | '/relative90' - | '/relative91' - | '/relative92' - | '/relative93' - | '/relative94' - | '/relative95' - | '/relative96' - | '/relative97' - | '/relative98' - | '/relative99' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - | '/params/$param0' - | '/params/$param1' - | '/params/$param10' - | '/params/$param11' - | '/params/$param12' - | '/params/$param13' - | '/params/$param14' - | '/params/$param15' - | '/params/$param16' - | '/params/$param17' - | '/params/$param18' - | '/params/$param19' - | '/params/$param2' - | '/params/$param20' - | '/params/$param21' - | '/params/$param22' - | '/params/$param23' - | '/params/$param24' - | '/params/$param25' - | '/params/$param26' - | '/params/$param27' - | '/params/$param28' - | '/params/$param29' - | '/params/$param3' - | '/params/$param30' - | '/params/$param31' - | '/params/$param32' - | '/params/$param33' - | '/params/$param34' - | '/params/$param35' - | '/params/$param36' - | '/params/$param37' - | '/params/$param38' - | '/params/$param39' - | '/params/$param4' - | '/params/$param40' - | '/params/$param41' - | '/params/$param42' - | '/params/$param43' - | '/params/$param44' - | '/params/$param45' - | '/params/$param46' - | '/params/$param47' - | '/params/$param48' - | '/params/$param49' - | '/params/$param5' - | '/params/$param50' - | '/params/$param51' - | '/params/$param52' - | '/params/$param53' - | '/params/$param54' - | '/params/$param55' - | '/params/$param56' - | '/params/$param57' - | '/params/$param58' - | '/params/$param59' - | '/params/$param6' - | '/params/$param60' - | '/params/$param61' - | '/params/$param62' - | '/params/$param63' - | '/params/$param64' - | '/params/$param65' - | '/params/$param66' - | '/params/$param67' - | '/params/$param68' - | '/params/$param69' - | '/params/$param7' - | '/params/$param70' - | '/params/$param71' - | '/params/$param72' - | '/params/$param73' - | '/params/$param74' - | '/params/$param75' - | '/params/$param76' - | '/params/$param77' - | '/params/$param78' - | '/params/$param79' - | '/params/$param8' - | '/params/$param80' - | '/params/$param81' - | '/params/$param82' - | '/params/$param83' - | '/params/$param84' - | '/params/$param85' - | '/params/$param86' - | '/params/$param87' - | '/params/$param88' - | '/params/$param89' - | '/params/$param9' - | '/params/$param90' - | '/params/$param91' - | '/params/$param92' - | '/params/$param93' - | '/params/$param94' - | '/params/$param95' - | '/params/$param96' - | '/params/$param97' - | '/params/$param98' - | '/params/$param99' - | '/search/search0' - | '/search/search1' - | '/search/search10' - | '/search/search11' - | '/search/search12' - | '/search/search13' - | '/search/search14' - | '/search/search15' - | '/search/search16' - | '/search/search17' - | '/search/search18' - | '/search/search19' - | '/search/search2' - | '/search/search20' - | '/search/search21' - | '/search/search22' - | '/search/search23' - | '/search/search24' - | '/search/search25' - | '/search/search26' - | '/search/search27' - | '/search/search28' - | '/search/search29' - | '/search/search3' - | '/search/search30' - | '/search/search31' - | '/search/search32' - | '/search/search33' - | '/search/search34' - | '/search/search35' - | '/search/search36' - | '/search/search37' - | '/search/search38' - | '/search/search39' - | '/search/search4' - | '/search/search40' - | '/search/search41' - | '/search/search42' - | '/search/search43' - | '/search/search44' - | '/search/search45' - | '/search/search46' - | '/search/search47' - | '/search/search48' - | '/search/search49' - | '/search/search5' - | '/search/search50' - | '/search/search51' - | '/search/search52' - | '/search/search53' - | '/search/search54' - | '/search/search55' - | '/search/search56' - | '/search/search57' - | '/search/search58' - | '/search/search59' - | '/search/search6' - | '/search/search60' - | '/search/search61' - | '/search/search62' - | '/search/search63' - | '/search/search64' - | '/search/search65' - | '/search/search66' - | '/search/search67' - | '/search/search68' - | '/search/search69' - | '/search/search7' - | '/search/search70' - | '/search/search71' - | '/search/search72' - | '/search/search73' - | '/search/search74' - | '/search/search75' - | '/search/search76' - | '/search/search77' - | '/search/search78' - | '/search/search79' - | '/search/search8' - | '/search/search80' - | '/search/search81' - | '/search/search82' - | '/search/search83' - | '/search/search84' - | '/search/search85' - | '/search/search86' - | '/search/search87' - | '/search/search88' - | '/search/search89' - | '/search/search9' - | '/search/search90' - | '/search/search91' - | '/search/search92' - | '/search/search93' - | '/search/search94' - | '/search/search95' - | '/search/search96' - | '/search/search97' - | '/search/search98' - | '/search/search99' - id: - | '__root__' - | '/' - | '/params' - | '/search' - | '/absolute' - | '/linkProps' - | '/relative' - | '/(gen)/params' - | '/(gen)/search' - | '/(gen)/absolute0' - | '/(gen)/absolute1' - | '/(gen)/absolute10' - | '/(gen)/absolute11' - | '/(gen)/absolute12' - | '/(gen)/absolute13' - | '/(gen)/absolute14' - | '/(gen)/absolute15' - | '/(gen)/absolute16' - | '/(gen)/absolute17' - | '/(gen)/absolute18' - | '/(gen)/absolute19' - | '/(gen)/absolute2' - | '/(gen)/absolute20' - | '/(gen)/absolute21' - | '/(gen)/absolute22' - | '/(gen)/absolute23' - | '/(gen)/absolute24' - | '/(gen)/absolute25' - | '/(gen)/absolute26' - | '/(gen)/absolute27' - | '/(gen)/absolute28' - | '/(gen)/absolute29' - | '/(gen)/absolute3' - | '/(gen)/absolute30' - | '/(gen)/absolute31' - | '/(gen)/absolute32' - | '/(gen)/absolute33' - | '/(gen)/absolute34' - | '/(gen)/absolute35' - | '/(gen)/absolute36' - | '/(gen)/absolute37' - | '/(gen)/absolute38' - | '/(gen)/absolute39' - | '/(gen)/absolute4' - | '/(gen)/absolute40' - | '/(gen)/absolute41' - | '/(gen)/absolute42' - | '/(gen)/absolute43' - | '/(gen)/absolute44' - | '/(gen)/absolute45' - | '/(gen)/absolute46' - | '/(gen)/absolute47' - | '/(gen)/absolute48' - | '/(gen)/absolute49' - | '/(gen)/absolute5' - | '/(gen)/absolute50' - | '/(gen)/absolute51' - | '/(gen)/absolute52' - | '/(gen)/absolute53' - | '/(gen)/absolute54' - | '/(gen)/absolute55' - | '/(gen)/absolute56' - | '/(gen)/absolute57' - | '/(gen)/absolute58' - | '/(gen)/absolute59' - | '/(gen)/absolute6' - | '/(gen)/absolute60' - | '/(gen)/absolute61' - | '/(gen)/absolute62' - | '/(gen)/absolute63' - | '/(gen)/absolute64' - | '/(gen)/absolute65' - | '/(gen)/absolute66' - | '/(gen)/absolute67' - | '/(gen)/absolute68' - | '/(gen)/absolute69' - | '/(gen)/absolute7' - | '/(gen)/absolute70' - | '/(gen)/absolute71' - | '/(gen)/absolute72' - | '/(gen)/absolute73' - | '/(gen)/absolute74' - | '/(gen)/absolute75' - | '/(gen)/absolute76' - | '/(gen)/absolute77' - | '/(gen)/absolute78' - | '/(gen)/absolute79' - | '/(gen)/absolute8' - | '/(gen)/absolute80' - | '/(gen)/absolute81' - | '/(gen)/absolute82' - | '/(gen)/absolute83' - | '/(gen)/absolute84' - | '/(gen)/absolute85' - | '/(gen)/absolute86' - | '/(gen)/absolute87' - | '/(gen)/absolute88' - | '/(gen)/absolute89' - | '/(gen)/absolute9' - | '/(gen)/absolute90' - | '/(gen)/absolute91' - | '/(gen)/absolute92' - | '/(gen)/absolute93' - | '/(gen)/absolute94' - | '/(gen)/absolute95' - | '/(gen)/absolute96' - | '/(gen)/absolute97' - | '/(gen)/absolute98' - | '/(gen)/absolute99' - | '/(gen)/relative0' - | '/(gen)/relative1' - | '/(gen)/relative10' - | '/(gen)/relative11' - | '/(gen)/relative12' - | '/(gen)/relative13' - | '/(gen)/relative14' - | '/(gen)/relative15' - | '/(gen)/relative16' - | '/(gen)/relative17' - | '/(gen)/relative18' - | '/(gen)/relative19' - | '/(gen)/relative2' - | '/(gen)/relative20' - | '/(gen)/relative21' - | '/(gen)/relative22' - | '/(gen)/relative23' - | '/(gen)/relative24' - | '/(gen)/relative25' - | '/(gen)/relative26' - | '/(gen)/relative27' - | '/(gen)/relative28' - | '/(gen)/relative29' - | '/(gen)/relative3' - | '/(gen)/relative30' - | '/(gen)/relative31' - | '/(gen)/relative32' - | '/(gen)/relative33' - | '/(gen)/relative34' - | '/(gen)/relative35' - | '/(gen)/relative36' - | '/(gen)/relative37' - | '/(gen)/relative38' - | '/(gen)/relative39' - | '/(gen)/relative4' - | '/(gen)/relative40' - | '/(gen)/relative41' - | '/(gen)/relative42' - | '/(gen)/relative43' - | '/(gen)/relative44' - | '/(gen)/relative45' - | '/(gen)/relative46' - | '/(gen)/relative47' - | '/(gen)/relative48' - | '/(gen)/relative49' - | '/(gen)/relative5' - | '/(gen)/relative50' - | '/(gen)/relative51' - | '/(gen)/relative52' - | '/(gen)/relative53' - | '/(gen)/relative54' - | '/(gen)/relative55' - | '/(gen)/relative56' - | '/(gen)/relative57' - | '/(gen)/relative58' - | '/(gen)/relative59' - | '/(gen)/relative6' - | '/(gen)/relative60' - | '/(gen)/relative61' - | '/(gen)/relative62' - | '/(gen)/relative63' - | '/(gen)/relative64' - | '/(gen)/relative65' - | '/(gen)/relative66' - | '/(gen)/relative67' - | '/(gen)/relative68' - | '/(gen)/relative69' - | '/(gen)/relative7' - | '/(gen)/relative70' - | '/(gen)/relative71' - | '/(gen)/relative72' - | '/(gen)/relative73' - | '/(gen)/relative74' - | '/(gen)/relative75' - | '/(gen)/relative76' - | '/(gen)/relative77' - | '/(gen)/relative78' - | '/(gen)/relative79' - | '/(gen)/relative8' - | '/(gen)/relative80' - | '/(gen)/relative81' - | '/(gen)/relative82' - | '/(gen)/relative83' - | '/(gen)/relative84' - | '/(gen)/relative85' - | '/(gen)/relative86' - | '/(gen)/relative87' - | '/(gen)/relative88' - | '/(gen)/relative89' - | '/(gen)/relative9' - | '/(gen)/relative90' - | '/(gen)/relative91' - | '/(gen)/relative92' - | '/(gen)/relative93' - | '/(gen)/relative94' - | '/(gen)/relative95' - | '/(gen)/relative96' - | '/(gen)/relative97' - | '/(gen)/relative98' - | '/(gen)/relative99' - | '/params/$paramsPlaceholder' - | '/search/searchPlaceholder' - | '/(gen)/params/$param0' - | '/(gen)/params/$param1' - | '/(gen)/params/$param10' - | '/(gen)/params/$param11' - | '/(gen)/params/$param12' - | '/(gen)/params/$param13' - | '/(gen)/params/$param14' - | '/(gen)/params/$param15' - | '/(gen)/params/$param16' - | '/(gen)/params/$param17' - | '/(gen)/params/$param18' - | '/(gen)/params/$param19' - | '/(gen)/params/$param2' - | '/(gen)/params/$param20' - | '/(gen)/params/$param21' - | '/(gen)/params/$param22' - | '/(gen)/params/$param23' - | '/(gen)/params/$param24' - | '/(gen)/params/$param25' - | '/(gen)/params/$param26' - | '/(gen)/params/$param27' - | '/(gen)/params/$param28' - | '/(gen)/params/$param29' - | '/(gen)/params/$param3' - | '/(gen)/params/$param30' - | '/(gen)/params/$param31' - | '/(gen)/params/$param32' - | '/(gen)/params/$param33' - | '/(gen)/params/$param34' - | '/(gen)/params/$param35' - | '/(gen)/params/$param36' - | '/(gen)/params/$param37' - | '/(gen)/params/$param38' - | '/(gen)/params/$param39' - | '/(gen)/params/$param4' - | '/(gen)/params/$param40' - | '/(gen)/params/$param41' - | '/(gen)/params/$param42' - | '/(gen)/params/$param43' - | '/(gen)/params/$param44' - | '/(gen)/params/$param45' - | '/(gen)/params/$param46' - | '/(gen)/params/$param47' - | '/(gen)/params/$param48' - | '/(gen)/params/$param49' - | '/(gen)/params/$param5' - | '/(gen)/params/$param50' - | '/(gen)/params/$param51' - | '/(gen)/params/$param52' - | '/(gen)/params/$param53' - | '/(gen)/params/$param54' - | '/(gen)/params/$param55' - | '/(gen)/params/$param56' - | '/(gen)/params/$param57' - | '/(gen)/params/$param58' - | '/(gen)/params/$param59' - | '/(gen)/params/$param6' - | '/(gen)/params/$param60' - | '/(gen)/params/$param61' - | '/(gen)/params/$param62' - | '/(gen)/params/$param63' - | '/(gen)/params/$param64' - | '/(gen)/params/$param65' - | '/(gen)/params/$param66' - | '/(gen)/params/$param67' - | '/(gen)/params/$param68' - | '/(gen)/params/$param69' - | '/(gen)/params/$param7' - | '/(gen)/params/$param70' - | '/(gen)/params/$param71' - | '/(gen)/params/$param72' - | '/(gen)/params/$param73' - | '/(gen)/params/$param74' - | '/(gen)/params/$param75' - | '/(gen)/params/$param76' - | '/(gen)/params/$param77' - | '/(gen)/params/$param78' - | '/(gen)/params/$param79' - | '/(gen)/params/$param8' - | '/(gen)/params/$param80' - | '/(gen)/params/$param81' - | '/(gen)/params/$param82' - | '/(gen)/params/$param83' - | '/(gen)/params/$param84' - | '/(gen)/params/$param85' - | '/(gen)/params/$param86' - | '/(gen)/params/$param87' - | '/(gen)/params/$param88' - | '/(gen)/params/$param89' - | '/(gen)/params/$param9' - | '/(gen)/params/$param90' - | '/(gen)/params/$param91' - | '/(gen)/params/$param92' - | '/(gen)/params/$param93' - | '/(gen)/params/$param94' - | '/(gen)/params/$param95' - | '/(gen)/params/$param96' - | '/(gen)/params/$param97' - | '/(gen)/params/$param98' - | '/(gen)/params/$param99' - | '/(gen)/search/search0' - | '/(gen)/search/search1' - | '/(gen)/search/search10' - | '/(gen)/search/search11' - | '/(gen)/search/search12' - | '/(gen)/search/search13' - | '/(gen)/search/search14' - | '/(gen)/search/search15' - | '/(gen)/search/search16' - | '/(gen)/search/search17' - | '/(gen)/search/search18' - | '/(gen)/search/search19' - | '/(gen)/search/search2' - | '/(gen)/search/search20' - | '/(gen)/search/search21' - | '/(gen)/search/search22' - | '/(gen)/search/search23' - | '/(gen)/search/search24' - | '/(gen)/search/search25' - | '/(gen)/search/search26' - | '/(gen)/search/search27' - | '/(gen)/search/search28' - | '/(gen)/search/search29' - | '/(gen)/search/search3' - | '/(gen)/search/search30' - | '/(gen)/search/search31' - | '/(gen)/search/search32' - | '/(gen)/search/search33' - | '/(gen)/search/search34' - | '/(gen)/search/search35' - | '/(gen)/search/search36' - | '/(gen)/search/search37' - | '/(gen)/search/search38' - | '/(gen)/search/search39' - | '/(gen)/search/search4' - | '/(gen)/search/search40' - | '/(gen)/search/search41' - | '/(gen)/search/search42' - | '/(gen)/search/search43' - | '/(gen)/search/search44' - | '/(gen)/search/search45' - | '/(gen)/search/search46' - | '/(gen)/search/search47' - | '/(gen)/search/search48' - | '/(gen)/search/search49' - | '/(gen)/search/search5' - | '/(gen)/search/search50' - | '/(gen)/search/search51' - | '/(gen)/search/search52' - | '/(gen)/search/search53' - | '/(gen)/search/search54' - | '/(gen)/search/search55' - | '/(gen)/search/search56' - | '/(gen)/search/search57' - | '/(gen)/search/search58' - | '/(gen)/search/search59' - | '/(gen)/search/search6' - | '/(gen)/search/search60' - | '/(gen)/search/search61' - | '/(gen)/search/search62' - | '/(gen)/search/search63' - | '/(gen)/search/search64' - | '/(gen)/search/search65' - | '/(gen)/search/search66' - | '/(gen)/search/search67' - | '/(gen)/search/search68' - | '/(gen)/search/search69' - | '/(gen)/search/search7' - | '/(gen)/search/search70' - | '/(gen)/search/search71' - | '/(gen)/search/search72' - | '/(gen)/search/search73' - | '/(gen)/search/search74' - | '/(gen)/search/search75' - | '/(gen)/search/search76' - | '/(gen)/search/search77' - | '/(gen)/search/search78' - | '/(gen)/search/search79' - | '/(gen)/search/search8' - | '/(gen)/search/search80' - | '/(gen)/search/search81' - | '/(gen)/search/search82' - | '/(gen)/search/search83' - | '/(gen)/search/search84' - | '/(gen)/search/search85' - | '/(gen)/search/search86' - | '/(gen)/search/search87' - | '/(gen)/search/search88' - | '/(gen)/search/search89' - | '/(gen)/search/search9' - | '/(gen)/search/search90' - | '/(gen)/search/search91' - | '/(gen)/search/search92' - | '/(gen)/search/search93' - | '/(gen)/search/search94' - | '/(gen)/search/search95' - | '/(gen)/search/search96' - | '/(gen)/search/search97' - | '/(gen)/search/search98' - | '/(gen)/search/search99' - fileRoutesById: FileRoutesById -} - -export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - ParamsRouteRoute: typeof ParamsRouteRouteWithChildren - SearchRouteRoute: typeof SearchRouteRouteWithChildren - AbsoluteRoute: typeof AbsoluteRoute - LinkPropsRoute: typeof LinkPropsRoute - RelativeRoute: typeof RelativeRoute - genParamsRouteRoute: typeof genParamsRouteRouteWithChildren - genSearchRouteRoute: typeof genSearchRouteRouteWithChildren - genAbsolute0Route: typeof genAbsolute0Route - genAbsolute1Route: typeof genAbsolute1Route - genAbsolute10Route: typeof genAbsolute10Route - genAbsolute11Route: typeof genAbsolute11Route - genAbsolute12Route: typeof genAbsolute12Route - genAbsolute13Route: typeof genAbsolute13Route - genAbsolute14Route: typeof genAbsolute14Route - genAbsolute15Route: typeof genAbsolute15Route - genAbsolute16Route: typeof genAbsolute16Route - genAbsolute17Route: typeof genAbsolute17Route - genAbsolute18Route: typeof genAbsolute18Route - genAbsolute19Route: typeof genAbsolute19Route - genAbsolute2Route: typeof genAbsolute2Route - genAbsolute20Route: typeof genAbsolute20Route - genAbsolute21Route: typeof genAbsolute21Route - genAbsolute22Route: typeof genAbsolute22Route - genAbsolute23Route: typeof genAbsolute23Route - genAbsolute24Route: typeof genAbsolute24Route - genAbsolute25Route: typeof genAbsolute25Route - genAbsolute26Route: typeof genAbsolute26Route - genAbsolute27Route: typeof genAbsolute27Route - genAbsolute28Route: typeof genAbsolute28Route - genAbsolute29Route: typeof genAbsolute29Route - genAbsolute3Route: typeof genAbsolute3Route - genAbsolute30Route: typeof genAbsolute30Route - genAbsolute31Route: typeof genAbsolute31Route - genAbsolute32Route: typeof genAbsolute32Route - genAbsolute33Route: typeof genAbsolute33Route - genAbsolute34Route: typeof genAbsolute34Route - genAbsolute35Route: typeof genAbsolute35Route - genAbsolute36Route: typeof genAbsolute36Route - genAbsolute37Route: typeof genAbsolute37Route - genAbsolute38Route: typeof genAbsolute38Route - genAbsolute39Route: typeof genAbsolute39Route - genAbsolute4Route: typeof genAbsolute4Route - genAbsolute40Route: typeof genAbsolute40Route - genAbsolute41Route: typeof genAbsolute41Route - genAbsolute42Route: typeof genAbsolute42Route - genAbsolute43Route: typeof genAbsolute43Route - genAbsolute44Route: typeof genAbsolute44Route - genAbsolute45Route: typeof genAbsolute45Route - genAbsolute46Route: typeof genAbsolute46Route - genAbsolute47Route: typeof genAbsolute47Route - genAbsolute48Route: typeof genAbsolute48Route - genAbsolute49Route: typeof genAbsolute49Route - genAbsolute5Route: typeof genAbsolute5Route - genAbsolute50Route: typeof genAbsolute50Route - genAbsolute51Route: typeof genAbsolute51Route - genAbsolute52Route: typeof genAbsolute52Route - genAbsolute53Route: typeof genAbsolute53Route - genAbsolute54Route: typeof genAbsolute54Route - genAbsolute55Route: typeof genAbsolute55Route - genAbsolute56Route: typeof genAbsolute56Route - genAbsolute57Route: typeof genAbsolute57Route - genAbsolute58Route: typeof genAbsolute58Route - genAbsolute59Route: typeof genAbsolute59Route - genAbsolute6Route: typeof genAbsolute6Route - genAbsolute60Route: typeof genAbsolute60Route - genAbsolute61Route: typeof genAbsolute61Route - genAbsolute62Route: typeof genAbsolute62Route - genAbsolute63Route: typeof genAbsolute63Route - genAbsolute64Route: typeof genAbsolute64Route - genAbsolute65Route: typeof genAbsolute65Route - genAbsolute66Route: typeof genAbsolute66Route - genAbsolute67Route: typeof genAbsolute67Route - genAbsolute68Route: typeof genAbsolute68Route - genAbsolute69Route: typeof genAbsolute69Route - genAbsolute7Route: typeof genAbsolute7Route - genAbsolute70Route: typeof genAbsolute70Route - genAbsolute71Route: typeof genAbsolute71Route - genAbsolute72Route: typeof genAbsolute72Route - genAbsolute73Route: typeof genAbsolute73Route - genAbsolute74Route: typeof genAbsolute74Route - genAbsolute75Route: typeof genAbsolute75Route - genAbsolute76Route: typeof genAbsolute76Route - genAbsolute77Route: typeof genAbsolute77Route - genAbsolute78Route: typeof genAbsolute78Route - genAbsolute79Route: typeof genAbsolute79Route - genAbsolute8Route: typeof genAbsolute8Route - genAbsolute80Route: typeof genAbsolute80Route - genAbsolute81Route: typeof genAbsolute81Route - genAbsolute82Route: typeof genAbsolute82Route - genAbsolute83Route: typeof genAbsolute83Route - genAbsolute84Route: typeof genAbsolute84Route - genAbsolute85Route: typeof genAbsolute85Route - genAbsolute86Route: typeof genAbsolute86Route - genAbsolute87Route: typeof genAbsolute87Route - genAbsolute88Route: typeof genAbsolute88Route - genAbsolute89Route: typeof genAbsolute89Route - genAbsolute9Route: typeof genAbsolute9Route - genAbsolute90Route: typeof genAbsolute90Route - genAbsolute91Route: typeof genAbsolute91Route - genAbsolute92Route: typeof genAbsolute92Route - genAbsolute93Route: typeof genAbsolute93Route - genAbsolute94Route: typeof genAbsolute94Route - genAbsolute95Route: typeof genAbsolute95Route - genAbsolute96Route: typeof genAbsolute96Route - genAbsolute97Route: typeof genAbsolute97Route - genAbsolute98Route: typeof genAbsolute98Route - genAbsolute99Route: typeof genAbsolute99Route - genRelative0Route: typeof genRelative0Route - genRelative1Route: typeof genRelative1Route - genRelative10Route: typeof genRelative10Route - genRelative11Route: typeof genRelative11Route - genRelative12Route: typeof genRelative12Route - genRelative13Route: typeof genRelative13Route - genRelative14Route: typeof genRelative14Route - genRelative15Route: typeof genRelative15Route - genRelative16Route: typeof genRelative16Route - genRelative17Route: typeof genRelative17Route - genRelative18Route: typeof genRelative18Route - genRelative19Route: typeof genRelative19Route - genRelative2Route: typeof genRelative2Route - genRelative20Route: typeof genRelative20Route - genRelative21Route: typeof genRelative21Route - genRelative22Route: typeof genRelative22Route - genRelative23Route: typeof genRelative23Route - genRelative24Route: typeof genRelative24Route - genRelative25Route: typeof genRelative25Route - genRelative26Route: typeof genRelative26Route - genRelative27Route: typeof genRelative27Route - genRelative28Route: typeof genRelative28Route - genRelative29Route: typeof genRelative29Route - genRelative3Route: typeof genRelative3Route - genRelative30Route: typeof genRelative30Route - genRelative31Route: typeof genRelative31Route - genRelative32Route: typeof genRelative32Route - genRelative33Route: typeof genRelative33Route - genRelative34Route: typeof genRelative34Route - genRelative35Route: typeof genRelative35Route - genRelative36Route: typeof genRelative36Route - genRelative37Route: typeof genRelative37Route - genRelative38Route: typeof genRelative38Route - genRelative39Route: typeof genRelative39Route - genRelative4Route: typeof genRelative4Route - genRelative40Route: typeof genRelative40Route - genRelative41Route: typeof genRelative41Route - genRelative42Route: typeof genRelative42Route - genRelative43Route: typeof genRelative43Route - genRelative44Route: typeof genRelative44Route - genRelative45Route: typeof genRelative45Route - genRelative46Route: typeof genRelative46Route - genRelative47Route: typeof genRelative47Route - genRelative48Route: typeof genRelative48Route - genRelative49Route: typeof genRelative49Route - genRelative5Route: typeof genRelative5Route - genRelative50Route: typeof genRelative50Route - genRelative51Route: typeof genRelative51Route - genRelative52Route: typeof genRelative52Route - genRelative53Route: typeof genRelative53Route - genRelative54Route: typeof genRelative54Route - genRelative55Route: typeof genRelative55Route - genRelative56Route: typeof genRelative56Route - genRelative57Route: typeof genRelative57Route - genRelative58Route: typeof genRelative58Route - genRelative59Route: typeof genRelative59Route - genRelative6Route: typeof genRelative6Route - genRelative60Route: typeof genRelative60Route - genRelative61Route: typeof genRelative61Route - genRelative62Route: typeof genRelative62Route - genRelative63Route: typeof genRelative63Route - genRelative64Route: typeof genRelative64Route - genRelative65Route: typeof genRelative65Route - genRelative66Route: typeof genRelative66Route - genRelative67Route: typeof genRelative67Route - genRelative68Route: typeof genRelative68Route - genRelative69Route: typeof genRelative69Route - genRelative7Route: typeof genRelative7Route - genRelative70Route: typeof genRelative70Route - genRelative71Route: typeof genRelative71Route - genRelative72Route: typeof genRelative72Route - genRelative73Route: typeof genRelative73Route - genRelative74Route: typeof genRelative74Route - genRelative75Route: typeof genRelative75Route - genRelative76Route: typeof genRelative76Route - genRelative77Route: typeof genRelative77Route - genRelative78Route: typeof genRelative78Route - genRelative79Route: typeof genRelative79Route - genRelative8Route: typeof genRelative8Route - genRelative80Route: typeof genRelative80Route - genRelative81Route: typeof genRelative81Route - genRelative82Route: typeof genRelative82Route - genRelative83Route: typeof genRelative83Route - genRelative84Route: typeof genRelative84Route - genRelative85Route: typeof genRelative85Route - genRelative86Route: typeof genRelative86Route - genRelative87Route: typeof genRelative87Route - genRelative88Route: typeof genRelative88Route - genRelative89Route: typeof genRelative89Route - genRelative9Route: typeof genRelative9Route - genRelative90Route: typeof genRelative90Route - genRelative91Route: typeof genRelative91Route - genRelative92Route: typeof genRelative92Route - genRelative93Route: typeof genRelative93Route - genRelative94Route: typeof genRelative94Route - genRelative95Route: typeof genRelative95Route - genRelative96Route: typeof genRelative96Route - genRelative97Route: typeof genRelative97Route - genRelative98Route: typeof genRelative98Route - genRelative99Route: typeof genRelative99Route -} - -const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - ParamsRouteRoute: ParamsRouteRouteWithChildren, - SearchRouteRoute: SearchRouteRouteWithChildren, - AbsoluteRoute: AbsoluteRoute, - LinkPropsRoute: LinkPropsRoute, - RelativeRoute: RelativeRoute, - genParamsRouteRoute: genParamsRouteRouteWithChildren, - genSearchRouteRoute: genSearchRouteRouteWithChildren, - genAbsolute0Route: genAbsolute0Route, - genAbsolute1Route: genAbsolute1Route, - genAbsolute10Route: genAbsolute10Route, - genAbsolute11Route: genAbsolute11Route, - genAbsolute12Route: genAbsolute12Route, - genAbsolute13Route: genAbsolute13Route, - genAbsolute14Route: genAbsolute14Route, - genAbsolute15Route: genAbsolute15Route, - genAbsolute16Route: genAbsolute16Route, - genAbsolute17Route: genAbsolute17Route, - genAbsolute18Route: genAbsolute18Route, - genAbsolute19Route: genAbsolute19Route, - genAbsolute2Route: genAbsolute2Route, - genAbsolute20Route: genAbsolute20Route, - genAbsolute21Route: genAbsolute21Route, - genAbsolute22Route: genAbsolute22Route, - genAbsolute23Route: genAbsolute23Route, - genAbsolute24Route: genAbsolute24Route, - genAbsolute25Route: genAbsolute25Route, - genAbsolute26Route: genAbsolute26Route, - genAbsolute27Route: genAbsolute27Route, - genAbsolute28Route: genAbsolute28Route, - genAbsolute29Route: genAbsolute29Route, - genAbsolute3Route: genAbsolute3Route, - genAbsolute30Route: genAbsolute30Route, - genAbsolute31Route: genAbsolute31Route, - genAbsolute32Route: genAbsolute32Route, - genAbsolute33Route: genAbsolute33Route, - genAbsolute34Route: genAbsolute34Route, - genAbsolute35Route: genAbsolute35Route, - genAbsolute36Route: genAbsolute36Route, - genAbsolute37Route: genAbsolute37Route, - genAbsolute38Route: genAbsolute38Route, - genAbsolute39Route: genAbsolute39Route, - genAbsolute4Route: genAbsolute4Route, - genAbsolute40Route: genAbsolute40Route, - genAbsolute41Route: genAbsolute41Route, - genAbsolute42Route: genAbsolute42Route, - genAbsolute43Route: genAbsolute43Route, - genAbsolute44Route: genAbsolute44Route, - genAbsolute45Route: genAbsolute45Route, - genAbsolute46Route: genAbsolute46Route, - genAbsolute47Route: genAbsolute47Route, - genAbsolute48Route: genAbsolute48Route, - genAbsolute49Route: genAbsolute49Route, - genAbsolute5Route: genAbsolute5Route, - genAbsolute50Route: genAbsolute50Route, - genAbsolute51Route: genAbsolute51Route, - genAbsolute52Route: genAbsolute52Route, - genAbsolute53Route: genAbsolute53Route, - genAbsolute54Route: genAbsolute54Route, - genAbsolute55Route: genAbsolute55Route, - genAbsolute56Route: genAbsolute56Route, - genAbsolute57Route: genAbsolute57Route, - genAbsolute58Route: genAbsolute58Route, - genAbsolute59Route: genAbsolute59Route, - genAbsolute6Route: genAbsolute6Route, - genAbsolute60Route: genAbsolute60Route, - genAbsolute61Route: genAbsolute61Route, - genAbsolute62Route: genAbsolute62Route, - genAbsolute63Route: genAbsolute63Route, - genAbsolute64Route: genAbsolute64Route, - genAbsolute65Route: genAbsolute65Route, - genAbsolute66Route: genAbsolute66Route, - genAbsolute67Route: genAbsolute67Route, - genAbsolute68Route: genAbsolute68Route, - genAbsolute69Route: genAbsolute69Route, - genAbsolute7Route: genAbsolute7Route, - genAbsolute70Route: genAbsolute70Route, - genAbsolute71Route: genAbsolute71Route, - genAbsolute72Route: genAbsolute72Route, - genAbsolute73Route: genAbsolute73Route, - genAbsolute74Route: genAbsolute74Route, - genAbsolute75Route: genAbsolute75Route, - genAbsolute76Route: genAbsolute76Route, - genAbsolute77Route: genAbsolute77Route, - genAbsolute78Route: genAbsolute78Route, - genAbsolute79Route: genAbsolute79Route, - genAbsolute8Route: genAbsolute8Route, - genAbsolute80Route: genAbsolute80Route, - genAbsolute81Route: genAbsolute81Route, - genAbsolute82Route: genAbsolute82Route, - genAbsolute83Route: genAbsolute83Route, - genAbsolute84Route: genAbsolute84Route, - genAbsolute85Route: genAbsolute85Route, - genAbsolute86Route: genAbsolute86Route, - genAbsolute87Route: genAbsolute87Route, - genAbsolute88Route: genAbsolute88Route, - genAbsolute89Route: genAbsolute89Route, - genAbsolute9Route: genAbsolute9Route, - genAbsolute90Route: genAbsolute90Route, - genAbsolute91Route: genAbsolute91Route, - genAbsolute92Route: genAbsolute92Route, - genAbsolute93Route: genAbsolute93Route, - genAbsolute94Route: genAbsolute94Route, - genAbsolute95Route: genAbsolute95Route, - genAbsolute96Route: genAbsolute96Route, - genAbsolute97Route: genAbsolute97Route, - genAbsolute98Route: genAbsolute98Route, - genAbsolute99Route: genAbsolute99Route, - genRelative0Route: genRelative0Route, - genRelative1Route: genRelative1Route, - genRelative10Route: genRelative10Route, - genRelative11Route: genRelative11Route, - genRelative12Route: genRelative12Route, - genRelative13Route: genRelative13Route, - genRelative14Route: genRelative14Route, - genRelative15Route: genRelative15Route, - genRelative16Route: genRelative16Route, - genRelative17Route: genRelative17Route, - genRelative18Route: genRelative18Route, - genRelative19Route: genRelative19Route, - genRelative2Route: genRelative2Route, - genRelative20Route: genRelative20Route, - genRelative21Route: genRelative21Route, - genRelative22Route: genRelative22Route, - genRelative23Route: genRelative23Route, - genRelative24Route: genRelative24Route, - genRelative25Route: genRelative25Route, - genRelative26Route: genRelative26Route, - genRelative27Route: genRelative27Route, - genRelative28Route: genRelative28Route, - genRelative29Route: genRelative29Route, - genRelative3Route: genRelative3Route, - genRelative30Route: genRelative30Route, - genRelative31Route: genRelative31Route, - genRelative32Route: genRelative32Route, - genRelative33Route: genRelative33Route, - genRelative34Route: genRelative34Route, - genRelative35Route: genRelative35Route, - genRelative36Route: genRelative36Route, - genRelative37Route: genRelative37Route, - genRelative38Route: genRelative38Route, - genRelative39Route: genRelative39Route, - genRelative4Route: genRelative4Route, - genRelative40Route: genRelative40Route, - genRelative41Route: genRelative41Route, - genRelative42Route: genRelative42Route, - genRelative43Route: genRelative43Route, - genRelative44Route: genRelative44Route, - genRelative45Route: genRelative45Route, - genRelative46Route: genRelative46Route, - genRelative47Route: genRelative47Route, - genRelative48Route: genRelative48Route, - genRelative49Route: genRelative49Route, - genRelative5Route: genRelative5Route, - genRelative50Route: genRelative50Route, - genRelative51Route: genRelative51Route, - genRelative52Route: genRelative52Route, - genRelative53Route: genRelative53Route, - genRelative54Route: genRelative54Route, - genRelative55Route: genRelative55Route, - genRelative56Route: genRelative56Route, - genRelative57Route: genRelative57Route, - genRelative58Route: genRelative58Route, - genRelative59Route: genRelative59Route, - genRelative6Route: genRelative6Route, - genRelative60Route: genRelative60Route, - genRelative61Route: genRelative61Route, - genRelative62Route: genRelative62Route, - genRelative63Route: genRelative63Route, - genRelative64Route: genRelative64Route, - genRelative65Route: genRelative65Route, - genRelative66Route: genRelative66Route, - genRelative67Route: genRelative67Route, - genRelative68Route: genRelative68Route, - genRelative69Route: genRelative69Route, - genRelative7Route: genRelative7Route, - genRelative70Route: genRelative70Route, - genRelative71Route: genRelative71Route, - genRelative72Route: genRelative72Route, - genRelative73Route: genRelative73Route, - genRelative74Route: genRelative74Route, - genRelative75Route: genRelative75Route, - genRelative76Route: genRelative76Route, - genRelative77Route: genRelative77Route, - genRelative78Route: genRelative78Route, - genRelative79Route: genRelative79Route, - genRelative8Route: genRelative8Route, - genRelative80Route: genRelative80Route, - genRelative81Route: genRelative81Route, - genRelative82Route: genRelative82Route, - genRelative83Route: genRelative83Route, - genRelative84Route: genRelative84Route, - genRelative85Route: genRelative85Route, - genRelative86Route: genRelative86Route, - genRelative87Route: genRelative87Route, - genRelative88Route: genRelative88Route, - genRelative89Route: genRelative89Route, - genRelative9Route: genRelative9Route, - genRelative90Route: genRelative90Route, - genRelative91Route: genRelative91Route, - genRelative92Route: genRelative92Route, - genRelative93Route: genRelative93Route, - genRelative94Route: genRelative94Route, - genRelative95Route: genRelative95Route, - genRelative96Route: genRelative96Route, - genRelative97Route: genRelative97Route, - genRelative98Route: genRelative98Route, - genRelative99Route: genRelative99Route, -} - -export const routeTree = rootRoute - ._addFileChildren(rootRouteChildren) - ._addFileTypes() - -/* ROUTE_MANIFEST_START -{ - "routes": { - "__root__": { - "filePath": "__root.tsx", - "children": [ - "/", - "/params", - "/search", - "/absolute", - "/linkProps", - "/relative", - "/(gen)/params", - "/(gen)/search", - "/(gen)/absolute0", - "/(gen)/absolute1", - "/(gen)/absolute10", - "/(gen)/absolute11", - "/(gen)/absolute12", - "/(gen)/absolute13", - "/(gen)/absolute14", - "/(gen)/absolute15", - "/(gen)/absolute16", - "/(gen)/absolute17", - "/(gen)/absolute18", - "/(gen)/absolute19", - "/(gen)/absolute2", - "/(gen)/absolute20", - "/(gen)/absolute21", - "/(gen)/absolute22", - "/(gen)/absolute23", - "/(gen)/absolute24", - "/(gen)/absolute25", - "/(gen)/absolute26", - "/(gen)/absolute27", - "/(gen)/absolute28", - "/(gen)/absolute29", - "/(gen)/absolute3", - "/(gen)/absolute30", - "/(gen)/absolute31", - "/(gen)/absolute32", - "/(gen)/absolute33", - "/(gen)/absolute34", - "/(gen)/absolute35", - "/(gen)/absolute36", - "/(gen)/absolute37", - "/(gen)/absolute38", - "/(gen)/absolute39", - "/(gen)/absolute4", - "/(gen)/absolute40", - "/(gen)/absolute41", - "/(gen)/absolute42", - "/(gen)/absolute43", - "/(gen)/absolute44", - "/(gen)/absolute45", - "/(gen)/absolute46", - "/(gen)/absolute47", - "/(gen)/absolute48", - "/(gen)/absolute49", - "/(gen)/absolute5", - "/(gen)/absolute50", - "/(gen)/absolute51", - "/(gen)/absolute52", - "/(gen)/absolute53", - "/(gen)/absolute54", - "/(gen)/absolute55", - "/(gen)/absolute56", - "/(gen)/absolute57", - "/(gen)/absolute58", - "/(gen)/absolute59", - "/(gen)/absolute6", - "/(gen)/absolute60", - "/(gen)/absolute61", - "/(gen)/absolute62", - "/(gen)/absolute63", - "/(gen)/absolute64", - "/(gen)/absolute65", - "/(gen)/absolute66", - "/(gen)/absolute67", - "/(gen)/absolute68", - "/(gen)/absolute69", - "/(gen)/absolute7", - "/(gen)/absolute70", - "/(gen)/absolute71", - "/(gen)/absolute72", - "/(gen)/absolute73", - "/(gen)/absolute74", - "/(gen)/absolute75", - "/(gen)/absolute76", - "/(gen)/absolute77", - "/(gen)/absolute78", - "/(gen)/absolute79", - "/(gen)/absolute8", - "/(gen)/absolute80", - "/(gen)/absolute81", - "/(gen)/absolute82", - "/(gen)/absolute83", - "/(gen)/absolute84", - "/(gen)/absolute85", - "/(gen)/absolute86", - "/(gen)/absolute87", - "/(gen)/absolute88", - "/(gen)/absolute89", - "/(gen)/absolute9", - "/(gen)/absolute90", - "/(gen)/absolute91", - "/(gen)/absolute92", - "/(gen)/absolute93", - "/(gen)/absolute94", - "/(gen)/absolute95", - "/(gen)/absolute96", - "/(gen)/absolute97", - "/(gen)/absolute98", - "/(gen)/absolute99", - "/(gen)/relative0", - "/(gen)/relative1", - "/(gen)/relative10", - "/(gen)/relative11", - "/(gen)/relative12", - "/(gen)/relative13", - "/(gen)/relative14", - "/(gen)/relative15", - "/(gen)/relative16", - "/(gen)/relative17", - "/(gen)/relative18", - "/(gen)/relative19", - "/(gen)/relative2", - "/(gen)/relative20", - "/(gen)/relative21", - "/(gen)/relative22", - "/(gen)/relative23", - "/(gen)/relative24", - "/(gen)/relative25", - "/(gen)/relative26", - "/(gen)/relative27", - "/(gen)/relative28", - "/(gen)/relative29", - "/(gen)/relative3", - "/(gen)/relative30", - "/(gen)/relative31", - "/(gen)/relative32", - "/(gen)/relative33", - "/(gen)/relative34", - "/(gen)/relative35", - "/(gen)/relative36", - "/(gen)/relative37", - "/(gen)/relative38", - "/(gen)/relative39", - "/(gen)/relative4", - "/(gen)/relative40", - "/(gen)/relative41", - "/(gen)/relative42", - "/(gen)/relative43", - "/(gen)/relative44", - "/(gen)/relative45", - "/(gen)/relative46", - "/(gen)/relative47", - "/(gen)/relative48", - "/(gen)/relative49", - "/(gen)/relative5", - "/(gen)/relative50", - "/(gen)/relative51", - "/(gen)/relative52", - "/(gen)/relative53", - "/(gen)/relative54", - "/(gen)/relative55", - "/(gen)/relative56", - "/(gen)/relative57", - "/(gen)/relative58", - "/(gen)/relative59", - "/(gen)/relative6", - "/(gen)/relative60", - "/(gen)/relative61", - "/(gen)/relative62", - "/(gen)/relative63", - "/(gen)/relative64", - "/(gen)/relative65", - "/(gen)/relative66", - "/(gen)/relative67", - "/(gen)/relative68", - "/(gen)/relative69", - "/(gen)/relative7", - "/(gen)/relative70", - "/(gen)/relative71", - "/(gen)/relative72", - "/(gen)/relative73", - "/(gen)/relative74", - "/(gen)/relative75", - "/(gen)/relative76", - "/(gen)/relative77", - "/(gen)/relative78", - "/(gen)/relative79", - "/(gen)/relative8", - "/(gen)/relative80", - "/(gen)/relative81", - "/(gen)/relative82", - "/(gen)/relative83", - "/(gen)/relative84", - "/(gen)/relative85", - "/(gen)/relative86", - "/(gen)/relative87", - "/(gen)/relative88", - "/(gen)/relative89", - "/(gen)/relative9", - "/(gen)/relative90", - "/(gen)/relative91", - "/(gen)/relative92", - "/(gen)/relative93", - "/(gen)/relative94", - "/(gen)/relative95", - "/(gen)/relative96", - "/(gen)/relative97", - "/(gen)/relative98", - "/(gen)/relative99" - ] - }, - "/": { - "filePath": "index.tsx" - }, - "/params": { - "filePath": "params/route.tsx", - "children": [ - "/params/$paramsPlaceholder" - ] - }, - "/search": { - "filePath": "search/route.tsx", - "children": [ - "/search/searchPlaceholder" - ] - }, - "/absolute": { - "filePath": "absolute.tsx" - }, - "/linkProps": { - "filePath": "linkProps.tsx" - }, - "/relative": { - "filePath": "relative.tsx" - }, - "/(gen)/params": { - "filePath": "(gen)/params/route.tsx", - "children": [ - "/(gen)/params/$param0", - "/(gen)/params/$param1", - "/(gen)/params/$param10", - "/(gen)/params/$param11", - "/(gen)/params/$param12", - "/(gen)/params/$param13", - "/(gen)/params/$param14", - "/(gen)/params/$param15", - "/(gen)/params/$param16", - "/(gen)/params/$param17", - "/(gen)/params/$param18", - "/(gen)/params/$param19", - "/(gen)/params/$param2", - "/(gen)/params/$param20", - "/(gen)/params/$param21", - "/(gen)/params/$param22", - "/(gen)/params/$param23", - "/(gen)/params/$param24", - "/(gen)/params/$param25", - "/(gen)/params/$param26", - "/(gen)/params/$param27", - "/(gen)/params/$param28", - "/(gen)/params/$param29", - "/(gen)/params/$param3", - "/(gen)/params/$param30", - "/(gen)/params/$param31", - "/(gen)/params/$param32", - "/(gen)/params/$param33", - "/(gen)/params/$param34", - "/(gen)/params/$param35", - "/(gen)/params/$param36", - "/(gen)/params/$param37", - "/(gen)/params/$param38", - "/(gen)/params/$param39", - "/(gen)/params/$param4", - "/(gen)/params/$param40", - "/(gen)/params/$param41", - "/(gen)/params/$param42", - "/(gen)/params/$param43", - "/(gen)/params/$param44", - "/(gen)/params/$param45", - "/(gen)/params/$param46", - "/(gen)/params/$param47", - "/(gen)/params/$param48", - "/(gen)/params/$param49", - "/(gen)/params/$param5", - "/(gen)/params/$param50", - "/(gen)/params/$param51", - "/(gen)/params/$param52", - "/(gen)/params/$param53", - "/(gen)/params/$param54", - "/(gen)/params/$param55", - "/(gen)/params/$param56", - "/(gen)/params/$param57", - "/(gen)/params/$param58", - "/(gen)/params/$param59", - "/(gen)/params/$param6", - "/(gen)/params/$param60", - "/(gen)/params/$param61", - "/(gen)/params/$param62", - "/(gen)/params/$param63", - "/(gen)/params/$param64", - "/(gen)/params/$param65", - "/(gen)/params/$param66", - "/(gen)/params/$param67", - "/(gen)/params/$param68", - "/(gen)/params/$param69", - "/(gen)/params/$param7", - "/(gen)/params/$param70", - "/(gen)/params/$param71", - "/(gen)/params/$param72", - "/(gen)/params/$param73", - "/(gen)/params/$param74", - "/(gen)/params/$param75", - "/(gen)/params/$param76", - "/(gen)/params/$param77", - "/(gen)/params/$param78", - "/(gen)/params/$param79", - "/(gen)/params/$param8", - "/(gen)/params/$param80", - "/(gen)/params/$param81", - "/(gen)/params/$param82", - "/(gen)/params/$param83", - "/(gen)/params/$param84", - "/(gen)/params/$param85", - "/(gen)/params/$param86", - "/(gen)/params/$param87", - "/(gen)/params/$param88", - "/(gen)/params/$param89", - "/(gen)/params/$param9", - "/(gen)/params/$param90", - "/(gen)/params/$param91", - "/(gen)/params/$param92", - "/(gen)/params/$param93", - "/(gen)/params/$param94", - "/(gen)/params/$param95", - "/(gen)/params/$param96", - "/(gen)/params/$param97", - "/(gen)/params/$param98", - "/(gen)/params/$param99" - ] - }, - "/(gen)/search": { - "filePath": "(gen)/search/route.tsx", - "children": [ - "/(gen)/search/search0", - "/(gen)/search/search1", - "/(gen)/search/search10", - "/(gen)/search/search11", - "/(gen)/search/search12", - "/(gen)/search/search13", - "/(gen)/search/search14", - "/(gen)/search/search15", - "/(gen)/search/search16", - "/(gen)/search/search17", - "/(gen)/search/search18", - "/(gen)/search/search19", - "/(gen)/search/search2", - "/(gen)/search/search20", - "/(gen)/search/search21", - "/(gen)/search/search22", - "/(gen)/search/search23", - "/(gen)/search/search24", - "/(gen)/search/search25", - "/(gen)/search/search26", - "/(gen)/search/search27", - "/(gen)/search/search28", - "/(gen)/search/search29", - "/(gen)/search/search3", - "/(gen)/search/search30", - "/(gen)/search/search31", - "/(gen)/search/search32", - "/(gen)/search/search33", - "/(gen)/search/search34", - "/(gen)/search/search35", - "/(gen)/search/search36", - "/(gen)/search/search37", - "/(gen)/search/search38", - "/(gen)/search/search39", - "/(gen)/search/search4", - "/(gen)/search/search40", - "/(gen)/search/search41", - "/(gen)/search/search42", - "/(gen)/search/search43", - "/(gen)/search/search44", - "/(gen)/search/search45", - "/(gen)/search/search46", - "/(gen)/search/search47", - "/(gen)/search/search48", - "/(gen)/search/search49", - "/(gen)/search/search5", - "/(gen)/search/search50", - "/(gen)/search/search51", - "/(gen)/search/search52", - "/(gen)/search/search53", - "/(gen)/search/search54", - "/(gen)/search/search55", - "/(gen)/search/search56", - "/(gen)/search/search57", - "/(gen)/search/search58", - "/(gen)/search/search59", - "/(gen)/search/search6", - "/(gen)/search/search60", - "/(gen)/search/search61", - "/(gen)/search/search62", - "/(gen)/search/search63", - "/(gen)/search/search64", - "/(gen)/search/search65", - "/(gen)/search/search66", - "/(gen)/search/search67", - "/(gen)/search/search68", - "/(gen)/search/search69", - "/(gen)/search/search7", - "/(gen)/search/search70", - "/(gen)/search/search71", - "/(gen)/search/search72", - "/(gen)/search/search73", - "/(gen)/search/search74", - "/(gen)/search/search75", - "/(gen)/search/search76", - "/(gen)/search/search77", - "/(gen)/search/search78", - "/(gen)/search/search79", - "/(gen)/search/search8", - "/(gen)/search/search80", - "/(gen)/search/search81", - "/(gen)/search/search82", - "/(gen)/search/search83", - "/(gen)/search/search84", - "/(gen)/search/search85", - "/(gen)/search/search86", - "/(gen)/search/search87", - "/(gen)/search/search88", - "/(gen)/search/search89", - "/(gen)/search/search9", - "/(gen)/search/search90", - "/(gen)/search/search91", - "/(gen)/search/search92", - "/(gen)/search/search93", - "/(gen)/search/search94", - "/(gen)/search/search95", - "/(gen)/search/search96", - "/(gen)/search/search97", - "/(gen)/search/search98", - "/(gen)/search/search99" - ] - }, - "/(gen)/absolute0": { - "filePath": "(gen)/absolute0.tsx" - }, - "/(gen)/absolute1": { - "filePath": "(gen)/absolute1.tsx" - }, - "/(gen)/absolute10": { - "filePath": "(gen)/absolute10.tsx" - }, - "/(gen)/absolute11": { - "filePath": "(gen)/absolute11.tsx" - }, - "/(gen)/absolute12": { - "filePath": "(gen)/absolute12.tsx" - }, - "/(gen)/absolute13": { - "filePath": "(gen)/absolute13.tsx" - }, - "/(gen)/absolute14": { - "filePath": "(gen)/absolute14.tsx" - }, - "/(gen)/absolute15": { - "filePath": "(gen)/absolute15.tsx" - }, - "/(gen)/absolute16": { - "filePath": "(gen)/absolute16.tsx" - }, - "/(gen)/absolute17": { - "filePath": "(gen)/absolute17.tsx" - }, - "/(gen)/absolute18": { - "filePath": "(gen)/absolute18.tsx" - }, - "/(gen)/absolute19": { - "filePath": "(gen)/absolute19.tsx" - }, - "/(gen)/absolute2": { - "filePath": "(gen)/absolute2.tsx" - }, - "/(gen)/absolute20": { - "filePath": "(gen)/absolute20.tsx" - }, - "/(gen)/absolute21": { - "filePath": "(gen)/absolute21.tsx" - }, - "/(gen)/absolute22": { - "filePath": "(gen)/absolute22.tsx" - }, - "/(gen)/absolute23": { - "filePath": "(gen)/absolute23.tsx" - }, - "/(gen)/absolute24": { - "filePath": "(gen)/absolute24.tsx" - }, - "/(gen)/absolute25": { - "filePath": "(gen)/absolute25.tsx" - }, - "/(gen)/absolute26": { - "filePath": "(gen)/absolute26.tsx" - }, - "/(gen)/absolute27": { - "filePath": "(gen)/absolute27.tsx" - }, - "/(gen)/absolute28": { - "filePath": "(gen)/absolute28.tsx" - }, - "/(gen)/absolute29": { - "filePath": "(gen)/absolute29.tsx" - }, - "/(gen)/absolute3": { - "filePath": "(gen)/absolute3.tsx" - }, - "/(gen)/absolute30": { - "filePath": "(gen)/absolute30.tsx" - }, - "/(gen)/absolute31": { - "filePath": "(gen)/absolute31.tsx" - }, - "/(gen)/absolute32": { - "filePath": "(gen)/absolute32.tsx" - }, - "/(gen)/absolute33": { - "filePath": "(gen)/absolute33.tsx" - }, - "/(gen)/absolute34": { - "filePath": "(gen)/absolute34.tsx" - }, - "/(gen)/absolute35": { - "filePath": "(gen)/absolute35.tsx" - }, - "/(gen)/absolute36": { - "filePath": "(gen)/absolute36.tsx" - }, - "/(gen)/absolute37": { - "filePath": "(gen)/absolute37.tsx" - }, - "/(gen)/absolute38": { - "filePath": "(gen)/absolute38.tsx" - }, - "/(gen)/absolute39": { - "filePath": "(gen)/absolute39.tsx" - }, - "/(gen)/absolute4": { - "filePath": "(gen)/absolute4.tsx" - }, - "/(gen)/absolute40": { - "filePath": "(gen)/absolute40.tsx" - }, - "/(gen)/absolute41": { - "filePath": "(gen)/absolute41.tsx" - }, - "/(gen)/absolute42": { - "filePath": "(gen)/absolute42.tsx" - }, - "/(gen)/absolute43": { - "filePath": "(gen)/absolute43.tsx" - }, - "/(gen)/absolute44": { - "filePath": "(gen)/absolute44.tsx" - }, - "/(gen)/absolute45": { - "filePath": "(gen)/absolute45.tsx" - }, - "/(gen)/absolute46": { - "filePath": "(gen)/absolute46.tsx" - }, - "/(gen)/absolute47": { - "filePath": "(gen)/absolute47.tsx" - }, - "/(gen)/absolute48": { - "filePath": "(gen)/absolute48.tsx" - }, - "/(gen)/absolute49": { - "filePath": "(gen)/absolute49.tsx" - }, - "/(gen)/absolute5": { - "filePath": "(gen)/absolute5.tsx" - }, - "/(gen)/absolute50": { - "filePath": "(gen)/absolute50.tsx" - }, - "/(gen)/absolute51": { - "filePath": "(gen)/absolute51.tsx" - }, - "/(gen)/absolute52": { - "filePath": "(gen)/absolute52.tsx" - }, - "/(gen)/absolute53": { - "filePath": "(gen)/absolute53.tsx" - }, - "/(gen)/absolute54": { - "filePath": "(gen)/absolute54.tsx" - }, - "/(gen)/absolute55": { - "filePath": "(gen)/absolute55.tsx" - }, - "/(gen)/absolute56": { - "filePath": "(gen)/absolute56.tsx" - }, - "/(gen)/absolute57": { - "filePath": "(gen)/absolute57.tsx" - }, - "/(gen)/absolute58": { - "filePath": "(gen)/absolute58.tsx" - }, - "/(gen)/absolute59": { - "filePath": "(gen)/absolute59.tsx" - }, - "/(gen)/absolute6": { - "filePath": "(gen)/absolute6.tsx" - }, - "/(gen)/absolute60": { - "filePath": "(gen)/absolute60.tsx" - }, - "/(gen)/absolute61": { - "filePath": "(gen)/absolute61.tsx" - }, - "/(gen)/absolute62": { - "filePath": "(gen)/absolute62.tsx" - }, - "/(gen)/absolute63": { - "filePath": "(gen)/absolute63.tsx" - }, - "/(gen)/absolute64": { - "filePath": "(gen)/absolute64.tsx" - }, - "/(gen)/absolute65": { - "filePath": "(gen)/absolute65.tsx" - }, - "/(gen)/absolute66": { - "filePath": "(gen)/absolute66.tsx" - }, - "/(gen)/absolute67": { - "filePath": "(gen)/absolute67.tsx" - }, - "/(gen)/absolute68": { - "filePath": "(gen)/absolute68.tsx" - }, - "/(gen)/absolute69": { - "filePath": "(gen)/absolute69.tsx" - }, - "/(gen)/absolute7": { - "filePath": "(gen)/absolute7.tsx" - }, - "/(gen)/absolute70": { - "filePath": "(gen)/absolute70.tsx" - }, - "/(gen)/absolute71": { - "filePath": "(gen)/absolute71.tsx" - }, - "/(gen)/absolute72": { - "filePath": "(gen)/absolute72.tsx" - }, - "/(gen)/absolute73": { - "filePath": "(gen)/absolute73.tsx" - }, - "/(gen)/absolute74": { - "filePath": "(gen)/absolute74.tsx" - }, - "/(gen)/absolute75": { - "filePath": "(gen)/absolute75.tsx" - }, - "/(gen)/absolute76": { - "filePath": "(gen)/absolute76.tsx" - }, - "/(gen)/absolute77": { - "filePath": "(gen)/absolute77.tsx" - }, - "/(gen)/absolute78": { - "filePath": "(gen)/absolute78.tsx" - }, - "/(gen)/absolute79": { - "filePath": "(gen)/absolute79.tsx" - }, - "/(gen)/absolute8": { - "filePath": "(gen)/absolute8.tsx" - }, - "/(gen)/absolute80": { - "filePath": "(gen)/absolute80.tsx" - }, - "/(gen)/absolute81": { - "filePath": "(gen)/absolute81.tsx" - }, - "/(gen)/absolute82": { - "filePath": "(gen)/absolute82.tsx" - }, - "/(gen)/absolute83": { - "filePath": "(gen)/absolute83.tsx" - }, - "/(gen)/absolute84": { - "filePath": "(gen)/absolute84.tsx" - }, - "/(gen)/absolute85": { - "filePath": "(gen)/absolute85.tsx" - }, - "/(gen)/absolute86": { - "filePath": "(gen)/absolute86.tsx" - }, - "/(gen)/absolute87": { - "filePath": "(gen)/absolute87.tsx" - }, - "/(gen)/absolute88": { - "filePath": "(gen)/absolute88.tsx" - }, - "/(gen)/absolute89": { - "filePath": "(gen)/absolute89.tsx" - }, - "/(gen)/absolute9": { - "filePath": "(gen)/absolute9.tsx" - }, - "/(gen)/absolute90": { - "filePath": "(gen)/absolute90.tsx" - }, - "/(gen)/absolute91": { - "filePath": "(gen)/absolute91.tsx" - }, - "/(gen)/absolute92": { - "filePath": "(gen)/absolute92.tsx" - }, - "/(gen)/absolute93": { - "filePath": "(gen)/absolute93.tsx" - }, - "/(gen)/absolute94": { - "filePath": "(gen)/absolute94.tsx" - }, - "/(gen)/absolute95": { - "filePath": "(gen)/absolute95.tsx" - }, - "/(gen)/absolute96": { - "filePath": "(gen)/absolute96.tsx" - }, - "/(gen)/absolute97": { - "filePath": "(gen)/absolute97.tsx" - }, - "/(gen)/absolute98": { - "filePath": "(gen)/absolute98.tsx" - }, - "/(gen)/absolute99": { - "filePath": "(gen)/absolute99.tsx" - }, - "/(gen)/relative0": { - "filePath": "(gen)/relative0.tsx" - }, - "/(gen)/relative1": { - "filePath": "(gen)/relative1.tsx" - }, - "/(gen)/relative10": { - "filePath": "(gen)/relative10.tsx" - }, - "/(gen)/relative11": { - "filePath": "(gen)/relative11.tsx" - }, - "/(gen)/relative12": { - "filePath": "(gen)/relative12.tsx" - }, - "/(gen)/relative13": { - "filePath": "(gen)/relative13.tsx" - }, - "/(gen)/relative14": { - "filePath": "(gen)/relative14.tsx" - }, - "/(gen)/relative15": { - "filePath": "(gen)/relative15.tsx" - }, - "/(gen)/relative16": { - "filePath": "(gen)/relative16.tsx" - }, - "/(gen)/relative17": { - "filePath": "(gen)/relative17.tsx" - }, - "/(gen)/relative18": { - "filePath": "(gen)/relative18.tsx" - }, - "/(gen)/relative19": { - "filePath": "(gen)/relative19.tsx" - }, - "/(gen)/relative2": { - "filePath": "(gen)/relative2.tsx" - }, - "/(gen)/relative20": { - "filePath": "(gen)/relative20.tsx" - }, - "/(gen)/relative21": { - "filePath": "(gen)/relative21.tsx" - }, - "/(gen)/relative22": { - "filePath": "(gen)/relative22.tsx" - }, - "/(gen)/relative23": { - "filePath": "(gen)/relative23.tsx" - }, - "/(gen)/relative24": { - "filePath": "(gen)/relative24.tsx" - }, - "/(gen)/relative25": { - "filePath": "(gen)/relative25.tsx" - }, - "/(gen)/relative26": { - "filePath": "(gen)/relative26.tsx" - }, - "/(gen)/relative27": { - "filePath": "(gen)/relative27.tsx" - }, - "/(gen)/relative28": { - "filePath": "(gen)/relative28.tsx" - }, - "/(gen)/relative29": { - "filePath": "(gen)/relative29.tsx" - }, - "/(gen)/relative3": { - "filePath": "(gen)/relative3.tsx" - }, - "/(gen)/relative30": { - "filePath": "(gen)/relative30.tsx" - }, - "/(gen)/relative31": { - "filePath": "(gen)/relative31.tsx" - }, - "/(gen)/relative32": { - "filePath": "(gen)/relative32.tsx" - }, - "/(gen)/relative33": { - "filePath": "(gen)/relative33.tsx" - }, - "/(gen)/relative34": { - "filePath": "(gen)/relative34.tsx" - }, - "/(gen)/relative35": { - "filePath": "(gen)/relative35.tsx" - }, - "/(gen)/relative36": { - "filePath": "(gen)/relative36.tsx" - }, - "/(gen)/relative37": { - "filePath": "(gen)/relative37.tsx" - }, - "/(gen)/relative38": { - "filePath": "(gen)/relative38.tsx" - }, - "/(gen)/relative39": { - "filePath": "(gen)/relative39.tsx" - }, - "/(gen)/relative4": { - "filePath": "(gen)/relative4.tsx" - }, - "/(gen)/relative40": { - "filePath": "(gen)/relative40.tsx" - }, - "/(gen)/relative41": { - "filePath": "(gen)/relative41.tsx" - }, - "/(gen)/relative42": { - "filePath": "(gen)/relative42.tsx" - }, - "/(gen)/relative43": { - "filePath": "(gen)/relative43.tsx" - }, - "/(gen)/relative44": { - "filePath": "(gen)/relative44.tsx" - }, - "/(gen)/relative45": { - "filePath": "(gen)/relative45.tsx" - }, - "/(gen)/relative46": { - "filePath": "(gen)/relative46.tsx" - }, - "/(gen)/relative47": { - "filePath": "(gen)/relative47.tsx" - }, - "/(gen)/relative48": { - "filePath": "(gen)/relative48.tsx" - }, - "/(gen)/relative49": { - "filePath": "(gen)/relative49.tsx" - }, - "/(gen)/relative5": { - "filePath": "(gen)/relative5.tsx" - }, - "/(gen)/relative50": { - "filePath": "(gen)/relative50.tsx" - }, - "/(gen)/relative51": { - "filePath": "(gen)/relative51.tsx" - }, - "/(gen)/relative52": { - "filePath": "(gen)/relative52.tsx" - }, - "/(gen)/relative53": { - "filePath": "(gen)/relative53.tsx" - }, - "/(gen)/relative54": { - "filePath": "(gen)/relative54.tsx" - }, - "/(gen)/relative55": { - "filePath": "(gen)/relative55.tsx" - }, - "/(gen)/relative56": { - "filePath": "(gen)/relative56.tsx" - }, - "/(gen)/relative57": { - "filePath": "(gen)/relative57.tsx" - }, - "/(gen)/relative58": { - "filePath": "(gen)/relative58.tsx" - }, - "/(gen)/relative59": { - "filePath": "(gen)/relative59.tsx" - }, - "/(gen)/relative6": { - "filePath": "(gen)/relative6.tsx" - }, - "/(gen)/relative60": { - "filePath": "(gen)/relative60.tsx" - }, - "/(gen)/relative61": { - "filePath": "(gen)/relative61.tsx" - }, - "/(gen)/relative62": { - "filePath": "(gen)/relative62.tsx" - }, - "/(gen)/relative63": { - "filePath": "(gen)/relative63.tsx" - }, - "/(gen)/relative64": { - "filePath": "(gen)/relative64.tsx" - }, - "/(gen)/relative65": { - "filePath": "(gen)/relative65.tsx" - }, - "/(gen)/relative66": { - "filePath": "(gen)/relative66.tsx" - }, - "/(gen)/relative67": { - "filePath": "(gen)/relative67.tsx" - }, - "/(gen)/relative68": { - "filePath": "(gen)/relative68.tsx" - }, - "/(gen)/relative69": { - "filePath": "(gen)/relative69.tsx" - }, - "/(gen)/relative7": { - "filePath": "(gen)/relative7.tsx" - }, - "/(gen)/relative70": { - "filePath": "(gen)/relative70.tsx" - }, - "/(gen)/relative71": { - "filePath": "(gen)/relative71.tsx" - }, - "/(gen)/relative72": { - "filePath": "(gen)/relative72.tsx" - }, - "/(gen)/relative73": { - "filePath": "(gen)/relative73.tsx" - }, - "/(gen)/relative74": { - "filePath": "(gen)/relative74.tsx" - }, - "/(gen)/relative75": { - "filePath": "(gen)/relative75.tsx" - }, - "/(gen)/relative76": { - "filePath": "(gen)/relative76.tsx" - }, - "/(gen)/relative77": { - "filePath": "(gen)/relative77.tsx" - }, - "/(gen)/relative78": { - "filePath": "(gen)/relative78.tsx" - }, - "/(gen)/relative79": { - "filePath": "(gen)/relative79.tsx" - }, - "/(gen)/relative8": { - "filePath": "(gen)/relative8.tsx" - }, - "/(gen)/relative80": { - "filePath": "(gen)/relative80.tsx" - }, - "/(gen)/relative81": { - "filePath": "(gen)/relative81.tsx" - }, - "/(gen)/relative82": { - "filePath": "(gen)/relative82.tsx" - }, - "/(gen)/relative83": { - "filePath": "(gen)/relative83.tsx" - }, - "/(gen)/relative84": { - "filePath": "(gen)/relative84.tsx" - }, - "/(gen)/relative85": { - "filePath": "(gen)/relative85.tsx" - }, - "/(gen)/relative86": { - "filePath": "(gen)/relative86.tsx" - }, - "/(gen)/relative87": { - "filePath": "(gen)/relative87.tsx" - }, - "/(gen)/relative88": { - "filePath": "(gen)/relative88.tsx" - }, - "/(gen)/relative89": { - "filePath": "(gen)/relative89.tsx" - }, - "/(gen)/relative9": { - "filePath": "(gen)/relative9.tsx" - }, - "/(gen)/relative90": { - "filePath": "(gen)/relative90.tsx" - }, - "/(gen)/relative91": { - "filePath": "(gen)/relative91.tsx" - }, - "/(gen)/relative92": { - "filePath": "(gen)/relative92.tsx" - }, - "/(gen)/relative93": { - "filePath": "(gen)/relative93.tsx" +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + ParamsRouteRoute: typeof ParamsRouteRouteWithChildren + SearchRouteRoute: typeof SearchRouteRouteWithChildren + AbsoluteRoute: typeof AbsoluteRoute + LinkPropsRoute: typeof LinkPropsRoute + RelativeRoute: typeof RelativeRoute +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + ParamsRouteRoute: ParamsRouteRouteWithChildren, + SearchRouteRoute: SearchRouteRouteWithChildren, + AbsoluteRoute: AbsoluteRoute, + LinkPropsRoute: LinkPropsRoute, + RelativeRoute: RelativeRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/params", + "/search", + "/absolute", + "/linkProps", + "/relative" + ] }, - "/(gen)/relative94": { - "filePath": "(gen)/relative94.tsx" + "/": { + "filePath": "index.tsx" }, - "/(gen)/relative95": { - "filePath": "(gen)/relative95.tsx" + "/params": { + "filePath": "params/route.tsx", + "children": [ + "/params/$paramsPlaceholder" + ] }, - "/(gen)/relative96": { - "filePath": "(gen)/relative96.tsx" + "/search": { + "filePath": "search/route.tsx", + "children": [ + "/search/searchPlaceholder" + ] }, - "/(gen)/relative97": { - "filePath": "(gen)/relative97.tsx" + "/absolute": { + "filePath": "absolute.tsx" }, - "/(gen)/relative98": { - "filePath": "(gen)/relative98.tsx" + "/linkProps": { + "filePath": "linkProps.tsx" }, - "/(gen)/relative99": { - "filePath": "(gen)/relative99.tsx" + "/relative": { + "filePath": "relative.tsx" }, "/params/$paramsPlaceholder": { "filePath": "params/$paramsPlaceholder.tsx", @@ -13857,806 +371,6 @@ export const routeTree = rootRoute "/search/searchPlaceholder": { "filePath": "search/searchPlaceholder.tsx", "parent": "/search" - }, - "/(gen)/params/$param0": { - "filePath": "(gen)/params/$param0.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param1": { - "filePath": "(gen)/params/$param1.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param10": { - "filePath": "(gen)/params/$param10.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param11": { - "filePath": "(gen)/params/$param11.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param12": { - "filePath": "(gen)/params/$param12.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param13": { - "filePath": "(gen)/params/$param13.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param14": { - "filePath": "(gen)/params/$param14.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param15": { - "filePath": "(gen)/params/$param15.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param16": { - "filePath": "(gen)/params/$param16.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param17": { - "filePath": "(gen)/params/$param17.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param18": { - "filePath": "(gen)/params/$param18.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param19": { - "filePath": "(gen)/params/$param19.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param2": { - "filePath": "(gen)/params/$param2.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param20": { - "filePath": "(gen)/params/$param20.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param21": { - "filePath": "(gen)/params/$param21.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param22": { - "filePath": "(gen)/params/$param22.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param23": { - "filePath": "(gen)/params/$param23.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param24": { - "filePath": "(gen)/params/$param24.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param25": { - "filePath": "(gen)/params/$param25.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param26": { - "filePath": "(gen)/params/$param26.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param27": { - "filePath": "(gen)/params/$param27.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param28": { - "filePath": "(gen)/params/$param28.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param29": { - "filePath": "(gen)/params/$param29.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param3": { - "filePath": "(gen)/params/$param3.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param30": { - "filePath": "(gen)/params/$param30.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param31": { - "filePath": "(gen)/params/$param31.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param32": { - "filePath": "(gen)/params/$param32.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param33": { - "filePath": "(gen)/params/$param33.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param34": { - "filePath": "(gen)/params/$param34.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param35": { - "filePath": "(gen)/params/$param35.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param36": { - "filePath": "(gen)/params/$param36.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param37": { - "filePath": "(gen)/params/$param37.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param38": { - "filePath": "(gen)/params/$param38.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param39": { - "filePath": "(gen)/params/$param39.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param4": { - "filePath": "(gen)/params/$param4.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param40": { - "filePath": "(gen)/params/$param40.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param41": { - "filePath": "(gen)/params/$param41.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param42": { - "filePath": "(gen)/params/$param42.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param43": { - "filePath": "(gen)/params/$param43.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param44": { - "filePath": "(gen)/params/$param44.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param45": { - "filePath": "(gen)/params/$param45.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param46": { - "filePath": "(gen)/params/$param46.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param47": { - "filePath": "(gen)/params/$param47.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param48": { - "filePath": "(gen)/params/$param48.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param49": { - "filePath": "(gen)/params/$param49.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param5": { - "filePath": "(gen)/params/$param5.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param50": { - "filePath": "(gen)/params/$param50.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param51": { - "filePath": "(gen)/params/$param51.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param52": { - "filePath": "(gen)/params/$param52.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param53": { - "filePath": "(gen)/params/$param53.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param54": { - "filePath": "(gen)/params/$param54.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param55": { - "filePath": "(gen)/params/$param55.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param56": { - "filePath": "(gen)/params/$param56.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param57": { - "filePath": "(gen)/params/$param57.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param58": { - "filePath": "(gen)/params/$param58.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param59": { - "filePath": "(gen)/params/$param59.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param6": { - "filePath": "(gen)/params/$param6.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param60": { - "filePath": "(gen)/params/$param60.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param61": { - "filePath": "(gen)/params/$param61.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param62": { - "filePath": "(gen)/params/$param62.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param63": { - "filePath": "(gen)/params/$param63.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param64": { - "filePath": "(gen)/params/$param64.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param65": { - "filePath": "(gen)/params/$param65.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param66": { - "filePath": "(gen)/params/$param66.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param67": { - "filePath": "(gen)/params/$param67.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param68": { - "filePath": "(gen)/params/$param68.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param69": { - "filePath": "(gen)/params/$param69.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param7": { - "filePath": "(gen)/params/$param7.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param70": { - "filePath": "(gen)/params/$param70.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param71": { - "filePath": "(gen)/params/$param71.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param72": { - "filePath": "(gen)/params/$param72.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param73": { - "filePath": "(gen)/params/$param73.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param74": { - "filePath": "(gen)/params/$param74.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param75": { - "filePath": "(gen)/params/$param75.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param76": { - "filePath": "(gen)/params/$param76.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param77": { - "filePath": "(gen)/params/$param77.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param78": { - "filePath": "(gen)/params/$param78.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param79": { - "filePath": "(gen)/params/$param79.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param8": { - "filePath": "(gen)/params/$param8.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param80": { - "filePath": "(gen)/params/$param80.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param81": { - "filePath": "(gen)/params/$param81.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param82": { - "filePath": "(gen)/params/$param82.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param83": { - "filePath": "(gen)/params/$param83.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param84": { - "filePath": "(gen)/params/$param84.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param85": { - "filePath": "(gen)/params/$param85.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param86": { - "filePath": "(gen)/params/$param86.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param87": { - "filePath": "(gen)/params/$param87.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param88": { - "filePath": "(gen)/params/$param88.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param89": { - "filePath": "(gen)/params/$param89.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param9": { - "filePath": "(gen)/params/$param9.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param90": { - "filePath": "(gen)/params/$param90.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param91": { - "filePath": "(gen)/params/$param91.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param92": { - "filePath": "(gen)/params/$param92.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param93": { - "filePath": "(gen)/params/$param93.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param94": { - "filePath": "(gen)/params/$param94.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param95": { - "filePath": "(gen)/params/$param95.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param96": { - "filePath": "(gen)/params/$param96.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param97": { - "filePath": "(gen)/params/$param97.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param98": { - "filePath": "(gen)/params/$param98.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/params/$param99": { - "filePath": "(gen)/params/$param99.tsx", - "parent": "/(gen)/params" - }, - "/(gen)/search/search0": { - "filePath": "(gen)/search/search0.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search1": { - "filePath": "(gen)/search/search1.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search10": { - "filePath": "(gen)/search/search10.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search11": { - "filePath": "(gen)/search/search11.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search12": { - "filePath": "(gen)/search/search12.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search13": { - "filePath": "(gen)/search/search13.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search14": { - "filePath": "(gen)/search/search14.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search15": { - "filePath": "(gen)/search/search15.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search16": { - "filePath": "(gen)/search/search16.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search17": { - "filePath": "(gen)/search/search17.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search18": { - "filePath": "(gen)/search/search18.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search19": { - "filePath": "(gen)/search/search19.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search2": { - "filePath": "(gen)/search/search2.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search20": { - "filePath": "(gen)/search/search20.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search21": { - "filePath": "(gen)/search/search21.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search22": { - "filePath": "(gen)/search/search22.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search23": { - "filePath": "(gen)/search/search23.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search24": { - "filePath": "(gen)/search/search24.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search25": { - "filePath": "(gen)/search/search25.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search26": { - "filePath": "(gen)/search/search26.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search27": { - "filePath": "(gen)/search/search27.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search28": { - "filePath": "(gen)/search/search28.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search29": { - "filePath": "(gen)/search/search29.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search3": { - "filePath": "(gen)/search/search3.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search30": { - "filePath": "(gen)/search/search30.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search31": { - "filePath": "(gen)/search/search31.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search32": { - "filePath": "(gen)/search/search32.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search33": { - "filePath": "(gen)/search/search33.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search34": { - "filePath": "(gen)/search/search34.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search35": { - "filePath": "(gen)/search/search35.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search36": { - "filePath": "(gen)/search/search36.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search37": { - "filePath": "(gen)/search/search37.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search38": { - "filePath": "(gen)/search/search38.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search39": { - "filePath": "(gen)/search/search39.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search4": { - "filePath": "(gen)/search/search4.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search40": { - "filePath": "(gen)/search/search40.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search41": { - "filePath": "(gen)/search/search41.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search42": { - "filePath": "(gen)/search/search42.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search43": { - "filePath": "(gen)/search/search43.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search44": { - "filePath": "(gen)/search/search44.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search45": { - "filePath": "(gen)/search/search45.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search46": { - "filePath": "(gen)/search/search46.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search47": { - "filePath": "(gen)/search/search47.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search48": { - "filePath": "(gen)/search/search48.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search49": { - "filePath": "(gen)/search/search49.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search5": { - "filePath": "(gen)/search/search5.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search50": { - "filePath": "(gen)/search/search50.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search51": { - "filePath": "(gen)/search/search51.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search52": { - "filePath": "(gen)/search/search52.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search53": { - "filePath": "(gen)/search/search53.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search54": { - "filePath": "(gen)/search/search54.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search55": { - "filePath": "(gen)/search/search55.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search56": { - "filePath": "(gen)/search/search56.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search57": { - "filePath": "(gen)/search/search57.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search58": { - "filePath": "(gen)/search/search58.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search59": { - "filePath": "(gen)/search/search59.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search6": { - "filePath": "(gen)/search/search6.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search60": { - "filePath": "(gen)/search/search60.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search61": { - "filePath": "(gen)/search/search61.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search62": { - "filePath": "(gen)/search/search62.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search63": { - "filePath": "(gen)/search/search63.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search64": { - "filePath": "(gen)/search/search64.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search65": { - "filePath": "(gen)/search/search65.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search66": { - "filePath": "(gen)/search/search66.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search67": { - "filePath": "(gen)/search/search67.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search68": { - "filePath": "(gen)/search/search68.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search69": { - "filePath": "(gen)/search/search69.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search7": { - "filePath": "(gen)/search/search7.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search70": { - "filePath": "(gen)/search/search70.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search71": { - "filePath": "(gen)/search/search71.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search72": { - "filePath": "(gen)/search/search72.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search73": { - "filePath": "(gen)/search/search73.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search74": { - "filePath": "(gen)/search/search74.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search75": { - "filePath": "(gen)/search/search75.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search76": { - "filePath": "(gen)/search/search76.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search77": { - "filePath": "(gen)/search/search77.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search78": { - "filePath": "(gen)/search/search78.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search79": { - "filePath": "(gen)/search/search79.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search8": { - "filePath": "(gen)/search/search8.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search80": { - "filePath": "(gen)/search/search80.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search81": { - "filePath": "(gen)/search/search81.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search82": { - "filePath": "(gen)/search/search82.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search83": { - "filePath": "(gen)/search/search83.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search84": { - "filePath": "(gen)/search/search84.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search85": { - "filePath": "(gen)/search/search85.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search86": { - "filePath": "(gen)/search/search86.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search87": { - "filePath": "(gen)/search/search87.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search88": { - "filePath": "(gen)/search/search88.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search89": { - "filePath": "(gen)/search/search89.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search9": { - "filePath": "(gen)/search/search9.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search90": { - "filePath": "(gen)/search/search90.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search91": { - "filePath": "(gen)/search/search91.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search92": { - "filePath": "(gen)/search/search92.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search93": { - "filePath": "(gen)/search/search93.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search94": { - "filePath": "(gen)/search/search94.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search95": { - "filePath": "(gen)/search/search95.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search96": { - "filePath": "(gen)/search/search96.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search97": { - "filePath": "(gen)/search/search97.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search98": { - "filePath": "(gen)/search/search98.tsx", - "parent": "/(gen)/search" - }, - "/(gen)/search/search99": { - "filePath": "(gen)/search/search99.tsx", - "parent": "/(gen)/search" } } } diff --git a/examples/react/start-large/src/tanstack-start.d.ts b/examples/react/start-large/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-large/src/tanstack-start.d.ts +++ b/examples/react/start-large/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-material-ui/src/tanstack-start.d.ts b/examples/react/start-material-ui/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-material-ui/src/tanstack-start.d.ts +++ b/examples/react/start-material-ui/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-supabase-basic/src/tanstack-start.d.ts b/examples/react/start-supabase-basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-supabase-basic/src/tanstack-start.d.ts +++ b/examples/react/start-supabase-basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-trellaux/src/tanstack-start.d.ts b/examples/react/start-trellaux/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/react/start-trellaux/src/tanstack-start.d.ts +++ b/examples/react/start-trellaux/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-workos/src/tanstack-start.d.ts b/examples/react/start-workos/src/tanstack-start.d.ts index 4ec0e297aa..833d577af8 100644 --- a/examples/react/start-workos/src/tanstack-start.d.ts +++ b/examples/react/start-workos/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen'; diff --git a/examples/react/view-transitions/src/routeTree.gen.ts b/examples/react/view-transitions/src/routeTree.gen.ts index 2eb2bc10db..73f3d006a7 100644 --- a/examples/react/view-transitions/src/routeTree.gen.ts +++ b/examples/react/view-transitions/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -107,63 +105,6 @@ declare module '@tanstack/react-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/posts.route' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/explore' { - const createFileRoute: CreateFileRoute< - '/explore', - FileRoutesByPath['/explore']['parentRoute'], - FileRoutesByPath['/explore']['id'], - FileRoutesByPath['/explore']['path'], - FileRoutesByPath['/explore']['fullPath'] - > -} -declare module './routes/how-it-works' { - const createFileRoute: CreateFileRoute< - '/how-it-works', - FileRoutesByPath['/how-it-works']['parentRoute'], - FileRoutesByPath['/how-it-works']['id'], - FileRoutesByPath['/how-it-works']['path'], - FileRoutesByPath['/how-it-works']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} - // Create and export the route tree interface PostsRouteRouteChildren { diff --git a/examples/react/view-transitions/src/routes/explore.tsx b/examples/react/view-transitions/src/routes/explore.tsx index 6728fd4ad8..1bb60ed1fc 100644 --- a/examples/react/view-transitions/src/routes/explore.tsx +++ b/examples/react/view-transitions/src/routes/explore.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/explore')({ component: RouteComponent, }) diff --git a/examples/react/view-transitions/src/routes/how-it-works.tsx b/examples/react/view-transitions/src/routes/how-it-works.tsx index bf2c1b4287..3ae9a88d52 100644 --- a/examples/react/view-transitions/src/routes/how-it-works.tsx +++ b/examples/react/view-transitions/src/routes/how-it-works.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/how-it-works')({ component: RouteComponent, }) diff --git a/examples/react/view-transitions/src/routes/index.tsx b/examples/react/view-transitions/src/routes/index.tsx index d62a1aff95..19f597dc7b 100644 --- a/examples/react/view-transitions/src/routes/index.tsx +++ b/examples/react/view-transitions/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/react/view-transitions/src/routes/posts.$postId.tsx b/examples/react/view-transitions/src/routes/posts.$postId.tsx index 0578182ecb..956ca50ecd 100644 --- a/examples/react/view-transitions/src/routes/posts.$postId.tsx +++ b/examples/react/view-transitions/src/routes/posts.$postId.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { ErrorComponent } from '@tanstack/react-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/react-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/react/view-transitions/src/routes/posts.index.tsx b/examples/react/view-transitions/src/routes/posts.index.tsx index fdbe5865e5..c6b65f1892 100644 --- a/examples/react/view-transitions/src/routes/posts.index.tsx +++ b/examples/react/view-transitions/src/routes/posts.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/examples/react/view-transitions/src/routes/posts.route.tsx b/examples/react/view-transitions/src/routes/posts.route.tsx index 41c034c7ee..88296c3c54 100644 --- a/examples/react/view-transitions/src/routes/posts.route.tsx +++ b/examples/react/view-transitions/src/routes/posts.route.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' import { Link, Outlet } from '@tanstack/react-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) diff --git a/examples/solid/basic-file-based/src/routeTree.gen.ts b/examples/solid/basic-file-based/src/routeTree.gen.ts index bf1a9aa496..13710a3f4a 100644 --- a/examples/solid/basic-file-based/src/routeTree.gen.ts +++ b/examples/solid/basic-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -136,81 +134,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout', - FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-a', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-b', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] - > -} - // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx index c549175638..227a421bfe 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index dd2e04ea2b..bea54d9af4 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: LayoutComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a0bd5240b7..2484c0be81 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutAComponent, -}) +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( + { + component: LayoutAComponent, + }, +) function LayoutAComponent() { return
I'm A!
diff --git a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 2864ec1f28..14549ab011 100644 --- a/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/solid/basic-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutBComponent, -}) +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( + { + component: LayoutBComponent, + }, +) function LayoutBComponent() { return
I'm B!
diff --git a/examples/solid/basic-file-based/src/routes/index.tsx b/examples/solid/basic-file-based/src/routes/index.tsx index 510db79b73..3f905db60c 100644 --- a/examples/solid/basic-file-based/src/routes/index.tsx +++ b/examples/solid/basic-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/solid/basic-file-based/src/routes/posts.$postId.tsx b/examples/solid/basic-file-based/src/routes/posts.$postId.tsx index e06a7e1f38..c673d45fa6 100644 --- a/examples/solid/basic-file-based/src/routes/posts.$postId.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.$postId.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { fetchPost } from '../posts' import { PostErrorComponent } from './-components/PostErrorComponent' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, notFoundComponent: () => { diff --git a/examples/solid/basic-file-based/src/routes/posts.index.tsx b/examples/solid/basic-file-based/src/routes/posts.index.tsx index 13529228bb..812b581e0a 100644 --- a/examples/solid/basic-file-based/src/routes/posts.index.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/examples/solid/basic-file-based/src/routes/posts.tsx b/examples/solid/basic-file-based/src/routes/posts.tsx index 2e28f9beb3..86fb7a1841 100644 --- a/examples/solid/basic-file-based/src/routes/posts.tsx +++ b/examples/solid/basic-file-based/src/routes/posts.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { fetchPosts } from '../posts' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts b/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts index bf1a9aa496..13710a3f4a 100644 --- a/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts +++ b/examples/solid/basic-solid-query-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -136,81 +134,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/posts' { - const createFileRoute: CreateFileRoute< - '/posts', - FileRoutesByPath['/posts']['parentRoute'], - FileRoutesByPath['/posts']['id'], - FileRoutesByPath['/posts']['path'], - FileRoutesByPath['/posts']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout', - FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] - > -} -declare module './routes/posts.$postId' { - const createFileRoute: CreateFileRoute< - '/posts/$postId', - FileRoutesByPath['/posts/$postId']['parentRoute'], - FileRoutesByPath['/posts/$postId']['id'], - FileRoutesByPath['/posts/$postId']['path'], - FileRoutesByPath['/posts/$postId']['fullPath'] - > -} -declare module './routes/posts.index' { - const createFileRoute: CreateFileRoute< - '/posts/', - FileRoutesByPath['/posts/']['parentRoute'], - FileRoutesByPath['/posts/']['id'], - FileRoutesByPath['/posts/']['path'], - FileRoutesByPath['/posts/']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-a', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout/_nested-layout/route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/_nested-layout/route-b', - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] - > -} - // Create and export the route tree interface PathlessLayoutNestedLayoutRouteChildren { diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx index 53068bc1bb..7cdec28d8d 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: LayoutComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx index 584515d8ec..04a1d07c42 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout/_nested-layout')({ component: PathlessLayoutComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx index a0bd5240b7..2484c0be81 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutAComponent, -}) +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-a')( + { + component: LayoutAComponent, + }, +) function LayoutAComponent() { return
I'm A!
diff --git a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx index 2864ec1f28..14549ab011 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -1,6 +1,9 @@ -export const Route = createFileRoute({ - component: LayoutBComponent, -}) +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/_nested-layout/route-b')( + { + component: LayoutBComponent, + }, +) function LayoutBComponent() { return
I'm B!
diff --git a/examples/solid/basic-solid-query-file-based/src/routes/index.tsx b/examples/solid/basic-solid-query-file-based/src/routes/index.tsx index 510db79b73..3f905db60c 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/index.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: Home, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx index 38ae2af8bd..f771b7be7e 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.$postId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import { ErrorComponent, useRouter } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { createEffect, createMemo } from 'solid-js' @@ -31,7 +32,7 @@ export function PostErrorComponent({ error, reset }: ErrorComponentProps) { ) } -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) }, diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx index 13529228bb..812b581e0a 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/posts/')({ component: PostsIndexComponent, }) diff --git a/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx b/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx index a41ebe0dd7..eb3b3c9072 100644 --- a/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx +++ b/examples/solid/basic-solid-query-file-based/src/routes/posts.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Link, Outlet } from '@tanstack/solid-router' import { useQuery } from '@tanstack/solid-query' import { postsQueryOptions } from '../postsQueryOptions' import { createMemo } from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/posts')({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, diff --git a/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts b/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts index f8a770b3f8..f7af0fbf39 100644 --- a/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts +++ b/examples/solid/kitchen-sink-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -261,162 +259,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/dashboard.route' { - const createFileRoute: CreateFileRoute< - '/dashboard', - FileRoutesByPath['/dashboard']['parentRoute'], - FileRoutesByPath['/dashboard']['id'], - FileRoutesByPath['/dashboard']['path'], - FileRoutesByPath['/dashboard']['fullPath'] - > -} -declare module './routes/_auth' { - const createFileRoute: CreateFileRoute< - '/_auth', - FileRoutesByPath['/_auth']['parentRoute'], - FileRoutesByPath['/_auth']['id'], - FileRoutesByPath['/_auth']['path'], - FileRoutesByPath['/_auth']['fullPath'] - > -} -declare module './routes/_pathlessLayout' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout', - FileRoutesByPath['/_pathlessLayout']['parentRoute'], - FileRoutesByPath['/_pathlessLayout']['id'], - FileRoutesByPath['/_pathlessLayout']['path'], - FileRoutesByPath['/_pathlessLayout']['fullPath'] - > -} -declare module './routes/login' { - const createFileRoute: CreateFileRoute< - '/login', - FileRoutesByPath['/login']['parentRoute'], - FileRoutesByPath['/login']['id'], - FileRoutesByPath['/login']['path'], - FileRoutesByPath['/login']['fullPath'] - > -} -declare module './routes/dashboard.invoices.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices', - FileRoutesByPath['/dashboard/invoices']['parentRoute'], - FileRoutesByPath['/dashboard/invoices']['id'], - FileRoutesByPath['/dashboard/invoices']['path'], - FileRoutesByPath['/dashboard/invoices']['fullPath'] - > -} -declare module './routes/dashboard.users.route' { - const createFileRoute: CreateFileRoute< - '/dashboard/users', - FileRoutesByPath['/dashboard/users']['parentRoute'], - FileRoutesByPath['/dashboard/users']['id'], - FileRoutesByPath['/dashboard/users']['path'], - FileRoutesByPath['/dashboard/users']['fullPath'] - > -} -declare module './routes/(this-folder-is-not-in-the-url)/route-group' { - const createFileRoute: CreateFileRoute< - '/(this-folder-is-not-in-the-url)/route-group', - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['parentRoute'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['id'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['path'], - FileRoutesByPath['/(this-folder-is-not-in-the-url)/route-group']['fullPath'] - > -} -declare module './routes/_auth.profile' { - const createFileRoute: CreateFileRoute< - '/_auth/profile', - FileRoutesByPath['/_auth/profile']['parentRoute'], - FileRoutesByPath['/_auth/profile']['id'], - FileRoutesByPath['/_auth/profile']['path'], - FileRoutesByPath['/_auth/profile']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-a' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-a', - FileRoutesByPath['/_pathlessLayout/route-a']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-a']['id'], - FileRoutesByPath['/_pathlessLayout/route-a']['path'], - FileRoutesByPath['/_pathlessLayout/route-a']['fullPath'] - > -} -declare module './routes/_pathlessLayout.route-b' { - const createFileRoute: CreateFileRoute< - '/_pathlessLayout/route-b', - FileRoutesByPath['/_pathlessLayout/route-b']['parentRoute'], - FileRoutesByPath['/_pathlessLayout/route-b']['id'], - FileRoutesByPath['/_pathlessLayout/route-b']['path'], - FileRoutesByPath['/_pathlessLayout/route-b']['fullPath'] - > -} -declare module './routes/dashboard.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/', - FileRoutesByPath['/dashboard/']['parentRoute'], - FileRoutesByPath['/dashboard/']['id'], - FileRoutesByPath['/dashboard/']['path'], - FileRoutesByPath['/dashboard/']['fullPath'] - > -} -declare module './routes/expensive/index' { - const createFileRoute: CreateFileRoute< - '/expensive/', - FileRoutesByPath['/expensive/']['parentRoute'], - FileRoutesByPath['/expensive/']['id'], - FileRoutesByPath['/expensive/']['path'], - FileRoutesByPath['/expensive/']['fullPath'] - > -} -declare module './routes/dashboard.invoices.$invoiceId' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/$invoiceId', - FileRoutesByPath['/dashboard/invoices/$invoiceId']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['id'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['path'], - FileRoutesByPath['/dashboard/invoices/$invoiceId']['fullPath'] - > -} -declare module './routes/dashboard.users.user' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/user', - FileRoutesByPath['/dashboard/users/user']['parentRoute'], - FileRoutesByPath['/dashboard/users/user']['id'], - FileRoutesByPath['/dashboard/users/user']['path'], - FileRoutesByPath['/dashboard/users/user']['fullPath'] - > -} -declare module './routes/dashboard.invoices.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/invoices/', - FileRoutesByPath['/dashboard/invoices/']['parentRoute'], - FileRoutesByPath['/dashboard/invoices/']['id'], - FileRoutesByPath['/dashboard/invoices/']['path'], - FileRoutesByPath['/dashboard/invoices/']['fullPath'] - > -} -declare module './routes/dashboard.users.index' { - const createFileRoute: CreateFileRoute< - '/dashboard/users/', - FileRoutesByPath['/dashboard/users/']['parentRoute'], - FileRoutesByPath['/dashboard/users/']['id'], - FileRoutesByPath['/dashboard/users/']['path'], - FileRoutesByPath['/dashboard/users/']['fullPath'] - > -} - // Create and export the route tree interface DashboardInvoicesRouteRouteChildren { diff --git a/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx b/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx index 3b34f15613..93cddb7fbb 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/(this-folder-is-not-in-the-url)/route-group.tsx @@ -1,6 +1,9 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute( + '/(this-folder-is-not-in-the-url)/route-group', +)({ component: RouteGroupExample, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx index 389d0f3477..8756fe59e3 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_auth.profile.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth/profile')({ component: ProfileComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx index 6936f9e0ff..063eb5956d 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_auth.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import { redirect } from '@tanstack/solid-router' import { auth } from '../utils/auth' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_auth')({ // Before loading, authenticate the user via our auth context // This will also happen during prefetching (e.g. hovering over links, etc) beforeLoad: ({ context, location }) => { diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx index a0bd5240b7..73d603f19e 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-a.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/route-a')({ component: LayoutAComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx index 2864ec1f28..c3181d4905 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.route-b.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/_pathlessLayout/route-b')({ component: LayoutBComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx index ebfb59943c..3b6c2f007a 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/_pathlessLayout.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import { Outlet } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/_pathlessLayout')({ component: PathlessLayoutComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx index d046fd363b..d929550691 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.index.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/')({ loader: () => fetchInvoices(), component: DashboardIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx index 5f520989a7..1f8de1cd12 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { Link, useNavigate, useRouter } from '@tanstack/solid-router' import { z } from 'zod' @@ -5,7 +6,7 @@ import { InvoiceFields } from '../components/InvoiceFields' import { useMutation } from '../hooks/useMutation' import { fetchInvoiceById, patchInvoice } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/$invoiceId')({ params: { parse: (params) => ({ invoiceId: z.number().int().parse(Number(params.invoiceId)), diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx index 591a53b7cb..04f48fdb31 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.index.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { useRouter } from '@tanstack/solid-router' import { InvoiceFields } from '../components/InvoiceFields' @@ -6,7 +7,7 @@ import { useMutation } from '../hooks/useMutation' import { postInvoice } from '../utils/mockTodos' import type { Invoice } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices/')({ component: InvoicesIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx index 817a493f75..a8e60043db 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.route.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { Link, MatchRoute, Outlet } from '@tanstack/solid-router' import { Spinner } from '../components/Spinner' import { fetchInvoices } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/invoices')({ loader: () => fetchInvoices(), component: InvoicesComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx index fe88331414..de7f1922ab 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.route.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { Link, Outlet, linkOptions } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard')({ component: DashboardComponent, loader: () => ({ crumb: 'Dashboard', diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx index b6f431fbdf..e86fd08079 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.index.tsx @@ -1,6 +1,7 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/')({ component: UsersIndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx index 32213eacb2..846d56dd48 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.route.tsx @@ -1,3 +1,4 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { Link, @@ -14,7 +15,7 @@ import { fetchUsers } from '../utils/mockTodos' type UsersViewSortBy = 'name' | 'id' | 'email' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users')({ validateSearch: z.object({ usersView: z .object({ diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx index 962d1e27cb..b05172fb49 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.users.user.tsx @@ -1,9 +1,10 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { z } from 'zod' import { fetchUserById } from '../utils/mockTodos' -export const Route = createFileRoute({ +export const Route = createFileRoute('/dashboard/users/user')({ validateSearch: z.object({ userId: z.number(), }), diff --git a/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx index 5066d67ac5..f1ae88b32b 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/expensive/index.tsx @@ -1,5 +1,6 @@ +import { createFileRoute } from '@tanstack/solid-router' import Expensive from './-components/Expensive' -export const Route = createFileRoute({ +export const Route = createFileRoute('/expensive/')({ component: Expensive, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/index.tsx b/examples/solid/kitchen-sink-file-based/src/routes/index.tsx index d0f309f8b5..2fd9f1ce71 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/index.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/index.tsx @@ -1,7 +1,8 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { Link } from '@tanstack/solid-router' -export const Route = createFileRoute({ +export const Route = createFileRoute('/')({ component: IndexComponent, }) diff --git a/examples/solid/kitchen-sink-file-based/src/routes/login.tsx b/examples/solid/kitchen-sink-file-based/src/routes/login.tsx index 823555d813..8367e59e10 100644 --- a/examples/solid/kitchen-sink-file-based/src/routes/login.tsx +++ b/examples/solid/kitchen-sink-file-based/src/routes/login.tsx @@ -1,8 +1,9 @@ +import { createFileRoute } from '@tanstack/solid-router' import * as Solid from 'solid-js' import { useRouter } from '@tanstack/solid-router' import { z } from 'zod' -export const Route = createFileRoute({ +export const Route = createFileRoute('/login')({ validateSearch: z.object({ redirect: z.string().optional(), }), diff --git a/examples/solid/quickstart-file-based/src/routeTree.gen.ts b/examples/solid/quickstart-file-based/src/routeTree.gen.ts index ba17474a57..f1ce74b320 100644 --- a/examples/solid/quickstart-file-based/src/routeTree.gen.ts +++ b/examples/solid/quickstart-file-based/src/routeTree.gen.ts @@ -8,8 +8,6 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' - // Import Routes import { Route as rootRoute } from './routes/__root' @@ -51,27 +49,6 @@ declare module '@tanstack/solid-router' { } } -// Add type-safety to the createFileRoute function across the route tree - -declare module './routes/index' { - const createFileRoute: CreateFileRoute< - '/', - FileRoutesByPath['/']['parentRoute'], - FileRoutesByPath['/']['id'], - FileRoutesByPath['/']['path'], - FileRoutesByPath['/']['fullPath'] - > -} -declare module './routes/about' { - const createFileRoute: CreateFileRoute< - '/about', - FileRoutesByPath['/about']['parentRoute'], - FileRoutesByPath['/about']['id'], - FileRoutesByPath['/about']['path'], - FileRoutesByPath['/about']['fullPath'] - > -} - // Create and export the route tree export interface FileRoutesByFullPath { diff --git a/examples/solid/quickstart-file-based/src/routes/about.tsx b/examples/solid/quickstart-file-based/src/routes/about.tsx index 5cc1a89442..47f6c510f2 100644 --- a/examples/solid/quickstart-file-based/src/routes/about.tsx +++ b/examples/solid/quickstart-file-based/src/routes/about.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/about')({ component: AboutComponent, }) diff --git a/examples/solid/quickstart-file-based/src/routes/index.tsx b/examples/solid/quickstart-file-based/src/routes/index.tsx index e64f9b04f0..10d3d3acaf 100644 --- a/examples/solid/quickstart-file-based/src/routes/index.tsx +++ b/examples/solid/quickstart-file-based/src/routes/index.tsx @@ -1,4 +1,5 @@ -export const Route = createFileRoute({ +import { createFileRoute } from '@tanstack/solid-router' +export const Route = createFileRoute('/')({ component: HomeComponent, }) diff --git a/examples/solid/start-bare/src/tanstack-start.d.ts b/examples/solid/start-bare/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/solid/start-bare/src/tanstack-start.d.ts +++ b/examples/solid/start-bare/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/solid/start-basic/src/tanstack-start.d.ts b/examples/solid/start-basic/src/tanstack-start.d.ts index 7f91a4813b..3adaf59556 100644 --- a/examples/solid/start-basic/src/tanstack-start.d.ts +++ b/examples/solid/start-basic/src/tanstack-start.d.ts @@ -1 +1,2 @@ +/// import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts index a7f86b82ed..7fd204b3f9 100644 --- a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts +++ b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts @@ -684,7 +684,12 @@ function buildStartDeclarationFile({ }: { serverRoutesRelativePath: string }) { - return [`import '${serverRoutesRelativePath}'`].join('\n') + '\n' + return ( + [ + '/// ', + `import '${serverRoutesRelativePath}'`, + ].join('\n') + '\n' + ) } function removeGroups(s: string) { From a57676eacb544cf910b3ee35e98cc1d2a3d114d0 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 02:21:32 +0000 Subject: [PATCH 016/126] release: v1.120.4-alpha.6 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index fad24099a0..af351bea04 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index d46794af69..0670af8a24 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 592df70d37..def6476160 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 823b66e6fe..53f9636773 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index fd0878f7b6..df18a18552 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index cc430a5aaf..ae0791fff1 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 9ad39d43d2..03643b63a0 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 534752b0ca..e75545b871 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 973d40327c..18acc10bb5 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 5423ea92ef..6da51d9dcf 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index b269d1aae4..0e158df648 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 4bd1f1a8da..23781da3d2 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 124bc1ad72..ac6539c5bd 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 59a55e34c9..337ff7d0a7 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 5d527ddd99..85eb7c8c4b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 8ed9edcd58..d31df76de5 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.5", + "@tanstack/react-start": "^1.120.4-alpha.6", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index accb8817ce..2da5a8d1e2 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.5", + "@tanstack/solid-start": "^1.120.4-alpha.6", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 0794b0beb1..032f9abe56 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.5", + "@tanstack/solid-start": "^1.120.4-alpha.6", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index a684bb71b9..ec066c9b03 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.5", + "version": "1.120.4-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 1d0a8c37f0..c3d3a2dab1 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.5", + "version": "1.120.4-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 9235c8e8d3..e21a6a46db 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.5", + "version": "1.120.4-alpha.6", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index b622b583c8..180068f4b0 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.5", + "version": "1.120.4-alpha.6", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index a1e78d971f..9a5f6a25d8 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.5", + "version": "1.120.4-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From d5c2e6dd02f5f39a7243a1b19e8a7550c0b9d2f6 Mon Sep 17 00:00:00 2001 From: MoeedDar Date: Sun, 11 May 2025 21:26:39 +0100 Subject: [PATCH 017/126] fix(start-server-core): appending headers to immutable response object + matching server function handler route on Windows (#4146) --- .../src/createStartHandler.ts | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 1ce6c4b73d..71e42ba965 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -81,9 +81,9 @@ export function createStartHandler({ } // First, let's attempt to handle server functions - if ( - href.startsWith(path.join('/', process.env.TSS_SERVER_FN_BASE, '/')) - ) { + // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE + const serverFnBase = process.env.TSS_SERVER_FN_BASE.startsWith('/') ? process.env.TSS_SERVER_FN_BASE : '/' + process.env.TSS_SERVER_FN_BASE + if (href.startsWith(serverFnBase)) { return await handleServerAction({ request }) } @@ -202,12 +202,17 @@ export function createStartHandler({ return redirect } - response.headers.append( - 'Access-Control-Expose-Headers', - tsrRedirectHeaderKey, - ) + // Add Access-Control-Expose-Headers + // With HTTPs the response/header objects are immutable, therefore we must clone them + const body = response.status === 204 ? null : (await response.clone().blob()) + const headers = new Headers(response.headers) + headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey) - return response + return new Response(body, { + status: response.status, + statusText: response.statusText, + headers, + }) }) } } From bef4dabd83adc460957cec0f726ec2ad67d4fce6 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sun, 11 May 2025 20:27:40 +0000 Subject: [PATCH 018/126] ci: apply automated fixes --- packages/start-server-core/src/createStartHandler.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 71e42ba965..f022354554 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -82,7 +82,9 @@ export function createStartHandler({ // First, let's attempt to handle server functions // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE - const serverFnBase = process.env.TSS_SERVER_FN_BASE.startsWith('/') ? process.env.TSS_SERVER_FN_BASE : '/' + process.env.TSS_SERVER_FN_BASE + const serverFnBase = process.env.TSS_SERVER_FN_BASE.startsWith('/') + ? process.env.TSS_SERVER_FN_BASE + : '/' + process.env.TSS_SERVER_FN_BASE if (href.startsWith(serverFnBase)) { return await handleServerAction({ request }) } @@ -204,7 +206,8 @@ export function createStartHandler({ // Add Access-Control-Expose-Headers // With HTTPs the response/header objects are immutable, therefore we must clone them - const body = response.status === 204 ? null : (await response.clone().blob()) + const body = + response.status === 204 ? null : await response.clone().blob() const headers = new Headers(response.headers) headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey) From 565c8a0e74f0510bcad9da865f943ff98ec1cc38 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sun, 11 May 2025 23:18:26 +0200 Subject: [PATCH 019/126] chore: lint --- packages/start-server-core/src/createStartHandler.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index f022354554..4ee563a3b6 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -1,4 +1,3 @@ -import path from 'node:path' import { createMemoryHistory } from '@tanstack/history' import { flattenMiddlewares, From 65422872a8149eaa6c932a8ed7785304d9a02217 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 21:24:02 +0000 Subject: [PATCH 020/126] release: v1.120.4-alpha.7 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-server-core/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index af351bea04..f2ca184de6 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 0670af8a24..d8ca2031b4 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index def6476160..a1cb085aab 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 53f9636773..17088825a6 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index df18a18552..7648bce417 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ae0791fff1..29d4f462f7 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 03643b63a0..327bfa3ff6 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index e75545b871..1106dc5792 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 18acc10bb5..67c1915c42 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 6da51d9dcf..58e5a6ce95 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 0e158df648..88d4a3fe9d 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 23781da3d2..3450980534 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index ac6539c5bd..39036a71d7 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 337ff7d0a7..ecc988c29d 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 85eb7c8c4b..8778befbf9 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index d31df76de5..44d00a0e34 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.6", + "@tanstack/react-start": "^1.120.4-alpha.7", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 2da5a8d1e2..c8fa3c682e 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.6", + "@tanstack/solid-start": "^1.120.4-alpha.7", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 032f9abe56..ccae321323 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.6", + "@tanstack/solid-start": "^1.120.4-alpha.7", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index c3fb2d5a70..f21bc9fa66 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index c3d3a2dab1..ada3689bb4 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.6", + "version": "1.120.4-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 51b42de1ae..010fdc3dc7 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.7", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 180068f4b0..3245077679 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.6", + "version": "1.120.4-alpha.7", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 3953accc4f..fbfd46f40a 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.2", + "version": "1.120.4-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 94c12845ada07095b0acb4303614a8e0018dbf94 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Mon, 12 May 2025 09:34:06 +1200 Subject: [PATCH 021/126] refactor(start-server-core): use utility functions from router-core (#4147) --- packages/start-server-core/src/createStartHandler.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 4ee563a3b6..c0415164f9 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -7,8 +7,10 @@ import { import { getMatchedRoutes, isRedirect, + joinPaths, processRouteTree, rootRouteId, + trimPath, tsrRedirectHeaderKey, } from '@tanstack/router-core' import { getResponseHeaders, requestHandler } from './h3' @@ -81,9 +83,11 @@ export function createStartHandler({ // First, let's attempt to handle server functions // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE - const serverFnBase = process.env.TSS_SERVER_FN_BASE.startsWith('/') - ? process.env.TSS_SERVER_FN_BASE - : '/' + process.env.TSS_SERVER_FN_BASE + const serverFnBase = joinPaths([ + '/', + trimPath(process.env.TSS_SERVER_FN_BASE), + '/', + ]) if (href.startsWith(serverFnBase)) { return await handleServerAction({ request }) } @@ -104,7 +108,7 @@ export function createStartHandler({ // If we have a server route tree, then we try matching to see if we have a // server route that matches the request. if (serverRouteTreeModule) { - const [matchedRoutes, response] = await handleServerRoutes({ + const [_matchedRoutes, response] = await handleServerRoutes({ routeTree: serverRouteTreeModule.routeTree, request, }) From 4533d30600498c175f7f3ba7ed48347ce2dec3d6 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 21:35:12 +0000 Subject: [PATCH 022/126] release: v1.120.4-alpha.8 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-server-core/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index f2ca184de6..ed588d9264 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index d8ca2031b4..4cdabf9a69 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index a1cb085aab..2a199cc817 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 17088825a6..c38ca86d3e 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 7648bce417..866b5a3ff4 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 29d4f462f7..f70506351e 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 327bfa3ff6..c77af0423b 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 1106dc5792..32af70d430 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 67c1915c42..62b8c9dfce 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 58e5a6ce95..8de278902b 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 88d4a3fe9d..2509df9dfe 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 3450980534..3799cc1311 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 39036a71d7..ffd37ddf5d 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index ecc988c29d..34d7c36dae 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 8778befbf9..e32fdce803 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 44d00a0e34..35a6bb7714 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.7", + "@tanstack/react-start": "^1.120.4-alpha.8", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index c8fa3c682e..08365b78ce 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.7", + "@tanstack/solid-start": "^1.120.4-alpha.8", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index ccae321323..dc03f3de05 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.7", + "@tanstack/solid-start": "^1.120.4-alpha.8", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index f21bc9fa66..d41ea20211 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.7", + "version": "1.120.4-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index ada3689bb4..335bba1779 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.7", + "version": "1.120.4-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 010fdc3dc7..85ad40c900 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.7", + "version": "1.120.4-alpha.8", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 3245077679..fb7dd32182 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.7", + "version": "1.120.4-alpha.8", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index fbfd46f40a..d7b875deb4 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.7", + "version": "1.120.4-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 62a044eff24ab386322598da9d18ea764586b4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20=C5=A0ijak?= Date: Sun, 11 May 2025 23:42:38 +0200 Subject: [PATCH 023/126] docs(start): remove validators from "server routes" guide (#4148) --- docs/start/framework/react/server-routes.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md index f712a29f8f..c046c16eae 100644 --- a/docs/start/framework/react/server-routes.md +++ b/docs/start/framework/react/server-routes.md @@ -110,7 +110,7 @@ export default createStartHandler({ })(defaultStreamHandler) ``` -The start handler is responsible for matching an incoming request to a server route and executing the appropriate middleware, validators and handler. +The start handler is responsible for matching an incoming request to a server route and executing the appropriate middleware and handler. Remember, if you need to customize the server handler, you can do so by creating a custom handler and then passing the event to the start handler: @@ -134,7 +134,6 @@ Server routes are created by exporting a `ServerRoute` from a route file. The `S - Add route-level middleware - Define handlers for each HTTP method -- Add middleware and validators to specific HTTP methods ```ts // routes/hello.ts @@ -167,20 +166,14 @@ export const ServerRoute = createServerFileRoute().methods({ ### Providing a handler function via the method builder object -For more complex use cases, you can provide a handler function via the method builder object. This allows you to: - -- Add middleware to the method -- Add a validator to the method +For more complex use cases, you can provide a handler function via the method builder object. This allows you to add middleware to the method. ```tsx // routes/hello.ts export const ServerRoute = createServerFileRoute().methods((api) => ({ - GET: api - .middleware([loggerMiddleware]) - .validator(z.object({ name: z.string() })) - .handler(async ({ request }) => { - return new Response('Hello, World! from ' + request.url) - }), + GET: api.middleware([loggerMiddleware]).handler(async ({ request }) => { + return new Response('Hello, World! from ' + request.url) + }), })) ``` From ac7db71d4f404ad4feaaccf50320393adced4c6c Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Mon, 12 May 2025 09:55:03 +1200 Subject: [PATCH 024/126] fix(start-plugin-core): remove backslashes from declaration import (#4149) --- .../start-plugin-core/src/start-server-routes-plugin/plugin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts index 7fd204b3f9..d149f76534 100644 --- a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts +++ b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts @@ -684,10 +684,11 @@ function buildStartDeclarationFile({ }: { serverRoutesRelativePath: string }) { + const serverRoutesPath = replaceBackslash(serverRoutesRelativePath) return ( [ '/// ', - `import '${serverRoutesRelativePath}'`, + `import '${serverRoutesPath}'`, ].join('\n') + '\n' ) } From 32f1a8bdc9dcbc54879a7060b926c70a452fd4f4 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 21:56:14 +0000 Subject: [PATCH 025/126] release: v1.120.4-alpha.9 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index ed588d9264..0d7ca735ad 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 4cdabf9a69..b50b1b84ee 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 2a199cc817..c9b1b4fa82 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index c38ca86d3e..9656443e92 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 866b5a3ff4..7e7fbb9005 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index f70506351e..debcc42fbb 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index c77af0423b..70ab25d729 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 32af70d430..110884e26c 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 62b8c9dfce..829af1f9d5 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 8de278902b..afa1b269b6 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 2509df9dfe..b881b2fca8 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 3799cc1311..42add893b1 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index ffd37ddf5d..2a0b2a033d 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-with-query": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 34d7c36dae..76ae4f39d0 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index e32fdce803..63a2915c2b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 35a6bb7714..81940246d7 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.1", "@tanstack/react-router-devtools": "^1.120.4-alpha.1", "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.8", + "@tanstack/react-start": "^1.120.4-alpha.9", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 08365b78ce..da5cb2f98e 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.8", + "@tanstack/solid-start": "^1.120.4-alpha.9", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index dc03f3de05..63710b9030 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.1", "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.8", + "@tanstack/solid-start": "^1.120.4-alpha.9", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index ec066c9b03..7cc37a93f4 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.6", + "version": "1.120.4-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 335bba1779..ace71c51f4 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.8", + "version": "1.120.4-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index e21a6a46db..33b49311ef 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.6", + "version": "1.120.4-alpha.9", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index fb7dd32182..49f01841c1 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.8", + "version": "1.120.4-alpha.9", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 9a5f6a25d8..69b66ddedb 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.6", + "version": "1.120.4-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 9f63d404e4a12535b1b53066352562f4de5467b2 Mon Sep 17 00:00:00 2001 From: Christopher Horobin Date: Mon, 12 May 2025 00:30:55 +0200 Subject: [PATCH 026/126] feat(router-core): type level parsing of path params (#4144) --- .../src/routes/params-ps/index.tsx | 4 - e2e/react-router/basic/src/main.tsx | 4 - ...ion.docs.framework.$framework.{$}[.]md.tsx | 1 - packages/react-router/src/Matches.tsx | 5 +- packages/react-router/src/index.tsx | 5 +- packages/react-router/tests/route.test-d.tsx | 148 ++++++++++++++++ packages/router-core/src/index.ts | 5 +- packages/router-core/src/link.ts | 102 +++++++++-- packages/router-core/src/route.ts | 27 ++- packages/solid-router/src/Matches.tsx | 3 +- packages/solid-router/src/index.tsx | 5 +- packages/solid-router/tests/route.test-d.tsx | 162 ++++++++++++++++++ packages/start-server-core/src/serverRoute.ts | 2 +- 13 files changed, 426 insertions(+), 47 deletions(-) diff --git a/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx index c5f4b6c5c3..67893d7d23 100644 --- a/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx +++ b/e2e/react-router/basic-file-based/src/routes/params-ps/index.tsx @@ -23,7 +23,6 @@ function RouteComponent() { /params-ps/named/{'prefix{$foo}'} @@ -33,7 +32,6 @@ function RouteComponent() { /params-ps/named/{'{$foo}suffix'} @@ -56,7 +54,6 @@ function RouteComponent() { /params-ps/wildcard/{'prefix{$}'} @@ -66,7 +63,6 @@ function RouteComponent() { /params-ps/wildcard/{'{$}suffix'} diff --git a/e2e/react-router/basic/src/main.tsx b/e2e/react-router/basic/src/main.tsx index 24e89eb47a..8bd8d5afcf 100644 --- a/e2e/react-router/basic/src/main.tsx +++ b/e2e/react-router/basic/src/main.tsx @@ -232,7 +232,6 @@ const paramsPsIndexRoute = createRoute({ /params-ps/named/{'prefix{$foo}'} @@ -242,7 +241,6 @@ const paramsPsIndexRoute = createRoute({ /params-ps/named/{'{$foo}suffix'} @@ -265,7 +263,6 @@ const paramsPsIndexRoute = createRoute({ /params-ps/wildcard/{'prefix{$}'} @@ -275,7 +272,6 @@ const paramsPsIndexRoute = createRoute({ /params-ps/wildcard/{'{$}suffix'} diff --git a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx index 0272dc643d..4644e2d0cf 100644 --- a/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx +++ b/e2e/react-start/website/src/routes/$project.$version.docs.framework.$framework.{$}[.]md.tsx @@ -2,7 +2,6 @@ import { getDocument } from '~/server/document' export const ServerRoute = createServerFileRoute().methods({ GET: async ({ params }) => { - // @ts-expect-error const splat = params['_splat'] || '' const docPath = splat.split('.md')[0] diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index d5a0638ad3..bc96173a21 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -15,6 +15,7 @@ import type { ReactNode } from './route' import type { AnyRouter, DeepPartial, + Expand, MakeOptionalPathParams, MakeOptionalSearchParams, MakeRouteMatchUnion, @@ -123,7 +124,9 @@ export function useMatchRoute() { const TMaskTo extends string = '', >( opts: UseMatchRouteOptions, - ): false | ResolveRoute['types']['allParams'] => { + ): + | false + | Expand['types']['allParams']> => { const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts return router.matchRoute(rest as any, { diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index fd310f2058..c662c21fc0 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -48,7 +48,6 @@ export type { DeferredPromiseState, DeferredPromise, ParsedLocation, - ParsePathParams, RemoveTrailingSlashes, RemoveLeadingSlashes, ActiveOptions, @@ -57,6 +56,8 @@ export type { RootRouteId, AnyPathParams, ResolveParams, + ResolveOptionalParams, + ResolveRequiredParams, SearchSchemaInput, AnyContext, RouteContext, @@ -78,8 +79,6 @@ export type { TrimPath, TrimPathLeft, TrimPathRight, - ParseSplatParams, - SplatParams, StringifyParamsFn, ParamsOptions, InferAllParams, diff --git a/packages/react-router/tests/route.test-d.tsx b/packages/react-router/tests/route.test-d.tsx index 2183cf4af7..ed2ece1bc9 100644 --- a/packages/react-router/tests/route.test-d.tsx +++ b/packages/react-router/tests/route.test-d.tsx @@ -643,6 +643,8 @@ test('when creating a child route with a param and splat param from the root rou routeTree: rootRoute.addChildren([invoicesRoute]), }) + const params = invoicesRoute.useParams() + expectTypeOf(invoicesRoute.useParams()).toEqualTypeOf<{ invoiceId: string _splat?: string @@ -1776,3 +1778,149 @@ test('when creating a child route with an explicit search input', () => { .parameter(0) .toEqualTypeOf<{ page: string }>() }) + +test('when creating a route with a prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{$postId}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + postId: string + }>() +}) + +test('when creating a route with a optional prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{-$postId}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + postId?: string + }>() +}) + +test('when creating a route with a splat prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{$}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + _splat?: string + }>() +}) + +test('when creating a route with a splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/$/{-$detailId}/{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }>() +}) + +test('when creating a route with a boundary splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/detail{-$detailId}/file-{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }>() +}) + +test('when creating a route with a nested boundary splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/{-detail{$detailId}suffix}/file-{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }>() +}) + +test('when creating a route with a nested boundary splat, optional param, required param and escaping', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/{-detail{$detailId}suffix}[.$test]/file-{$myFile}[.]pdf/escape-param[$postId]', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }>() +}) + +test('when creating a route with escaped path param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '[$postId]', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf<{}>() +}) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index d254cdd0f9..d8296b0774 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -3,7 +3,6 @@ export type { DeferredPromiseState, DeferredPromise } from './defer' export { preloadWarning } from './link' export type { IsRequiredParams, - ParsePathParams, AddTrailingSlash, RemoveTrailingSlashes, AddLeadingSlash, @@ -144,8 +143,6 @@ export type { ErrorRouteProps, ErrorComponentProps, NotFoundRouteProps, - ParseSplatParams, - SplatParams, ResolveParams, ParseParamsFn, StringifyParamsFn, @@ -198,6 +195,8 @@ export type { RouteAddChildrenFn, RouteAddFileChildrenFn, RouteAddFileTypesFn, + ResolveOptionalParams, + ResolveRequiredParams, } from './route' export { diff --git a/packages/router-core/src/link.ts b/packages/router-core/src/link.ts index 2ff538bee1..4223e86e6e 100644 --- a/packages/router-core/src/link.ts +++ b/packages/router-core/src/link.ts @@ -30,18 +30,98 @@ import type { ParsedLocation } from './location' export type IsRequiredParams = Record extends TParams ? never : true -export type ParsePathParams = T & - `${string}$${string}` extends never - ? TAcc - : T extends `${string}$${infer TPossiblyParam}` - ? TPossiblyParam extends '' - ? TAcc - : TPossiblyParam & `${string}/${string}` extends never - ? TPossiblyParam | TAcc - : TPossiblyParam extends `${infer TParam}/${infer TRest}` - ? ParsePathParams +export interface ParsePathParamsResult< + in out TRequired, + in out TOptional, + in out TRest, +> { + required: TRequired + optional: TOptional + rest: TRest +} + +export type AnyParsePathParamsResult = ParsePathParamsResult< + string, + string, + string +> + +export type ParsePathParamsBoundaryStart = + T extends `${infer TLeft}{-${infer TRight}` + ? ParsePathParamsResult< + ParsePathParams['required'], + | ParsePathParams['optional'] + | ParsePathParams['required'] + | ParsePathParams['optional'], + ParsePathParams['rest'] + > + : T extends `${infer TLeft}{${infer TRight}` + ? ParsePathParamsResult< + | ParsePathParams['required'] + | ParsePathParams['required'], + | ParsePathParams['optional'] + | ParsePathParams['optional'], + ParsePathParams['rest'] + > + : never + +export type ParsePathParamsSymbol = + T extends `${string}$${infer TRight}` + ? TRight extends `${string}/${string}` + ? TRight extends `${infer TParam}/${infer TRest}` + ? TParam extends '' + ? ParsePathParamsResult< + ParsePathParams['required'], + '_splat' | ParsePathParams['optional'], + ParsePathParams['rest'] + > + : ParsePathParamsResult< + TParam | ParsePathParams['required'], + ParsePathParams['optional'], + ParsePathParams['rest'] + > + : never + : TRight extends '' + ? ParsePathParamsResult + : ParsePathParamsResult + : never + +export type ParsePathParamsBoundaryEnd = + T extends `${infer TLeft}}${infer TRight}` + ? ParsePathParamsResult< + | ParsePathParams['required'] + | ParsePathParams['required'], + | ParsePathParams['optional'] + | ParsePathParams['optional'], + ParsePathParams['rest'] + > + : never + +export type ParsePathParamsEscapeStart = + T extends `${infer TLeft}[${infer TRight}` + ? ParsePathParamsResult< + | ParsePathParams['required'] + | ParsePathParams['required'], + | ParsePathParams['optional'] + | ParsePathParams['optional'], + ParsePathParams['rest'] + > + : never + +export type ParsePathParamsEscapeEnd = + T extends `${string}]${infer TRight}` ? ParsePathParams : never + +export type ParsePathParams = T extends `${string}[${string}` + ? ParsePathParamsEscapeStart + : T extends `${string}]${string}` + ? ParsePathParamsEscapeEnd + : T extends `${string}}${string}` + ? ParsePathParamsBoundaryEnd + : T extends `${string}{${string}` + ? ParsePathParamsBoundaryStart + : T extends `${string}$${string}` + ? ParsePathParamsSymbol : never - : TAcc export type AddTrailingSlash = T extends `${string}/` ? T : `${T & string}/` diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 3157cb990b..fd5bbe46fa 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -153,27 +153,24 @@ export type ResolveSearchSchema = ? ResolveSearchSchemaFn : ResolveSearchSchemaFn -export type ParseSplatParams = TPath & - `${string}$` extends never - ? TPath & `${string}$/${string}` extends never - ? never - : '_splat' - : '_splat' +export type ResolveRequiredParams = { + [K in ParsePathParams['required']]: T +} -export interface SplatParams { - _splat?: string +export type ResolveOptionalParams = { + [K in ParsePathParams['optional']]?: T } -export type ResolveParams = - ParseSplatParams extends never - ? Record, string> - : Record, string> & SplatParams +export type ResolveParams< + TPath extends string, + T = string, +> = ResolveRequiredParams & ResolveOptionalParams export type ParseParamsFn = ( - rawParams: ResolveParams, -) => TParams extends Record, any> + rawParams: Expand>, +) => TParams extends ResolveParams ? TParams - : Record, any> + : ResolveParams export type StringifyParamsFn = ( params: TParams, diff --git a/packages/solid-router/src/Matches.tsx b/packages/solid-router/src/Matches.tsx index c269f74d68..7a0d32918d 100644 --- a/packages/solid-router/src/Matches.tsx +++ b/packages/solid-router/src/Matches.tsx @@ -10,6 +10,7 @@ import { SafeFragment } from './SafeFragment' import type { AnyRouter, DeepPartial, + Expand, MakeOptionalPathParams, MakeOptionalSearchParams, MakeRouteMatchUnion, @@ -117,7 +118,7 @@ export function useMatchRoute() { >( opts: UseMatchRouteOptions, ): Solid.Accessor< - false | ResolveRoute['types']['allParams'] + false | Expand['types']['allParams']> > => { const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index d25d73545a..2d7204db62 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -47,7 +47,6 @@ export type { DeferredPromiseState, DeferredPromise, ParsedLocation, - ParsePathParams, RemoveTrailingSlashes, RemoveLeadingSlashes, ActiveOptions, @@ -56,6 +55,8 @@ export type { RootRouteId, AnyPathParams, ResolveParams, + ResolveOptionalParams, + ResolveRequiredParams, SearchSchemaInput, AnyContext, RouteContext, @@ -77,8 +78,6 @@ export type { TrimPath, TrimPathLeft, TrimPathRight, - ParseSplatParams, - SplatParams, StringifyParamsFn, ParamsOptions, InferAllParams, diff --git a/packages/solid-router/tests/route.test-d.tsx b/packages/solid-router/tests/route.test-d.tsx index fc58b779ab..3cdc65bb1d 100644 --- a/packages/solid-router/tests/route.test-d.tsx +++ b/packages/solid-router/tests/route.test-d.tsx @@ -1765,3 +1765,165 @@ test('when creating a child route with an explicit search input', () => { .parameter(0) .toEqualTypeOf<{ page: string }>() }) + +test('when creating a route with a prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{$postId}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + postId: string + }> + >() +}) + +test('when creating a route with a optional prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{-$postId}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + postId?: string + }> + >() +}) + +test('when creating a route with a splat prefix and suffix', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'prefix{$}suffix', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + _splat?: string + }> + >() +}) + +test('when creating a route with a splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/$/{-$detailId}/{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }> + >() +}) + +test('when creating a route with a boundary splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/detail{-$detailId}/file-{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }> + >() +}) + +test('when creating a route with a nested boundary splat, optional param and required param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/{-detail{$detailId}suffix}/file-{$myFile}.pdf', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }> + >() +}) + +test('when creating a route with a nested boundary splat, optional param, required param and escaping', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'docs/$docId/before{$}after/{-detail{$detailId}suffix}[.$test]/file-{$myFile}[.]pdf/escape-param[$postId]', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{ + docId: string + _splat?: string + myFile: string + detailId?: string + }> + >() +}) + +test('when creating a route with escaped path param', () => { + const rootRoute = createRootRoute() + + const prefixSuffixRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '[$postId]', + }) + + const routeTree = rootRoute.addChildren([prefixSuffixRoute]) + + const router = createRouter({ routeTree }) + + expectTypeOf(prefixSuffixRoute.useParams()).toEqualTypeOf< + Accessor<{}> + >() +}) diff --git a/packages/start-server-core/src/serverRoute.ts b/packages/start-server-core/src/serverRoute.ts index 65fa00c8b2..18011d6656 100644 --- a/packages/start-server-core/src/serverRoute.ts +++ b/packages/start-server-core/src/serverRoute.ts @@ -473,7 +473,7 @@ export interface ServerRouteMethodHandlerCtx< AssignAllMethodContext > request: Request - params: ResolveParams + params: Expand> pathname: TFullPath } From 8d4a7e8b7f49f9f3cc8a61fcfc72a07b77e6f132 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 11 May 2025 22:32:04 +0000 Subject: [PATCH 027/126] release: v1.120.4-alpha.10 --- .../package.json | 6 +++--- .../react/authenticated-routes/package.json | 6 +++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 +++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../package.json | 6 +++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 +++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 +++--- .../react/quickstart-file-based/package.json | 6 +++--- .../quickstart-rspack-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++------ examples/react/start-bare/package.json | 6 +++--- examples/react/start-basic-auth/package.json | 6 +++--- .../start-basic-react-query/package.json | 8 ++++---- examples/react/start-basic-rsc/package.json | 6 +++--- .../react/start-basic-static/package.json | 6 +++--- examples/react/start-basic/package.json | 6 +++--- examples/react/start-clerk-basic/package.json | 6 +++--- .../react/start-convex-trellaux/package.json | 8 ++++---- examples/react/start-counter/package.json | 6 +++--- examples/react/start-large/package.json | 6 +++--- examples/react/start-material-ui/package.json | 6 +++--- .../react/start-supabase-basic/package.json | 6 +++--- examples/react/start-trellaux/package.json | 8 ++++---- examples/react/start-workos/package.json | 6 +++--- examples/react/view-transitions/package.json | 6 +++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 ++++---- examples/react/with-trpc/package.json | 8 ++++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 +++--- examples/solid/basic-solid-query/package.json | 6 +++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../solid/quickstart-file-based/package.json | 6 +++--- examples/solid/start-bare/package.json | 6 +++--- examples/solid/start-basic/package.json | 6 +++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 92 files changed, 210 insertions(+), 210 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index fe5443b2dc..3e41dd6896 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index bc6d02d16b..626bad6d44 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 38d7a43a99..ed0627c73e 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 6c212c8d8d..6a06002007 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 50b1a3dc81..62adf5590a 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 36d60a2c7a..957f02f9ea 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 47b0b0057a..ee6d95b962 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 8e94f141e7..5adaf4712a 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index b92b1e69df..93a1773208 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index b640eb8538..05888c5b9f 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 6f861b744e..f89eabab26 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 9b3f07c61e..83887f20b0 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index c0822bdf58..eecb457036 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index b76b80f4b1..6d424bbc4d 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index f1d48bf0b4..046f6cf0e0 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 24af5ffcb5..9eb027659e 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 3f2b016072..ec4bf8a565 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index b6340e4270..a1af6c9089 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 612d77e05c..c635c37f45 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 2ecbfb0093..cf25609380 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 504b7b1339..01449a8591 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 87ece13e02..3ea39dbe9b 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 85a90349de..cd395f714e 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index dc3945c274..37f893c605 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index fce0dc6d11..fced4dd951 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index ad9c2b49a9..ae703b7cce 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index df05a63fd1..b2bdea8bc0 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 7a393fa20c..dbe335becd 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index f92ec1e3ea..8c16b54bd7 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 46fcef0028..c2d4e9c55b 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index fe21ee0866..e06af05f02 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index f1cf5e4cdd..8ee186f1b8 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 67413e6e45..ff85fce43f 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index c3a1b0fb27..cd7603a616 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 5a51334597..d6589f1dd2 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.1", + "@tanstack/arktype-adapter": "^1.120.4-alpha.10", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/valibot-adapter": "^1.120.4-alpha.1", - "@tanstack/zod-adapter": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/valibot-adapter": "^1.120.4-alpha.10", + "@tanstack/zod-adapter": "^1.120.4-alpha.10", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 0d7ca735ad..b6b784328e 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index b50b1b84ee..87b2cd5610 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index c9b1b4fa82..e443770b45 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-with-query": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-with-query": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 9656443e92..573f6f7793 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 7e7fbb9005..e64e2217e0 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index debcc42fbb..156d0d00df 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 70ab25d729..18e8e86e36 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 110884e26c..dfb6172fd4 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-with-query": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-with-query": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 829af1f9d5..dc39eb09f5 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index afa1b269b6..2bee72bff6 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index b881b2fca8..fcb522a2e6 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 42add893b1..c35a29c4c9 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 2a0b2a033d..f5fe9b56f5 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-with-query": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-with-query": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 76ae4f39d0..3d31f296a4 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index a67a4bd11d..9aceee8190 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 669cfa3475..9be129ee42 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 63a2915c2b..02fbf20e8a 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 81940246d7..721f29a849 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.1", - "@tanstack/react-router-devtools": "^1.120.4-alpha.1", - "@tanstack/router-plugin": "^1.120.4-alpha.4", - "@tanstack/react-start": "^1.120.4-alpha.9", + "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.10", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 2ebbb6892b..5f512bfae6 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 51a26c21c5..b44dd4bf40 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 70319c9792..6a8f9dd969 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 7c5b641f51..de2ed8871a 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index dd24feeb48..eb49bff326 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index ff93c47b93..a01085c41b 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 83a153446e..dfe644bd33 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index f3e6624224..e07c8bd8e7 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.4", + "@tanstack/router-plugin": "^1.120.4-alpha.10", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index da5cb2f98e..f55aee053f 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.9", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-start": "^1.120.4-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 63710b9030..7a093844e5 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.1", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.1", - "@tanstack/solid-start": "^1.120.4-alpha.9", + "@tanstack/solid-router": "^1.120.4-alpha.10", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-start": "^1.120.4-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 0ac9f4df74..1d669208cc 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 40b555cde1..eae128e446 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index 6dc7e5bae9..f5f24a155c 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index c4b35f7928..4a021b2624 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 1cbbca4a87..3bce3bd679 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 7cc37a93f4..559ce1f9ea 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.9", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index d41ea20211..36444f8250 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.8", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index ace71c51f4..a3f89431fc 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.9", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 0ddd9cdc92..d766f08731 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 45b06e5dc1..16c99a7a23 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 0d3ecca290..8c484d2bcd 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 37b923d3e1..534aa31d98 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 59dcf8f5a3..202ced65f0 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index d7f77bc03a..5919ca90b1 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 4417e7f29e..3b3a5557fe 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.4", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 41fc1bff85..b2923f7380 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index ea535937bc..5660742ffb 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 87fc87fc75..8c58cacb0f 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 33b49311ef..5dd6d539eb 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.9", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 85ad40c900..6253fc83b7 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.8", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 49f01841c1..8634bc68ca 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.9", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 8838c4a5e6..362119e109 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 69b66ddedb..f64531fb8a 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.9", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index d7b875deb4..dd1dd53661 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.8", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index f7189faecc..111a2aa590 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 603996291d..9d234078ca 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 99ae410780..bdb53c4910 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 3daf7810ca..ade50171ca 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.1", + "version": "1.120.4-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b48c3108a..2b51fe199c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5069,7 +5069,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5109,7 +5109,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5143,7 +5143,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5183,7 +5183,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5229,7 +5229,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5272,7 +5272,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5312,7 +5312,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5355,7 +5355,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5395,7 +5395,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.1 + specifier: ^1.120.4-alpha.10 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 6bde41fdf5fe8beaff1e70e3ea43bbc20ad1166a Mon Sep 17 00:00:00 2001 From: Ryan Gillie Date: Mon, 12 May 2025 13:25:14 -0400 Subject: [PATCH 028/126] docs(start): Server Functions can be called from Server Routes (#4154) --- docs/start/framework/react/server-functions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/start/framework/react/server-functions.md b/docs/start/framework/react/server-functions.md index 61c97a5080..ebb7795567 100644 --- a/docs/start/framework/react/server-functions.md +++ b/docs/start/framework/react/server-functions.md @@ -8,7 +8,7 @@ title: Server Functions Server functions allow you to specify logic that can be invoked almost anywhere (even the client), but run **only** on the server. In fact, they are not so different from an API Route, but with a few key differences: - They do not have stable public URL (but you'll be able to do this very soon!) -- They can be called from anywhere in your application, including loaders, hooks, components, etc., but cannot be called from API Routes. +- They can be called from anywhere in your application, including loaders, hooks, components, etc. However, they are similar to regular API Routes in that: From e6fab6a445a056de452c1b314a60b5cabee05a23 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Mon, 12 May 2025 19:59:22 +0200 Subject: [PATCH 029/126] docs(start): server-routes (#4155) --- docs/start/framework/react/server-routes.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md index c046c16eae..830667327b 100644 --- a/docs/start/framework/react/server-routes.md +++ b/docs/start/framework/react/server-routes.md @@ -7,14 +7,14 @@ title: Server Routes Server routes are a powerful feature of TanStack Start that allow you to create server-side endpoints in your application and are useful for handling raw HTTP requests, form submissions, user authentication, and much more. -Server routes can be defined in your `./app/routes` directory of your project **right alongside your TanStack Router routes** and are automatically handled by the TanStack Start server. +Server routes can be defined in your `./src/routes` directory of your project **right alongside your TanStack Router routes** and are automatically handled by the TanStack Start server. Here's what a simple server route looks like: ```ts // routes/hello.ts -export const ServerRoute = createServerRoute({ +export const ServerRoute = createServerFileRoute().methods({ GET: async ({ request }) => { return new Response('Hello, World!') }, @@ -26,9 +26,9 @@ export const ServerRoute = createServerRoute({ Because server routes can be defined in the same directory as your app routes, you can even use the same file for both! ```tsx -// routes/hello.ts +// routes/hello.tsx -export const ServerRoute = createServerRoute().methods({ +export const ServerRoute = createServerFileRoute().methods({ POST: async ({ request }) => { const body = await request.json() return new Response(JSON.stringify({ message: `Hello, ${body.name}!` })) @@ -83,7 +83,7 @@ Each route can only have a single handler file associated with it. So, if you ha ## Escaped Matching -Just as with normal routes, server routes can match on escaped characters. For example, a file named `routes/users[.]ts` will create an API route at `/api/users[.]`. +Just as with normal routes, server routes can match on escaped characters. For example, a file named `routes/users[.]json.ts` will create an API route at `/api/users[.]json`. ## Pathless Layout Routes and Break-out Routes From 418fac9f24ee851d0ca247f6232583d3d8f08106 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Mon, 12 May 2025 21:52:17 +0200 Subject: [PATCH 030/126] docs: update build from scratch --- docs/start/framework/react/build-from-scratch.md | 5 ++--- docs/start/framework/solid/build-from-scratch.md | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/start/framework/react/build-from-scratch.md b/docs/start/framework/react/build-from-scratch.md index d8436d71a1..401d82ed8f 100644 --- a/docs/start/framework/react/build-from-scratch.md +++ b/docs/start/framework/react/build-from-scratch.md @@ -55,17 +55,16 @@ To install them, run: npm i @tanstack/react-start @tanstack/react-router vite ``` -You'll also need React and the Vite React plugin, so install them too: +You'll also need React:: ```shell npm i react react-dom -npm i -D @vitejs/plugin-react vite-tsconfig-paths ``` and some TypeScript: ```shell -npm i -D typescript @types/react @types/react-dom +npm i -D typescript @types/react @types/react-dom vite-tsconfig-paths ``` ## Update Configuration Files diff --git a/docs/start/framework/solid/build-from-scratch.md b/docs/start/framework/solid/build-from-scratch.md index 92d41fb237..c6b95b9e96 100644 --- a/docs/start/framework/solid/build-from-scratch.md +++ b/docs/start/framework/solid/build-from-scratch.md @@ -60,17 +60,16 @@ To install them, run: npm i @tanstack/solid-start @tanstack/solid-router vite ``` -You'll also need Solid and the Vite Solid plugin, so install them too: +You'll also need Solid: ```shell npm i solid-js -npm i -D vite-plugin-solid vite-tsconfig-paths ``` and some TypeScript: ```shell -npm i -D typescript +npm i -D typescript vite-tsconfig-paths ``` ## Update Configuration Files From 3f33f04a29bc9016d76a22430afafedf24fde19b Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Mon, 12 May 2025 23:03:53 +0200 Subject: [PATCH 031/126] fix: remove set/get global origin (#4157) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> fixes #4141 fixes #4153 --- packages/react-start-plugin/src/index.ts | 3 +- packages/solid-start-plugin/src/index.ts | 3 +- packages/start-server-core/src/index.tsx | 2 - packages/start-server-core/src/undici.ts | 60 ------------------------ 4 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 packages/start-server-core/src/undici.ts diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 72b2cc8de8..694109160f 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -57,12 +57,11 @@ export function TanStackStartVitePlugin( if (id === '/~start/server-entry.tsx') { return ` -import { toWebRequest, defineEventHandler, __setGlobalOrigin, __getAbsoluteUrl } from '@tanstack/react-start/server'; +import { toWebRequest, defineEventHandler } from '@tanstack/react-start/server'; import serverEntry from '${options.serverEntryPath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); - __setGlobalOrigin(__getAbsoluteUrl(request)); return serverEntry({ request }); }) ` diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index c7903ae0f3..8035d4b431 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -54,12 +54,11 @@ export function TanStackStartVitePlugin( if (id === '/~start/server-entry.tsx') { return ` -import { toWebRequest, defineEventHandler, __setGlobalOrigin, __getAbsoluteUrl } from '@tanstack/solid-start/server'; +import { toWebRequest, defineEventHandler } from '@tanstack/solid-start/server'; import serverEntry from '${options.serverEntryPath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); - __setGlobalOrigin(__getAbsoluteUrl(request)); return serverEntry({ request }); }) ` diff --git a/packages/start-server-core/src/index.tsx b/packages/start-server-core/src/index.tsx index 4803124cfa..9337b7c4cd 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -20,5 +20,3 @@ export * from './h3' export { createServerRoute, createServerFileRoute } from './serverRoute' export type { CreateServerFileRoute } from './serverRoute' - -export { __getAbsoluteUrl, __setGlobalOrigin } from './undici' diff --git a/packages/start-server-core/src/undici.ts b/packages/start-server-core/src/undici.ts deleted file mode 100644 index 8a3a638acb..0000000000 --- a/packages/start-server-core/src/undici.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { setGlobalOrigin } from 'undici' - -/** - * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY. - * - * @internal - */ -export const __setGlobalOrigin = setGlobalOrigin - -/** - * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY. - * - * Constructs an absolute URL from the given request object and options. - * - * @internal - * @param req - The `Request` object containing the headers to extract the host and protocol. - * @param options - Configuration options for determining the trust level of proxy headers. - * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers - * to determine the host and protocol. Defaults to `false`. - * @returns The absolute URL constructed from the request headers as a string. - * @throws Will throw an error if the `host` cannot be determined from the request headers. - * - * @example - * ```ts - * // Example usage: - * const req = new Request('http://example.com', { - * headers: { - * 'host': 'example.com', - * 'x-forwarded-host': 'proxy.example.com', - * 'x-forwarded-proto': 'https', - * }, - * }); - * - * // Without trusting proxy headers - * const url1 = getAbsoluteUrl(req); - * console.log(url1); // Output: "http://example.com" - * - * // With trusting proxy headers - * const url2 = getAbsoluteUrl(req, { trustProxy: true }); - * console.log(url2); // Output: "https://proxy.example.com" - * ``` - */ -export function __getAbsoluteUrl( - req: Request, - options: { trustProxy: boolean } = { trustProxy: false }, -): string { - const headers = req.headers - - const host = options.trustProxy - ? headers.get('x-forwarded-host') || headers.get('host') - : headers.get('host') - - const protocol = options.trustProxy - ? headers.get('x-forwarded-proto') || 'http' - : 'http' - - if (!host) throw new Error('Cannot determine host from request headers') - - return `${protocol}://${host}` -} From 6f764c2a217701fac217e1e9b2b0150111b42c13 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Mon, 12 May 2025 21:05:05 +0000 Subject: [PATCH 032/126] release: v1.120.4-alpha.11 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-server-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index b6b784328e..b3c377fefa 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 87b2cd5610..2214008699 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index e443770b45..b85144ad4d 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-with-query": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 573f6f7793..a85da94181 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index e64e2217e0..c2c84398c6 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 156d0d00df..a607432a57 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 18e8e86e36..a95281efd5 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index dfb6172fd4..18d9564113 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-with-query": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index dc39eb09f5..ed76e9ee4d 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 2bee72bff6..8284a6e1b0 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index fcb522a2e6..15d93fc156 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index c35a29c4c9..70f6d87ef2 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index f5fe9b56f5..14824d3d0e 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-with-query": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 3d31f296a4..ed56fe4839 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 02fbf20e8a..d3af28ae6f 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "@tanstack/router-plugin": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 721f29a849..dbe6ec9dec 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.10", "@tanstack/react-router-devtools": "^1.120.4-alpha.10", "@tanstack/router-plugin": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.10", + "@tanstack/react-start": "^1.120.4-alpha.11", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index f55aee053f..1eabc28b5d 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.10", "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", - "@tanstack/solid-start": "^1.120.4-alpha.10", + "@tanstack/solid-start": "^1.120.4-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 7a093844e5..f86f205017 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.10", "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", - "@tanstack/solid-start": "^1.120.4-alpha.10", + "@tanstack/solid-start": "^1.120.4-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 559ce1f9ea..2566830840 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 36444f8250..4de4c83d73 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index a3f89431fc..bd5042dfe2 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 5dd6d539eb..1c9d2fd9b5 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 6253fc83b7..7a13c426d0 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 8634bc68ca..cf7dc13c74 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index dd1dd53661..3edffb2898 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 9882e3031fee5bd17f8fb3cd5041ebbbe7d17efb Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Tue, 13 May 2025 00:18:53 +0200 Subject: [PATCH 033/126] fix: properly handle redirects thrown by server functions (#4156) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- packages/router-core/src/redirect.ts | 4 +++- .../src/createStartHandler.ts | 23 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/router-core/src/redirect.ts b/packages/router-core/src/redirect.ts index 84b82cc652..5036325435 100644 --- a/packages/router-core/src/redirect.ts +++ b/packages/router-core/src/redirect.ts @@ -87,7 +87,9 @@ export function isRedirect(obj: any): obj is AnyRedirect { return obj instanceof Response && !!(obj as any).options } -export function isResolvedRedirect(obj: any): obj is AnyRedirect { +export function isResolvedRedirect( + obj: any, +): obj is AnyRedirect & { options: { href: string } } { return isRedirect(obj) && !!obj.options.href } diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index c0415164f9..e31cfc1f7c 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -7,6 +7,7 @@ import { import { getMatchedRoutes, isRedirect, + isResolvedRedirect, joinPaths, processRouteTree, rootRouteId, @@ -165,6 +166,20 @@ export function createStartHandler({ })() if (isRedirect(response)) { + if (isResolvedRedirect(response)) { + if (request.headers.get('x-tsr-redirect') === 'manual') { + return json( + { + ...response.options, + isSerializedRedirect: true, + }, + { + headers: response.headers, + }, + ) + } + return response + } if ( response.options.to && typeof response.options.to === 'string' && @@ -199,7 +214,7 @@ export function createStartHandler({ isSerializedRedirect: true, }, { - headers: redirect.headers, + headers: response.headers, }, ) } @@ -355,5 +370,9 @@ function handleCtxResult(result: TODO) { } function isSpecialResponse(err: TODO) { - return err instanceof Response || isRedirect(err) + return isResponse(err) || isRedirect(err) +} + +function isResponse(response: Response): response is Response { + return response instanceof Response } From 6d428d360239cd4cf9e2a0ab7435edaf77e73669 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Mon, 12 May 2025 22:20:03 +0000 Subject: [PATCH 034/126] release: v1.120.4-alpha.12 --- .../package.json | 6 +++--- .../react/authenticated-routes/package.json | 6 +++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 +++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../package.json | 6 +++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 +++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 +++--- .../react/quickstart-file-based/package.json | 6 +++--- .../quickstart-rspack-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++------ examples/react/start-bare/package.json | 6 +++--- examples/react/start-basic-auth/package.json | 6 +++--- .../start-basic-react-query/package.json | 8 ++++---- examples/react/start-basic-rsc/package.json | 6 +++--- .../react/start-basic-static/package.json | 6 +++--- examples/react/start-basic/package.json | 6 +++--- examples/react/start-clerk-basic/package.json | 6 +++--- .../react/start-convex-trellaux/package.json | 8 ++++---- examples/react/start-counter/package.json | 6 +++--- examples/react/start-large/package.json | 6 +++--- examples/react/start-material-ui/package.json | 6 +++--- .../react/start-supabase-basic/package.json | 6 +++--- examples/react/start-trellaux/package.json | 8 ++++---- examples/react/start-workos/package.json | 6 +++--- examples/react/view-transitions/package.json | 6 +++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 ++++---- examples/react/with-trpc/package.json | 8 ++++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 +++--- examples/solid/basic-solid-query/package.json | 6 +++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../solid/quickstart-file-based/package.json | 6 +++--- examples/solid/start-bare/package.json | 6 +++--- examples/solid/start-basic/package.json | 6 +++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 92 files changed, 210 insertions(+), 210 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 3e41dd6896..fc911876dd 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 626bad6d44..74e2a46742 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index ed0627c73e..2146ce5139 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 6a06002007..5617ce58a7 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 62adf5590a..d0ff5eeb9c 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 957f02f9ea..9da30c2ed2 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index ee6d95b962..d4b2208b60 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 5adaf4712a..5d8c16b663 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 93a1773208..22d7d50b26 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 05888c5b9f..994c0a8083 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index f89eabab26..15d504976e 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 83887f20b0..077c891f0a 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index eecb457036..3d4b4df95c 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 6d424bbc4d..06dbc1801b 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 046f6cf0e0..7beac33f03 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 9eb027659e..bb35446a64 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index ec4bf8a565..fb6be17998 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index a1af6c9089..f8ed87553c 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index c635c37f45..5f700631eb 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index cf25609380..dd98bdb7ef 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 01449a8591..ce860f08a1 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 3ea39dbe9b..3503609ba3 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index cd395f714e..9532470596 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 37f893c605..135ec9867e 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index fced4dd951..b846b890a1 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index ae703b7cce..f95787fb78 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index b2bdea8bc0..d31566909e 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index dbe335becd..713a23ffc9 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 8c16b54bd7..5052594961 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index c2d4e9c55b..0fbb2834cb 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index e06af05f02..85523875a1 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 8ee186f1b8..965e5f28e1 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index ff85fce43f..625789d2db 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index cd7603a616..287209f1e1 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index d6589f1dd2..4e7ebc3f9a 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.10", + "@tanstack/arktype-adapter": "^1.120.4-alpha.12", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", - "@tanstack/valibot-adapter": "^1.120.4-alpha.10", - "@tanstack/zod-adapter": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/valibot-adapter": "^1.120.4-alpha.12", + "@tanstack/zod-adapter": "^1.120.4-alpha.12", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index b3c377fefa..627bc2a597 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 2214008699..e1fc390d9c 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index b85144ad4d..38fc76295b 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-with-query": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-with-query": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index a85da94181..0b40c74031 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index c2c84398c6..acab61663e 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index a607432a57..00f173bb61 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index a95281efd5..11488d9107 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 18d9564113..52f4d88e60 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-with-query": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-with-query": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index ed76e9ee4d..31956f41e0 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 8284a6e1b0..b720d15c5f 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 15d93fc156..737ea9a94b 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 70f6d87ef2..9c5677de5a 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 14824d3d0e..8716cc864a 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-with-query": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-with-query": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index ed56fe4839..311b2769ab 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 9aceee8190..84b3df32ba 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 9be129ee42..99f78f3e33 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index d3af28ae6f..d832227163 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index dbe6ec9dec..9fd9e9f2ba 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.10", - "@tanstack/react-router-devtools": "^1.120.4-alpha.10", - "@tanstack/router-plugin": "^1.120.4-alpha.10", - "@tanstack/react-start": "^1.120.4-alpha.11", + "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-start": "^1.120.4-alpha.12", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 5f512bfae6..c5d5859cd8 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index b44dd4bf40..fc6a510d6b 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 6a8f9dd969..e38f366162 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index de2ed8871a..1aa0bd1e16 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index eb49bff326..a05d80997d 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index a01085c41b..c3885e8946 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index dfe644bd33..edd7dc7eb4 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index e07c8bd8e7..16de840a57 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.10", + "@tanstack/router-plugin": "^1.120.4-alpha.12", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 1eabc28b5d..eeb0573dd7 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", - "@tanstack/solid-start": "^1.120.4-alpha.11", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-start": "^1.120.4-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index f86f205017..83ac8af95d 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.10", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.10", - "@tanstack/solid-start": "^1.120.4-alpha.11", + "@tanstack/solid-router": "^1.120.4-alpha.12", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-start": "^1.120.4-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 1d669208cc..0debc19c58 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index eae128e446..edadecf439 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index f5f24a155c..e8d7ed3bc0 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 4a021b2624..a878e10cb0 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 3bce3bd679..512d2b1a3a 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 2566830840..b21d9232c5 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 4de4c83d73..1ca5a265a4 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index bd5042dfe2..876e010ec8 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index d766f08731..8b31c6c5c7 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 16c99a7a23..1768dc7987 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 8c484d2bcd..fa8e5efb98 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 534aa31d98..5539c44fb9 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 202ced65f0..e961a9ccb3 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 5919ca90b1..cd28c2aa7a 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 3b3a5557fe..118ddc6f37 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index b2923f7380..ed7f928158 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 5660742ffb..5d91923ef9 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 8c58cacb0f..db0d190af3 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 1c9d2fd9b5..b6dcd6585d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 7a13c426d0..fdb61364de 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index cf7dc13c74..02d7aea027 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 362119e109..7e97982eff 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f64531fb8a..fa427c7d9f 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 3edffb2898..70b9f5716a 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.11", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 111a2aa590..ff8e04adcd 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 9d234078ca..86f4e1dec0 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index bdb53c4910..06f9d5bf55 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index ade50171ca..92d3fcfa2d 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.10", + "version": "1.120.4-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b51fe199c..7bef389b8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5069,7 +5069,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5109,7 +5109,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5143,7 +5143,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5183,7 +5183,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5229,7 +5229,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5272,7 +5272,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5312,7 +5312,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5355,7 +5355,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5395,7 +5395,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.10 + specifier: ^1.120.4-alpha.12 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From c81090d02eb9ceff0bdcc0e5268bef6dec2c2919 Mon Sep 17 00:00:00 2001 From: Jaga Santagostino Date: Tue, 13 May 2025 00:29:38 +0200 Subject: [PATCH 035/126] docs(start): document that serverFn can be used in server routes (#4152) Co-authored-by: Manuel Schiller --- docs/start/framework/react/server-functions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/start/framework/react/server-functions.md b/docs/start/framework/react/server-functions.md index ebb7795567..26a99a8c94 100644 --- a/docs/start/framework/react/server-functions.md +++ b/docs/start/framework/react/server-functions.md @@ -8,7 +8,7 @@ title: Server Functions Server functions allow you to specify logic that can be invoked almost anywhere (even the client), but run **only** on the server. In fact, they are not so different from an API Route, but with a few key differences: - They do not have stable public URL (but you'll be able to do this very soon!) -- They can be called from anywhere in your application, including loaders, hooks, components, etc. +- They can be called from anywhere in your application, including loaders, hooks, components, server routes etc. However, they are similar to regular API Routes in that: From abb047ec4063d674fd94bd53b8647a5f78377f52 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Tue, 13 May 2025 01:31:22 +0200 Subject: [PATCH 036/126] fix: remove unused header (#4160) --- packages/router-core/src/index.ts | 1 - packages/router-core/src/redirect.ts | 2 -- .../start-server-core/src/createStartHandler.ts | 14 +------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index d8296b0774..361a0697dd 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -377,7 +377,6 @@ export { redirect, isRedirect, isResolvedRedirect, - tsrRedirectHeaderKey, parseRedirect, } from './redirect' diff --git a/packages/router-core/src/redirect.ts b/packages/router-core/src/redirect.ts index 5036325435..450d422afd 100644 --- a/packages/router-core/src/redirect.ts +++ b/packages/router-core/src/redirect.ts @@ -1,8 +1,6 @@ import type { NavigateOptions } from './link' import type { AnyRouter, RegisteredRouter } from './router' -export const tsrRedirectHeaderKey = 'X-Tanstack-Router-Redirect-Options' - export type AnyRedirect = Redirect /** diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index e31cfc1f7c..6acbf749ae 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -12,7 +12,6 @@ import { processRouteTree, rootRouteId, trimPath, - tsrRedirectHeaderKey, } from '@tanstack/router-core' import { getResponseHeaders, requestHandler } from './h3' import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server' @@ -222,18 +221,7 @@ export function createStartHandler({ return redirect } - // Add Access-Control-Expose-Headers - // With HTTPs the response/header objects are immutable, therefore we must clone them - const body = - response.status === 204 ? null : await response.clone().blob() - const headers = new Headers(response.headers) - headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey) - - return new Response(body, { - status: response.status, - statusText: response.statusText, - headers, - }) + return response }) } } From 4e0638bd658526e574c0cc5a746b702cdd130b04 Mon Sep 17 00:00:00 2001 From: Ryan Gillie Date: Mon, 12 May 2025 19:31:31 -0400 Subject: [PATCH 037/126] feat(react-start): Wrap default client entry with `` (#4159) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- docs/start/framework/react/learn-the-basics.md | 10 ++++++++-- packages/react-start-plugin/src/index.ts | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docs/start/framework/react/learn-the-basics.md b/docs/start/framework/react/learn-the-basics.md index dc4b55dcbc..9e746bed5e 100644 --- a/docs/start/framework/react/learn-the-basics.md +++ b/docs/start/framework/react/learn-the-basics.md @@ -82,13 +82,19 @@ Getting our html to the client is only half the battle. Once there, we need to h ```tsx // app/client.tsx -import { hydrateRoot } from 'react-dom/client' import { StartClient } from '@tanstack/react-start' +import { StrictMode } from 'react' +import { hydrateRoot } from 'react-dom/client' import { createRouter } from './router' const router = createRouter() -hydrateRoot(document, ) +hydrateRoot( + document, + + + , +) ``` This enables us to kick off client-side routing once the user's initial server request has fulfilled. diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 694109160f..c998afd448 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -69,13 +69,19 @@ export default defineEventHandler(function(event) { if (id === '/~start/default-client-entry.tsx') { return ` -import { hydrateRoot } from 'react-dom/client' import { StartClient } from '@tanstack/react-start' +import { StrictMode } from 'react' +import { hydrateRoot } from 'react-dom/client' import { createRouter } from ${routerImportPath} const router = createRouter() -hydrateRoot(document, ) +hydrateRoot( + document, + + + +) ` } From 55e54e1edb2f9b85df4813ec5f641734b3cbf14d Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Mon, 12 May 2025 23:36:04 +0000 Subject: [PATCH 038/126] release: v1.120.4-alpha.13 --- .../package.json | 6 +++--- .../react/authenticated-routes/package.json | 6 +++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 +++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../package.json | 6 +++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 +++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 +++--- .../react/quickstart-file-based/package.json | 6 +++--- .../quickstart-rspack-file-based/package.json | 6 +++--- .../package.json | 6 +++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 +++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++------ examples/react/start-bare/package.json | 6 +++--- examples/react/start-basic-auth/package.json | 6 +++--- .../start-basic-react-query/package.json | 8 ++++---- examples/react/start-basic-rsc/package.json | 6 +++--- .../react/start-basic-static/package.json | 6 +++--- examples/react/start-basic/package.json | 6 +++--- examples/react/start-clerk-basic/package.json | 6 +++--- .../react/start-convex-trellaux/package.json | 8 ++++---- examples/react/start-counter/package.json | 6 +++--- examples/react/start-large/package.json | 6 +++--- examples/react/start-material-ui/package.json | 6 +++--- .../react/start-supabase-basic/package.json | 6 +++--- examples/react/start-trellaux/package.json | 8 ++++---- examples/react/start-workos/package.json | 6 +++--- examples/react/view-transitions/package.json | 6 +++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 ++++---- examples/react/with-trpc/package.json | 8 ++++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 +++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 +++--- examples/solid/basic-solid-query/package.json | 6 +++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 +++--- .../solid/quickstart-file-based/package.json | 6 +++--- examples/solid/start-bare/package.json | 6 +++--- examples/solid/start-basic/package.json | 6 +++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 92 files changed, 210 insertions(+), 210 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index fc911876dd..f936de760b 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 74e2a46742..0b8d620fb8 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 2146ce5139..7bedf6cf22 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 5617ce58a7..0d243e7ed4 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index d0ff5eeb9c..3fad0ea62f 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 9da30c2ed2..6d19b0acc7 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index d4b2208b60..9045403698 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 5d8c16b663..c8525367d4 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 22d7d50b26..81165a2d6e 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 994c0a8083..3da91c0969 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 15d504976e..6d53e85e31 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 077c891f0a..14a3d0b826 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 3d4b4df95c..6e34bd5bb9 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 06dbc1801b..9b63e2d26a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 7beac33f03..75a03231e4 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index bb35446a64..440dcebea5 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index fb6be17998..659f131080 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index f8ed87553c..a9c065efb5 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 5f700631eb..86e3045370 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index dd98bdb7ef..51d05b2344 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index ce860f08a1..ffef264244 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 3503609ba3..32332e4e26 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 9532470596..73640f628b 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 135ec9867e..879ec390b9 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index b846b890a1..389b787645 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index f95787fb78..8bbf5d5375 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index d31566909e..3645ee3d03 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 713a23ffc9..68e952a1b5 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 5052594961..0cea1887b8 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 0fbb2834cb..acfd92e4a0 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 85523875a1..06360ef648 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 965e5f28e1..aa15e00208 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 625789d2db..564ee3827d 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 287209f1e1..b0142ca92c 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 4e7ebc3f9a..d617d30d79 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.12", + "@tanstack/arktype-adapter": "^1.120.4-alpha.13", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", - "@tanstack/valibot-adapter": "^1.120.4-alpha.12", - "@tanstack/zod-adapter": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/valibot-adapter": "^1.120.4-alpha.13", + "@tanstack/zod-adapter": "^1.120.4-alpha.13", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 627bc2a597..be43f50935 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index e1fc390d9c..ed05a7a47e 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 38fc76295b..6c0c4fee0d 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-with-query": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-with-query": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 0b40c74031..af82822204 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index acab61663e..38173a901a 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 00f173bb61..512890e635 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 11488d9107..9fb63f72ff 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 52f4d88e60..4ca26a9bab 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-with-query": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-with-query": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 31956f41e0..2460f42c9c 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index b720d15c5f..1ab6732f94 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 737ea9a94b..a77398a769 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 9c5677de5a..6efca8eb82 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 8716cc864a..f3ff81f8f5 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-with-query": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-with-query": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 311b2769ab..19258eae30 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 84b3df32ba..fc6a66936c 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 99f78f3e33..3a3775e074 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index d832227163..ad3d8b6d61 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 9fd9e9f2ba..46b7787ad5 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.12", - "@tanstack/react-router-devtools": "^1.120.4-alpha.12", - "@tanstack/router-plugin": "^1.120.4-alpha.12", - "@tanstack/react-start": "^1.120.4-alpha.12", + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index c5d5859cd8..ad3a453067 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index fc6a510d6b..71560094ed 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index e38f366162..6d712cb2a8 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 1aa0bd1e16..e6002e6ef5 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index a05d80997d..4f277798db 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index c3885e8946..81f802755d 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index edd7dc7eb4..431f31575e 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 16de840a57..c707fb19c2 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.12", + "@tanstack/router-plugin": "^1.120.4-alpha.13", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index eeb0573dd7..7c12ede751 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", - "@tanstack/solid-start": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-start": "^1.120.4-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 83ac8af95d..cc0372b131 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.12", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.12", - "@tanstack/solid-start": "^1.120.4-alpha.12", + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-start": "^1.120.4-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 0debc19c58..f3769c3bc6 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index edadecf439..b4651745f1 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index e8d7ed3bc0..d9687f3707 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index a878e10cb0..f7c82993ed 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 512d2b1a3a..4d4a282d79 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index b21d9232c5..0d07abd6db 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 1ca5a265a4..545518850f 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 876e010ec8..3994772c11 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 8b31c6c5c7..ef9b4f8ac4 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 1768dc7987..9372aff7ff 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index fa8e5efb98..4ba04beed9 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 5539c44fb9..e4821656b7 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index e961a9ccb3..a2fef653de 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index cd28c2aa7a..ecab796a9f 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 118ddc6f37..ba5c715397 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index ed7f928158..fe9a8a6573 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 5d91923ef9..661a7f14ac 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index db0d190af3..2d9160a9b2 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index b6dcd6585d..4275d4ca81 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index fdb61364de..dc4576a29f 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 02d7aea027..82518e8309 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 7e97982eff..b544c03f81 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index fa427c7d9f..d50aff385c 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 70b9f5716a..4805a571e8 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index ff8e04adcd..8961e775da 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 86f4e1dec0..dc2c99b1d2 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 06f9d5bf55..f61f73adcd 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 92d3fcfa2d..abdb0b9ef3 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.12", + "version": "1.120.4-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bef389b8f..1d2f59ae27 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5069,7 +5069,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5109,7 +5109,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5143,7 +5143,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5183,7 +5183,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5229,7 +5229,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5272,7 +5272,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5312,7 +5312,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5355,7 +5355,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5395,7 +5395,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.12 + specifier: ^1.120.4-alpha.13 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From a153fdad4c7bc36b93973d6add70074af8adc373 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Tue, 13 May 2025 16:14:15 +0200 Subject: [PATCH 039/126] docs(start): update src path for images --- docs/start/framework/react/authentication.md | 6 ++-- docs/start/framework/react/databases.md | 12 ++++---- docs/start/framework/react/hosting.md | 6 ++-- docs/start/framework/react/observability.md | 6 ++-- docs/start/framework/react/overview.md | 30 ++++++++++---------- docs/start/framework/solid/authentication.md | 6 ++-- docs/start/framework/solid/hosting.md | 6 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/start/framework/react/authentication.md b/docs/start/framework/react/authentication.md index fe90ebbcff..8d4ed86236 100644 --- a/docs/start/framework/react/authentication.md +++ b/docs/start/framework/react/authentication.md @@ -17,9 +17,9 @@ That said, authentication is not something to be taken lightly. After much vetti - - - Clerk logo + + + Clerk logo diff --git a/docs/start/framework/react/databases.md b/docs/start/framework/react/databases.md index 6f6aba34bd..e2a0bc42de 100644 --- a/docs/start/framework/react/databases.md +++ b/docs/start/framework/react/databases.md @@ -41,9 +41,9 @@ While TanStack Start is designed to work with any database provider, we highly r - - - Neon logo + + + Neon logo @@ -65,9 +65,9 @@ Key features that make Neon stand out: - - - Convex logo + + + Convex logo diff --git a/docs/start/framework/react/hosting.md b/docs/start/framework/react/hosting.md index 18cf42f713..5082039f48 100644 --- a/docs/start/framework/react/hosting.md +++ b/docs/start/framework/react/hosting.md @@ -15,9 +15,9 @@ However, since hosting is one of the most crucial aspects of your application's - - - Netlify logo + + + Netlify logo diff --git a/docs/start/framework/react/observability.md b/docs/start/framework/react/observability.md index fb483ba814..78e6a2dff3 100644 --- a/docs/start/framework/react/observability.md +++ b/docs/start/framework/react/observability.md @@ -15,9 +15,9 @@ However, for the best observability experience, we highly recommend using [Sentr - - - Convex logo + + + Convex logo diff --git a/docs/start/framework/react/overview.md b/docs/start/framework/react/overview.md index 5fa9088845..30f0388822 100644 --- a/docs/start/framework/react/overview.md +++ b/docs/start/framework/react/overview.md @@ -71,45 +71,45 @@ TanStack works closely with our partners to provide the best possible developer - **Clerk** - - - Clerk logo + + + Clerk logo The best possible authentication experience for modern web applications, including TanStack Start applications. Clerk provides TanStack Start users with first-class integrations and solutions to auth and collaborates closely with the TanStack team to ensure that TanStack Start provides APIs that are up to date with the latest in auth best practices. - **Netlify** - - - Netlify logo + + + Netlify logo The leading hosting platform for web applications that provides a fast, secure, and reliable environment for deploying your web applications. We work closely with Netlify to ensure that TanStack Start applications not only deploy seamlessly to their platform, but also implement best practices for performance, security, and reliability regardless of where you end up deploying. - **Neon** - - - Neon logo + + + Neon logo A serverless, autoscaling Postgres solution purpose-built for modern full-stack apps. Neon offers rich integration opportunities with TanStack Start, including server functions and database-backed routing. Together, we’re simplifying the database experience for developers using TanStack. - **Convex** - - - Convex logo + + + Convex logo A serverless database platform that integrates seamlessly with TanStack Start. Convex is designed to simplify the process of managing your application's data and provides a real-time, scalable, and transactional data backend that works well with TanStack Start applications. Convex also collaborates closely with the TanStack team to ensure that TanStack Start provides APIs that are up to date with the latest in database best practices. - **Sentry** - - - Sentry logo + + + Sentry logo A powerful, full-featured observability platform that integrates seamlessly with TanStack Start. Sentry helps developers monitor and fix crashes in real-time and provides insights into your application's performance and error tracking. Sentry collaborates closely with the TanStack team to ensure that TanStack Start provides APIs that are up to date with the latest in observability best practices. diff --git a/docs/start/framework/solid/authentication.md b/docs/start/framework/solid/authentication.md index 24a74f7316..eee03da9da 100644 --- a/docs/start/framework/solid/authentication.md +++ b/docs/start/framework/solid/authentication.md @@ -17,9 +17,9 @@ That said, authentication is not something to be taken lightly. After much vetti - - - Convex logo + + + Convex logo diff --git a/docs/start/framework/solid/hosting.md b/docs/start/framework/solid/hosting.md index 0acb872b8b..0a1586223e 100644 --- a/docs/start/framework/solid/hosting.md +++ b/docs/start/framework/solid/hosting.md @@ -15,9 +15,9 @@ However, since hosting is one of the most crucial aspects of your application's - - - Netlify logo + + + Netlify logo From 2559877826676708a1a48c3e2a968afc072ba857 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Tue, 13 May 2025 19:16:45 +0200 Subject: [PATCH 040/126] fix: remove undici (#4168) --- packages/start-plugin-core/src/plugin.ts | 1 - packages/start-server-core/package.json | 3 +- pnpm-lock.yaml | 43 ++++++++++-------------- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index fde7ea057f..9c4df86847 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -115,7 +115,6 @@ export function TanStackStartVitePluginCore( 'nitropack', '@tanstack/**', ], - external: ['undici'], }, /* prettier-ignore */ define: { diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 4805a571e8..7d28b5524b 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -70,8 +70,7 @@ "jsesc": "^3.1.0", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3", - "unctx": "^2.4.1", - "undici": "^7.8.0" + "unctx": "^2.4.1" }, "devDependencies": { "@types/jsesc": "^3.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d2f59ae27..91dea5c2d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3441,10 +3441,10 @@ importers: version: 19.0.3(@types/react@19.0.8) html-webpack-plugin: specifier: ^5.6.3 - version: 5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1) + version: 5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) swc-loader: specifier: ^0.2.6 - version: 0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1) + version: 0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) typescript: specifier: ^5.7.2 version: 5.8.2 @@ -6378,9 +6378,6 @@ importers: unctx: specifier: ^2.4.1 version: 2.4.1 - undici: - specifier: ^7.8.0 - version: 7.8.0 devDependencies: '@types/jsesc': specifier: ^3.0.3 @@ -13889,10 +13886,6 @@ packages: resolution: {integrity: sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==} engines: {node: '>=18.17'} - undici@7.8.0: - resolution: {integrity: sha512-vFv1GA99b7eKO1HG/4RPu2Is3FBTWBrmzqzO0mz+rLxN3yXkE4mqRcb8g8fHxzX4blEysrNZLqg5RbJLqX5buA==} - engines: {node: '>=20.18.1'} - unenv@1.10.0: resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==} @@ -18342,17 +18335,17 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.97.1)': + '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) - '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.97.1)': + '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) - '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1)': + '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) @@ -20158,7 +20151,7 @@ snapshots: html-tags@3.3.1: {} - html-webpack-plugin@5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1): + html-webpack-plugin@5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): dependencies: '@types/html-minifier-terser': 6.1.0 html-minifier-terser: 6.1.0 @@ -22198,7 +22191,7 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - swc-loader@0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1): + swc-loader@0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): dependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) '@swc/counter': 0.1.3 @@ -22270,26 +22263,26 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) esbuild: 0.25.2 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) esbuild: 0.25.2 @@ -22498,8 +22491,6 @@ snapshots: undici@6.21.2: {} - undici@7.8.0: {} - unenv@1.10.0: dependencies: consola: 3.4.2 @@ -22870,9 +22861,9 @@ snapshots: webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.97.1) - '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.97.1) - '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1) + '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) colorette: 2.0.20 commander: 10.0.1 cross-spawn: 7.0.6 @@ -22886,7 +22877,7 @@ snapshots: optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) - webpack-dev-middleware@7.4.2(webpack@5.97.1): + webpack-dev-middleware@7.4.2(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): dependencies: colorette: 2.0.20 memfs: 4.17.0 @@ -22924,7 +22915,7 @@ snapshots: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack-dev-middleware: 7.4.2(webpack@5.97.1) + webpack-dev-middleware: 7.4.2(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) ws: 8.18.0 optionalDependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) @@ -22999,7 +22990,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: From 0a661471aaf7a22e0df16d14da637b5c1029cd0b Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 17:17:47 +0000 Subject: [PATCH 041/126] release: v1.120.4-alpha.14 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index be43f50935..b5cdb31aa0 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index ed05a7a47e..2edbaba868 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 6c0c4fee0d..a48be93a02 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-with-query": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index af82822204..8b530b37a2 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 38173a901a..a75a880cdd 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 512890e635..d7856ec99f 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 9fb63f72ff..cde77b5ddb 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 4ca26a9bab..a4a135d72c 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-with-query": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 2460f42c9c..aab07795ae 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 1ab6732f94..712c3b1f80 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index a77398a769..d49972c97e 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 6efca8eb82..f12ffa8988 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index f3ff81f8f5..d006af1be3 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-with-query": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 19258eae30..5ef9a08f7d 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index ad3d8b6d61..ec0138e1d4 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "@tanstack/router-plugin": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 46b7787ad5..9643ed9f67 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", "@tanstack/router-plugin": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.14", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 7c12ede751..84f775e4b0 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.13", "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", - "@tanstack/solid-start": "^1.120.4-alpha.13", + "@tanstack/solid-start": "^1.120.4-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index cc0372b131..2d389da86d 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.13", "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", - "@tanstack/solid-start": "^1.120.4-alpha.13", + "@tanstack/solid-start": "^1.120.4-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 0d07abd6db..482450794a 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 545518850f..aaa974ea64 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 3994772c11..730b632051 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 4275d4ca81..3244762086 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index dc4576a29f..fc215bb1e2 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 82518e8309..0fc4b04216 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index d50aff385c..20656eca69 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 7d28b5524b..f724fd501d 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 273c4c1ecd41ac98331902bd78879a98a83b645b Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 11:25:31 -0600 Subject: [PATCH 042/126] feat: shell mode --- docs/start/config.json | 4 + docs/start/framework/react/spa-shell.md | 164 ++++++++++++++++++ .../start-basic-static/src/routes/__root.tsx | 10 +- .../react/start-basic-static/vite.config.ts | 2 +- packages/react-router/src/Match.tsx | 19 +- .../src/defaultStreamHandler.tsx | 5 + packages/router-core/src/router.ts | 6 + .../src/nitro/nitro-plugin.ts | 40 +++++ packages/start-plugin-core/src/prerender.ts | 46 +++-- packages/start-plugin-core/src/schema.ts | 18 ++ 10 files changed, 287 insertions(+), 27 deletions(-) create mode 100644 docs/start/framework/react/spa-shell.md diff --git a/docs/start/config.json b/docs/start/config.json index 49ae01b516..bbc90dbb5b 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -53,6 +53,10 @@ "label": "SSR", "to": "framework/react/ssr" }, + { + "label": "SPA Shell", + "to": "framework/react/spa-shell" + }, { "label": "Hosting", "to": "framework/react/hosting" diff --git a/docs/start/framework/react/spa-shell.md b/docs/start/framework/react/spa-shell.md new file mode 100644 index 0000000000..d3b921c461 --- /dev/null +++ b/docs/start/framework/react/spa-shell.md @@ -0,0 +1,164 @@ +--- +id: spa-shell +title: SPA Shell +--- + +## What the heck is an SPA Shell? + +For applications that do not require SSR for either SEO, crawlers, or performance reasons, it may be desirable to ship a single HTML document to your users containing the "shell" of your application, or more specifically, the bare-minimum `html`, `head`, and `body` tags necessary to bootstrap your application only on the client. + +## Why use Start to create an SPA Shell? + +**No SSR doesn't mean giving up server-side features!** SPA Shells actually pair very nicely with server-side features like server functions and/or server routes. It **simply means that the initial document will not contain the fully rendered HTML of your application until it has been rendered on the client using JS**. + +## Benefits of an SPA Shell + +- **Easier to deploy** - A CDN that can serve static assets is all you need. +- **Cheaper** to host - CDNs are cheap compared to Lambda functions or long-running processes. +- **Client-side Only is simpler** - No SSR means less to go wrong with hydration, rendering, and routing. + +## Caveats of an SPA Shell + +- **Slower time to full content** - Time to full content is longer since all JS must download and execute before anything below the shell can be rendered. +- **Less SEO friendly** - Robots, crawlers and link unfurlers _may_ have a harder time indexing your application unless they are configured to execute JS and your application can render within a reasonable amount of time. + +## How does it work? + +After enabling the SPA Shell mode, running a Start build will have an additional prerendering step afterwards to generate the shell. This is done by: + +- **Prerendering** your application's **root route only** +- Where your application would normally render your matched routes, your router's configured **pending fallback component is rendered instead**. +- The resulting HTML is stored to a static HTML page called `/_shell.html` (configurable) +- Default rewrites are configured to redirect all 404 requests to the SPA shell + +## Enabling the SPA Shell + +To configure the SPA shell, you can add the following to your Start plugin's options: + +```tsx +// vite.config.ts +export default defineConfig({ + plugins: [ + TanStackStart({ + shell: { + enabled: true, + }, + }), + ], +}) +``` + +## Shell Mask Path + +The default pathname used to generate the shell is `/`. We call this the **shell mask path**. Since matched routes are not included, the pathname used to generate the shell is mostly irrelevant, but it's still configurable. + +> [!NOTE] +> It's recommended to keep the default value of `/` as the shell mask path. + +```tsx +// vite.config.ts +export default defineConfig({ + plugins: [ + TanStackStart({ + shell: { + maskPath: '/app', + }, + }), + ], +}) +``` + +## Auto Redirects + +When shell mode is enabled, the default behavior is to add a catch-all redirect from all 404 requests to the output shell HTML file. This behavior can be disabled by setting the `autoRedirect` option to `false`. + +```tsx +// vite.config.ts +export default defineConfig({ + plugins: [TanStackStart({ shell: { autoRedirect: false } })], +}) +``` + +## Prerendering Options + +The prerender option is used to configure the prerendering behavior of the SPA shell, and accepts the same prerender options as found in our prerendering guide. + +**By default, the following `prerender` options are set:** + +- `outputPath`: `/_shell.html` +- `crawlLinks`: `false` +- `retryCount`: `0` + +This means that by default, the shell will not be crawled for links to follow for additional prerendering, and will not retry prerendering fails. + +You can always override these options by providing your own prerender options: + +```tsx +// vite.config.ts +export default defineConfig({ + plugins: [ + TanStackStart({ + shell: { + prerender: { + outputPath: '/custom-shell', + crawlLinks: true, + retryCount: 3, + }, + }, + }), + ], +}) +``` + +## Customizing the SPA Shell + +Customizing the SPA shell can be useful if you want to: + +- Provide generic head tags for SPA routes +- Provide a custom pending fallback component +- Change literally anything about the shell's HTML, CSS, and JS + +To make this process simple, an `isShell` boolean can be found on the `router` instance: + +```tsx +// src/routes/root.tsx +export default function Root() { + const isShell = useRouter().isShell + + if (isShell) console.log('Rendering the shell!') +} +``` + +You can use this boolean to conditionally render different UI based on whether the current route is a shell or not, but keep in mind that after hydrating the shell, the router will immediately navigate to the first route and the `isShell` boolean will be `false`. **This could produce flashes of unstyled content if not handled properly.** + +## Dynamic Data in your Shell + +Since the shell is prerendered using the SSR build of your application, any `loader`s, or server-specific functionality defined on your **Root Route** will run during the prerendering process and the data will be included in the shell. + +This means that you can use dynamic data in your shell by using a `loader` or server-specific functionality. + +```tsx +// src/routes/__root.tsx + +export const RootRoute = createRootRoute({ + loader: async () => { + return { + name: 'Tanner', + } + }, + component: Root, +}) + +export default function Root() { + const { name } = useLoaderData() + + return ( + + +

Hello, {name}!

+ + + + ) +} +``` diff --git a/examples/react/start-basic-static/src/routes/__root.tsx b/examples/react/start-basic-static/src/routes/__root.tsx index 70140f2306..7bd99ed901 100644 --- a/examples/react/start-basic-static/src/routes/__root.tsx +++ b/examples/react/start-basic-static/src/routes/__root.tsx @@ -53,9 +53,9 @@ export const Route = createRootRoute({ }), errorComponent: (props) => { return ( - + - + ) }, notFoundComponent: () => , @@ -64,13 +64,13 @@ export const Route = createRootRoute({ function RootComponent() { return ( - + - + ) } -function RootDocument({ children }: { children: React.ReactNode }) { +function RootLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/examples/react/start-basic-static/vite.config.ts b/examples/react/start-basic-static/vite.config.ts index 094ff074ae..71a9b8a656 100644 --- a/examples/react/start-basic-static/vite.config.ts +++ b/examples/react/start-basic-static/vite.config.ts @@ -11,7 +11,7 @@ export default defineConfig({ projects: ['./tsconfig.json'], }), tanstackStart({ - prerender: { + shell: { enabled: true, }, }), diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 79dd4ed01a..bf549f362b 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -306,6 +306,17 @@ export const Outlet = React.memo(function OutletImpl() { }, }) + const pendingElement = router.options.defaultPendingComponent ? ( + + ) : null + + if (router.isShell) + return ( + + + + ) + if (parentGlobalNotFound) { return renderRouteNotFound(router, route, undefined) } @@ -316,10 +327,6 @@ export const Outlet = React.memo(function OutletImpl() { const nextMatch = - const pendingElement = router.options.defaultPendingComponent ? ( - - ) : null - if (matchId === rootRouteId) { return ( {nextMatch} @@ -328,3 +335,7 @@ export const Outlet = React.memo(function OutletImpl() { return nextMatch }) + +function ShellInner(): React.ReactElement { + throw new Error('ShellBoundaryError') +} diff --git a/packages/react-start-server/src/defaultStreamHandler.tsx b/packages/react-start-server/src/defaultStreamHandler.tsx index e95a9fcb87..8891dfd218 100644 --- a/packages/react-start-server/src/defaultStreamHandler.tsx +++ b/packages/react-start-server/src/defaultStreamHandler.tsx @@ -54,6 +54,11 @@ export const defaultStreamHandler = defineHandlerCallback( }, }), onError: (error, info) => { + if ( + error instanceof Error && + error.message === 'ShellBoundaryError' + ) + return console.error('Error in renderToPipeableStream:', error, info) }, }, diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 5f7fc3f0d0..94a6c9bda2 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -844,6 +844,8 @@ export class RouterCore< // router can be used in a non-react environment if necessary startTransition: StartTransitionFn = (fn) => fn() + isShell = false + update: UpdateFn< TRouteTree, TTrailingSlashOption, @@ -932,6 +934,10 @@ export class RouterCore< 'selector(:active-view-transition-type(a)', ) } + + if ((this.latestLocation.search as any).__TSS_SHELL) { + this.isShell = true + } } get state() { diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index c61be21144..60b80633d0 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -80,12 +80,52 @@ export function nitroPlugin( rollupConfig: { plugins: [virtualBundlePlugin(getSsrBundle())], }, + routeRules: { + // TODO: We need to expose *some* kind of routeRules configuration + // and it needs to translate to this for now. But we should + // be cognizant of the probability that we will not use Nitro's + // routeRules configuration in the future. + ...(options.shell.enabled && options.shell.autoRedirect + ? { + '/**': { + // @ts-expect-error We are using this as a marker + __TSS_SHELL: true, + redirect: { + to: `${options.shell.prerender.outputPath.replace(/[/]{1,}$/, '')}`, + statusCode: 200, + }, + }, + } + : {}), + }, } const nitro = await createNitro(nitroConfig) await buildNitroEnvironment(nitro, () => build(nitro)) + if (options.shell.enabled) { + options.prerender = { + ...options.prerender, + enabled: true, + } + + const maskUrl = new URL( + options.shell.maskPath, + 'http://localhost', + ) + + maskUrl.searchParams.set('__TSS_SHELL', 'true') + + options.pages.push({ + path: maskUrl.toString().replace('http://localhost', ''), + prerender: options.shell.prerender, + sitemap: { + exclude: true, + }, + }) + } + if (options.prerender?.enabled) { await prerender({ options, diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index afb252431a..43037daec0 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -20,7 +20,7 @@ export async function prerender({ nitro: Nitro builder: ViteBuilder }) { - nitro.logger.info('Prendering pages...') + console.info('Prendering pages...') // If prerender is enabled but no pages are provided, default to prerendering the root page if (options.prerender?.enabled && !options.pages.length) { @@ -44,6 +44,14 @@ export async function prerender({ const nodeNitro = await createNitro({ ...nitro.options._config, + routeRules: { + // Filter out our shell redirect rule if it exists + ...Object.fromEntries( + Object.entries(nitro.options._config.routeRules ?? {}).filter( + ([_, value]) => !(value as any).__TSS_SHELL, + ), + ), + }, preset: 'nitro-prerender', logLevel: 0, output: { @@ -90,14 +98,14 @@ export async function prerender({ // Crawl all pages const pages = await prerenderPages() - nitro.logger.info(`Prerendered ${pages.length} pages:`) + console.info(`Prerendered ${pages.length} pages:`) pages.forEach((page) => { - nitro.logger.info(`- ${page}`) + console.info(`- ${page}`) }) // TODO: Write the prerendered pages to the output directory } catch (error) { - nitro.logger.error(error) + console.error(error) } finally { // Ensure server is always closed // server.process.kill() @@ -123,7 +131,7 @@ export async function prerender({ const seen = new Set() const retriesByPath = new Map() const concurrency = options.prerender?.concurrency ?? os.cpus().length - nitro.logger.info(`Concurrency: ${concurrency}`) + console.info(`Concurrency: ${concurrency}`) const queue = new Queue({ concurrency }) options.pages.forEach((_page) => { @@ -165,7 +173,7 @@ export async function prerender({ // Add the task queue.add(async () => { - nitro.logger.info(`Crawling: ${page.path}`) + console.info(`Crawling: ${page.path}`) const retries = retriesByPath.get(page.path) || 0 try { // Fetch the route @@ -179,23 +187,29 @@ export async function prerender({ ) if (!res.ok) { - throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`) + throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`, { + cause: res, + }) } + const cleanPagePath = ( + prerenderOptions.outputPath || page.path + ).split(/[?#]/)[0]! + // Guess route type and populate fileName const contentType = res.headers.get('content-type') || '' const isImplicitHTML = - !page.path.endsWith('.html') && contentType.includes('html') + !cleanPagePath.endsWith('.html') && contentType.includes('html') // && // !JsonSigRx.test(dataBuff.subarray(0, 32).toString('utf8')) - const routeWithIndex = page.path.endsWith('/') - ? page.path + 'index' - : page.path + const routeWithIndex = cleanPagePath.endsWith('/') + ? cleanPagePath + 'index' + : cleanPagePath const htmlPath = - page.path.endsWith('/') || prerenderOptions.autoSubfolderIndex - ? joinURL(page.path, 'index.html') - : page.path + '.html' + cleanPagePath.endsWith('/') || prerenderOptions.autoSubfolderIndex + ? joinURL(cleanPagePath, 'index.html') + : cleanPagePath + '.html' const filename = withoutBase( isImplicitHTML ? htmlPath : routeWithIndex, @@ -227,9 +241,7 @@ export async function prerender({ } } catch (error) { if (retries < (prerenderOptions.retryCount ?? 0)) { - nitro.logger.warn( - `Encountered error, retrying: ${page.path} in 500ms`, - ) + console.warn(`Encountered error, retrying: ${page.path} in 500ms`) await new Promise((resolve) => setTimeout(resolve, prerenderOptions.retryDelay), ) diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index b2f135d0c7..8cc22454bc 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -121,6 +121,7 @@ export function createTanStackStartOptionsSchema( }) .and(pagePrerenderOptionsSchema.optional()) .optional(), + shell: shellSchema.optional().default({}), }) .optional() .default({}) @@ -170,6 +171,7 @@ const pageBaseSchema = z.object({ const pagePrerenderOptionsSchema = z.object({ enabled: z.boolean().optional(), + outputPath: z.string().optional(), autoSubfolderIndex: z.boolean().optional(), crawlLinks: z.boolean().optional(), retryCount: z.number().optional(), @@ -186,6 +188,22 @@ const pagePrerenderOptionsSchema = z.object({ .optional(), }) +const shellSchema = z.object({ + enabled: z.boolean().optional().default(true), + maskPath: z.string().optional().default('/'), + autoRedirect: z.boolean().optional().default(true), + prerender: pagePrerenderOptionsSchema + .optional() + .default({}) + .transform((opts) => ({ + outputPath: opts.outputPath ?? '/_shell', + crawlLinks: false, + retryCount: 0, + ...opts, + enabled: true, + })), +}) + export const pageSchema = pageBaseSchema.extend({ prerender: pagePrerenderOptionsSchema.optional(), }) From 1e894bc011861642ecd14b4816f911ed92c2620a Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Tue, 13 May 2025 23:30:47 +0200 Subject: [PATCH 043/126] solidjs shell mode --- docs/start/config.json | 4 + docs/start/framework/solid/spa-shell.md | 3 + examples/solid/start-basic-static/.gitignore | 18 + .../solid/start-basic-static/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 70 ++ examples/solid/start-basic-static/README.md | 72 +++ .../solid/start-basic-static/package.json | 27 + .../start-basic-static/postcss.config.cjs | 7 + .../public/android-chrome-192x192.png | Bin 0 -> 29964 bytes .../public/android-chrome-512x512.png | Bin 0 -> 109271 bytes .../public/apple-touch-icon.png | Bin 0 -> 27246 bytes .../public/favicon-16x16.png | Bin 0 -> 832 bytes .../public/favicon-32x32.png | Bin 0 -> 2115 bytes .../start-basic-static/public/favicon.ico | Bin 0 -> 15406 bytes .../start-basic-static/public/favicon.png | Bin 0 -> 1507 bytes .../public/site.webmanifest | 19 + .../src/components/DefaultCatchBoundary.tsx | 53 ++ .../src/components/NotFound.tsx | 25 + .../start-basic-static/src/routeTree.gen.ts | 609 ++++++++++++++++++ .../solid/start-basic-static/src/router.tsx | 22 + .../start-basic-static/src/routes/__root.tsx | 139 ++++ .../src/routes/_pathlessLayout.tsx | 16 + .../routes/_pathlessLayout/_nested-layout.tsx | 34 + .../_nested-layout/route-a.tsx | 7 + .../_nested-layout/route-b.tsx | 7 + .../src/routes/deferred.tsx | 62 ++ .../start-basic-static/src/routes/index.tsx | 11 + .../src/routes/posts.$postId.tsx | 38 ++ .../src/routes/posts.index.tsx | 7 + .../start-basic-static/src/routes/posts.tsx | 38 ++ .../src/routes/posts_.$postId.deep.tsx | 29 + .../src/routes/redirect.tsx | 9 + .../src/routes/users.$userId.tsx | 49 ++ .../src/routes/users.index.tsx | 7 + .../start-basic-static/src/routes/users.tsx | 54 ++ .../solid/start-basic-static/src/server.ts | 12 + .../start-basic-static/src/styles/app.css | 14 + .../src/tanstack-start.d.ts | 2 + .../src/utils/loggingMiddleware.tsx | 42 ++ .../start-basic-static/src/utils/posts.tsx | 37 ++ .../solid/start-basic-static/src/utils/seo.ts | 33 + .../start-basic-static/src/utils/users.tsx | 7 + .../start-basic-static/tailwind.config.cjs | 4 + .../solid/start-basic-static/tsconfig.json | 23 + .../solid/start-basic-static/vite.config.ts | 19 + packages/solid-router/src/Match.tsx | 10 + pnpm-lock.yaml | 74 ++- 47 files changed, 1700 insertions(+), 17 deletions(-) create mode 100644 docs/start/framework/solid/spa-shell.md create mode 100644 examples/solid/start-basic-static/.gitignore create mode 100644 examples/solid/start-basic-static/.prettierignore create mode 100644 examples/solid/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts create mode 100644 examples/solid/start-basic-static/README.md create mode 100644 examples/solid/start-basic-static/package.json create mode 100644 examples/solid/start-basic-static/postcss.config.cjs create mode 100644 examples/solid/start-basic-static/public/android-chrome-192x192.png create mode 100644 examples/solid/start-basic-static/public/android-chrome-512x512.png create mode 100644 examples/solid/start-basic-static/public/apple-touch-icon.png create mode 100644 examples/solid/start-basic-static/public/favicon-16x16.png create mode 100644 examples/solid/start-basic-static/public/favicon-32x32.png create mode 100644 examples/solid/start-basic-static/public/favicon.ico create mode 100644 examples/solid/start-basic-static/public/favicon.png create mode 100644 examples/solid/start-basic-static/public/site.webmanifest create mode 100644 examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx create mode 100644 examples/solid/start-basic-static/src/components/NotFound.tsx create mode 100644 examples/solid/start-basic-static/src/routeTree.gen.ts create mode 100644 examples/solid/start-basic-static/src/router.tsx create mode 100644 examples/solid/start-basic-static/src/routes/__root.tsx create mode 100644 examples/solid/start-basic-static/src/routes/_pathlessLayout.tsx create mode 100644 examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx create mode 100644 examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx create mode 100644 examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx create mode 100644 examples/solid/start-basic-static/src/routes/deferred.tsx create mode 100644 examples/solid/start-basic-static/src/routes/index.tsx create mode 100644 examples/solid/start-basic-static/src/routes/posts.$postId.tsx create mode 100644 examples/solid/start-basic-static/src/routes/posts.index.tsx create mode 100644 examples/solid/start-basic-static/src/routes/posts.tsx create mode 100644 examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx create mode 100644 examples/solid/start-basic-static/src/routes/redirect.tsx create mode 100644 examples/solid/start-basic-static/src/routes/users.$userId.tsx create mode 100644 examples/solid/start-basic-static/src/routes/users.index.tsx create mode 100644 examples/solid/start-basic-static/src/routes/users.tsx create mode 100644 examples/solid/start-basic-static/src/server.ts create mode 100644 examples/solid/start-basic-static/src/styles/app.css create mode 100644 examples/solid/start-basic-static/src/tanstack-start.d.ts create mode 100644 examples/solid/start-basic-static/src/utils/loggingMiddleware.tsx create mode 100644 examples/solid/start-basic-static/src/utils/posts.tsx create mode 100644 examples/solid/start-basic-static/src/utils/seo.ts create mode 100644 examples/solid/start-basic-static/src/utils/users.tsx create mode 100644 examples/solid/start-basic-static/tailwind.config.cjs create mode 100644 examples/solid/start-basic-static/tsconfig.json create mode 100644 examples/solid/start-basic-static/vite.config.ts diff --git a/docs/start/config.json b/docs/start/config.json index bbc90dbb5b..5f68366f6c 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -126,6 +126,10 @@ "label": "SSR", "to": "framework/solid/ssr" }, + { + "label": "SPA Shell", + "to": "framework/react/spa-shell" + }, { "label": "Hosting", "to": "framework/solid/hosting" diff --git a/docs/start/framework/solid/spa-shell.md b/docs/start/framework/solid/spa-shell.md new file mode 100644 index 0000000000..fb155429f1 --- /dev/null +++ b/docs/start/framework/solid/spa-shell.md @@ -0,0 +1,3 @@ +--- +ref: docs/start/framework/react/spa-shell.md +--- \ No newline at end of file diff --git a/examples/solid/start-basic-static/.gitignore b/examples/solid/start-basic-static/.gitignore new file mode 100644 index 0000000000..ca63f49885 --- /dev/null +++ b/examples/solid/start-basic-static/.gitignore @@ -0,0 +1,18 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output +/build/ +/api/ +/server/build +/public/build# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/examples/solid/start-basic-static/.prettierignore b/examples/solid/start-basic-static/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/examples/solid/start-basic-static/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/examples/solid/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts b/examples/solid/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..2dc6bfc4bd --- /dev/null +++ b/examples/solid/start-basic-static/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/solid/start-basic-static/README.md b/examples/solid/start-basic-static/README.md new file mode 100644 index 0000000000..eb580a5bf8 --- /dev/null +++ b/examples/solid/start-basic-static/README.md @@ -0,0 +1,72 @@ +# Welcome to TanStack.com! + +This site is built with TanStack Router! + +- [TanStack Router Docs](https://tanstack.com/router) + +It's deployed automagically with Vercel! + +- [Vercel](https://vercel.com/) + +## Development + +From your terminal: + +```sh +pnpm install +pnpm dev +``` + +This starts your app in development mode, rebuilding assets on file changes. + +## Editing and previewing the docs of TanStack projects locally + +The documentations for all TanStack projects except for `React Charts` are hosted on [https://tanstack.com](https://tanstack.com), powered by this TanStack Router app. +In production, the markdown doc pages are fetched from the GitHub repos of the projects, but in development they are read from the local file system. + +Follow these steps if you want to edit the doc pages of a project (in these steps we'll assume it's [`TanStack/form`](https://github.com/tanstack/form)) and preview them locally : + +1. Create a new directory called `tanstack`. + +```sh +mkdir tanstack +``` + +2. Enter the directory and clone this repo and the repo of the project there. + +```sh +cd tanstack +git clone git@github.com:TanStack/tanstack.com.git +git clone git@github.com:TanStack/form.git +``` + +> [!NOTE] +> Your `tanstack` directory should look like this: +> +> ``` +> tanstack/ +> | +> +-- form/ +> | +> +-- tanstack.com/ +> ``` + +> [!WARNING] +> Make sure the name of the directory in your local file system matches the name of the project's repo. For example, `tanstack/form` must be cloned into `form` (this is the default) instead of `some-other-name`, because that way, the doc pages won't be found. + +3. Enter the `tanstack/tanstack.com` directory, install the dependencies and run the app in dev mode: + +```sh +cd tanstack.com +pnpm i +# The app will run on https://localhost:3000 by default +pnpm dev +``` + +4. Now you can visit http://localhost:3000/form/latest/docs/overview in the browser and see the changes you make in `tanstack/form/docs`. + +> [!NOTE] +> The updated pages need to be manually reloaded in the browser. + +> [!WARNING] +> You will need to update the `docs/config.json` file (in the project's repo) if you add a new doc page! diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json new file mode 100644 index 0000000000..0763d46d9b --- /dev/null +++ b/examples/solid/start-basic-static/package.json @@ -0,0 +1,27 @@ +{ + "name": "tanstack-solid-start-example-basic-static", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev", + "build": "vite build", + "start": "vite start" + }, + "dependencies": { + "@tanstack/solid-router": "^1.120.4-alpha.13", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-start": "^1.120.4-alpha.14", + "solid-js": "^1.9.5", + "redaxios": "^0.5.1", + "tailwind-merge": "^2.5.5" + }, + "devDependencies": { + "@types/node": "^22.5.4", + "autoprefixer": "^10.4.20", + "postcss": "^8.4.49", + "tailwindcss": "^3.4.15", + "typescript": "^5.6.2", + "vite-tsconfig-paths": "^5.1.3" + } +} diff --git a/examples/solid/start-basic-static/postcss.config.cjs b/examples/solid/start-basic-static/postcss.config.cjs new file mode 100644 index 0000000000..8e638a6bcd --- /dev/null +++ b/examples/solid/start-basic-static/postcss.config.cjs @@ -0,0 +1,7 @@ +module.exports = { + plugins: [ + require('tailwindcss/nesting'), + require('tailwindcss'), + require('autoprefixer'), + ], +} diff --git a/examples/solid/start-basic-static/public/android-chrome-192x192.png b/examples/solid/start-basic-static/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..09c8324f8c6781bc90fcf5dd38e0702bd5f171f3 GIT binary patch literal 29964 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 b=FG literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/android-chrome-512x512.png b/examples/solid/start-basic-static/public/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..11d626ea3d00fddd52861bf0af5554a92fc30d69 GIT binary patch literal 109271 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 Ef@mE(_W%F@ literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/apple-touch-icon.png b/examples/solid/start-basic-static/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9423cc02c40ea066d2a061cdcdf621c0718cb1 GIT binary patch literal 27246 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⪼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 N002ovPDHLkV1k;v<;Va4 literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/favicon-16x16.png b/examples/solid/start-basic-static/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..e3389b00443d602a249b48ae0e21e333971c9c1e GIT binary patch literal 832 zcmV-G1Hb%Px%`bk7VR5(v%lW%BSRTRK~=OuZ4FYhI3vvy^4t8t~UDHGBS#44K%hSiDal!9Nj zeb^RZ;3&cb72F3w6s4;uUA7>Cf>1=Z56;a$8wZ=NKHtq z33GDV=_|V0E(QPTEB1=edhG{{=-+C??RQi7*e9J7YBnZR+PppIKjA8EV+}Yt`zH<7 zGR%O5D3|Ef)99hUXu19=Cxaki@6toZIe&u-X0(oDFRl|x6P7Bwc^mB(i9|gOY)Jh6DaPkmt z8Wr!@TP1|RPlYRlJe^eRB0K(gn91{(=zi{HrkpHIflw8&q%;+U!V&dFPYDQAWJh@< zwcklN9VEX?vG;}75GqCepKC25M^xV%BcR%A8c!)S5k4P0$g}HS#lA6zy`~K@9&EX4 zOrvr%_1U2dp~gg6G*;&`Jag*?jZTJv+$S`*#)zme_SFWOCm*F4U&hJihqxAu;8z}x zWv7!u>YKRa3PUJQs55wC)i4QvFOAV0jW$?1cnUJJ7Vl?z_ge{9q!zpfCJxd8vJ>-ql@0&`Bttn1~4;s>8tax%hr(^q#A_*wqAv( zh(T&>hJD?OhiP$sxAzkd1W1^EHV1WL3xM&6$*HhG@|8}OjPpG{+!;GC>w;ha0000< KMNUMnLSTZGXp5cz literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/favicon-32x32.png b/examples/solid/start-basic-static/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..900c77d444c9b31e6144b6ac0bb1ab7bb7ca767f GIT binary patch literal 2115 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 literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/favicon.ico b/examples/solid/start-basic-static/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a1751676f7e22811b1070572093996c93c87617 GIT binary patch literal 15406 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 literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/favicon.png b/examples/solid/start-basic-static/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e77bc06091ade4496525a09d8900675afcf03f0 GIT binary patch literal 1507 zcmV<91swW`P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$^O-V#SR9Fd>S3Qp$MHK9ro!#4$ zEP@L_hX|b@f=!*_42h6mKu7{)4)_U*>1>0bCkUj;Z1X!7 zHe(Ew^Oi(|bW3J~xu+)XbtFF?4>!7TH$>(D_atUQVEj(8fGvYu2NF33#JZX>)(Vj8 zIi@z>Glt?6t~;Lf(|C8F>;WF^8F<^s7Scr!sZc01uB?HMHoL5+FZ>B(g+r-)?Sn)#3Zal#?G@GAwO5U27MpGOlC2+_saA)rl zP-<@-n~;PQOlm|Hi<+W;NdR;5+=zADzM&?!+CPD36=cGwHy6!D^vPEHG?rO`K>G|M z3FposX{yT132wuw1OR3Um_5JoKB#6?!QgBupIT;?YIr;WcpmuCE>S75mZid+ens#E zGPuYjiG0UNNVWu=f!Id^?9)34)eIpu-`j_~W0iAQzK(}XYc_!;87Tk~?4tq|h=2(! zuq0HCiNK)@+ocCKR3q1REdUju>HdYxd>JX@%oOibg+J~D+}rhz54D!NfC{h-OYk{M zkzmFtdrL@nL0bm8nF@pob1CeLC>12ef#in-Bzv2!wi)Iuwq24)`AH}|0QNQ^f$KHv z?5PBPo1*#GAuAk+Poe`?UJ>mP`@~d4a(103j0lwUx@_+$#B&VC%7r>#2$HIiD`KO8L|s3Yp%M}BT0;NJDzZtPnx=4%enhU zhW*pNN0t`^4%5MKAR+}=^Q?QeqQ`>bbK zf+-ji$Uz8V0?LpX@kh`k%DL)GCA2=@SJNKg56Wh>>pr=7{1PmHqG|~=AdLV3002ov JPDHLkV1ivgp)>#h literal 0 HcmV?d00001 diff --git a/examples/solid/start-basic-static/public/site.webmanifest b/examples/solid/start-basic-static/public/site.webmanifest new file mode 100644 index 0000000000..fa99de77db --- /dev/null +++ b/examples/solid/start-basic-static/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx b/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..0dff3919fd --- /dev/null +++ b/examples/solid/start-basic-static/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,53 @@ +import { + ErrorComponent, + Link, + rootRouteId, + useMatch, + useRouter, +} from '@tanstack/solid-router' +import type { ErrorComponentProps } from '@tanstack/solid-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, + }) + + console.error('DefaultCatchBoundary Error:', error) + + return ( +
+ +
+ + {isRoot() ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/components/NotFound.tsx b/examples/solid/start-basic-static/src/components/NotFound.tsx new file mode 100644 index 0000000000..ca4c1960fa --- /dev/null +++ b/examples/solid/start-basic-static/src/components/NotFound.tsx @@ -0,0 +1,25 @@ +import { Link } from '@tanstack/solid-router' + +export function NotFound({ children }: { children?: any }) { + return ( +
+
+ {children ||

The page you are looking for does not exist.

} +
+

+ + + Start Over + +

+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routeTree.gen.ts b/examples/solid/start-basic-static/src/routeTree.gen.ts new file mode 100644 index 0000000000..91d6a4bf15 --- /dev/null +++ b/examples/solid/start-basic-static/src/routeTree.gen.ts @@ -0,0 +1,609 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as UsersRouteImport } from './routes/users' +import { Route as RedirectRouteImport } from './routes/redirect' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' +import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' +import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' + +// Create/Update Routes + +const UsersRoute = UsersRouteImport.update({ + id: '/users', + path: '/users', + getParentRoute: () => rootRoute, +} as any) + +const RedirectRoute = RedirectRouteImport.update({ + id: '/redirect', + path: '/redirect', + getParentRoute: () => rootRoute, +} as any) + +const PostsRoute = PostsRouteImport.update({ + id: '/posts', + path: '/posts', + getParentRoute: () => rootRoute, +} as any) + +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', + getParentRoute: () => rootRoute, +} as any) + +const PathlessLayoutRoute = PathlessLayoutRouteImport.update({ + id: '/_pathlessLayout', + getParentRoute: () => rootRoute, +} as any) + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRoute, +} as any) + +const UsersIndexRoute = UsersIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => UsersRoute, +} as any) + +const PostsIndexRoute = PostsIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => PostsRoute, +} as any) + +const UsersUserIdRoute = UsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => UsersRoute, +} as any) + +const PostsPostIdRoute = PostsPostIdRouteImport.update({ + id: '/$postId', + path: '/$postId', + getParentRoute: () => PostsRoute, +} as any) + +const PathlessLayoutNestedLayoutRoute = + PathlessLayoutNestedLayoutRouteImport.update({ + id: '/_nested-layout', + getParentRoute: () => PathlessLayoutRoute, + } as any) + +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ + id: '/posts_/$postId/deep', + path: '/posts/$postId/deep', + getParentRoute: () => rootRoute, +} as any) + +const PathlessLayoutNestedLayoutRouteBRoute = + PathlessLayoutNestedLayoutRouteBRouteImport.update({ + id: '/route-b', + path: '/route-b', + getParentRoute: () => PathlessLayoutNestedLayoutRoute, + } as any) + +const PathlessLayoutNestedLayoutRouteARoute = + PathlessLayoutNestedLayoutRouteARouteImport.update({ + id: '/route-a', + path: '/route-a', + getParentRoute: () => PathlessLayoutNestedLayoutRoute, + } as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + '/_pathlessLayout': { + id: '/_pathlessLayout' + path: '' + fullPath: '' + preLoaderRoute: typeof PathlessLayoutRouteImport + parentRoute: typeof rootRoute + } + '/deferred': { + id: '/deferred' + path: '/deferred' + fullPath: '/deferred' + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRoute + } + '/posts': { + id: '/posts' + path: '/posts' + fullPath: '/posts' + preLoaderRoute: typeof PostsRouteImport + parentRoute: typeof rootRoute + } + '/redirect': { + id: '/redirect' + path: '/redirect' + fullPath: '/redirect' + preLoaderRoute: typeof RedirectRouteImport + parentRoute: typeof rootRoute + } + '/users': { + id: '/users' + path: '/users' + fullPath: '/users' + preLoaderRoute: typeof UsersRouteImport + parentRoute: typeof rootRoute + } + '/_pathlessLayout/_nested-layout': { + id: '/_pathlessLayout/_nested-layout' + path: '' + fullPath: '' + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteImport + parentRoute: typeof PathlessLayoutRouteImport + } + '/posts/$postId': { + id: '/posts/$postId' + path: '/$postId' + fullPath: '/posts/$postId' + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/$userId': { + id: '/users/$userId' + path: '/$userId' + fullPath: '/users/$userId' + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport + } + '/posts/': { + id: '/posts/' + path: '/' + fullPath: '/posts/' + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/': { + id: '/users/' + path: '/' + fullPath: '/users/' + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport + } + '/_pathlessLayout/_nested-layout/route-a': { + id: '/_pathlessLayout/_nested-layout/route-a' + path: '/route-a' + fullPath: '/route-a' + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteARouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport + } + '/_pathlessLayout/_nested-layout/route-b': { + id: '/_pathlessLayout/_nested-layout/route-b' + path: '/route-b' + fullPath: '/route-b' + preLoaderRoute: typeof PathlessLayoutNestedLayoutRouteBRouteImport + parentRoute: typeof PathlessLayoutNestedLayoutRouteImport + } + '/posts_/$postId/deep': { + id: '/posts_/$postId/deep' + path: '/posts/$postId/deep' + fullPath: '/posts/$postId/deep' + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/_pathlessLayout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout', + FileRoutesByPath['/_pathlessLayout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout']['id'], + FileRoutesByPath['/_pathlessLayout']['path'], + FileRoutesByPath['/_pathlessLayout']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/redirect' { + const createFileRoute: CreateFileRoute< + '/redirect', + FileRoutesByPath['/redirect']['parentRoute'], + FileRoutesByPath['/redirect']['id'], + FileRoutesByPath['/redirect']['path'], + FileRoutesByPath['/redirect']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout', + FileRoutesByPath['/_pathlessLayout/_nested-layout']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-a' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-a', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-a']['fullPath'] + > +} +declare module './routes/_pathlessLayout/_nested-layout/route-b' { + const createFileRoute: CreateFileRoute< + '/_pathlessLayout/_nested-layout/route-b', + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['parentRoute'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['id'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['path'], + FileRoutesByPath['/_pathlessLayout/_nested-layout/route-b']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + +// Create and export the route tree + +interface PathlessLayoutNestedLayoutRouteChildren { + PathlessLayoutNestedLayoutRouteARoute: typeof PathlessLayoutNestedLayoutRouteARoute + PathlessLayoutNestedLayoutRouteBRoute: typeof PathlessLayoutNestedLayoutRouteBRoute +} + +const PathlessLayoutNestedLayoutRouteChildren: PathlessLayoutNestedLayoutRouteChildren = + { + PathlessLayoutNestedLayoutRouteARoute: + PathlessLayoutNestedLayoutRouteARoute, + PathlessLayoutNestedLayoutRouteBRoute: + PathlessLayoutNestedLayoutRouteBRoute, + } + +const PathlessLayoutNestedLayoutRouteWithChildren = + PathlessLayoutNestedLayoutRoute._addFileChildren( + PathlessLayoutNestedLayoutRouteChildren, + ) + +interface PathlessLayoutRouteChildren { + PathlessLayoutNestedLayoutRoute: typeof PathlessLayoutNestedLayoutRouteWithChildren +} + +const PathlessLayoutRouteChildren: PathlessLayoutRouteChildren = { + PathlessLayoutNestedLayoutRoute: PathlessLayoutNestedLayoutRouteWithChildren, +} + +const PathlessLayoutRouteWithChildren = PathlessLayoutRoute._addFileChildren( + PathlessLayoutRouteChildren, +) + +interface PostsRouteChildren { + PostsPostIdRoute: typeof PostsPostIdRoute + PostsIndexRoute: typeof PostsIndexRoute +} + +const PostsRouteChildren: PostsRouteChildren = { + PostsPostIdRoute: PostsPostIdRoute, + PostsIndexRoute: PostsIndexRoute, +} + +const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) + +interface UsersRouteChildren { + UsersUserIdRoute: typeof UsersUserIdRoute + UsersIndexRoute: typeof UsersIndexRoute +} + +const UsersRouteChildren: UsersRouteChildren = { + UsersUserIdRoute: UsersUserIdRoute, + UsersIndexRoute: UsersIndexRoute, +} + +const UsersRouteWithChildren = UsersRoute._addFileChildren(UsersRouteChildren) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '': typeof PathlessLayoutNestedLayoutRouteWithChildren + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/redirect': typeof RedirectRoute + '/users': typeof UsersRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/route-a': typeof PathlessLayoutNestedLayoutRouteARoute + '/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesByTo { + '/': typeof IndexRoute + '': typeof PathlessLayoutNestedLayoutRouteWithChildren + '/deferred': typeof DeferredRoute + '/redirect': typeof RedirectRoute + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts': typeof PostsIndexRoute + '/users': typeof UsersIndexRoute + '/route-a': typeof PathlessLayoutNestedLayoutRouteARoute + '/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute + '/_pathlessLayout': typeof PathlessLayoutRouteWithChildren + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/redirect': typeof RedirectRoute + '/users': typeof UsersRouteWithChildren + '/_pathlessLayout/_nested-layout': typeof PathlessLayoutNestedLayoutRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/_pathlessLayout/_nested-layout/route-a': typeof PathlessLayoutNestedLayoutRouteARoute + '/_pathlessLayout/_nested-layout/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute + '/posts_/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '' + | '/deferred' + | '/posts' + | '/redirect' + | '/users' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/route-a' + | '/route-b' + | '/posts/$postId/deep' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '' + | '/deferred' + | '/redirect' + | '/posts/$postId' + | '/users/$userId' + | '/posts' + | '/users' + | '/route-a' + | '/route-b' + | '/posts/$postId/deep' + id: + | '__root__' + | '/' + | '/_pathlessLayout' + | '/deferred' + | '/posts' + | '/redirect' + | '/users' + | '/_pathlessLayout/_nested-layout' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/_pathlessLayout/_nested-layout/route-a' + | '/_pathlessLayout/_nested-layout/route-b' + | '/posts_/$postId/deep' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + PathlessLayoutRoute: typeof PathlessLayoutRouteWithChildren + DeferredRoute: typeof DeferredRoute + PostsRoute: typeof PostsRouteWithChildren + RedirectRoute: typeof RedirectRoute + UsersRoute: typeof UsersRouteWithChildren + PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + PathlessLayoutRoute: PathlessLayoutRouteWithChildren, + DeferredRoute: DeferredRoute, + PostsRoute: PostsRouteWithChildren, + RedirectRoute: RedirectRoute, + UsersRoute: UsersRouteWithChildren, + PostsPostIdDeepRoute: PostsPostIdDeepRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/_pathlessLayout", + "/deferred", + "/posts", + "/redirect", + "/users", + "/posts_/$postId/deep" + ] + }, + "/": { + "filePath": "index.tsx" + }, + "/_pathlessLayout": { + "filePath": "_pathlessLayout.tsx", + "children": [ + "/_pathlessLayout/_nested-layout" + ] + }, + "/deferred": { + "filePath": "deferred.tsx" + }, + "/posts": { + "filePath": "posts.tsx", + "children": [ + "/posts/$postId", + "/posts/" + ] + }, + "/redirect": { + "filePath": "redirect.tsx" + }, + "/users": { + "filePath": "users.tsx", + "children": [ + "/users/$userId", + "/users/" + ] + }, + "/_pathlessLayout/_nested-layout": { + "filePath": "_pathlessLayout/_nested-layout.tsx", + "parent": "/_pathlessLayout", + "children": [ + "/_pathlessLayout/_nested-layout/route-a", + "/_pathlessLayout/_nested-layout/route-b" + ] + }, + "/posts/$postId": { + "filePath": "posts.$postId.tsx", + "parent": "/posts" + }, + "/users/$userId": { + "filePath": "users.$userId.tsx", + "parent": "/users" + }, + "/posts/": { + "filePath": "posts.index.tsx", + "parent": "/posts" + }, + "/users/": { + "filePath": "users.index.tsx", + "parent": "/users" + }, + "/_pathlessLayout/_nested-layout/route-a": { + "filePath": "_pathlessLayout/_nested-layout/route-a.tsx", + "parent": "/_pathlessLayout/_nested-layout" + }, + "/_pathlessLayout/_nested-layout/route-b": { + "filePath": "_pathlessLayout/_nested-layout/route-b.tsx", + "parent": "/_pathlessLayout/_nested-layout" + }, + "/posts_/$postId/deep": { + "filePath": "posts_.$postId.deep.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/solid/start-basic-static/src/router.tsx b/examples/solid/start-basic-static/src/router.tsx new file mode 100644 index 0000000000..c45bed4758 --- /dev/null +++ b/examples/solid/start-basic-static/src/router.tsx @@ -0,0 +1,22 @@ +import { createRouter as createTanStackRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' +import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' +import { NotFound } from './components/NotFound' + +export function createRouter() { + const router = createTanStackRouter({ + routeTree, + defaultPreload: 'intent', + defaultErrorComponent: DefaultCatchBoundary, + defaultNotFoundComponent: () => , + scrollRestoration: true, + }) + + return router +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} diff --git a/examples/solid/start-basic-static/src/routes/__root.tsx b/examples/solid/start-basic-static/src/routes/__root.tsx new file mode 100644 index 0000000000..2b70666cbd --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/__root.tsx @@ -0,0 +1,139 @@ +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/solid-router' +import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools' +import type * as Solid from 'solid-js' +import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { NotFound } from '~/components/NotFound' +import appCss from '~/styles/app.css?url' +import { seo } from '~/utils/seo' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { + charset: 'utf-8', + }, + { + name: 'viewport', + content: 'width=device-width, initial-scale=1', + }, + ...seo({ + title: + 'TanStack Start | Type-Safe, Client-First, Full-Stack React Framework', + description: `TanStack Start is a type-safe, client-first, full-stack React framework. `, + }), + ], + links: [ + { rel: 'stylesheet', href: appCss }, + { + rel: 'apple-touch-icon', + sizes: '180x180', + href: '/apple-touch-icon.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '32x32', + href: '/favicon-32x32.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '16x16', + href: '/favicon-16x16.png', + }, + { rel: 'manifest', href: '/site.webmanifest', color: '#fffff' }, + { rel: 'icon', href: '/favicon.ico' }, + ], + }), + errorComponent: (props) => { + return ( + + + + ) + }, + notFoundComponent: () => , + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + ) +} + +function RootLayout({ children }: { children: Solid.JSX.Element }) { + return ( + + + + + +
+ + Home + {' '} + + Posts + {' '} + + Users + {' '} + + Pathless Layout + {' '} + + Deferred + {' '} + + This Route Does Not Exist + +
+
+ {children} + + + + + ) +} diff --git a/examples/solid/start-basic-static/src/routes/_pathlessLayout.tsx b/examples/solid/start-basic-static/src/routes/_pathlessLayout.tsx new file mode 100644 index 0000000000..9bb7ce1c98 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/_pathlessLayout.tsx @@ -0,0 +1,16 @@ +import { Outlet } from '@tanstack/solid-router' + +export const Route = createFileRoute({ + component: PathlessLayoutComponent, +}) + +function PathlessLayoutComponent() { + return ( +
+
I'm a pathless layout
+
+ +
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx new file mode 100644 index 0000000000..03bcac9d47 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout.tsx @@ -0,0 +1,34 @@ +import { Link, Outlet } from '@tanstack/solid-router' + +export const Route = createFileRoute({ + component: LayoutComponent, +}) + +function LayoutComponent() { + return ( +
+
I'm a nested layout
+
+ + Go to route A + + + Go to route B + +
+
+ +
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx new file mode 100644 index 0000000000..a0bd5240b7 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-a.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: LayoutAComponent, +}) + +function LayoutAComponent() { + return
I'm A!
+} diff --git a/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx new file mode 100644 index 0000000000..2864ec1f28 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/_pathlessLayout/_nested-layout/route-b.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: LayoutBComponent, +}) + +function LayoutBComponent() { + return
I'm B!
+} diff --git a/examples/solid/start-basic-static/src/routes/deferred.tsx b/examples/solid/start-basic-static/src/routes/deferred.tsx new file mode 100644 index 0000000000..fa945306b9 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/deferred.tsx @@ -0,0 +1,62 @@ +import { Await } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { Suspense, createSignal } from 'solid-js' + +const personServerFn = createServerFn({ method: 'GET', type: 'static' }) + .validator((d: string) => d) + .handler(({ data: name }) => { + return { name, randomNumber: Math.floor(Math.random() * 100) } + }) + +const slowServerFn = createServerFn({ method: 'GET', type: 'static' }) + .validator((d: string) => d) + .handler(async ({ data: name }) => { + await new Promise((r) => setTimeout(r, 1000)) + return { name, randomNumber: Math.floor(Math.random() * 100) } + }) + +export const Route = createFileRoute({ + loader: async () => { + return { + deferredStuff: new Promise((r) => + setTimeout(() => r('Hello deferred!'), 2000), + ), + deferredPerson: slowServerFn({ data: 'Tanner Linsley' }), + person: await personServerFn({ data: 'John Doe' }), + } + }, + component: Deferred, +}) + +function Deferred() { + const [count, setCount] = createSignal(0) + const loaderData = Route.useLoaderData() + + return ( +
+
+ {loaderData().person.name} - {loaderData().person.randomNumber} +
+ Loading person...
}> + ( +
+ {data.name} - {data.randomNumber} +
+ )} + /> + + Loading stuff...
}> +

{data}

} + /> + +
Count: {count()}
+
+ +
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/index.tsx b/examples/solid/start-basic-static/src/routes/index.tsx new file mode 100644 index 0000000000..2f35891abb --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/index.tsx @@ -0,0 +1,11 @@ +export const Route = createFileRoute({ + component: Home, +}) + +function Home() { + return ( +
+

Welcome Home!!!

+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/posts.$postId.tsx b/examples/solid/start-basic-static/src/routes/posts.$postId.tsx new file mode 100644 index 0000000000..b33d1ae326 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/posts.$postId.tsx @@ -0,0 +1,38 @@ +import { ErrorComponent, Link } from '@tanstack/solid-router' +import { fetchPost } from '../utils/posts' +import type { ErrorComponentProps } from '@tanstack/solid-router' +import { NotFound } from '~/components/NotFound' + +export const Route = createFileRoute({ + loader: ({ params: { postId } }) => fetchPost({ data: postId }), + errorComponent: PostErrorComponent, + component: PostComponent, + notFoundComponent: () => { + return Post not found + }, +}) + +export function PostErrorComponent({ error }: ErrorComponentProps) { + return +} + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.title}

+
{post.body}
+ + Deep View + +
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/posts.index.tsx b/examples/solid/start-basic-static/src/routes/posts.index.tsx new file mode 100644 index 0000000000..13529228bb --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/posts.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: PostsIndexComponent, +}) + +function PostsIndexComponent() { + return
Select a post.
+} diff --git a/examples/solid/start-basic-static/src/routes/posts.tsx b/examples/solid/start-basic-static/src/routes/posts.tsx new file mode 100644 index 0000000000..4f0b47fa08 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/posts.tsx @@ -0,0 +1,38 @@ +import { Link, Outlet } from '@tanstack/solid-router' +import { fetchPosts } from '../utils/posts' + +export const Route = createFileRoute({ + loader: async () => fetchPosts(), + component: PostsComponent, +}) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[...posts(), { id: 'i-do-not-exist', title: 'Non-existent Post' }].map( + (post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
    • + ) + }, + )} +
+
+ +
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx b/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx new file mode 100644 index 0000000000..d218bc2a8d --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx @@ -0,0 +1,29 @@ +import { Link } from '@tanstack/solid-router' +import { fetchPost } from '../utils/posts' +import { PostErrorComponent } from './posts.$postId' + +export const Route = createFileRoute({ + loader: ({ params: { postId } }) => + fetchPost({ + data: postId, + }), + errorComponent: PostErrorComponent, + component: PostDeepComponent, +}) + +function PostDeepComponent() { + const post = Route.useLoaderData() + + return ( +
+ + ← All Posts + +

{post().title}

+
{post().body}
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/redirect.tsx b/examples/solid/start-basic-static/src/routes/redirect.tsx new file mode 100644 index 0000000000..d80d290638 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/redirect.tsx @@ -0,0 +1,9 @@ +import { redirect } from '@tanstack/solid-router' + +export const Route = createFileRoute({ + beforeLoad: async () => { + throw redirect({ + to: '/posts', + }) + }, +}) diff --git a/examples/solid/start-basic-static/src/routes/users.$userId.tsx b/examples/solid/start-basic-static/src/routes/users.$userId.tsx new file mode 100644 index 0000000000..414436f8d5 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/users.$userId.tsx @@ -0,0 +1,49 @@ +import { ErrorComponent } from '@tanstack/solid-router' +import axios from 'redaxios' +import { createServerFn } from '@tanstack/solid-start' +import type { ErrorComponentProps } from '@tanstack/solid-router' +import type { User } from '~/utils/users' +import { NotFound } from '~/components/NotFound' + +const fetchUser = createServerFn({ method: 'GET', type: 'static' }) + .validator((d: string) => d) + .handler(async ({ data: userId }) => { + return axios + .get('https://jsonplaceholder.typicode.com/users/' + userId) + .then((d) => ({ + id: d.data.id, + name: d.data.name, + email: d.data.email, + })) + .catch((e) => { + throw new Error('Failed to fetch user') + }) + }) + +export const Route = createFileRoute({ + loader: ({ params: { userId } }) => fetchUser({ data: userId }), + errorComponent: UserErrorComponent, + component: UserComponent, + notFoundComponent: () => { + return User not found + }, +}) + +export function UserErrorComponent({ error }: ErrorComponentProps) { + return +} + +function UserComponent() { + const user = Route.useLoaderData() + + if ('error' in user()) { + return User not found + } + + return ( +
+

{user().name}

+
{user().email}
+
+ ) +} diff --git a/examples/solid/start-basic-static/src/routes/users.index.tsx b/examples/solid/start-basic-static/src/routes/users.index.tsx new file mode 100644 index 0000000000..662e8b6c68 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/users.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: UsersIndexComponent, +}) + +function UsersIndexComponent() { + return
Select a user.
+} diff --git a/examples/solid/start-basic-static/src/routes/users.tsx b/examples/solid/start-basic-static/src/routes/users.tsx new file mode 100644 index 0000000000..440d3c93a5 --- /dev/null +++ b/examples/solid/start-basic-static/src/routes/users.tsx @@ -0,0 +1,54 @@ +import { Link, Outlet } from '@tanstack/solid-router' +import axios from 'redaxios' +import { createServerFn } from '@tanstack/solid-start' +import type { User } from '../utils/users' + +const fetchUsers = createServerFn({ method: 'GET', type: 'static' }).handler( + async () => { + console.info('Fetching users...') + const res = await axios.get>( + 'https://jsonplaceholder.typicode.com/users', + ) + + return res.data + .slice(0, 10) + .map((u) => ({ id: u.id, name: u.name, email: u.email })) + }, +) + +export const Route = createFileRoute({ + loader: async () => fetchUsers(), + component: UsersComponent, +}) + +function UsersComponent() { + const users = Route.useLoaderData() + + return ( +
+
    + {[ + ...users(), + { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, + ].map((user) => { + return ( +
  • + +
    {user.name}
    + +
    • + ) + })} +
+
+ +
+ ) +} diff --git a/examples/solid/start-basic-static/src/server.ts b/examples/solid/start-basic-static/src/server.ts new file mode 100644 index 0000000000..6d10bea05f --- /dev/null +++ b/examples/solid/start-basic-static/src/server.ts @@ -0,0 +1,12 @@ +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/solid-start/server' +import { getRouterManifest } from '@tanstack/solid-start/router-manifest' + +import { createRouter } from './router' + +export default createStartHandler({ + createRouter, + getRouterManifest, +})(defaultStreamHandler) diff --git a/examples/solid/start-basic-static/src/styles/app.css b/examples/solid/start-basic-static/src/styles/app.css new file mode 100644 index 0000000000..d6426ccb72 --- /dev/null +++ b/examples/solid/start-basic-static/src/styles/app.css @@ -0,0 +1,14 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/examples/solid/start-basic-static/src/tanstack-start.d.ts b/examples/solid/start-basic-static/src/tanstack-start.d.ts new file mode 100644 index 0000000000..3adaf59556 --- /dev/null +++ b/examples/solid/start-basic-static/src/tanstack-start.d.ts @@ -0,0 +1,2 @@ +/// +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/solid/start-basic-static/src/utils/loggingMiddleware.tsx b/examples/solid/start-basic-static/src/utils/loggingMiddleware.tsx new file mode 100644 index 0000000000..c2362c834c --- /dev/null +++ b/examples/solid/start-basic-static/src/utils/loggingMiddleware.tsx @@ -0,0 +1,42 @@ +import { createMiddleware } from '@tanstack/solid-start' + +export const logMiddleware = createMiddleware({ type: 'function' }) + .middleware([ + createMiddleware({ type: 'function' }) + .client(async (ctx) => { + const clientTime = new Date() + + return await ctx.next({ + context: { + clientTime, + }, + sendContext: { + clientTime, + }, + }) + }) + .server(async (ctx) => { + const serverTime = new Date() + + return await ctx.next({ + sendContext: { + serverTime, + durationToServer: + serverTime.getTime() - ctx.context.clientTime.getTime(), + }, + }) + }), + ]) + .client(async (options) => { + const result = await options.next() + + const now = new Date() + + console.log('Client Req/Res:', { + duration: result.context.clientTime.getTime() - now.getTime(), + durationToServer: result.context.durationToServer, + durationFromServer: now.getTime() - result.context.serverTime.getTime(), + }) + + return result + }) diff --git a/examples/solid/start-basic-static/src/utils/posts.tsx b/examples/solid/start-basic-static/src/utils/posts.tsx new file mode 100644 index 0000000000..204230b7fe --- /dev/null +++ b/examples/solid/start-basic-static/src/utils/posts.tsx @@ -0,0 +1,37 @@ +import { createServerFn } from '@tanstack/solid-start' +import axios from 'redaxios' +import { notFound } from '@tanstack/solid-router' +import { logMiddleware } from './loggingMiddleware' + +export type PostType = { + id: string + title: string + body: string +} + +export const fetchPost = createServerFn({ method: 'GET', type: 'static' }) + .middleware([logMiddleware]) + .validator((d: string) => d) + .handler(async ({ data }) => { + console.info(`Fetching post with id ${data}...`) + const post = await axios + .get(`https://jsonplaceholder.typicode.com/posts/${data}`) + .catch((err) => { + if (err.status === 404) { + throw notFound() + } + throw err + }) + .then((r) => r.data) + + return post + }) + +export const fetchPosts = createServerFn({ method: 'GET', type: 'static' }) + .middleware([logMiddleware]) + .handler(async () => { + console.info('Fetching posts...') + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }) diff --git a/examples/solid/start-basic-static/src/utils/seo.ts b/examples/solid/start-basic-static/src/utils/seo.ts new file mode 100644 index 0000000000..d18ad84b74 --- /dev/null +++ b/examples/solid/start-basic-static/src/utils/seo.ts @@ -0,0 +1,33 @@ +export const seo = ({ + title, + description, + keywords, + image, +}: { + title: string + description?: string + image?: string + keywords?: string +}) => { + const tags = [ + { title }, + { name: 'description', content: description }, + { name: 'keywords', content: keywords }, + { name: 'twitter:title', content: title }, + { name: 'twitter:description', content: description }, + { name: 'twitter:creator', content: '@tannerlinsley' }, + { name: 'twitter:site', content: '@tannerlinsley' }, + { name: 'og:type', content: 'website' }, + { name: 'og:title', content: title }, + { name: 'og:description', content: description }, + ...(image + ? [ + { name: 'twitter:image', content: image }, + { name: 'twitter:card', content: 'summary_large_image' }, + { name: 'og:image', content: image }, + ] + : []), + ] + + return tags +} diff --git a/examples/solid/start-basic-static/src/utils/users.tsx b/examples/solid/start-basic-static/src/utils/users.tsx new file mode 100644 index 0000000000..b810f455fe --- /dev/null +++ b/examples/solid/start-basic-static/src/utils/users.tsx @@ -0,0 +1,7 @@ +export type User = { + id: number + name: string + email: string +} + +export const DEPLOY_URL = 'http://localhost:3000' diff --git a/examples/solid/start-basic-static/tailwind.config.cjs b/examples/solid/start-basic-static/tailwind.config.cjs new file mode 100644 index 0000000000..10c9224f8c --- /dev/null +++ b/examples/solid/start-basic-static/tailwind.config.cjs @@ -0,0 +1,4 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{js,ts,jsx,tsx}'], +} diff --git a/examples/solid/start-basic-static/tsconfig.json b/examples/solid/start-basic-static/tsconfig.json new file mode 100644 index 0000000000..a40235b863 --- /dev/null +++ b/examples/solid/start-basic-static/tsconfig.json @@ -0,0 +1,23 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "baseUrl": ".", + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true + } +} diff --git a/examples/solid/start-basic-static/vite.config.ts b/examples/solid/start-basic-static/vite.config.ts new file mode 100644 index 0000000000..6ff67ad90b --- /dev/null +++ b/examples/solid/start-basic-static/vite.config.ts @@ -0,0 +1,19 @@ +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({ + shell: { + enabled: true, + }, + }), + ], +}) diff --git a/packages/solid-router/src/Match.tsx b/packages/solid-router/src/Match.tsx index e4d6dc91e3..b053540f08 100644 --- a/packages/solid-router/src/Match.tsx +++ b/packages/solid-router/src/Match.tsx @@ -329,6 +329,16 @@ export const Outlet = () => { return ( + + + } + > + + + + {renderRouteNotFound(router, route(), undefined)} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91dea5c2d1..dc2ff4d5b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3441,10 +3441,10 @@ importers: version: 19.0.3(@types/react@19.0.8) html-webpack-plugin: specifier: ^5.6.3 - version: 5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + version: 5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1) swc-loader: specifier: ^0.2.6 - version: 0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + version: 0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1) typescript: specifier: ^5.7.2 version: 5.8.2 @@ -5484,6 +5484,46 @@ importers: specifier: ^5.1.4 version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + examples/solid/start-basic-static: + dependencies: + '@tanstack/solid-router': + specifier: ^1.120.4-alpha.13 + version: link:../../../packages/solid-router + '@tanstack/solid-router-devtools': + specifier: workspace:^ + version: link:../../../packages/solid-router-devtools + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + redaxios: + specifier: ^0.5.1 + version: 0.5.1 + solid-js: + specifier: ^1.9.5 + version: 1.9.5 + tailwind-merge: + specifier: ^2.5.5 + version: 2.6.0 + devDependencies: + '@types/node': + specifier: ^22.5.4 + version: 22.13.4 + autoprefixer: + specifier: ^10.4.20 + version: 10.4.20(postcss@8.5.3) + postcss: + specifier: ^8.4.49 + version: 8.5.3 + tailwindcss: + specifier: ^3.4.15 + version: 3.4.17 + typescript: + specifier: ^5.6.2 + version: 5.8.2 + vite-tsconfig-paths: + specifier: ^5.1.3 + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + packages/arktype-adapter: devDependencies: '@tanstack/react-router': @@ -18335,17 +18375,17 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': + '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) - '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': + '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) - '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4))': + '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1)': dependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) @@ -20151,7 +20191,7 @@ snapshots: html-tags@3.3.1: {} - html-webpack-plugin@5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): + html-webpack-plugin@5.6.3(@rspack/core@1.2.2(@swc/helpers@0.5.15))(webpack@5.97.1): dependencies: '@types/html-minifier-terser': 6.1.0 html-minifier-terser: 6.1.0 @@ -22191,7 +22231,7 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - swc-loader@0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): + swc-loader@0.2.6(@swc/core@1.10.15(@swc/helpers@0.5.15))(webpack@5.97.1): dependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) '@swc/counter': 0.1.3 @@ -22263,26 +22303,26 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) esbuild: 0.25.2 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) esbuild: 0.25.2 @@ -22861,9 +22901,9 @@ snapshots: webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) - '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) - '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1))(webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1))(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.97.1) + '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.97.1) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1) colorette: 2.0.20 commander: 10.0.1 cross-spawn: 7.0.6 @@ -22877,7 +22917,7 @@ snapshots: optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) - webpack-dev-middleware@7.4.2(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)): + webpack-dev-middleware@7.4.2(webpack@5.97.1): dependencies: colorette: 2.0.20 memfs: 4.17.0 @@ -22915,7 +22955,7 @@ snapshots: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack-dev-middleware: 7.4.2(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + webpack-dev-middleware: 7.4.2(webpack@5.97.1) ws: 8.18.0 optionalDependencies: webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) @@ -22990,7 +23030,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4)) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: From 4225562463a5c7aa2c564432d1d891362f79c205 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 21:31:49 +0000 Subject: [PATCH 044/126] ci: apply automated fixes --- docs/start/framework/solid/spa-shell.md | 2 +- .../start-basic-static/src/routes/posts_.$postId.deep.tsx | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/start/framework/solid/spa-shell.md b/docs/start/framework/solid/spa-shell.md index fb155429f1..4f3d298428 100644 --- a/docs/start/framework/solid/spa-shell.md +++ b/docs/start/framework/solid/spa-shell.md @@ -1,3 +1,3 @@ --- ref: docs/start/framework/react/spa-shell.md ---- \ No newline at end of file +--- diff --git a/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx b/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx index d218bc2a8d..b36e86eb53 100644 --- a/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx +++ b/examples/solid/start-basic-static/src/routes/posts_.$postId.deep.tsx @@ -16,10 +16,7 @@ function PostDeepComponent() { return ( }> +

{data}

} + /> + +
Count: {count}
+
+ +
+
- + ← All Posts

{post().title}

From 10eed5fa08f9e28f8ac59b7d4855473259401725 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 16:12:57 -0600 Subject: [PATCH 045/126] fix: Do not default to shell mode --- packages/start-plugin-core/src/schema.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index 8cc22454bc..c3c35d7159 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -121,7 +121,7 @@ export function createTanStackStartOptionsSchema( }) .and(pagePrerenderOptionsSchema.optional()) .optional(), - shell: shellSchema.optional().default({}), + shell: shellSchema.optional(), }) .optional() .default({}) From f727dac6b7c791e1b04b36b197446c7cf72a1c1e Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 16:28:04 -0600 Subject: [PATCH 046/126] fix: nitro-plugin types --- packages/start-plugin-core/src/nitro/nitro-plugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 60b80633d0..fcf2520862 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -85,7 +85,7 @@ export function nitroPlugin( // and it needs to translate to this for now. But we should // be cognizant of the probability that we will not use Nitro's // routeRules configuration in the future. - ...(options.shell.enabled && options.shell.autoRedirect + ...(options.shell?.enabled && options.shell.autoRedirect ? { '/**': { // @ts-expect-error We are using this as a marker @@ -104,7 +104,7 @@ export function nitroPlugin( await buildNitroEnvironment(nitro, () => build(nitro)) - if (options.shell.enabled) { + if (options.shell?.enabled) { options.prerender = { ...options.prerender, enabled: true, From 3cbd11adfe6c279dd6d92066e777c94a6ea2d318 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 22:34:01 +0000 Subject: [PATCH 047/126] release: v1.120.4-alpha.15 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 93 files changed, 214 insertions(+), 214 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index f936de760b..84aae16e9d 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 0b8d620fb8..fd17b3343e 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 7bedf6cf22..d5814a7316 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 0d243e7ed4..74b82f7bcc 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 3fad0ea62f..3ad2b7c85d 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 6d19b0acc7..6a76352fa9 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 9045403698..75f282d97c 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index c8525367d4..e7f37e6a24 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 81165a2d6e..b8e05bcd4e 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 3da91c0969..ee36ace509 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 6d53e85e31..fa54045086 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 14a3d0b826..5600c096d8 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 6e34bd5bb9..5d26e08d80 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 9b63e2d26a..5f72ccf162 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 75a03231e4..f6617b5c22 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 440dcebea5..a5f0d9aac4 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 659f131080..2c7c505d0b 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index a9c065efb5..a1f6dc1f5f 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 86e3045370..2e80a98d6c 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 51d05b2344..c0fa6d6143 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index ffef264244..f989d015db 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 32332e4e26..60397bfa34 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 73640f628b..bf52c27d23 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 879ec390b9..74b438293a 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 389b787645..3c30b0ce38 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 8bbf5d5375..2872906822 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 3645ee3d03..7fe39d60f7 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 68e952a1b5..b0979785d6 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 0cea1887b8..fae3c5c383 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index acfd92e4a0..944a36cc68 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 06360ef648..1ab842175b 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index aa15e00208..ea9890584e 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 564ee3827d..e275c1e892 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index b0142ca92c..8b621093f1 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index d617d30d79..043a9cd307 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.13", + "@tanstack/arktype-adapter": "^1.120.4-alpha.15", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", - "@tanstack/valibot-adapter": "^1.120.4-alpha.13", - "@tanstack/zod-adapter": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/valibot-adapter": "^1.120.4-alpha.15", + "@tanstack/zod-adapter": "^1.120.4-alpha.15", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index b5cdb31aa0..c470519232 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 2edbaba868..554d4c8cb0 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index a48be93a02..42a8e9ffaf 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-with-query": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-with-query": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 8b530b37a2..e2ee83d0cb 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index a75a880cdd..da89c2de4f 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index d7856ec99f..42c180ed87 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index cde77b5ddb..67307d57ad 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index a4a135d72c..0da0dfa2a2 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-with-query": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-with-query": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index aab07795ae..371d14bf36 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 712c3b1f80..11752b4b1b 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index d49972c97e..6bf5a0b83e 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index f12ffa8988..6509fbe52e 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index d006af1be3..e393540f6e 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-with-query": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-with-query": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 5ef9a08f7d..435187c112 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index fc6a66936c..57570a3622 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 3a3775e074..25bf2c01c7 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index ec0138e1d4..8165695358 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 9643ed9f67..53793d83b7 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/router-plugin": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.14", + "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.15", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index ad3a453067..8623078e24 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 71560094ed..c19b51242b 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 6d712cb2a8..4b601bb37f 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index e6002e6ef5..6348060bcd 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 4f277798db..3e429c7cec 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 81f802755d..3af8f94cfc 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 431f31575e..4bb66ecadb 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index c707fb19c2..35fba37596 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.13", + "@tanstack/router-plugin": "^1.120.4-alpha.15", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 84f775e4b0..922858a193 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", - "@tanstack/solid-start": "^1.120.4-alpha.14", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 0763d46d9b..8665ca2d33 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", - "@tanstack/solid-start": "^1.120.4-alpha.14", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 2d389da86d..1391aec278 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.13", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.13", - "@tanstack/solid-start": "^1.120.4-alpha.14", + "@tanstack/solid-router": "^1.120.4-alpha.15", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index f3769c3bc6..033092233d 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index b4651745f1..25fe6d1c5d 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index d9687f3707..9abba9f290 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index f7c82993ed..52a6712f79 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 4d4a282d79..cacce1c942 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 482450794a..51b3767430 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index aaa974ea64..fe53b3cb49 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 730b632051..d3362ddd28 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index ef9b4f8ac4..17419a804c 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 9372aff7ff..5cf5e9520f 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 4ba04beed9..bd1d3c11a7 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index e4821656b7..ce61a8db48 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index a2fef653de..f5c0fddc56 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index ecab796a9f..e18d07679c 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index ba5c715397..64e9f6659d 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index fe9a8a6573..d087cb22a0 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 661a7f14ac..32c96d9da0 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 2d9160a9b2..c825d53598 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 3244762086..b4be8ee071 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index fc215bb1e2..43a9ef4da0 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 0fc4b04216..d7addd70e0 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index b544c03f81..abc3aad7d0 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 20656eca69..b3a29b224a 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index f724fd501d..5597b9171e 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.14", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 8961e775da..3dd06af4f0 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index dc2c99b1d2..b723ee7c9f 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index f61f73adcd..143eb7c49d 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index abdb0b9ef3..2b971e4a82 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.13", + "version": "1.120.4-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc2ff4d5b8..0538139e04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5069,7 +5069,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5109,7 +5109,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5143,7 +5143,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5183,7 +5183,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5229,7 +5229,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5272,7 +5272,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5312,7 +5312,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5355,7 +5355,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5395,7 +5395,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5487,7 +5487,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.13 + specifier: ^1.120.4-alpha.15 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 1417d177c67508d9ce5032feab5671ef3310794f Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Wed, 14 May 2025 00:51:42 +0200 Subject: [PATCH 048/126] fix: ensure compatibility with vite plugins that don't support the vite environment API (#4167) fixes #4132 --- examples/react/start-tailwind-v4/.gitignore | 20 + .../react/start-tailwind-v4/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 70 ++ .../start-tailwind-v4/.vscode/settings.json | 11 + examples/react/start-tailwind-v4/README.md | 72 ++ examples/react/start-tailwind-v4/package.json | 30 + .../start-tailwind-v4/src/routeTree.gen.ts | 102 ++ .../react/start-tailwind-v4/src/router.tsx | 18 + .../start-tailwind-v4/src/routes/__root.tsx | 52 + .../start-tailwind-v4/src/routes/index.tsx | 11 + .../start-tailwind-v4/src/styles/app.css | 20 + .../start-tailwind-v4/src/tanstack-start.d.ts | 2 + .../react/start-tailwind-v4/tsconfig.json | 22 + .../react/start-tailwind-v4/vite.config.ts | 17 + packages/react-start-plugin/package.json | 1 - packages/react-start-plugin/src/index.ts | 20 +- .../src/core/router-generator-plugin.ts | 2 +- packages/server-functions-plugin/src/index.ts | 18 +- packages/solid-start-plugin/package.json | 1 - packages/solid-start-plugin/src/index.ts | 20 +- packages/start-plugin-core/package.json | 1 + packages/start-plugin-core/src/constants.ts | 6 + .../src/nitro/dev-server-plugin.ts | 18 +- .../src/nitro/nitro-plugin.ts | 9 +- packages/start-plugin-core/src/plugin.ts | 65 +- packages/start-plugin-core/src/prerender.ts | 7 +- .../src/server-functions-handler.ts | 17 +- pnpm-lock.yaml | 889 ++++++++++++------ 28 files changed, 1161 insertions(+), 364 deletions(-) create mode 100644 examples/react/start-tailwind-v4/.gitignore create mode 100644 examples/react/start-tailwind-v4/.prettierignore create mode 100644 examples/react/start-tailwind-v4/.tanstack-start/server-routes/routeTree.gen.ts create mode 100644 examples/react/start-tailwind-v4/.vscode/settings.json create mode 100644 examples/react/start-tailwind-v4/README.md create mode 100644 examples/react/start-tailwind-v4/package.json create mode 100644 examples/react/start-tailwind-v4/src/routeTree.gen.ts create mode 100644 examples/react/start-tailwind-v4/src/router.tsx create mode 100644 examples/react/start-tailwind-v4/src/routes/__root.tsx create mode 100644 examples/react/start-tailwind-v4/src/routes/index.tsx create mode 100644 examples/react/start-tailwind-v4/src/styles/app.css create mode 100644 examples/react/start-tailwind-v4/src/tanstack-start.d.ts create mode 100644 examples/react/start-tailwind-v4/tsconfig.json create mode 100644 examples/react/start-tailwind-v4/vite.config.ts create mode 100644 packages/start-plugin-core/src/constants.ts diff --git a/examples/react/start-tailwind-v4/.gitignore b/examples/react/start-tailwind-v4/.gitignore new file mode 100644 index 0000000000..0bb5a583db --- /dev/null +++ b/examples/react/start-tailwind-v4/.gitignore @@ -0,0 +1,20 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output +.nitro +/build/ +/api/ +/server/build +/public/build# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ +.tanstack-start/build \ No newline at end of file diff --git a/examples/react/start-tailwind-v4/.prettierignore b/examples/react/start-tailwind-v4/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/examples/react/start-tailwind-v4/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/examples/react/start-tailwind-v4/.tanstack-start/server-routes/routeTree.gen.ts b/examples/react/start-tailwind-v4/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..52adc3a6f3 --- /dev/null +++ b/examples/react/start-tailwind-v4/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,70 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath {} +} + +// Add type-safety to the createFileRoute function across the route tree + +// Create and export the route tree + +export interface FileRoutesByFullPath {} + +export interface FileRoutesByTo {} + +export interface FileRoutesById { + __root__: typeof rootRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: never + fileRoutesByTo: FileRoutesByTo + to: never + id: '__root__' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren {} + +const rootRouteChildren: RootRouteChildren = {} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [] + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-tailwind-v4/.vscode/settings.json b/examples/react/start-tailwind-v4/.vscode/settings.json new file mode 100644 index 0000000000..00b5278e58 --- /dev/null +++ b/examples/react/start-tailwind-v4/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "files.watcherExclude": { + "**/routeTree.gen.ts": true + }, + "search.exclude": { + "**/routeTree.gen.ts": true + }, + "files.readonlyInclude": { + "**/routeTree.gen.ts": true + } +} diff --git a/examples/react/start-tailwind-v4/README.md b/examples/react/start-tailwind-v4/README.md new file mode 100644 index 0000000000..90cba4aac1 --- /dev/null +++ b/examples/react/start-tailwind-v4/README.md @@ -0,0 +1,72 @@ +# Welcome to TanStack.com! + +This site is built with TanStack Router! + +- [TanStack Router Docs](https://tanstack.com/router) + +It's deployed automagically with Netlify! + +- [Netlify](https://netlify.com/) + +## Development + +From your terminal: + +```sh +pnpm install +pnpm dev +``` + +This starts your app in development mode, rebuilding assets on file changes. + +## Editing and previewing the docs of TanStack projects locally + +The documentations for all TanStack projects except for `React Charts` are hosted on [https://tanstack.com](https://tanstack.com), powered by this TanStack Router app. +In production, the markdown doc pages are fetched from the GitHub repos of the projects, but in development they are read from the local file system. + +Follow these steps if you want to edit the doc pages of a project (in these steps we'll assume it's [`TanStack/form`](https://github.com/tanstack/form)) and preview them locally : + +1. Create a new directory called `tanstack`. + +```sh +mkdir tanstack +``` + +2. Enter the directory and clone this repo and the repo of the project there. + +```sh +cd tanstack +git clone git@github.com:TanStack/tanstack.com.git +git clone git@github.com:TanStack/form.git +``` + +> [!NOTE] +> Your `tanstack` directory should look like this: +> +> ``` +> tanstack/ +> | +> +-- form/ +> | +> +-- tanstack.com/ +> ``` + +> [!WARNING] +> Make sure the name of the directory in your local file system matches the name of the project's repo. For example, `tanstack/form` must be cloned into `form` (this is the default) instead of `some-other-name`, because that way, the doc pages won't be found. + +3. Enter the `tanstack/tanstack.com` directory, install the dependencies and run the app in dev mode: + +```sh +cd tanstack.com +pnpm i +# The app will run on https://localhost:3000 by default +pnpm dev +``` + +4. Now you can visit http://localhost:3000/form/latest/docs/overview in the browser and see the changes you make in `tanstack/form/docs`. + +> [!NOTE] +> The updated pages need to be manually reloaded in the browser. + +> [!WARNING] +> You will need to update the `docs/config.json` file (in the project's repo) if you add a new doc page! diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json new file mode 100644 index 0000000000..c2d03d423a --- /dev/null +++ b/examples/react/start-tailwind-v4/package.json @@ -0,0 +1,30 @@ +{ + "name": "tanstack-start-tailwind-v4", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs" + }, + "dependencies": { + "@tanstack/react-router": "^1.120.4-alpha.13", + "@tanstack/react-router-devtools": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.13", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "tailwind-merge": "^2.6.0", + "vite": "^6.3.5", + "zod": "^3.24.2" + }, + "devDependencies": { + "@tailwindcss/vite": "^4.1.6", + "@types/node": "^22.5.4", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "tailwindcss": "^4.1.6", + "typescript": "^5.7.2", + "vite-tsconfig-paths": "^5.1.4" + } +} diff --git a/examples/react/start-tailwind-v4/src/routeTree.gen.ts b/examples/react/start-tailwind-v4/src/routeTree.gen.ts new file mode 100644 index 0000000000..dd5eda94a9 --- /dev/null +++ b/examples/react/start-tailwind-v4/src/routeTree.gen.ts @@ -0,0 +1,102 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as IndexRouteImport } from './routes/index' + +// Create/Update Routes + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} + +// Create and export the route tree + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute +} + +export interface FileRoutesByTo { + '/': typeof IndexRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' + fileRoutesByTo: FileRoutesByTo + to: '/' + id: '__root__' | '/' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/" + ] + }, + "/": { + "filePath": "index.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/examples/react/start-tailwind-v4/src/router.tsx b/examples/react/start-tailwind-v4/src/router.tsx new file mode 100644 index 0000000000..b8744cb41f --- /dev/null +++ b/examples/react/start-tailwind-v4/src/router.tsx @@ -0,0 +1,18 @@ +import { createRouter as createTanStackRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' + +export function createRouter() { + const router = createTanStackRouter({ + routeTree, + defaultPreload: 'intent', + scrollRestoration: true, + }) + + return router +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} diff --git a/examples/react/start-tailwind-v4/src/routes/__root.tsx b/examples/react/start-tailwind-v4/src/routes/__root.tsx new file mode 100644 index 0000000000..0d08681e8f --- /dev/null +++ b/examples/react/start-tailwind-v4/src/routes/__root.tsx @@ -0,0 +1,52 @@ +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' +import * as React from 'react' +import appCss from '~/styles/app.css?url' + +export const Route = createRootRoute({ + head: () => ({ + links: [{ rel: 'stylesheet', href: appCss }], + }), + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + ) +} + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + +
+ + Home + +
+
+ {children} + + + + + ) +} diff --git a/examples/react/start-tailwind-v4/src/routes/index.tsx b/examples/react/start-tailwind-v4/src/routes/index.tsx new file mode 100644 index 0000000000..f6c5b98b02 --- /dev/null +++ b/examples/react/start-tailwind-v4/src/routes/index.tsx @@ -0,0 +1,11 @@ +export const Route = createFileRoute({ + component: Home, +}) + +function Home() { + return ( +
+

Welcome Home!!!

+
+ ) +} diff --git a/examples/react/start-tailwind-v4/src/styles/app.css b/examples/react/start-tailwind-v4/src/styles/app.css new file mode 100644 index 0000000000..dcca122a5c --- /dev/null +++ b/examples/react/start-tailwind-v4/src/styles/app.css @@ -0,0 +1,20 @@ +@import 'tailwindcss' source('../'); + +@layer base { + html { + color-scheme: light dark; + } + + * { + @apply border-gray-200 dark:border-gray-800; + } + + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/examples/react/start-tailwind-v4/src/tanstack-start.d.ts b/examples/react/start-tailwind-v4/src/tanstack-start.d.ts new file mode 100644 index 0000000000..3adaf59556 --- /dev/null +++ b/examples/react/start-tailwind-v4/src/tanstack-start.d.ts @@ -0,0 +1,2 @@ +/// +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/examples/react/start-tailwind-v4/tsconfig.json b/examples/react/start-tailwind-v4/tsconfig.json new file mode 100644 index 0000000000..3a9fb7cd71 --- /dev/null +++ b/examples/react/start-tailwind-v4/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "baseUrl": ".", + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true + } +} diff --git a/examples/react/start-tailwind-v4/vite.config.ts b/examples/react/start-tailwind-v4/vite.config.ts new file mode 100644 index 0000000000..6a8f14e7c0 --- /dev/null +++ b/examples/react/start-tailwind-v4/vite.config.ts @@ -0,0 +1,17 @@ +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import tailwindcss from '@tailwindcss/vite' + +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + tailwindcss(), + ], +}) diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 51b3767430..63b8c41dfc 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -67,7 +67,6 @@ "dependencies": { "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", - "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", "zod": "^3.24.2" }, diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index c998afd448..83c029938c 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -1,5 +1,4 @@ import path from 'node:path' -import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import { tanstackRouter } from '@tanstack/router-plugin/vite' import viteReact from '@vitejs/plugin-react' import { @@ -31,7 +30,7 @@ export function TanStackStartVitePlugin( enableRouteGeneration: true, autoCodeSplitting: true, }), - TanStackStartVitePluginCore('react', options), + TanStackStartVitePluginCore({ framework: 'react' }, options), { name: 'tanstack-react-start:resolve-entries', resolveId(id) { @@ -99,23 +98,6 @@ export default createStartHandler({ return null }, }, - TanStackServerFnPluginEnv({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module - manifestVirtualImportId: 'tanstack:server-fn-manifest', - client: { - getRuntimeCode: () => - `import { createClientRpc } from '@tanstack/react-start/server-functions-client'`, - replacer: (d) => - `createClientRpc('${d.functionId}', '${options.serverFns.base}')`, - }, - server: { - getRuntimeCode: () => - `import { createServerRpc } from '@tanstack/react-start/server-functions-server'`, - replacer: (d) => - `createServerRpc('${d.functionId}', '${options.serverFns.base}', ${d.fn})`, - }, - }), TanStackStartServerRoutesVite({ ...options.tsr, target: 'react', diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 39829d60a7..475014d979 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -91,7 +91,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory< // } }, async buildStart() { - if (this.environment.name === 'server') { + if (this.environment.config.consumer === 'server') { // When building in environment mode, we only need to generate routes // for the client environment return diff --git a/packages/server-functions-plugin/src/index.ts b/packages/server-functions-plugin/src/index.ts index cf55102643..89c6959f30 100644 --- a/packages/server-functions-plugin/src/index.ts +++ b/packages/server-functions-plugin/src/index.ts @@ -26,6 +26,7 @@ export type ServerFnPluginOpts = { client: ServerFnPluginEnvOpts ssr: ServerFnPluginEnvOpts server: ServerFnPluginEnvOpts + importer?: (fn: DirectiveFn) => Promise } const manifestFilename = @@ -62,7 +63,8 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { // into the manifest because it's a dynamic import. Instead, as you'll // see below, we augment the manifest output with a code-generated importer // that looks exactly like this. - importer: () => import(fn.extractedFilename), + importer: () => + opts.importer ? opts.importer(fn) : import(fn.extractedFilename), }, ]), ), @@ -190,7 +192,7 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { } } -export function TanStackServerFnPluginEnv(opts: { +export interface TanStackServerFnPluginEnvOpts { manifestVirtualImportId: string client: { envName?: string @@ -202,7 +204,12 @@ export function TanStackServerFnPluginEnv(opts: { getRuntimeCode: () => string replacer: ReplacerFn } -}): Array { + importer?: (fn: DirectiveFn) => Promise +} + +export function TanStackServerFnPluginEnv( + opts: TanStackServerFnPluginEnvOpts, +): Array { opts = { ...opts, client: { @@ -236,7 +243,8 @@ export function TanStackServerFnPluginEnv(opts: { // into the manifest because it's a dynamic import. Instead, as you'll // see below, we augment the manifest output with a code-generated importer // that looks exactly like this. - importer: () => import(fn.extractedFilename), + importer: () => + opts.importer ? opts.importer(fn) : import(fn.extractedFilename), }, ]), ), @@ -259,11 +267,13 @@ export function TanStackServerFnPluginEnv(opts: { envLabel: 'Client', getRuntimeCode: opts.client.getRuntimeCode, replacer: opts.client.replacer, + envName: opts.client.envName, }, server: { envLabel: 'Server', getRuntimeCode: opts.server.getRuntimeCode, replacer: opts.server.replacer, + envName: opts.server.envName, }, }, }), diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index b4be8ee071..fa5d327e24 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -67,7 +67,6 @@ "dependencies": { "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", - "@tanstack/server-functions-plugin": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", "zod": "^3.24.2" }, diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index 8035d4b431..a3be89659f 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -1,5 +1,4 @@ import path from 'node:path' -import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import { tanstackRouter } from '@tanstack/router-plugin/vite' import viteSolid from 'vite-plugin-solid' import { @@ -31,7 +30,7 @@ export function TanStackStartVitePlugin( enableRouteGeneration: true, autoCodeSplitting: true, }), - TanStackStartVitePluginCore('solid', options), + TanStackStartVitePluginCore({ framework: 'solid' }, options), { name: 'tanstack-solid-start:resolve-entries', resolveId(id) { @@ -90,23 +89,6 @@ export default createStartHandler({ return null }, }, - TanStackServerFnPluginEnv({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module - manifestVirtualImportId: 'tanstack:server-fn-manifest', - client: { - getRuntimeCode: () => - `import { createClientRpc } from '@tanstack/solid-start/server-functions-client'`, - replacer: (d) => - `createClientRpc('${d.functionId}', '${options.serverFns.base}')`, - }, - server: { - getRuntimeCode: () => - `import { createServerRpc } from '@tanstack/solid-start/server-functions-server'`, - replacer: (d) => - `createServerRpc('${d.functionId}', '${options.serverFns.base}', ${d.fn})`, - }, - }), TanStackStartServerRoutesVite({ ...options.tsr, target: 'solid', diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index b3a29b224a..00f53ef9a4 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -72,6 +72,7 @@ "@tanstack/router-core": "workspace:^", "@tanstack/router-generator": "workspace:^", "@tanstack/router-utils": "workspace:^", + "@tanstack/server-functions-plugin": "workspace:^", "@types/babel__code-frame": "^7.0.6", "@types/babel__core": "^7.20.5", "babel-dead-code-elimination": "^1.0.9", diff --git a/packages/start-plugin-core/src/constants.ts b/packages/start-plugin-core/src/constants.ts new file mode 100644 index 0000000000..5ae26d8748 --- /dev/null +++ b/packages/start-plugin-core/src/constants.ts @@ -0,0 +1,6 @@ +export const VITE_ENVIRONMENT_NAMES = { + // 'ssr' is chosen as the name for the server environment to ensure backwards compatibility + // with vite plugins that are not compatible with the new vite environment API (e.g. tailwindcss) + server: 'ssr', + client: 'client', +} as const diff --git a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts index 1f868d4440..3fc02ba95e 100644 --- a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts +++ b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts @@ -1,7 +1,8 @@ import { createEvent, getHeader, sendWebResponse } from 'h3' import { isRunnableDevEnvironment } from 'vite' import { extractHtmlScripts } from '../extractHtmlScripts' -import type { Connect, Plugin, ViteDevServer } from 'vite' +import { VITE_ENVIRONMENT_NAMES } from '../constants' +import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite' declare global { // eslint-disable-next-line no-var @@ -30,11 +31,20 @@ export function devServerPlugin(): Plugin { let cachedScripts: string | undefined viteDevServer.middlewares.use(async (req, res) => { const event = createEvent(req, res) - const serverEnv = viteDevServer.environments['server'] + const serverEnv = viteDevServer.environments[ + VITE_ENVIRONMENT_NAMES.server + ] as DevEnvironment | undefined try { - if (!serverEnv || !isRunnableDevEnvironment(serverEnv)) { - throw new Error('Server environment not found') + if (!serverEnv) { + throw new Error( + `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`, + ) + } + if (!isRunnableDevEnvironment(serverEnv)) { + throw new Error( + `Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`, + ) } if (cachedScripts === undefined) { const templateHtml = `` diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index fcf2520862..637faea878 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -4,6 +4,7 @@ import { build, createNitro } from 'nitropack' import { dirname, resolve } from 'pathe' import { clientDistDir, ssrEntryFile } from '../plugin' import { prerender } from '../prerender' +import { VITE_ENVIRONMENT_NAMES } from '../constants' import { devServerPlugin } from './dev-server-plugin' import { buildNitroEnvironment } from './build-nitro' import type { EnvironmentOptions, PluginOption, Rollup } from 'vite' @@ -22,7 +23,7 @@ export function nitroPlugin( { name: 'tanstack-vite-plugin-nitro', configEnvironment(name) { - if (name === 'server') { + if (name === VITE_ENVIRONMENT_NAMES.server) { return { build: { commonjsOptions: { @@ -44,8 +45,10 @@ export function nitroPlugin( builder: { sharedPlugins: true, async buildApp(builder) { - const clientEnv = builder.environments['client'] - const serverEnv = builder.environments['server'] + const clientEnv = + builder.environments[VITE_ENVIRONMENT_NAMES.client] + const serverEnv = + builder.environments[VITE_ENVIRONMENT_NAMES.server] if (!clientEnv) { throw new Error('Client environment not found') diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 9c4df86847..a45a8ce4dd 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -1,5 +1,6 @@ import path from 'node:path' import { createNitro } from 'nitropack' +import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import { createTanStackConfig, createTanStackStartOptionsSchema, @@ -7,6 +8,7 @@ import { import { nitroPlugin } from './nitro/nitro-plugin' import { startManifestPlugin } from './routesManifestPlugin' import { TanStackStartCompilerPlugin } from './start-compiler-plugin' +import { VITE_ENVIRONMENT_NAMES } from './constants' import type { PluginOption, Rollup } from 'vite' import type { z } from 'zod' import type { CompileStartFrameworkOptions } from './compilers' @@ -28,12 +30,15 @@ export type TanStackStartOutputConfig = ReturnType< export const clientDistDir = '.tanstack-start/build/client-dist' export const ssrEntryFile = 'ssr.mjs' +export interface TanStackStartVitePluginCoreOptions { + framework: CompileStartFrameworkOptions +} // this needs to live outside of the TanStackStartVitePluginCore since it will be invoked multiple times by vite let ssrBundle: Rollup.OutputBundle export function TanStackStartVitePluginCore( - framework: CompileStartFrameworkOptions, - opts: TanStackStartOutputConfig, + opts: TanStackStartVitePluginCoreOptions, + startConfig: TanStackStartOutputConfig, ): Array { return [ { @@ -42,7 +47,7 @@ export function TanStackStartVitePluginCore( const nitroOutputPublicDir = await (async () => { // Create a dummy nitro app to get the resolved public output path const dummyNitroApp = await createNitro({ - preset: opts.target, + preset: startConfig.target, compatibilityDate: '2024-12-01', }) @@ -54,23 +59,23 @@ export function TanStackStartVitePluginCore( return { environments: { - client: { + [VITE_ENVIRONMENT_NAMES.client]: { consumer: 'client', build: { manifest: true, rollupOptions: { input: { - main: opts.clientEntryPath, + main: startConfig.clientEntryPath, }, output: { - dir: path.resolve(opts.root, clientDistDir), + dir: path.resolve(startConfig.root, clientDistDir), }, // TODO this should be removed external: ['node:fs', 'node:path', 'node:os', 'node:crypto'], }, }, }, - server: { + [VITE_ENVIRONMENT_NAMES.server]: { consumer: 'server', build: { ssr: true, @@ -118,18 +123,50 @@ export function TanStackStartVitePluginCore( }, /* prettier-ignore */ define: { - ...injectDefineEnv('TSS_PUBLIC_BASE', opts.public.base), - ...injectDefineEnv('TSS_CLIENT_BASE', opts.client.base), - ...injectDefineEnv('TSS_CLIENT_ENTRY', opts.clientEntryPath), - ...injectDefineEnv('TSS_SERVER_FN_BASE', opts.serverFns.base), + ...injectDefineEnv('TSS_PUBLIC_BASE', startConfig.public.base), + ...injectDefineEnv('TSS_CLIENT_BASE', startConfig.client.base), + ...injectDefineEnv('TSS_CLIENT_ENTRY', startConfig.clientEntryPath), + ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), }, } }, }, - TanStackStartCompilerPlugin(framework), - startManifestPlugin(opts), - nitroPlugin(opts, () => ssrBundle), + // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPluginEnv + TanStackStartCompilerPlugin(opts.framework, { + client: { envName: VITE_ENVIRONMENT_NAMES.client }, + server: { envName: VITE_ENVIRONMENT_NAMES.server }, + }), + TanStackServerFnPluginEnv({ + // This is the ID that will be available to look up and import + // our server function manifest and resolve its module + manifestVirtualImportId: 'tanstack:server-fn-manifest', + client: { + getRuntimeCode: () => + `import { createClientRpc } from '@tanstack/${opts.framework}-start/server-functions-client'`, + replacer: (d) => + `createClientRpc('${d.functionId}', '${startConfig.serverFns.base}')`, + envName: VITE_ENVIRONMENT_NAMES.client, + }, + server: { + getRuntimeCode: () => + `import { createServerRpc } from '@tanstack/${opts.framework}-start/server-functions-server'`, + replacer: (d) => + `createServerRpc('${d.functionId}', '${startConfig.serverFns.base}', ${d.fn})`, + envName: VITE_ENVIRONMENT_NAMES.server, + }, + importer: (fn) => { + const serverEnv = (globalThis as any).viteDevServer.environments[ + VITE_ENVIRONMENT_NAMES.server + ] + if (!serverEnv) { + throw new Error(`'ssr' vite dev environment not found`) + } + return serverEnv.runner.import(fn.extractedFilename) + }, + }), + startManifestPlugin(startConfig), + nitroPlugin(startConfig, () => ssrBundle), ] } diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index 43037daec0..7a8d808d52 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -6,6 +6,7 @@ import { build as buildNitro, createNitro } from 'nitropack' import { joinURL, withBase, withoutBase } from 'ufo' import { Queue } from './queue' import { buildNitroEnvironment } from './nitro/build-nitro' +import { VITE_ENVIRONMENT_NAMES } from './constants' import type { ViteBuilder } from 'vite' import type { $Fetch, Nitro } from 'nitropack' import type { TanStackStartOutputConfig } from './plugin' @@ -31,10 +32,12 @@ export async function prerender({ ] } - const serverEnv = builder.environments['server'] + const serverEnv = builder.environments[VITE_ENVIRONMENT_NAMES.server] if (!serverEnv) { - throw new Error(`Vite's "server" environment not found`) + throw new Error( + `Vite's "${VITE_ENVIRONMENT_NAMES.server}" environment not found`, + ) } const prerenderOutputDir = path.resolve( diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 7643e0aa4b..c85591c170 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -5,10 +5,6 @@ import { startSerializer } from '@tanstack/start-client-core' import _serverFnManifest from 'tanstack:server-fn-manifest' import { getEvent, getResponseStatus } from './h3' -// NOTE: This is a dummy export to silence warnings about -// only having a default export. -export const dummy = 2 - const serverFnManifest = _serverFnManifest as Record< string, { @@ -64,17 +60,8 @@ export const handleServerAction = async ({ request }: { request: Request }) => { throw new Error('Server function info not found for ' + serverFnId) } - let fnModule: undefined | { [key: string]: any } - - if (process.env.NODE_ENV === 'development') { - const serverEnv = (globalThis as any).viteDevServer.environments['server'] - if (!serverEnv) { - throw new Error(`'server' vite dev environment not found`) - } - fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename) - } else { - fnModule = await serverFnInfo.importer() - } + const fnModule: undefined | { [key: string]: any } = + await serverFnInfo.importer() if (!fnModule) { console.info('serverFnInfo', serverFnInfo) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0538139e04..175f4849bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,7 +68,7 @@ importers: version: 1.52.0 '@tanstack/config': specifier: ^0.16.1 - version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@tanstack/react-query': specifier: 5.66.0 version: 5.66.0(react@19.0.0) @@ -83,7 +83,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitest/browser': specifier: ^3.0.6 - version: 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) + version: 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) '@vitest/ui': specifier: ^3.0.6 version: 3.0.6(vitest@3.0.6) @@ -143,10 +143,10 @@ importers: version: typescript@5.7.3 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vitest: specifier: ^3.0.6 - version: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.2)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/e2e-utils: {} @@ -191,10 +191,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-esbuild-file-based: dependencies: @@ -289,13 +289,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) combinate: specifier: ^1.1.11 version: 1.1.11 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-file-based-code-splitting: dependencies: @@ -341,10 +341,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-react-query: dependencies: @@ -393,10 +393,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-react-query-file-based: dependencies: @@ -451,10 +451,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-scroll-restoration: dependencies: @@ -500,10 +500,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-virtual-file-based: dependencies: @@ -555,10 +555,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/basic-virtual-named-export-config-file-based: dependencies: @@ -610,10 +610,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/generator-cli-only: dependencies: @@ -659,10 +659,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/js-only-file-based: dependencies: @@ -708,10 +708,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/rspack-basic-file-based: dependencies: @@ -870,10 +870,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-router/sentry-integration: dependencies: @@ -925,10 +925,10 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) e2e/react-start/basic: dependencies: @@ -955,7 +955,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -977,7 +977,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -995,7 +995,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-auth: dependencies: @@ -1028,7 +1028,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1047,7 +1047,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1062,7 +1062,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-react-query: dependencies: @@ -1098,7 +1098,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@playwright/test': specifier: ^1.52.0 @@ -1117,7 +1117,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1132,7 +1132,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-rsc: dependencies: @@ -1162,7 +1162,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -1172,7 +1172,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1187,7 +1187,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/basic-tsr-config: dependencies: @@ -1205,7 +1205,7 @@ importers: version: 19.0.0(react@19.0.0) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -1251,7 +1251,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1273,7 +1273,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1291,7 +1291,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/server-functions: dependencies: @@ -1321,7 +1321,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1346,7 +1346,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1364,7 +1364,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/virtual-routes: dependencies: @@ -1394,7 +1394,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -1416,7 +1416,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1434,7 +1434,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/react-start/website: dependencies: @@ -1480,7 +1480,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -1495,10 +1495,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic: dependencies: @@ -1532,10 +1532,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -1618,10 +1618,10 @@ importers: version: 1.1.11 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-file-based-code-splitting: dependencies: @@ -1658,10 +1658,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-scroll-restoration: dependencies: @@ -1698,10 +1698,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-solid-query: dependencies: @@ -1741,10 +1741,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-solid-query-file-based: dependencies: @@ -1790,10 +1790,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-virtual-file-based: dependencies: @@ -1836,10 +1836,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: @@ -1882,10 +1882,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -2023,10 +2023,10 @@ importers: version: link:../../e2e-utils vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/basic: dependencies: @@ -2050,7 +2050,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2081,10 +2081,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/basic-tsr-config: dependencies: @@ -2102,7 +2102,7 @@ importers: version: 1.9.5 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -2115,7 +2115,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/scroll-restoration: dependencies: @@ -2142,7 +2142,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2173,10 +2173,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/server-functions: dependencies: @@ -2203,7 +2203,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2237,10 +2237,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) e2e/solid-start/website: dependencies: @@ -2264,7 +2264,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -2292,10 +2292,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/authenticated-routes: dependencies: @@ -2338,13 +2338,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/authenticated-routes-firebase: dependencies: @@ -2393,13 +2393,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic: dependencies: @@ -2436,13 +2436,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-default-search-params: dependencies: @@ -2485,13 +2485,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-devtools-panel: dependencies: @@ -2531,13 +2531,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-file-based: dependencies: @@ -2580,13 +2580,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-non-nested-devtools: dependencies: @@ -2623,13 +2623,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-react-query: dependencies: @@ -2672,13 +2672,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-react-query-file-based: dependencies: @@ -2727,13 +2727,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-virtual-file-based: dependencies: @@ -2779,13 +2779,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/basic-virtual-inside-file-based: dependencies: @@ -2831,13 +2831,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/deferred-data: dependencies: @@ -2877,13 +2877,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink: dependencies: @@ -2926,13 +2926,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-file-based: dependencies: @@ -2978,13 +2978,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-react-query: dependencies: @@ -3033,13 +3033,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/kitchen-sink-react-query-file-based: dependencies: @@ -3091,13 +3091,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/large-file-based: dependencies: @@ -3143,13 +3143,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/location-masking: dependencies: @@ -3192,13 +3192,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/navigation-blocking: dependencies: @@ -3238,13 +3238,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart: dependencies: @@ -3278,13 +3278,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart-esbuild-file-based: dependencies: @@ -3361,13 +3361,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/quickstart-rspack-file-based: dependencies: @@ -3496,16 +3496,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -3536,7 +3536,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3551,10 +3551,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -3582,16 +3582,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: @@ -3607,13 +3607,13 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/router-monorepo-react-query/packages/router: dependencies: @@ -3653,16 +3653,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple: dependencies: @@ -3696,16 +3696,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -3739,16 +3739,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -3776,7 +3776,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3791,10 +3791,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -3819,16 +3819,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -3862,16 +3862,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -3899,7 +3899,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.3) @@ -3914,10 +3914,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -3939,16 +3939,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -3982,16 +3982,16 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/scroll-restoration: dependencies: @@ -4028,13 +4028,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/search-validator-adapters: dependencies: @@ -4098,13 +4098,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/start-bare: dependencies: @@ -4129,7 +4129,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.5.4 version: 22.13.4 @@ -4147,7 +4147,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic: dependencies: @@ -4171,7 +4171,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 @@ -4199,7 +4199,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-auth: dependencies: @@ -4254,7 +4254,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-react-query: dependencies: @@ -4312,7 +4312,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-rsc: dependencies: @@ -4361,7 +4361,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-basic-static: dependencies: @@ -4410,7 +4410,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.3 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-clerk-basic: dependencies: @@ -4462,7 +4462,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-convex-trellaux: dependencies: @@ -4541,7 +4541,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-counter: dependencies: @@ -4627,10 +4627,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-material-ui: dependencies: @@ -4682,7 +4682,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-supabase-basic: dependencies: @@ -4728,7 +4728,56 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + + examples/react/start-tailwind-v4: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-router-devtools': + specifier: workspace:^ + version: link:../../../packages/react-router-devtools + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + tailwind-merge: + specifier: ^2.6.0 + version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: + '@tailwindcss/vite': + specifier: ^4.1.6 + version: 4.1.6(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@types/node': + specifier: ^22.5.4 + version: 22.13.4 + '@types/react': + specifier: ^19.0.8 + version: 19.0.8 + '@types/react-dom': + specifier: ^19.0.3 + version: 19.0.3(@types/react@19.0.8) + tailwindcss: + specifier: ^4.1.6 + version: 4.1.6 + typescript: + specifier: ^5.7.2 + version: 5.8.2 + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-trellaux: dependencies: @@ -4798,7 +4847,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/start-workos: dependencies: @@ -4831,7 +4880,7 @@ importers: version: 19.0.0(react@19.0.0) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/react': specifier: ^19.0.8 @@ -4853,7 +4902,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/view-transitions: dependencies: @@ -4896,13 +4945,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/with-framer-motion: dependencies: @@ -4945,13 +4994,13 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) typescript: specifier: ^5.7.2 version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) examples/react/with-trpc: dependencies: @@ -5003,7 +5052,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/with-trpc-react-query: dependencies: @@ -5064,7 +5113,7 @@ importers: version: 19.0.3(@types/react@19.0.8) '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic: dependencies: @@ -5101,10 +5150,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-devtools-panel: dependencies: @@ -5135,10 +5184,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-file-based: dependencies: @@ -5175,10 +5224,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-non-nested-devtools: dependencies: @@ -5215,10 +5264,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-solid-query: dependencies: @@ -5258,10 +5307,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/basic-solid-query-file-based: dependencies: @@ -5304,10 +5353,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/kitchen-sink-file-based: dependencies: @@ -5347,10 +5396,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/quickstart-file-based: dependencies: @@ -5387,10 +5436,10 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/start-bare: dependencies: @@ -5414,14 +5463,14 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.2 version: 3.24.2 devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.10.2 version: 22.13.4 @@ -5436,10 +5485,10 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/start-basic: dependencies: @@ -5463,7 +5512,7 @@ importers: version: 2.6.0 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/node': specifier: ^22.5.4 @@ -5482,7 +5531,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/solid/start-basic-static: dependencies: @@ -5522,7 +5571,7 @@ importers: version: 5.8.2 vite-tsconfig-paths: specifier: ^5.1.3 - version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/arktype-adapter: devDependencies: @@ -5592,7 +5641,7 @@ importers: version: 7.20.6 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/eslint-plugin-router: dependencies: @@ -5644,7 +5693,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) combinate: specifier: ^1.1.11 version: 1.1.11 @@ -5672,7 +5721,7 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5693,7 +5742,7 @@ importers: version: link:../router-core '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5720,7 +5769,7 @@ importers: version: link:../start-server-functions-server '@vitejs/plugin-react': specifier: '>=4.3.4' - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5729,7 +5778,7 @@ importers: version: 19.0.0(react@19.0.0) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: esbuild: specifier: ^0.25.0 @@ -5773,7 +5822,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/react-start-plugin: dependencies: @@ -5783,9 +5832,6 @@ importers: '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils - '@tanstack/server-functions-plugin': - specifier: workspace:* - version: link:../server-functions-plugin '@tanstack/start-plugin-core': specifier: workspace:* version: link:../start-plugin-core @@ -5795,10 +5841,10 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/react-start-server: dependencies: @@ -5841,7 +5887,7 @@ importers: version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) esbuild: specifier: ^0.25.0 version: 0.25.2 @@ -5903,7 +5949,7 @@ importers: devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 - version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 @@ -5934,7 +5980,7 @@ importers: version: 1.9.5 vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/router-generator: dependencies: @@ -6012,10 +6058,10 @@ importers: version: 2.2.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) webpack: specifier: '>=5.92.0' version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) @@ -6150,7 +6196,7 @@ importers: version: 1.9.5 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) zod: specifier: ^3.23.8 version: 3.24.2 @@ -6169,7 +6215,7 @@ importers: devDependencies: vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/solid-start: dependencies: @@ -6193,10 +6239,10 @@ importers: version: 1.9.5 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: '>=2.11.6' - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) devDependencies: esbuild: specifier: ^0.25.0 @@ -6240,7 +6286,7 @@ importers: version: 3.0.3 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/solid-start-plugin: dependencies: @@ -6250,9 +6296,6 @@ importers: '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils - '@tanstack/server-functions-plugin': - specifier: workspace:* - version: link:../server-functions-plugin '@tanstack/start-plugin-core': specifier: workspace:* version: link:../start-plugin-core @@ -6262,10 +6305,10 @@ importers: devDependencies: vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-solid: specifier: ^2.11.6 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/solid-start-server: dependencies: @@ -6317,7 +6360,7 @@ importers: version: 5.8.2 vite-plugin-solid: specifier: ^2.11.2 - version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) packages/start-client-core: dependencies: @@ -6354,6 +6397,9 @@ importers: '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils + '@tanstack/server-functions-plugin': + specifier: workspace:* + version: link:../server-functions-plugin '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 @@ -6387,7 +6433,7 @@ importers: devDependencies: vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-core: dependencies: @@ -6430,7 +6476,7 @@ importers: version: 5.8.2 vite: specifier: 6.3.5 - version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) packages/start-server-functions-client: dependencies: @@ -9464,81 +9510,171 @@ packages: '@tailwindcss/node@4.0.8': resolution: {integrity: sha512-FKArQpbrbwv08TNT0k7ejYXpF+R8knZFAatNc0acOxbgeqLzwb86r+P3LGOjIeI3Idqe9CVkZrh4GlsJLJKkkw==} + '@tailwindcss/node@4.1.6': + resolution: {integrity: sha512-ed6zQbgmKsjsVvodAS1q1Ld2BolEuxJOSyyNc+vhkjdmfNUDCmQnlXBfQkHrlzNmslxHsQU/bFmzcEbv4xXsLg==} + '@tailwindcss/oxide-android-arm64@4.0.8': resolution: {integrity: sha512-We7K79+Sm4mwJHk26Yzu/GAj7C7myemm7PeXvpgMxyxO70SSFSL3uCcqFbz9JA5M5UPkrl7N9fkBe/Y0iazqpA==} engines: {node: '>= 10'} cpu: [arm64] os: [android] + '@tailwindcss/oxide-android-arm64@4.1.6': + resolution: {integrity: sha512-VHwwPiwXtdIvOvqT/0/FLH/pizTVu78FOnI9jQo64kSAikFSZT7K4pjyzoDpSMaveJTGyAKvDjuhxJxKfmvjiQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [android] + '@tailwindcss/oxide-darwin-arm64@4.0.8': resolution: {integrity: sha512-Lv9Isi2EwkCTG1sRHNDi0uRNN1UGFdEThUAGFrydRmQZnraGLMjN8gahzg2FFnOizDl7LB2TykLUuiw833DSNg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] + '@tailwindcss/oxide-darwin-arm64@4.1.6': + resolution: {integrity: sha512-weINOCcqv1HVBIGptNrk7c6lWgSFFiQMcCpKM4tnVi5x8OY2v1FrV76jwLukfT6pL1hyajc06tyVmZFYXoxvhQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + '@tailwindcss/oxide-darwin-x64@4.0.8': resolution: {integrity: sha512-fWfywfYIlSWtKoqWTjukTHLWV3ARaBRjXCC2Eo0l6KVpaqGY4c2y8snUjp1xpxUtpqwMvCvFWFaleMoz1Vhzlw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] + '@tailwindcss/oxide-darwin-x64@4.1.6': + resolution: {integrity: sha512-3FzekhHG0ww1zQjQ1lPoq0wPrAIVXAbUkWdWM8u5BnYFZgb9ja5ejBqyTgjpo5mfy0hFOoMnMuVDI+7CXhXZaQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + '@tailwindcss/oxide-freebsd-x64@4.0.8': resolution: {integrity: sha512-SO+dyvjJV9G94bnmq2288Ke0BIdvrbSbvtPLaQdqjqHR83v5L2fWADyFO+1oecHo9Owsk8MxcXh1agGVPIKIqw==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] + '@tailwindcss/oxide-freebsd-x64@4.1.6': + resolution: {integrity: sha512-4m5F5lpkBZhVQJq53oe5XgJ+aFYWdrgkMwViHjRsES3KEu2m1udR21B1I77RUqie0ZYNscFzY1v9aDssMBZ/1w==} + engines: {node: '>= 10'} + cpu: [x64] + os: [freebsd] + '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.8': resolution: {integrity: sha512-ZSHggWiEblQNV69V0qUK5vuAtHP+I+S2eGrKGJ5lPgwgJeAd6GjLsVBN+Mqn2SPVfYM3BOpS9jX/zVg9RWQVDQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.6': + resolution: {integrity: sha512-qU0rHnA9P/ZoaDKouU1oGPxPWzDKtIfX7eOGi5jOWJKdxieUJdVV+CxWZOpDWlYTd4N3sFQvcnVLJWJ1cLP5TA==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + '@tailwindcss/oxide-linux-arm64-gnu@4.0.8': resolution: {integrity: sha512-xWpr6M0OZLDNsr7+bQz+3X7zcnDJZJ1N9gtBWCtfhkEtDjjxYEp+Lr5L5nc/yXlL4MyCHnn0uonGVXy3fhxaVA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@tailwindcss/oxide-linux-arm64-gnu@4.1.6': + resolution: {integrity: sha512-jXy3TSTrbfgyd3UxPQeXC3wm8DAgmigzar99Km9Sf6L2OFfn/k+u3VqmpgHQw5QNfCpPe43em6Q7V76Wx7ogIQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@tailwindcss/oxide-linux-arm64-musl@4.0.8': resolution: {integrity: sha512-5tz2IL7LN58ssGEq7h/staD7pu/izF/KeMWdlJ86WDe2Ah46LF3ET6ZGKTr5eZMrnEA0M9cVFuSPprKRHNgjeg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@tailwindcss/oxide-linux-arm64-musl@4.1.6': + resolution: {integrity: sha512-8kjivE5xW0qAQ9HX9reVFmZj3t+VmljDLVRJpVBEoTR+3bKMnvC7iLcoSGNIUJGOZy1mLVq7x/gerVg0T+IsYw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@tailwindcss/oxide-linux-x64-gnu@4.0.8': resolution: {integrity: sha512-KSzMkhyrxAQyY2o194NKVKU9j/c+NFSoMvnHWFaNHKi3P1lb+Vq1UC19tLHrmxSkKapcMMu69D7+G1+FVGNDXQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@tailwindcss/oxide-linux-x64-gnu@4.1.6': + resolution: {integrity: sha512-A4spQhwnWVpjWDLXnOW9PSinO2PTKJQNRmL/aIl2U/O+RARls8doDfs6R41+DAXK0ccacvRyDpR46aVQJJCoCg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@tailwindcss/oxide-linux-x64-musl@4.0.8': resolution: {integrity: sha512-yFYKG5UtHTRimjtqxUWXBgI4Tc6NJe3USjRIVdlTczpLRxq/SFwgzGl5JbatCxgSRDPBFwRrNPxq+ukfQFGdrw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@tailwindcss/oxide-linux-x64-musl@4.1.6': + resolution: {integrity: sha512-YRee+6ZqdzgiQAHVSLfl3RYmqeeaWVCk796MhXhLQu2kJu2COHBkqlqsqKYx3p8Hmk5pGCQd2jTAoMWWFeyG2A==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@tailwindcss/oxide-wasm32-wasi@4.1.6': + resolution: {integrity: sha512-qAp4ooTYrBQ5pk5jgg54/U1rCJ/9FLYOkkQ/nTE+bVMseMfB6O7J8zb19YTpWuu4UdfRf5zzOrNKfl6T64MNrQ==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + bundledDependencies: + - '@napi-rs/wasm-runtime' + - '@emnapi/core' + - '@emnapi/runtime' + - '@tybys/wasm-util' + - '@emnapi/wasi-threads' + - tslib + '@tailwindcss/oxide-win32-arm64-msvc@4.0.8': resolution: {integrity: sha512-tndGujmCSba85cRCnQzXgpA2jx5gXimyspsUYae5jlPyLRG0RjXbDshFKOheVXU4TLflo7FSG8EHCBJ0EHTKdQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] + '@tailwindcss/oxide-win32-arm64-msvc@4.1.6': + resolution: {integrity: sha512-nqpDWk0Xr8ELO/nfRUDjk1pc9wDJ3ObeDdNMHLaymc4PJBWj11gdPCWZFKSK2AVKjJQC7J2EfmSmf47GN7OuLg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + '@tailwindcss/oxide-win32-x64-msvc@4.0.8': resolution: {integrity: sha512-T77jroAc0p4EHVVgTUiNeFn6Nj3jtD3IeNId2X+0k+N1XxfNipy81BEkYErpKLiOkNhpNFjPee8/ZVas29b2OQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] + '@tailwindcss/oxide-win32-x64-msvc@4.1.6': + resolution: {integrity: sha512-5k9xF33xkfKpo9wCvYcegQ21VwIBU1/qEbYlVukfEIyQbEA47uK8AAwS7NVjNE3vHzcmxMYwd0l6L4pPjjm1rQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@tailwindcss/oxide@4.0.8': resolution: {integrity: sha512-KfMcuAu/Iw+DcV1e8twrFyr2yN8/ZDC/odIGta4wuuJOGkrkHZbvJvRNIbQNhGh7erZTYV6Ie0IeD6WC9Y8Hcw==} engines: {node: '>= 10'} + '@tailwindcss/oxide@4.1.6': + resolution: {integrity: sha512-0bpEBQiGx+227fW4G0fLQ8vuvyy5rsB1YIYNapTq3aRsJ9taF3f5cCaovDjN5pUGKKzcpMrZst/mhNaKAPOHOA==} + engines: {node: '>= 10'} + '@tailwindcss/vite@4.0.8': resolution: {integrity: sha512-+SAq44yLzYlzyrb7QTcFCdU8Xa7FOA0jp+Xby7fPMUie+MY9HhJysM7Vp+vL8qIp8ceQJfLD+FjgJuJ4lL6nyg==} peerDependencies: vite: 6.3.5 + '@tailwindcss/vite@4.1.6': + resolution: {integrity: sha512-zjtqjDeY1w3g2beYQtrMAf51n5G7o+UwmyOjtsDMP7t6XyoRMOidcoKP32ps7AkNOHIXEOK0bhIC05dj8oJp4w==} + peerDependencies: + vite: 6.3.5 + '@tanstack/config@0.16.1': resolution: {integrity: sha512-GLt1xyQCGRty58N2jv0ONouv8OU46FjkbcSSTiAKwydcX+JycZ7FCLWt05lefrvuV8Eay0eNuN0sYUemObZLEA==} engines: {node: '>=18'} @@ -10902,6 +11038,10 @@ packages: resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} engines: {node: '>=8'} + detect-libc@2.0.4: + resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==} + engines: {node: '>=8'} + detect-node-es@1.1.0: resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==} @@ -12177,64 +12317,128 @@ packages: cpu: [arm64] os: [darwin] + lightningcss-darwin-arm64@1.29.2: + resolution: {integrity: sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + lightningcss-darwin-x64@1.29.1: resolution: {integrity: sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] + lightningcss-darwin-x64@1.29.2: + resolution: {integrity: sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + lightningcss-freebsd-x64@1.29.1: resolution: {integrity: sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] + lightningcss-freebsd-x64@1.29.2: + resolution: {integrity: sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + lightningcss-linux-arm-gnueabihf@1.29.1: resolution: {integrity: sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] + lightningcss-linux-arm-gnueabihf@1.29.2: + resolution: {integrity: sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + lightningcss-linux-arm64-gnu@1.29.1: resolution: {integrity: sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-gnu@1.29.2: + resolution: {integrity: sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-arm64-musl@1.29.1: resolution: {integrity: sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-musl@1.29.2: + resolution: {integrity: sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-x64-gnu@1.29.1: resolution: {integrity: sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-gnu@1.29.2: + resolution: {integrity: sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-linux-x64-musl@1.29.1: resolution: {integrity: sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-musl@1.29.2: + resolution: {integrity: sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-win32-arm64-msvc@1.29.1: resolution: {integrity: sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] + lightningcss-win32-arm64-msvc@1.29.2: + resolution: {integrity: sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + lightningcss-win32-x64-msvc@1.29.1: resolution: {integrity: sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] + lightningcss-win32-x64-msvc@1.29.2: + resolution: {integrity: sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + lightningcss@1.29.1: resolution: {integrity: sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==} engines: {node: '>= 12.0.0'} + lightningcss@1.29.2: + resolution: {integrity: sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==} + engines: {node: '>= 12.0.0'} + lilconfig@3.1.3: resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} engines: {node: '>=14'} @@ -13633,6 +13837,9 @@ packages: tailwindcss@4.0.8: resolution: {integrity: sha512-Me7N5CKR+D2A1xdWA5t5+kjjT7bwnxZOE6/yDI/ixJdJokszsn2n++mdU5yJwrsTpqFX2B9ZNMBJDwcqk9C9lw==} + tailwindcss@4.1.6: + resolution: {integrity: sha512-j0cGLTreM6u4OWzBeLBpycK0WIh8w7kSwcUsQZoGLHZ7xDTdM69lN64AgoIEEwFi0tnhs4wSykUa5YWxAzgFYg==} + tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -17581,39 +17788,85 @@ snapshots: jiti: 2.4.2 tailwindcss: 4.0.8 + '@tailwindcss/node@4.1.6': + dependencies: + '@ampproject/remapping': 2.3.0 + enhanced-resolve: 5.18.1 + jiti: 2.4.2 + lightningcss: 1.29.2 + magic-string: 0.30.17 + source-map-js: 1.2.1 + tailwindcss: 4.1.6 + '@tailwindcss/oxide-android-arm64@4.0.8': optional: true + '@tailwindcss/oxide-android-arm64@4.1.6': + optional: true + '@tailwindcss/oxide-darwin-arm64@4.0.8': optional: true + '@tailwindcss/oxide-darwin-arm64@4.1.6': + optional: true + '@tailwindcss/oxide-darwin-x64@4.0.8': optional: true + '@tailwindcss/oxide-darwin-x64@4.1.6': + optional: true + '@tailwindcss/oxide-freebsd-x64@4.0.8': optional: true + '@tailwindcss/oxide-freebsd-x64@4.1.6': + optional: true + '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.8': optional: true + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.6': + optional: true + '@tailwindcss/oxide-linux-arm64-gnu@4.0.8': optional: true + '@tailwindcss/oxide-linux-arm64-gnu@4.1.6': + optional: true + '@tailwindcss/oxide-linux-arm64-musl@4.0.8': optional: true + '@tailwindcss/oxide-linux-arm64-musl@4.1.6': + optional: true + '@tailwindcss/oxide-linux-x64-gnu@4.0.8': optional: true + '@tailwindcss/oxide-linux-x64-gnu@4.1.6': + optional: true + '@tailwindcss/oxide-linux-x64-musl@4.0.8': optional: true + '@tailwindcss/oxide-linux-x64-musl@4.1.6': + optional: true + + '@tailwindcss/oxide-wasm32-wasi@4.1.6': + optional: true + '@tailwindcss/oxide-win32-arm64-msvc@4.0.8': optional: true + '@tailwindcss/oxide-win32-arm64-msvc@4.1.6': + optional: true + '@tailwindcss/oxide-win32-x64-msvc@4.0.8': optional: true + '@tailwindcss/oxide-win32-x64-msvc@4.1.6': + optional: true + '@tailwindcss/oxide@4.0.8': optionalDependencies: '@tailwindcss/oxide-android-arm64': 4.0.8 @@ -17628,15 +17881,40 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.0.8 '@tailwindcss/oxide-win32-x64-msvc': 4.0.8 - '@tailwindcss/vite@4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tailwindcss/oxide@4.1.6': + dependencies: + detect-libc: 2.0.4 + tar: 7.4.3 + optionalDependencies: + '@tailwindcss/oxide-android-arm64': 4.1.6 + '@tailwindcss/oxide-darwin-arm64': 4.1.6 + '@tailwindcss/oxide-darwin-x64': 4.1.6 + '@tailwindcss/oxide-freebsd-x64': 4.1.6 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.6 + '@tailwindcss/oxide-linux-arm64-gnu': 4.1.6 + '@tailwindcss/oxide-linux-arm64-musl': 4.1.6 + '@tailwindcss/oxide-linux-x64-gnu': 4.1.6 + '@tailwindcss/oxide-linux-x64-musl': 4.1.6 + '@tailwindcss/oxide-wasm32-wasi': 4.1.6 + '@tailwindcss/oxide-win32-arm64-msvc': 4.1.6 + '@tailwindcss/oxide-win32-x64-msvc': 4.1.6 + + '@tailwindcss/vite@4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@tailwindcss/node': 4.0.8 '@tailwindcss/oxide': 4.0.8 lightningcss: 1.29.1 tailwindcss: 4.0.8 - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tailwindcss/vite@4.1.6(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + dependencies: + '@tailwindcss/node': 4.1.6 + '@tailwindcss/oxide': 4.1.6 + tailwindcss: 4.1.6 + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + + '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@commitlint/parse': 19.5.0 '@eslint/js': 9.22.0 @@ -17658,9 +17936,9 @@ snapshots: typedoc-plugin-markdown: 4.4.1(typedoc@0.27.6(typescript@5.8.2)) typescript-eslint: 8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) v8flags: 4.0.1 - vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - vite-plugin-externalize-deps: 0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-externalize-deps: 0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vue-eslint-parser: 9.4.3(eslint@9.22.0(jiti@2.4.2)) transitivePeerDependencies: - '@types/node' @@ -18157,28 +18435,28 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-react@4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@vitejs/plugin-react@4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@babel/core': 7.26.8 '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.8) '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.8) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color - '@vitest/browser@3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6)': + '@vitest/browser@3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6)': dependencies: '@testing-library/dom': 10.4.0 '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.0) - '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@vitest/utils': 3.0.6 magic-string: 0.30.17 msw: 2.7.0(@types/node@22.13.4)(typescript@5.8.2) sirv: 3.0.1 tinyrainbow: 2.0.0 - vitest: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vitest: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.2)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) ws: 8.18.0 optionalDependencies: playwright: 1.52.0 @@ -18196,14 +18474,14 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@vitest/mocker@3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@vitest/spy': 3.0.6 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.7.0(@types/node@22.13.4)(typescript@5.8.2) - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) '@vitest/pretty-format@3.0.6': dependencies: @@ -18233,7 +18511,7 @@ snapshots: sirv: 3.0.1 tinyglobby: 0.2.12 tinyrainbow: 2.0.0 - vitest: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vitest: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.2)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) '@vitest/utils@3.0.6': dependencies: @@ -19168,6 +19446,8 @@ snapshots: detect-libc@2.0.3: {} + detect-libc@2.0.4: {} + detect-node-es@1.1.0: {} detect-node@2.1.0: {} @@ -20642,33 +20922,63 @@ snapshots: lightningcss-darwin-arm64@1.29.1: optional: true + lightningcss-darwin-arm64@1.29.2: + optional: true + lightningcss-darwin-x64@1.29.1: optional: true + lightningcss-darwin-x64@1.29.2: + optional: true + lightningcss-freebsd-x64@1.29.1: optional: true + lightningcss-freebsd-x64@1.29.2: + optional: true + lightningcss-linux-arm-gnueabihf@1.29.1: optional: true + lightningcss-linux-arm-gnueabihf@1.29.2: + optional: true + lightningcss-linux-arm64-gnu@1.29.1: optional: true + lightningcss-linux-arm64-gnu@1.29.2: + optional: true + lightningcss-linux-arm64-musl@1.29.1: optional: true + lightningcss-linux-arm64-musl@1.29.2: + optional: true + lightningcss-linux-x64-gnu@1.29.1: optional: true + lightningcss-linux-x64-gnu@1.29.2: + optional: true + lightningcss-linux-x64-musl@1.29.1: optional: true + lightningcss-linux-x64-musl@1.29.2: + optional: true + lightningcss-win32-arm64-msvc@1.29.1: optional: true + lightningcss-win32-arm64-msvc@1.29.2: + optional: true + lightningcss-win32-x64-msvc@1.29.1: optional: true + lightningcss-win32-x64-msvc@1.29.2: + optional: true + lightningcss@1.29.1: dependencies: detect-libc: 1.0.3 @@ -20684,6 +20994,21 @@ snapshots: lightningcss-win32-arm64-msvc: 1.29.1 lightningcss-win32-x64-msvc: 1.29.1 + lightningcss@1.29.2: + dependencies: + detect-libc: 2.0.3 + optionalDependencies: + lightningcss-darwin-arm64: 1.29.2 + lightningcss-darwin-x64: 1.29.2 + lightningcss-freebsd-x64: 1.29.2 + lightningcss-linux-arm-gnueabihf: 1.29.2 + lightningcss-linux-arm64-gnu: 1.29.2 + lightningcss-linux-arm64-musl: 1.29.2 + lightningcss-linux-x64-gnu: 1.29.2 + lightningcss-linux-x64-musl: 1.29.2 + lightningcss-win32-arm64-msvc: 1.29.2 + lightningcss-win32-x64-msvc: 1.29.2 + lilconfig@3.1.3: {} lines-and-columns@1.2.4: {} @@ -22278,6 +22603,8 @@ snapshots: tailwindcss@4.0.8: {} + tailwindcss@4.1.6: {} + tapable@2.2.1: {} tar-stream@2.2.0: @@ -22693,13 +23020,13 @@ snapshots: vary@1.1.2: {} - vite-node@3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): + vite-node@3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - jiti @@ -22714,7 +23041,7 @@ snapshots: - tsx - yaml - vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@22.13.4) '@rollup/pluginutils': 5.1.4(rollup@4.38.0) @@ -22728,13 +23055,13 @@ snapshots: typescript: 5.8.2 vue-tsc: 2.0.29(typescript@5.8.2) optionalDependencies: - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.49.2(@types/node@22.13.4) '@rollup/pluginutils': 5.1.4(rollup@4.38.0) @@ -22747,17 +23074,17 @@ snapshots: magic-string: 0.30.17 typescript: 5.8.2 optionalDependencies: - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-externalize-deps@0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-externalize-deps@0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@babel/core': 7.26.8 '@types/babel__core': 7.20.5 @@ -22765,25 +23092,25 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.5 solid-refresh: 0.6.3(solid-js@1.9.5) - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vitefu: 1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vitefu: 1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) optionalDependencies: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - vite-tsconfig-paths@5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-tsconfig-paths@5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.8.2) optionalDependencies: - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color - typescript - vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): + vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: esbuild: 0.25.2 fdir: 6.4.4(picomatch@4.0.2) @@ -22795,19 +23122,19 @@ snapshots: '@types/node': 22.13.4 fsevents: 2.3.3 jiti: 2.4.2 - lightningcss: 1.29.1 + lightningcss: 1.29.2 terser: 5.37.0 tsx: 4.19.2 yaml: 2.7.0 - vitefu@1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vitefu@1.0.5(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): optionalDependencies: - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vitest@3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.1)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): + vitest@3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.2)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: '@vitest/expect': 3.0.6 - '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@vitest/mocker': 3.0.6(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@vitest/pretty-format': 3.0.6 '@vitest/runner': 3.0.6 '@vitest/snapshot': 3.0.6 @@ -22823,12 +23150,12 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vite-node: 3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite-node: 3.0.6(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.13.4 - '@vitest/browser': 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) + '@vitest/browser': 3.0.6(@types/node@22.13.4)(playwright@1.52.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))(vitest@3.0.6) '@vitest/ui': 3.0.6(vitest@3.0.6) jsdom: 25.0.1 transitivePeerDependencies: From 063ccf6115ae2e5140620ba05bb26c76b175ca09 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 13 May 2025 22:53:57 +0000 Subject: [PATCH 049/126] release: v1.120.4-alpha.16 --- examples/react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- examples/react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../react/kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- examples/react/quickstart-rspack-file-based/package.json | 2 +- examples/react/quickstart-webpack-file-based/package.json | 2 +- examples/react/router-monorepo-react-query/package.json | 2 +- .../router-monorepo-react-query/packages/router/package.json | 2 +- examples/react/router-monorepo-simple-lazy/package.json | 2 +- .../router-monorepo-simple-lazy/packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../react/router-monorepo-simple/packages/router/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/view-transitions/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 4 ++-- examples/react/with-trpc/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 2 +- examples/solid/basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- examples/solid/kitchen-sink-file-based/package.json | 2 +- examples/solid/quickstart-file-based/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 59 files changed, 61 insertions(+), 61 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 84aae16e9d..eac003b549 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index fd17b3343e..d58135dd83 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 3ad2b7c85d..249a0c14c0 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 75f282d97c..aa51a1d98c 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index b8e05bcd4e..5f4e219ef0 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index ee36ace509..54cc96f036 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 5d26e08d80..826d7c4c26 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 5f72ccf162..17e60fbac7 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 2c7c505d0b..90c5e214f6 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index c0fa6d6143..4c66e13545 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index f989d015db..b005f8273e 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 60397bfa34..6bc7ae9d27 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index bf52c27d23..0fc8c8c948 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 3c30b0ce38..2454969e61 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 7fe39d60f7..15f5297733 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,7 +11,7 @@ "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index b0979785d6..7ee1a691b2 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 944a36cc68..10040b6b20 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 1ab842175b..b75e22fb3b 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index e275c1e892..e0d8322335 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 043a9cd307..b0d36f124a 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "@tanstack/valibot-adapter": "^1.120.4-alpha.15", "@tanstack/zod-adapter": "^1.120.4-alpha.15", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index c470519232..8a361e3d68 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 554d4c8cb0..6e222caf42 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 42a8e9ffaf..a1e418ffa3 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index e2ee83d0cb..ac46ae4193 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index da89c2de4f..82bf61f5df 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 42c180ed87..26eba402ca 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 67307d57ad..548585e1af 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 0da0dfa2a2..ff20986c6f 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 371d14bf36..de47145b42 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 11752b4b1b..28b426c442 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 6bf5a0b83e..8ec0ebc944 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 6509fbe52e..5e09012da1 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index c2d03d423a..432c1a2db1 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.13", + "@tanstack/react-start": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index e393540f6e..21f546d732 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 435187c112..1b2725e895 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/react-start": "^1.120.4-alpha.16", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 57570a3622..a78c01a06f 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 8165695358..43f56e0818 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -12,8 +12,8 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.16", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 53793d83b7..c8edc3386a 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.16", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index c19b51242b..300bdea4b8 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 6348060bcd..c3b04374a5 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 3e429c7cec..7dd3b660a7 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 4bb66ecadb..4e0c33134f 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 35fba37596..56bdd39c55 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.15", + "@tanstack/router-plugin": "^1.120.4-alpha.16", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 922858a193..5602f1d4f6 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 8665ca2d33..c5509a6759 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 1391aec278..cacea3a3cf 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.15", + "@tanstack/solid-start": "^1.120.4-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 63b8c41dfc..48bc8c3c75 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index fe53b3cb49..f7b6177ed5 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d3362ddd28..d62e3dcc9e 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index e18d07679c..9645930e27 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 64e9f6659d..d41d2d9669 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 132bdc7f89..0340ed34cc 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index fa5d327e24..c4b79dab02 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 43a9ef4da0..2f86abe944 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index d7addd70e0..9d93693b33 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 00f53ef9a4..d35ee6c6a4 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 5597b9171e..90465381bd 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 3dd06af4f0..b484df414b 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index d5839555fd..08bb51aa50 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.120.4-alpha.3", + "version": "1.120.4-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 9fd42904e58e74b4aea32663dedf40b40fa7c8d2 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Wed, 14 May 2025 20:50:46 +0200 Subject: [PATCH 050/126] docs(solid-start): correctly set link to spa-shell --- docs/start/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/start/config.json b/docs/start/config.json index 5f68366f6c..4a180e9ab0 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -128,7 +128,7 @@ }, { "label": "SPA Shell", - "to": "framework/react/spa-shell" + "to": "framework/solid/spa-shell" }, { "label": "Hosting", From 475556e1ca3b3b3fef393632642910dd2f37e218 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Wed, 14 May 2025 20:52:16 +0200 Subject: [PATCH 051/126] docs(solid-start): fix server routes docs --- docs/start/config.json | 4 ++-- docs/start/framework/solid/api-routes.md | 4 ---- docs/start/framework/solid/server-routes.md | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 docs/start/framework/solid/api-routes.md create mode 100644 docs/start/framework/solid/server-routes.md diff --git a/docs/start/config.json b/docs/start/config.json index 4a180e9ab0..fe1d31bc1c 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -119,8 +119,8 @@ "to": "framework/solid/middleware" }, { - "label": "API Routes", - "to": "framework/solid/api-routes" + "label": "Server Routes", + "to": "framework/solid/server-routes" }, { "label": "SSR", diff --git a/docs/start/framework/solid/api-routes.md b/docs/start/framework/solid/api-routes.md deleted file mode 100644 index fcc7ab4613..0000000000 --- a/docs/start/framework/solid/api-routes.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -ref: docs/start/framework/react/api-routes.md -replace: { 'react': 'solid' } ---- diff --git a/docs/start/framework/solid/server-routes.md b/docs/start/framework/solid/server-routes.md new file mode 100644 index 0000000000..9fe19933d0 --- /dev/null +++ b/docs/start/framework/solid/server-routes.md @@ -0,0 +1,4 @@ +--- +ref: docs/start/framework/react/server-routes.md +replace: { 'react': 'solid' } +--- From 14bcc58065e0fea6e7de44ee49da322b6ca7fd4a Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 14 May 2025 16:53:47 -0600 Subject: [PATCH 052/126] fix: recover from server pathname mismatch --- packages/start-client-core/src/ssr-client.tsx | 62 ++++++++++--------- .../src/nitro/nitro-plugin.ts | 18 ------ packages/start-plugin-core/src/schema.ts | 1 - packages/start-server-core/src/ssr-server.ts | 1 + 4 files changed, 34 insertions(+), 48 deletions(-) diff --git a/packages/start-client-core/src/ssr-client.tsx b/packages/start-client-core/src/ssr-client.tsx index 9eddf971db..f4ef371931 100644 --- a/packages/start-client-core/src/ssr-client.tsx +++ b/packages/start-client-core/src/ssr-client.tsx @@ -77,15 +77,16 @@ export interface ResolvePromiseState { export interface DehydratedRouter { manifest: Manifest | undefined dehydratedData: any + lastMatchId: string } -export function hydrate(router: AnyRouter) { +export async function hydrate(router: AnyRouter): Promise { invariant( window.__TSR_SSR__?.dehydrated, 'Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!', ) - const { manifest, dehydratedData } = startSerializer.parse( + const { manifest, dehydratedData, lastMatchId } = startSerializer.parse( window.__TSR_SSR__.dehydrated, ) as DehydratedRouter @@ -116,6 +117,7 @@ export function hydrate(router: AnyRouter) { // Hydrate the router state const matches = router.matchRoutes(router.state.location) + // kick off loading the route chunks const routeChunkPromise = Promise.all( matches.map((match) => { @@ -123,6 +125,7 @@ export function hydrate(router: AnyRouter) { return router.loadRouteChunk(route) }), ) + // Right after hydration and before the first render, we need to rehydrate each match // First step is to reyhdrate loaderData and __beforeLoadContext matches.forEach((match) => { @@ -130,39 +133,36 @@ export function hydrate(router: AnyRouter) { (d) => d.id === match.id, ) - if (dehydratedMatch) { - Object.assign(match, dehydratedMatch) + if (!dehydratedMatch) { + return + } - // Handle beforeLoadContext - if (dehydratedMatch.__beforeLoadContext) { - match.__beforeLoadContext = router.ssr!.serializer.parse( - dehydratedMatch.__beforeLoadContext, - ) as any - } + Object.assign(match, dehydratedMatch) - // Handle loaderData - if (dehydratedMatch.loaderData) { - match.loaderData = router.ssr!.serializer.parse( - dehydratedMatch.loaderData, - ) - } + // Handle beforeLoadContext + if (dehydratedMatch.__beforeLoadContext) { + match.__beforeLoadContext = router.ssr!.serializer.parse( + dehydratedMatch.__beforeLoadContext, + ) as any + } - // Handle error - if (dehydratedMatch.error) { - match.error = router.ssr!.serializer.parse(dehydratedMatch.error) - } + // Handle loaderData + if (dehydratedMatch.loaderData) { + match.loaderData = router.ssr!.serializer.parse( + dehydratedMatch.loaderData, + ) + } - // Handle extracted - ;(match as unknown as SsrMatch).extracted?.forEach((ex) => { - deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value) - }) - } else { - Object.assign(match, { - status: 'success', - updatedAt: Date.now(), - }) + // Handle error + if (dehydratedMatch.error) { + match.error = router.ssr!.serializer.parse(dehydratedMatch.error) } + // Handle extracted + ;(match as unknown as SsrMatch).extracted?.forEach((ex) => { + deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value) + }) + return match }) @@ -224,6 +224,10 @@ export function hydrate(router: AnyRouter) { match.scripts = scripts }) + if (matches[matches.length - 1]!.id !== lastMatchId) { + return await Promise.all([routeChunkPromise, router.load()]) + } + return routeChunkPromise } diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 637faea878..34465fed18 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -83,24 +83,6 @@ export function nitroPlugin( rollupConfig: { plugins: [virtualBundlePlugin(getSsrBundle())], }, - routeRules: { - // TODO: We need to expose *some* kind of routeRules configuration - // and it needs to translate to this for now. But we should - // be cognizant of the probability that we will not use Nitro's - // routeRules configuration in the future. - ...(options.shell?.enabled && options.shell.autoRedirect - ? { - '/**': { - // @ts-expect-error We are using this as a marker - __TSS_SHELL: true, - redirect: { - to: `${options.shell.prerender.outputPath.replace(/[/]{1,}$/, '')}`, - statusCode: 200, - }, - }, - } - : {}), - }, } const nitro = await createNitro(nitroConfig) diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index c3c35d7159..9e96fc3b88 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -191,7 +191,6 @@ const pagePrerenderOptionsSchema = z.object({ const shellSchema = z.object({ enabled: z.boolean().optional().default(true), maskPath: z.string().optional().default('/'), - autoRedirect: z.boolean().optional().default(true), prerender: pagePrerenderOptionsSchema .optional() .default({}) diff --git a/packages/start-server-core/src/ssr-server.ts b/packages/start-server-core/src/ssr-server.ts index a7f8378310..f647a78078 100644 --- a/packages/start-server-core/src/ssr-server.ts +++ b/packages/start-server-core/src/ssr-server.ts @@ -105,6 +105,7 @@ export function dehydrateRouter(router: AnyRouter) { const dehydratedRouter: DehydratedRouter = { manifest: router.ssr!.manifest, dehydratedData: router.options.dehydrate?.(), + lastMatchId: router.state.matches[router.state.matches.length - 1]!.id, } router.serverSsr!.injectScript( From 595b0d0fe9145574ab9631ed71fb8bfaef69be37 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 14 May 2025 23:00:08 +0000 Subject: [PATCH 053/126] release: v1.120.4-alpha.17 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-fetcher/package.json | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 8a361e3d68..debc1c76ea 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 6e222caf42..3c1a6f7aa7 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index a1e418ffa3..8ac9f63936 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index ac46ae4193..d927ceeaac 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 82bf61f5df..8d51f7e3ef 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 26eba402ca..ce99e80b48 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 548585e1af..a6213bf803 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index ff20986c6f..c715d8dc04 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index de47145b42..25a6434185 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 28b426c442..f84ae2f62f 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 8ec0ebc944..c5b3bdd812 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 5e09012da1..6cd98f32f9 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 432c1a2db1..f4de6d3fd0 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 21f546d732..1556cf6c47 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 1b2725e895..cbf00397ca 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 43f56e0818..cf5c0af95b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index c8edc3386a..f9b6bf7e61 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.16", + "@tanstack/react-start": "^1.120.4-alpha.17", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 5602f1d4f6..bd87e773d6 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.16", + "@tanstack/solid-start": "^1.120.4-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index c5509a6759..dc080e6211 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.16", + "@tanstack/solid-start": "^1.120.4-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index cacea3a3cf..25d2c6e909 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.16", + "@tanstack/solid-start": "^1.120.4-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index cacce1c942..cd21f65050 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 48bc8c3c75..8c5c8ac175 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index f7b6177ed5..7a4875ad3a 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d62e3dcc9e..c721694375 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index c825d53598..c7caaf0541 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index c4b79dab02..e2e5a4ecdf 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 2f86abe944..7a129e2f81 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 9d93693b33..220a492cd2 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index abc3aad7d0..3cf1baeadf 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index d35ee6c6a4..897596c182 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 90465381bd..35ebde725b 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index b484df414b..ef86ffc7aa 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index b723ee7c9f..2f45aefb58 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.17", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", From 0cca04906faa07426fefe65eb96da2a5fdc3a8c8 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Thu, 15 May 2025 14:04:19 +1200 Subject: [PATCH 054/126] chore: dedupe and fix lockfile (#4171) --- pnpm-lock.yaml | 309 ++----------------------------------------------- 1 file changed, 11 insertions(+), 298 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 175f4849bb..6eb68b6af1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -122,7 +122,7 @@ importers: version: 6.0.1 tinyglobby: specifier: ^0.2.12 - version: 0.2.12 + version: 0.2.13 typescript: specifier: ^5.8.2 version: 5.8.2 @@ -4129,7 +4129,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.1.6(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.5.4 version: 22.13.4 @@ -4141,7 +4141,7 @@ importers: version: 19.0.3(@types/react@19.0.8) tailwindcss: specifier: ^4.0.8 - version: 4.0.8 + version: 4.1.6 typescript: specifier: ^5.7.2 version: 5.8.2 @@ -5470,7 +5470,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.0.8 - version: 4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.1.6(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@types/node': specifier: ^22.10.2 version: 22.13.4 @@ -5479,7 +5479,7 @@ importers: version: 1.1.11 tailwindcss: specifier: ^4.0.0 - version: 4.0.8 + version: 4.1.6 typescript: specifier: ^5.7.2 version: 5.8.2 @@ -9507,114 +9507,57 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} - '@tailwindcss/node@4.0.8': - resolution: {integrity: sha512-FKArQpbrbwv08TNT0k7ejYXpF+R8knZFAatNc0acOxbgeqLzwb86r+P3LGOjIeI3Idqe9CVkZrh4GlsJLJKkkw==} - '@tailwindcss/node@4.1.6': resolution: {integrity: sha512-ed6zQbgmKsjsVvodAS1q1Ld2BolEuxJOSyyNc+vhkjdmfNUDCmQnlXBfQkHrlzNmslxHsQU/bFmzcEbv4xXsLg==} - '@tailwindcss/oxide-android-arm64@4.0.8': - resolution: {integrity: sha512-We7K79+Sm4mwJHk26Yzu/GAj7C7myemm7PeXvpgMxyxO70SSFSL3uCcqFbz9JA5M5UPkrl7N9fkBe/Y0iazqpA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [android] - '@tailwindcss/oxide-android-arm64@4.1.6': resolution: {integrity: sha512-VHwwPiwXtdIvOvqT/0/FLH/pizTVu78FOnI9jQo64kSAikFSZT7K4pjyzoDpSMaveJTGyAKvDjuhxJxKfmvjiQ==} engines: {node: '>= 10'} cpu: [arm64] os: [android] - '@tailwindcss/oxide-darwin-arm64@4.0.8': - resolution: {integrity: sha512-Lv9Isi2EwkCTG1sRHNDi0uRNN1UGFdEThUAGFrydRmQZnraGLMjN8gahzg2FFnOizDl7LB2TykLUuiw833DSNg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - '@tailwindcss/oxide-darwin-arm64@4.1.6': resolution: {integrity: sha512-weINOCcqv1HVBIGptNrk7c6lWgSFFiQMcCpKM4tnVi5x8OY2v1FrV76jwLukfT6pL1hyajc06tyVmZFYXoxvhQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.0.8': - resolution: {integrity: sha512-fWfywfYIlSWtKoqWTjukTHLWV3ARaBRjXCC2Eo0l6KVpaqGY4c2y8snUjp1xpxUtpqwMvCvFWFaleMoz1Vhzlw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.1.6': resolution: {integrity: sha512-3FzekhHG0ww1zQjQ1lPoq0wPrAIVXAbUkWdWM8u5BnYFZgb9ja5ejBqyTgjpo5mfy0hFOoMnMuVDI+7CXhXZaQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tailwindcss/oxide-freebsd-x64@4.0.8': - resolution: {integrity: sha512-SO+dyvjJV9G94bnmq2288Ke0BIdvrbSbvtPLaQdqjqHR83v5L2fWADyFO+1oecHo9Owsk8MxcXh1agGVPIKIqw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [freebsd] - '@tailwindcss/oxide-freebsd-x64@4.1.6': resolution: {integrity: sha512-4m5F5lpkBZhVQJq53oe5XgJ+aFYWdrgkMwViHjRsES3KEu2m1udR21B1I77RUqie0ZYNscFzY1v9aDssMBZ/1w==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.8': - resolution: {integrity: sha512-ZSHggWiEblQNV69V0qUK5vuAtHP+I+S2eGrKGJ5lPgwgJeAd6GjLsVBN+Mqn2SPVfYM3BOpS9jX/zVg9RWQVDQ==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.6': resolution: {integrity: sha512-qU0rHnA9P/ZoaDKouU1oGPxPWzDKtIfX7eOGi5jOWJKdxieUJdVV+CxWZOpDWlYTd4N3sFQvcnVLJWJ1cLP5TA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.0.8': - resolution: {integrity: sha512-xWpr6M0OZLDNsr7+bQz+3X7zcnDJZJ1N9gtBWCtfhkEtDjjxYEp+Lr5L5nc/yXlL4MyCHnn0uonGVXy3fhxaVA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.1.6': resolution: {integrity: sha512-jXy3TSTrbfgyd3UxPQeXC3wm8DAgmigzar99Km9Sf6L2OFfn/k+u3VqmpgHQw5QNfCpPe43em6Q7V76Wx7ogIQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.0.8': - resolution: {integrity: sha512-5tz2IL7LN58ssGEq7h/staD7pu/izF/KeMWdlJ86WDe2Ah46LF3ET6ZGKTr5eZMrnEA0M9cVFuSPprKRHNgjeg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.1.6': resolution: {integrity: sha512-8kjivE5xW0qAQ9HX9reVFmZj3t+VmljDLVRJpVBEoTR+3bKMnvC7iLcoSGNIUJGOZy1mLVq7x/gerVg0T+IsYw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.0.8': - resolution: {integrity: sha512-KSzMkhyrxAQyY2o194NKVKU9j/c+NFSoMvnHWFaNHKi3P1lb+Vq1UC19tLHrmxSkKapcMMu69D7+G1+FVGNDXQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.1.6': resolution: {integrity: sha512-A4spQhwnWVpjWDLXnOW9PSinO2PTKJQNRmL/aIl2U/O+RARls8doDfs6R41+DAXK0ccacvRyDpR46aVQJJCoCg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.0.8': - resolution: {integrity: sha512-yFYKG5UtHTRimjtqxUWXBgI4Tc6NJe3USjRIVdlTczpLRxq/SFwgzGl5JbatCxgSRDPBFwRrNPxq+ukfQFGdrw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.1.6': resolution: {integrity: sha512-YRee+6ZqdzgiQAHVSLfl3RYmqeeaWVCk796MhXhLQu2kJu2COHBkqlqsqKYx3p8Hmk5pGCQd2jTAoMWWFeyG2A==} engines: {node: '>= 10'} @@ -9633,43 +9576,22 @@ packages: - '@emnapi/wasi-threads' - tslib - '@tailwindcss/oxide-win32-arm64-msvc@4.0.8': - resolution: {integrity: sha512-tndGujmCSba85cRCnQzXgpA2jx5gXimyspsUYae5jlPyLRG0RjXbDshFKOheVXU4TLflo7FSG8EHCBJ0EHTKdQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - '@tailwindcss/oxide-win32-arm64-msvc@4.1.6': resolution: {integrity: sha512-nqpDWk0Xr8ELO/nfRUDjk1pc9wDJ3ObeDdNMHLaymc4PJBWj11gdPCWZFKSK2AVKjJQC7J2EfmSmf47GN7OuLg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.0.8': - resolution: {integrity: sha512-T77jroAc0p4EHVVgTUiNeFn6Nj3jtD3IeNId2X+0k+N1XxfNipy81BEkYErpKLiOkNhpNFjPee8/ZVas29b2OQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.1.6': resolution: {integrity: sha512-5k9xF33xkfKpo9wCvYcegQ21VwIBU1/qEbYlVukfEIyQbEA47uK8AAwS7NVjNE3vHzcmxMYwd0l6L4pPjjm1rQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tailwindcss/oxide@4.0.8': - resolution: {integrity: sha512-KfMcuAu/Iw+DcV1e8twrFyr2yN8/ZDC/odIGta4wuuJOGkrkHZbvJvRNIbQNhGh7erZTYV6Ie0IeD6WC9Y8Hcw==} - engines: {node: '>= 10'} - '@tailwindcss/oxide@4.1.6': resolution: {integrity: sha512-0bpEBQiGx+227fW4G0fLQ8vuvyy5rsB1YIYNapTq3aRsJ9taF3f5cCaovDjN5pUGKKzcpMrZst/mhNaKAPOHOA==} engines: {node: '>= 10'} - '@tailwindcss/vite@4.0.8': - resolution: {integrity: sha512-+SAq44yLzYlzyrb7QTcFCdU8Xa7FOA0jp+Xby7fPMUie+MY9HhJysM7Vp+vL8qIp8ceQJfLD+FjgJuJ4lL6nyg==} - peerDependencies: - vite: 6.3.5 - '@tailwindcss/vite@4.1.6': resolution: {integrity: sha512-zjtqjDeY1w3g2beYQtrMAf51n5G7o+UwmyOjtsDMP7t6XyoRMOidcoKP32ps7AkNOHIXEOK0bhIC05dj8oJp4w==} peerDependencies: @@ -11034,10 +10956,6 @@ packages: engines: {node: '>=0.10'} hasBin: true - detect-libc@2.0.3: - resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} - engines: {node: '>=8'} - detect-libc@2.0.4: resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==} engines: {node: '>=8'} @@ -11508,14 +11426,6 @@ packages: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} engines: {node: '>=0.8.0'} - fdir@6.4.3: - resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - fdir@6.4.4: resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} peerDependencies: @@ -12311,130 +12221,66 @@ packages: resolution: {integrity: sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg==} engines: {node: '>=10.13.0'} - lightningcss-darwin-arm64@1.29.1: - resolution: {integrity: sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [darwin] - lightningcss-darwin-arm64@1.29.2: resolution: {integrity: sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [darwin] - lightningcss-darwin-x64@1.29.1: - resolution: {integrity: sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [darwin] - lightningcss-darwin-x64@1.29.2: resolution: {integrity: sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] - lightningcss-freebsd-x64@1.29.1: - resolution: {integrity: sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [freebsd] - lightningcss-freebsd-x64@1.29.2: resolution: {integrity: sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] - lightningcss-linux-arm-gnueabihf@1.29.1: - resolution: {integrity: sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==} - engines: {node: '>= 12.0.0'} - cpu: [arm] - os: [linux] - lightningcss-linux-arm-gnueabihf@1.29.2: resolution: {integrity: sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] - lightningcss-linux-arm64-gnu@1.29.1: - resolution: {integrity: sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [linux] - lightningcss-linux-arm64-gnu@1.29.2: resolution: {integrity: sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - lightningcss-linux-arm64-musl@1.29.1: - resolution: {integrity: sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [linux] - lightningcss-linux-arm64-musl@1.29.2: resolution: {integrity: sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - lightningcss-linux-x64-gnu@1.29.1: - resolution: {integrity: sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [linux] - lightningcss-linux-x64-gnu@1.29.2: resolution: {integrity: sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - lightningcss-linux-x64-musl@1.29.1: - resolution: {integrity: sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [linux] - lightningcss-linux-x64-musl@1.29.2: resolution: {integrity: sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - lightningcss-win32-arm64-msvc@1.29.1: - resolution: {integrity: sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [win32] - lightningcss-win32-arm64-msvc@1.29.2: resolution: {integrity: sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] - lightningcss-win32-x64-msvc@1.29.1: - resolution: {integrity: sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [win32] - lightningcss-win32-x64-msvc@1.29.2: resolution: {integrity: sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] - lightningcss@1.29.1: - resolution: {integrity: sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==} - engines: {node: '>= 12.0.0'} - lightningcss@1.29.2: resolution: {integrity: sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==} engines: {node: '>= 12.0.0'} @@ -12985,9 +12831,6 @@ packages: parse5@6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} - parse5@7.2.1: - resolution: {integrity: sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==} - parse5@7.3.0: resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==} @@ -13834,9 +13677,6 @@ packages: engines: {node: '>=14.0.0'} hasBin: true - tailwindcss@4.0.8: - resolution: {integrity: sha512-Me7N5CKR+D2A1xdWA5t5+kjjT7bwnxZOE6/yDI/ixJdJokszsn2n++mdU5yJwrsTpqFX2B9ZNMBJDwcqk9C9lw==} - tailwindcss@4.1.6: resolution: {integrity: sha512-j0cGLTreM6u4OWzBeLBpycK0WIh8w7kSwcUsQZoGLHZ7xDTdM69lN64AgoIEEwFi0tnhs4wSykUa5YWxAzgFYg==} @@ -13914,10 +13754,6 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyglobby@0.2.12: - resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.13: resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} engines: {node: '>=12.0.0'} @@ -15997,7 +15833,7 @@ snapshots: '@mapbox/node-pre-gyp@2.0.0': dependencies: consola: 3.4.2 - detect-libc: 2.0.3 + detect-libc: 2.0.4 https-proxy-agent: 7.0.6 node-fetch: 2.7.0 nopt: 8.1.0 @@ -17131,7 +16967,7 @@ snapshots: '@rollup/pluginutils': 5.1.4(rollup@4.38.0) commondir: 1.0.1 estree-walker: 2.0.2 - fdir: 6.4.3(picomatch@4.0.2) + fdir: 6.4.4(picomatch@4.0.2) is-reference: 1.2.1 magic-string: 0.30.17 picomatch: 4.0.2 @@ -17782,12 +17618,6 @@ snapshots: dependencies: '@swc/counter': 0.1.3 - '@tailwindcss/node@4.0.8': - dependencies: - enhanced-resolve: 5.18.1 - jiti: 2.4.2 - tailwindcss: 4.0.8 - '@tailwindcss/node@4.1.6': dependencies: '@ampproject/remapping': 2.3.0 @@ -17798,89 +17628,42 @@ snapshots: source-map-js: 1.2.1 tailwindcss: 4.1.6 - '@tailwindcss/oxide-android-arm64@4.0.8': - optional: true - '@tailwindcss/oxide-android-arm64@4.1.6': optional: true - '@tailwindcss/oxide-darwin-arm64@4.0.8': - optional: true - '@tailwindcss/oxide-darwin-arm64@4.1.6': optional: true - '@tailwindcss/oxide-darwin-x64@4.0.8': - optional: true - '@tailwindcss/oxide-darwin-x64@4.1.6': optional: true - '@tailwindcss/oxide-freebsd-x64@4.0.8': - optional: true - '@tailwindcss/oxide-freebsd-x64@4.1.6': optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.8': - optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.6': optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.0.8': - optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.1.6': optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.0.8': - optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.1.6': optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.0.8': - optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.1.6': optional: true - '@tailwindcss/oxide-linux-x64-musl@4.0.8': - optional: true - '@tailwindcss/oxide-linux-x64-musl@4.1.6': optional: true '@tailwindcss/oxide-wasm32-wasi@4.1.6': optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.0.8': - optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.1.6': optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.0.8': - optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.1.6': optional: true - '@tailwindcss/oxide@4.0.8': - optionalDependencies: - '@tailwindcss/oxide-android-arm64': 4.0.8 - '@tailwindcss/oxide-darwin-arm64': 4.0.8 - '@tailwindcss/oxide-darwin-x64': 4.0.8 - '@tailwindcss/oxide-freebsd-x64': 4.0.8 - '@tailwindcss/oxide-linux-arm-gnueabihf': 4.0.8 - '@tailwindcss/oxide-linux-arm64-gnu': 4.0.8 - '@tailwindcss/oxide-linux-arm64-musl': 4.0.8 - '@tailwindcss/oxide-linux-x64-gnu': 4.0.8 - '@tailwindcss/oxide-linux-x64-musl': 4.0.8 - '@tailwindcss/oxide-win32-arm64-msvc': 4.0.8 - '@tailwindcss/oxide-win32-x64-msvc': 4.0.8 - '@tailwindcss/oxide@4.1.6': dependencies: detect-libc: 2.0.4 @@ -17899,14 +17682,6 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.6 '@tailwindcss/oxide-win32-x64-msvc': 4.1.6 - '@tailwindcss/vite@4.0.8(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': - dependencies: - '@tailwindcss/node': 4.0.8 - '@tailwindcss/oxide': 4.0.8 - lightningcss: 1.29.1 - tailwindcss: 4.0.8 - vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - '@tailwindcss/vite@4.1.6(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@tailwindcss/node': 4.1.6 @@ -18509,7 +18284,7 @@ snapshots: flatted: 3.3.2 pathe: 2.0.3 sirv: 3.0.1 - tinyglobby: 0.2.12 + tinyglobby: 0.2.13 tinyrainbow: 2.0.0 vitest: 3.0.6(@types/node@22.13.4)(@vitest/browser@3.0.6)(@vitest/ui@3.0.6)(jiti@2.4.2)(jsdom@25.0.1)(lightningcss@1.29.2)(msw@2.7.0(@types/node@22.13.4)(typescript@5.8.2))(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -19444,8 +19219,6 @@ snapshots: detect-libc@1.0.3: {} - detect-libc@2.0.3: {} - detect-libc@2.0.4: {} detect-node-es@1.1.0: {} @@ -20100,10 +19873,6 @@ snapshots: dependencies: websocket-driver: 0.7.4 - fdir@6.4.3(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.4.4(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -20826,7 +20595,7 @@ snapshots: https-proxy-agent: 7.0.6 is-potential-custom-element-name: 1.0.1 nwsapi: 2.2.16 - parse5: 7.2.1 + parse5: 7.3.0 rrweb-cssom: 0.7.1 saxes: 6.0.0 symbol-tree: 3.2.4 @@ -20919,84 +20688,39 @@ snapshots: rechoir: 0.8.0 resolve: 1.22.10 - lightningcss-darwin-arm64@1.29.1: - optional: true - lightningcss-darwin-arm64@1.29.2: optional: true - lightningcss-darwin-x64@1.29.1: - optional: true - lightningcss-darwin-x64@1.29.2: optional: true - lightningcss-freebsd-x64@1.29.1: - optional: true - lightningcss-freebsd-x64@1.29.2: optional: true - lightningcss-linux-arm-gnueabihf@1.29.1: - optional: true - lightningcss-linux-arm-gnueabihf@1.29.2: optional: true - lightningcss-linux-arm64-gnu@1.29.1: - optional: true - lightningcss-linux-arm64-gnu@1.29.2: optional: true - lightningcss-linux-arm64-musl@1.29.1: - optional: true - lightningcss-linux-arm64-musl@1.29.2: optional: true - lightningcss-linux-x64-gnu@1.29.1: - optional: true - lightningcss-linux-x64-gnu@1.29.2: optional: true - lightningcss-linux-x64-musl@1.29.1: - optional: true - lightningcss-linux-x64-musl@1.29.2: optional: true - lightningcss-win32-arm64-msvc@1.29.1: - optional: true - lightningcss-win32-arm64-msvc@1.29.2: optional: true - lightningcss-win32-x64-msvc@1.29.1: - optional: true - lightningcss-win32-x64-msvc@1.29.2: optional: true - lightningcss@1.29.1: - dependencies: - detect-libc: 1.0.3 - optionalDependencies: - lightningcss-darwin-arm64: 1.29.1 - lightningcss-darwin-x64: 1.29.1 - lightningcss-freebsd-x64: 1.29.1 - lightningcss-linux-arm-gnueabihf: 1.29.1 - lightningcss-linux-arm64-gnu: 1.29.1 - lightningcss-linux-arm64-musl: 1.29.1 - lightningcss-linux-x64-gnu: 1.29.1 - lightningcss-linux-x64-musl: 1.29.1 - lightningcss-win32-arm64-msvc: 1.29.1 - lightningcss-win32-x64-msvc: 1.29.1 - lightningcss@1.29.2: dependencies: - detect-libc: 2.0.3 + detect-libc: 2.0.4 optionalDependencies: lightningcss-darwin-arm64: 1.29.2 lightningcss-darwin-x64: 1.29.2 @@ -21672,10 +21396,6 @@ snapshots: parse5@6.0.1: {} - parse5@7.2.1: - dependencies: - entities: 4.5.0 - parse5@7.3.0: dependencies: entities: 6.0.0 @@ -22601,8 +22321,6 @@ snapshots: transitivePeerDependencies: - ts-node - tailwindcss@4.0.8: {} - tailwindcss@4.1.6: {} tapable@2.2.1: {} @@ -22691,11 +22409,6 @@ snapshots: tinyexec@0.3.2: {} - tinyglobby@0.2.12: - dependencies: - fdir: 6.4.3(picomatch@4.0.2) - picomatch: 4.0.2 - tinyglobby@0.2.13: dependencies: fdir: 6.4.4(picomatch@4.0.2) @@ -22891,7 +22604,7 @@ snapshots: pkg-types: 2.1.0 scule: 1.3.0 strip-literal: 3.0.0 - tinyglobby: 0.2.12 + tinyglobby: 0.2.13 unplugin: 2.2.2 unplugin-utils: 0.2.4 From 16705fab531f6e89db99aba962884b46082698ab Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Thu, 15 May 2025 16:04:03 +1200 Subject: [PATCH 055/126] fix: resolve custom `client` and `server` entry paths (#4172) This PR fixes it, so that a user can define a custom framework entry for both the `client` and `server` (in either `src/client.tsx` or `src/server.tsx`). This PR also removes the unneeded `src/server.ts` files present as part of the `devinxi` migration. Additionally, the React client entry has been change to wrap `hydrateRoot` with `startTransition`. This change useful, since after the SSR-rendered markup is sent to the client, `startTransition` lets React know to defer the hydration in favor of user events. fixes #4138 --- e2e/react-start/basic/src/client.tsx | 15 +++++++++ .../react-start/basic}/src/server.ts | 2 -- e2e/solid-start/basic/src/client.tsx | 7 +++++ .../solid-start/basic}/src/server.ts | 3 -- examples/react/start-basic-rsc/src/server.ts | 12 ------- .../react/start-basic-static/src/server.ts | 12 ------- .../react/start-clerk-basic/src/server.ts | 3 +- .../react/start-convex-trellaux/src/server.ts | 12 ------- examples/react/start-counter/src/server.ts | 12 ------- .../src/server.tsx} | 2 -- examples/react/start-trellaux/src/server.ts | 12 ------- packages/react-start-plugin/src/index.ts | 31 +++++++++++++------ packages/solid-start-plugin/src/index.ts | 13 ++++++-- packages/start-plugin-core/src/plugin.ts | 17 ++++++++-- packages/start-plugin-core/src/schema.ts | 8 +++++ 15 files changed, 78 insertions(+), 83 deletions(-) create mode 100644 e2e/react-start/basic/src/client.tsx rename {examples/react/start-basic-auth => e2e/react-start/basic}/src/server.ts (69%) create mode 100644 e2e/solid-start/basic/src/client.tsx rename {examples/solid/start-basic-static => e2e/solid-start/basic}/src/server.ts (68%) delete mode 100644 examples/react/start-basic-rsc/src/server.ts delete mode 100644 examples/react/start-basic-static/src/server.ts delete mode 100644 examples/react/start-convex-trellaux/src/server.ts delete mode 100644 examples/react/start-counter/src/server.ts rename examples/react/{start-basic-react-query/src/server.ts => start-counter/src/server.tsx} (69%) delete mode 100644 examples/react/start-trellaux/src/server.ts diff --git a/e2e/react-start/basic/src/client.tsx b/e2e/react-start/basic/src/client.tsx new file mode 100644 index 0000000000..7c4afb9d55 --- /dev/null +++ b/e2e/react-start/basic/src/client.tsx @@ -0,0 +1,15 @@ +import { StrictMode, startTransition } from 'react' +import { hydrateRoot } from 'react-dom/client' +import { StartClient } from '@tanstack/react-start' +import { createRouter } from './router' + +const router = createRouter() + +startTransition(() => { + hydrateRoot( + document, + + + , + ) +}) diff --git a/examples/react/start-basic-auth/src/server.ts b/e2e/react-start/basic/src/server.ts similarity index 69% rename from examples/react/start-basic-auth/src/server.ts rename to e2e/react-start/basic/src/server.ts index 65a580f25e..d329e88d30 100644 --- a/examples/react/start-basic-auth/src/server.ts +++ b/e2e/react-start/basic/src/server.ts @@ -2,11 +2,9 @@ import { createStartHandler, defaultStreamHandler, } from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) diff --git a/e2e/solid-start/basic/src/client.tsx b/e2e/solid-start/basic/src/client.tsx new file mode 100644 index 0000000000..fa83c45012 --- /dev/null +++ b/e2e/solid-start/basic/src/client.tsx @@ -0,0 +1,7 @@ +import { hydrate } from 'solid-js/web' +import { StartClient } from '@tanstack/solid-start' +import { createRouter } from './router' + +const router = createRouter() + +hydrate(() => , document.body) diff --git a/examples/solid/start-basic-static/src/server.ts b/e2e/solid-start/basic/src/server.ts similarity index 68% rename from examples/solid/start-basic-static/src/server.ts rename to e2e/solid-start/basic/src/server.ts index 6d10bea05f..58a11ec724 100644 --- a/examples/solid/start-basic-static/src/server.ts +++ b/e2e/solid-start/basic/src/server.ts @@ -2,11 +2,8 @@ import { createStartHandler, defaultStreamHandler, } from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) diff --git a/examples/react/start-basic-rsc/src/server.ts b/examples/react/start-basic-rsc/src/server.ts deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-basic-rsc/src/server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-static/src/server.ts b/examples/react/start-basic-static/src/server.ts deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-basic-static/src/server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-clerk-basic/src/server.ts b/examples/react/start-clerk-basic/src/server.ts index eab1a0c9f4..5e1d9e4492 100644 --- a/examples/react/start-clerk-basic/src/server.ts +++ b/examples/react/start-clerk-basic/src/server.ts @@ -2,15 +2,14 @@ import { createStartHandler, defaultStreamHandler, } from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createClerkHandler } from '@clerk/tanstack-react-start/server' import { createRouter } from './router' const handler = createStartHandler({ createRouter, - getRouterManifest, }) +// @ts-expect-error const clerkHandler = createClerkHandler(handler) export default clerkHandler(defaultStreamHandler) diff --git a/examples/react/start-convex-trellaux/src/server.ts b/examples/react/start-convex-trellaux/src/server.ts deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-convex-trellaux/src/server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-counter/src/server.ts b/examples/react/start-counter/src/server.ts deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-counter/src/server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-basic-react-query/src/server.ts b/examples/react/start-counter/src/server.tsx similarity index 69% rename from examples/react/start-basic-react-query/src/server.ts rename to examples/react/start-counter/src/server.tsx index 65a580f25e..d329e88d30 100644 --- a/examples/react/start-basic-react-query/src/server.ts +++ b/examples/react/start-counter/src/server.tsx @@ -2,11 +2,9 @@ import { createStartHandler, defaultStreamHandler, } from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) diff --git a/examples/react/start-trellaux/src/server.ts b/examples/react/start-trellaux/src/server.ts deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-trellaux/src/server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 83c029938c..25fa215b23 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -7,7 +7,7 @@ import { } from '@tanstack/start-plugin-core' import { getTanStackStartOptions } from './schema' import type { TanStackStartInputConfig, WithReactPlugin } from './schema' -import type { PluginOption } from 'vite' +import type { PluginOption, ResolvedConfig } from 'vite' export type { TanStackStartInputConfig, @@ -22,6 +22,8 @@ export function TanStackStartVitePlugin( WithReactPlugin const options: OptionsWithReact = getTanStackStartOptions(opts) + let resolvedConfig: ResolvedConfig + return [ tanstackRouter({ verboseFileRoutes: false, @@ -33,6 +35,9 @@ export function TanStackStartVitePlugin( TanStackStartVitePluginCore({ framework: 'react' }, options), { name: 'tanstack-react-start:resolve-entries', + configResolved: (config) => { + resolvedConfig = config + }, resolveId(id) { if ( [ @@ -55,9 +60,13 @@ export function TanStackStartVitePlugin( ) if (id === '/~start/server-entry.tsx') { + const ssrEntryPath = path.resolve( + resolvedConfig.root, + options.serverEntryPath, + ) return ` import { toWebRequest, defineEventHandler } from '@tanstack/react-start/server'; -import serverEntry from '${options.serverEntryPath}'; +import serverEntry from '${ssrEntryPath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); @@ -68,19 +77,21 @@ export default defineEventHandler(function(event) { if (id === '/~start/default-client-entry.tsx') { return ` -import { StartClient } from '@tanstack/react-start' -import { StrictMode } from 'react' +import { StrictMode, startTransition } from 'react' import { hydrateRoot } from 'react-dom/client' +import { StartClient } from '@tanstack/react-start' import { createRouter } from ${routerImportPath} const router = createRouter() -hydrateRoot( - document, - - - -) +startTransition(() => { + hydrateRoot( + document, + + + + ) +}) ` } diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index a3be89659f..844b1dcd23 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -6,7 +6,7 @@ import { TanStackStartVitePluginCore, } from '@tanstack/start-plugin-core' import { getTanStackStartOptions } from './schema' -import type { PluginOption } from 'vite' +import type { PluginOption, ResolvedConfig } from 'vite' import type { TanStackStartInputConfig, WithSolidPlugin } from './schema' export type { @@ -22,6 +22,8 @@ export function TanStackStartVitePlugin( WithSolidPlugin const options: OptionsWithSolid = getTanStackStartOptions(opts) + let resolvedConfig: ResolvedConfig + return [ tanstackRouter({ verboseFileRoutes: false, @@ -33,6 +35,9 @@ export function TanStackStartVitePlugin( TanStackStartVitePluginCore({ framework: 'solid' }, options), { name: 'tanstack-solid-start:resolve-entries', + configResolved: (config) => { + resolvedConfig = config + }, resolveId(id) { if ( [ @@ -52,9 +57,13 @@ export function TanStackStartVitePlugin( ) if (id === '/~start/server-entry.tsx') { + const ssrEntryPath = path.resolve( + resolvedConfig.root, + options.serverEntryPath, + ) return ` import { toWebRequest, defineEventHandler } from '@tanstack/solid-start/server'; -import serverEntry from '${options.serverEntryPath}'; +import serverEntry from '${ssrEntryPath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index a45a8ce4dd..1d42e200ad 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -57,6 +57,19 @@ export function TanStackStartVitePluginCore( return nitroOutputPublicDir })() + const getClientEntryPath = (startConfig: TanStackStartOutputConfig) => { + // when the user specifies a custom client entry path, we need to resolve it + // relative to the root of the project, keeping in mind that if not specified + // it will be /~start/default-client-entry which is a virtual path + // that is resolved by vite to the actual client entry path + const entry = startConfig.clientEntryPath.startsWith( + '/~start/default-client-entry', + ) + ? startConfig.clientEntryPath + : path.resolve(startConfig.root, startConfig.clientEntryPath) + return entry + } + return { environments: { [VITE_ENVIRONMENT_NAMES.client]: { @@ -65,7 +78,7 @@ export function TanStackStartVitePluginCore( manifest: true, rollupOptions: { input: { - main: startConfig.clientEntryPath, + main: getClientEntryPath(startConfig), }, output: { dir: path.resolve(startConfig.root, clientDistDir), @@ -125,7 +138,7 @@ export function TanStackStartVitePluginCore( define: { ...injectDefineEnv('TSS_PUBLIC_BASE', startConfig.public.base), ...injectDefineEnv('TSS_CLIENT_BASE', startConfig.client.base), - ...injectDefineEnv('TSS_CLIENT_ENTRY', startConfig.clientEntryPath), + ...injectDefineEnv('TSS_CLIENT_ENTRY', `/@fs${getClientEntryPath(startConfig)}`), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), }, diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index 9e96fc3b88..6a311ae7f7 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -48,6 +48,14 @@ export function createTanStackConfig< return path.join(srcDirectory, 'server.tsx') } + if (existsSync(path.join(srcDirectory, 'server.ts'))) { + return path.join(srcDirectory, 'server.ts') + } + + if (existsSync(path.join(srcDirectory, 'server.js'))) { + return path.join(srcDirectory, 'server.js') + } + return '/~start/default-server-entry' })() From fbfd8019a51941944088632ed46267b14478bf9e Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 04:05:34 +0000 Subject: [PATCH 056/126] release: v1.120.4-alpha.18 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index debc1c76ea..53d8d1cfc4 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 3c1a6f7aa7..0f8d4763ce 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 8ac9f63936..d3d697a966 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index d927ceeaac..1f6d00dfc7 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 8d51f7e3ef..852123f6c6 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ce99e80b48..0bb81c177f 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index a6213bf803..a5ca580755 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index c715d8dc04..1eecb4fb5b 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 25a6434185..415f69f69a 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index f84ae2f62f..bf773a7071 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index c5b3bdd812..403bfc6ecc 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 6cd98f32f9..5ce8a3310b 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index f4de6d3fd0..3b1f5ff0b3 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.13", "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 1556cf6c47..f3964016fb 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-with-query": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index cbf00397ca..8a3c6bcd12 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index cf5c0af95b..3953482195 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index f9b6bf7e61..eb34abcb48 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.15", "@tanstack/react-router-devtools": "^1.120.4-alpha.15", "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.17", + "@tanstack/react-start": "^1.120.4-alpha.18", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index bd87e773d6..a1ea5473d7 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.17", + "@tanstack/solid-start": "^1.120.4-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index dc080e6211..9d7ebc6c42 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.17", + "@tanstack/solid-start": "^1.120.4-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 25d2c6e909..6cec34eb51 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.15", "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.17", + "@tanstack/solid-start": "^1.120.4-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 8c5c8ac175..382005cc84 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index c721694375..3f0643cd66 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index e2e5a4ecdf..ff667cd8ac 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.18", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 220a492cd2..7086488ff9 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.18", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 897596c182..40d2899982 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From f940f850d5671bde1c6abc8e467e1a80d09ca603 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 15 May 2025 16:01:17 +0200 Subject: [PATCH 057/126] docs(server.ts/ssr.ts): cleanup redundant files and update docs --- docs/start/framework/react/learn-the-basics.md | 12 +++--------- docs/start/framework/react/server-routes.md | 4 ++-- docs/start/framework/react/ssr.md | 13 +++---------- docs/start/framework/solid/learn-the-basics.md | 12 +++--------- e2e/react-start/basic/src/server.ts | 10 ---------- e2e/solid-start/basic/src/server.ts | 9 --------- examples/react/start-counter/src/server.tsx | 10 ---------- examples/react/start-material-ui/src/ssr.tsx | 12 ------------ examples/react/start-workos/src/ssr.tsx | 9 --------- 9 files changed, 11 insertions(+), 80 deletions(-) delete mode 100644 e2e/react-start/basic/src/server.ts delete mode 100644 e2e/solid-start/basic/src/server.ts delete mode 100644 examples/react/start-counter/src/server.tsx delete mode 100644 examples/react/start-material-ui/src/ssr.tsx delete mode 100644 examples/react/start-workos/src/ssr.tsx diff --git a/docs/start/framework/react/learn-the-basics.md b/docs/start/framework/react/learn-the-basics.md index 9e746bed5e..04463ccb2a 100644 --- a/docs/start/framework/react/learn-the-basics.md +++ b/docs/start/framework/react/learn-the-basics.md @@ -49,21 +49,15 @@ The `routeTree.gen.ts` file is generated when you run TanStack Start (via `npm r > [!NOTE] > The server entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the server entry point for you using the below as a default. -This is done via the `src/server.tsx` file: +This is done via the `src/server.ts` file: ```tsx -// src/server.tsx -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - +// src/server.ts +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) ``` diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md index 830667327b..1d7ed36a63 100644 --- a/docs/start/framework/react/server-routes.md +++ b/docs/start/framework/react/server-routes.md @@ -102,11 +102,11 @@ Server route requests are handled by Start's `createStartHandler` in your `serve ```tsx // server.ts -import { createStartHandler } from '@tanstack/react-start/server' +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) ``` diff --git a/docs/start/framework/react/ssr.md b/docs/start/framework/react/ssr.md index b932548555..08e38490a5 100644 --- a/docs/start/framework/react/ssr.md +++ b/docs/start/framework/react/ssr.md @@ -7,22 +7,15 @@ Server-side rendering (SSR) is the process of rendering your application on the ## SSR Basics -TanStack Start supports server-side rendering out of the box. To enable server-side rendering, create an `src/server.tsx` file in your project: +TanStack Start supports server-side rendering out of the box. To enable server-side rendering, create an `src/server.ts` file in your project: ```tsx -// src/server.tsx - -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - +// src/server.ts +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) ``` diff --git a/docs/start/framework/solid/learn-the-basics.md b/docs/start/framework/solid/learn-the-basics.md index f9a5220d38..51e589f756 100644 --- a/docs/start/framework/solid/learn-the-basics.md +++ b/docs/start/framework/solid/learn-the-basics.md @@ -49,21 +49,15 @@ The `routeTree.gen.ts` file is generated when you run TanStack Start (via `npm r Although TanStack Start is designed with client-first APIs, it is by and large, a full-stack framework. This means that all use cases, including both dynamic and static rely on a server or build-time entry to render our application's initial HTML payload. -This is done via the `app/ssr.tsx` file: +This is done via the `app/ssr.ts` file: ```tsx -// app/ssr.tsx -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { getRouterManifest } from '@tanstack/solid-start/router-manifest' - +// app/ssr.ts +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) ``` diff --git a/e2e/react-start/basic/src/server.ts b/e2e/react-start/basic/src/server.ts deleted file mode 100644 index d329e88d30..0000000000 --- a/e2e/react-start/basic/src/server.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, -})(defaultStreamHandler) diff --git a/e2e/solid-start/basic/src/server.ts b/e2e/solid-start/basic/src/server.ts deleted file mode 100644 index 58a11ec724..0000000000 --- a/e2e/solid-start/basic/src/server.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/solid-start/server' -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, -})(defaultStreamHandler) diff --git a/examples/react/start-counter/src/server.tsx b/examples/react/start-counter/src/server.tsx deleted file mode 100644 index d329e88d30..0000000000 --- a/examples/react/start-counter/src/server.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, -})(defaultStreamHandler) diff --git a/examples/react/start-material-ui/src/ssr.tsx b/examples/react/start-material-ui/src/ssr.tsx deleted file mode 100644 index 65a580f25e..0000000000 --- a/examples/react/start-material-ui/src/ssr.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { getRouterManifest } from '@tanstack/react-start/router-manifest' - -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler) diff --git a/examples/react/start-workos/src/ssr.tsx b/examples/react/start-workos/src/ssr.tsx deleted file mode 100644 index 32848ff35a..0000000000 --- a/examples/react/start-workos/src/ssr.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server'; -import { getRouterManifest } from '@tanstack/react-start/router-manifest'; - -import { createRouter } from './router'; - -export default createStartHandler({ - createRouter, - getRouterManifest, -})(defaultStreamHandler); From 5f8506bb3fe8c8a382c3d233d07cbff5bce1f832 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 14:02:21 +0000 Subject: [PATCH 058/126] ci: apply automated fixes --- docs/start/framework/react/learn-the-basics.md | 5 ++++- docs/start/framework/react/server-routes.md | 5 ++++- docs/start/framework/react/ssr.md | 5 ++++- docs/start/framework/solid/learn-the-basics.md | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docs/start/framework/react/learn-the-basics.md b/docs/start/framework/react/learn-the-basics.md index 04463ccb2a..3f67d2e3dc 100644 --- a/docs/start/framework/react/learn-the-basics.md +++ b/docs/start/framework/react/learn-the-basics.md @@ -53,7 +53,10 @@ This is done via the `src/server.ts` file: ```tsx // src/server.ts -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md index 1d7ed36a63..0dfbf0b147 100644 --- a/docs/start/framework/react/server-routes.md +++ b/docs/start/framework/react/server-routes.md @@ -102,7 +102,10 @@ Server route requests are handled by Start's `createStartHandler` in your `serve ```tsx // server.ts -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ diff --git a/docs/start/framework/react/ssr.md b/docs/start/framework/react/ssr.md index 08e38490a5..1ccf937573 100644 --- a/docs/start/framework/react/ssr.md +++ b/docs/start/framework/react/ssr.md @@ -11,7 +11,10 @@ TanStack Start supports server-side rendering out of the box. To enable server-s ```tsx // src/server.ts -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ diff --git a/docs/start/framework/solid/learn-the-basics.md b/docs/start/framework/solid/learn-the-basics.md index 51e589f756..4634dd54f7 100644 --- a/docs/start/framework/solid/learn-the-basics.md +++ b/docs/start/framework/solid/learn-the-basics.md @@ -53,7 +53,10 @@ This is done via the `app/ssr.ts` file: ```tsx // app/ssr.ts -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/react-start/server' import { createRouter } from './router' export default createStartHandler({ From 7f5ba879c1a317cc2026123417750a09715cee91 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 11:47:22 -0600 Subject: [PATCH 059/126] fix: relative runtime navigation (#4174) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- e2e/react-start/basic/tests/redirect.spec.ts | 8 +- packages/react-router/src/link.tsx | 22 +- packages/react-router/src/useNavigate.tsx | 29 ++- packages/react-router/tests/link.test.tsx | 205 +++++++++++++++++ .../react-router/tests/useNavigate.test.tsx | 213 +++++++++++++++++- packages/router-core/src/link.ts | 1 + 6 files changed, 463 insertions(+), 15 deletions(-) diff --git a/e2e/react-start/basic/tests/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts index 1809b531df..4fa712bb32 100644 --- a/e2e/react-start/basic/tests/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -1,10 +1,10 @@ +import queryString from 'node:querystring' import { expect } from '@playwright/test' import combinateImport from 'combinate' import { derivePort, localDummyServer } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } import { test } from './fixture' -import { Server } from 'node:http' -import queryString from 'node:querystring' +import type { Server } from 'node:http' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport @@ -104,7 +104,7 @@ test.describe('redirects', () => { test(`external target: scenario: ${scenario}, thrower: ${thrower}`, async ({ page, }) => { - let q = queryString.stringify({ + const q = queryString.stringify({ externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) @@ -138,7 +138,7 @@ test.describe('redirects', () => { page, }) => { let fullPageLoad = false - let q = queryString.stringify({ + const q = queryString.stringify({ externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 3023a10288..3b4b195439 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -16,6 +16,7 @@ import { useLayoutEffect, } from './utils' +import { useMatch } from './useMatch' import { useMatches } from './Matches' import type { AnyRouter, @@ -105,11 +106,24 @@ export function useLinkProps< structuralSharing: true as any, }) - // when `from` is not supplied, use the leaf route of the current matches as the `from` location - // so relative routing works as expected - const from = useMatches({ - select: (matches) => options.from ?? matches[matches.length - 1]?.fullPath, + const isRelativeFromPath = options.relative === 'path' + + // when `from` is not supplied, use the nearest parent match's full path as the `from` location + // so relative routing works as expected. Try to stay out of rerenders as much as possible. + const nearestFrom = useMatch({ + strict: false, + select: (match) => (isRelativeFromPath ? undefined : match.fullPath), + }) + + // When no from and relative is path, use the leaf match as the from location + // Avoid rerenders as much as possible. + const leafFrom = useMatches({ + select: (matches) => + isRelativeFromPath ? matches[matches.length - 1]!.fullPath : undefined, }) + + const from = options.from ?? (isRelativeFromPath ? leafFrom : nearestFrom) + // Use it as the default `from` location const _options = React.useMemo(() => ({ ...options, from }), [options, from]) diff --git a/packages/react-router/src/useNavigate.tsx b/packages/react-router/src/useNavigate.tsx index 64fdeb470a..6ba40ab280 100644 --- a/packages/react-router/src/useNavigate.tsx +++ b/packages/react-router/src/useNavigate.tsx @@ -1,5 +1,6 @@ import * as React from 'react' import { useRouter } from './useRouter' +import { useMatch } from './useMatch' import type { AnyRouter, FromPathOption, @@ -14,15 +15,32 @@ export function useNavigate< >(_defaultOpts?: { from?: FromPathOption }): UseNavigateResult { - const { navigate } = useRouter() + const { navigate, state } = useRouter() + + // Just get the index of the current match to avoid rerenders + // as much as possible + const matchIndex = useMatch({ + strict: false, + select: (match) => match.index, + }) return React.useCallback( (options: NavigateOptions) => { + const isRelativeFromPath = options.relative === 'path' + + const from = + options.from ?? + _defaultOpts?.from ?? + (isRelativeFromPath + ? state.matches[state.matches.length - 1]!.fullPath + : state.matches[matchIndex]!.fullPath) + return navigate({ - from: _defaultOpts?.from, ...options, + from: from, }) }, + // eslint-disable-next-line react-hooks/exhaustive-deps [_defaultOpts?.from, navigate], ) as UseNavigateResult } @@ -35,6 +53,7 @@ export function Navigate< const TMaskTo extends string = '', >(props: NavigateOptions): null { const router = useRouter() + const navigate = useNavigate() const previousPropsRef = React.useRef | null>(null) React.useEffect(() => { if (previousPropsRef.current !== props) { - router.navigate({ - ...props, - }) + navigate(props) previousPropsRef.current = props } - }, [router, props]) + }, [router, props, navigate]) return null } diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 200c857ab5..4ab507639a 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -4463,3 +4463,208 @@ describe('search middleware', () => { }) }) }) + +describe('relative links', () => { + const setupRouter = () => { + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) + const aRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'a', + component: () => { + return ( + <> +

A Route

+ + + ) + }, + }) + + const bRoute = createRoute({ + getParentRoute: () => aRoute, + path: 'b', + component: () => { + return ( + <> +

B Route

+ Link to Parent + + ) + }, + }) + + const paramRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'param/$param', + component: () => { + return ( + <> +

Param Route

+ Link to ./a + + + ) + }, + }) + + const paramARoute = createRoute({ + getParentRoute: () => paramRoute, + path: 'a', + component: () => { + return ( + <> +

Param A Route

+ Link to .. from /param/foo/a + + + ) + }, + }) + + const paramBRoute = createRoute({ + getParentRoute: () => paramARoute, + path: 'b', + component: () => { + return ( + <> +

Param B Route

+ Link to Parent + + Link to Parent with param:bar + + ({ ...prev, param: 'bar' })} + > + Link to Parent with param:bar functional + + + ) + }, + }) + + return createRouter({ + routeTree: rootRoute.addChildren([ + indexRoute, + aRoute.addChildren([bRoute]), + paramRoute.addChildren([paramARoute, paramBRoute]), + ]), + history, + }) + } + + test('should navigate to the parent route', async () => { + const router = setupRouter() + + render() + + // Navigate to /a/b + await act(async () => { + history.push('/a/b') + }) + + // Inspect the link to go up a parent + const parentLink = await screen.findByText('Link to Parent') + expect(parentLink.getAttribute('href')).toBe('/a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/a') + }) + + test('should navigate to the parent route and keep params', async () => { + const router = setupRouter() + + render() + + // Navigate to /param/oldParamValue/a/b + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the link to go up a parent and keep the params + const parentLink = await screen.findByText('Link to Parent') + expect(parentLink.getAttribute('href')).toBe('/param/foo/a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a') + }) + + test('should navigate to the parent route and change params', async () => { + const router = setupRouter() + + render() + + // Navigate to /param/oldParamValue/a/b + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the link to go up a parent and keep the params + const parentLink = await screen.findByText('Link to Parent with param:bar') + expect(parentLink.getAttribute('href')).toBe('/param/bar/a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/param/bar/a') + }) + + test('should navigate to a relative link based on render location', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to ./a') + expect(relativeLink.getAttribute('href')).toBe('/param/foo/a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a') + }) + + test('should navigate to a parent link based on render location', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to .. from /param/foo/a') + expect(relativeLink.getAttribute('href')).toBe('/param/foo') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo') + }) +}) diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index 61458a8e56..ddb42abfcf 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React, { act } from 'react' import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { @@ -1509,3 +1509,214 @@ describe('when on /posts/$postId and navigating to ../ with default `from` /post test('Route', () => runTest('Route')) test('RouteApi', () => runTest('RouteApi')) }) + +describe('relative useNavigate', () => { + const setupRouter = () => { + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { + return

Index Route

+ }, + }) + const aRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'a', + component: () => { + return ( + <> +

A Route

+ + + ) + }, + }) + + const bRoute = createRoute({ + getParentRoute: () => aRoute, + path: 'b', + component: function BRoute() { + const navigate = useNavigate() + return ( + <> +

B Route

+ + + ) + }, + }) + + const paramRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'param/$param', + component: function ParamRoute() { + const navigate = useNavigate() + return ( + <> +

Param Route

+ + + + ) + }, + }) + + const paramARoute = createRoute({ + getParentRoute: () => paramRoute, + path: 'a', + component: function ParamARoute() { + const navigate = useNavigate() + return ( + <> +

Param A Route

+ + + + ) + }, + }) + + const paramBRoute = createRoute({ + getParentRoute: () => paramARoute, + path: 'b', + component: function ParamBRoute() { + const navigate = useNavigate() + return ( + <> +

Param B Route

+ + + + + ) + }, + }) + + return createRouter({ + routeTree: rootRoute.addChildren([ + indexRoute, + aRoute.addChildren([bRoute]), + paramRoute.addChildren([paramARoute, paramBRoute]), + ]), + history, + }) + } + + test('should navigate to the parent route', async () => { + const router = setupRouter() + + render() + + // Navigate to /a/b + await act(async () => { + history.push('/a/b') + }) + + // Inspect the link to go up a parent + const parentLink = await screen.findByText('Link to Parent') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/a') + }) + + test('should navigate to the parent route and keep params', async () => { + const router = setupRouter() + + render() + + // Navigate to /param/oldParamValue/a/b + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the link to go up a parent and keep the params + const parentLink = await screen.findByText('Link to Parent') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a') + }) + + test('should navigate to the parent route and change params', async () => { + const router = setupRouter() + + render() + + // Navigate to /param/oldParamValue/a/b + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the link to go up a parent and keep the params + const parentLink = await screen.findByText('Link to Parent with param:bar') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/param/bar/a') + }) + + test('should navigate to a relative link based on render location', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to ./a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a') + }) + + test('should navigate to a parent link based on render location', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to .. from /param/foo/a') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo') + }) +}) diff --git a/packages/router-core/src/link.ts b/packages/router-core/src/link.ts index 4223e86e6e..fe44bb83d5 100644 --- a/packages/router-core/src/link.ts +++ b/packages/router-core/src/link.ts @@ -424,6 +424,7 @@ export type ToSubOptionsProps< hash?: true | Updater state?: true | NonNullableUpdater from?: FromPathOption & {} + relative?: 'route' | 'path' } export type ParamsReducerFn< From 52cdc7edef0623928173fa1ad0f0f56a491cc3f8 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 17:48:37 +0000 Subject: [PATCH 060/126] release: v1.120.4-alpha.19 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 94 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index eac003b549..36967ad7bf 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index d58135dd83..0c78d5945f 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index d5814a7316..37dc70f772 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 74b82f7bcc..9645fd5dd8 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 249a0c14c0..8e8f2a8fcd 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 6a76352fa9..c60d8b3d15 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index aa51a1d98c..c2b88ee228 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index e7f37e6a24..add72b2d2c 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 5f4e219ef0..c5c2fee119 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 54cc96f036..5d6ad04150 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index fa54045086..9861cdd95d 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 5600c096d8..094387ef86 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 826d7c4c26..c629ca4095 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 17e60fbac7..637c9dfa08 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index f6617b5c22..26916c558b 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index a5f0d9aac4..b81ca30dd4 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 90c5e214f6..778d99afd9 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index a1f6dc1f5f..6495ec4e3e 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 2e80a98d6c..a276807d82 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 4c66e13545..dd643babb6 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index b005f8273e..e9f27b651e 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 6bc7ae9d27..669cd9133d 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 0fc8c8c948..908a934a01 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 74b438293a..09f66d7449 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 2454969e61..a55502a0d5 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 2872906822..2083b70264 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 15f5297733..eaa7033849 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 7ee1a691b2..3e4f41a618 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index fae3c5c383..e31eed93ea 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 10040b6b20..6cc9901f71 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index b75e22fb3b..fb8ea2f831 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index ea9890584e..e0101154c5 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index e0d8322335..6653b73029 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 8b621093f1..dc4d195aa2 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index b0d36f124a..134484a9b0 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.15", + "@tanstack/arktype-adapter": "^1.120.4-alpha.19", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/valibot-adapter": "^1.120.4-alpha.15", - "@tanstack/zod-adapter": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/valibot-adapter": "^1.120.4-alpha.19", + "@tanstack/zod-adapter": "^1.120.4-alpha.19", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 53d8d1cfc4..300589b9b1 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 0f8d4763ce..1adabba072 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index d3d697a966..d50ff2ab13 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-with-query": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-with-query": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 1f6d00dfc7..1f9ccc00fe 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 852123f6c6..8ecb75be84 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 0bb81c177f..860c798b6b 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index a5ca580755..679ca9b572 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 1eecb4fb5b..9f81539dfa 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-with-query": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-with-query": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 415f69f69a..5bb31fd62f 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index bf773a7071..7a5d862cd2 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 403bfc6ecc..8e934b4a42 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 5ce8a3310b..7bb090e1c5 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 3b1f5ff0b3..73130bd28f 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.13", - "@tanstack/react-router-devtools": "^1.120.4-alpha.13", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index f3964016fb..94491a7099 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-with-query": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-with-query": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 8a3c6bcd12..49deac6e35 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index a78c01a06f..463a1fef18 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 25bf2c01c7..264a167d3b 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3953482195..b201456c7c 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index eb34abcb48..c74f26c838 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.15", - "@tanstack/react-router-devtools": "^1.120.4-alpha.15", - "@tanstack/router-plugin": "^1.120.4-alpha.16", - "@tanstack/react-start": "^1.120.4-alpha.18", + "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.19", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 8623078e24..55e562ace3 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 300bdea4b8..b3362f06f0 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 4b601bb37f..7a8366b9da 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index c3b04374a5..eea51dda8d 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 7dd3b660a7..15b7b3bc74 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 3af8f94cfc..ab9ce90d11 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 4e0c33134f..76309473b8 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 56bdd39c55..ed85041b1f 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.16", + "@tanstack/router-plugin": "^1.120.4-alpha.19", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index a1ea5473d7..86e3a7aa2e 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.18", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 9d7ebc6c42..cdb7b6e77c 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.18", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 6cec34eb51..0173039d98 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.15", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.15", - "@tanstack/solid-start": "^1.120.4-alpha.18", + "@tanstack/solid-router": "^1.120.4-alpha.19", + "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 033092233d..c35b580393 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 25fe6d1c5d..8aea4109cd 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index 9abba9f290..f9bf9170c8 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 52a6712f79..7f173edd24 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index cd21f65050..5f502fc371 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 382005cc84..903bbc795d 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.18", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 7a4875ad3a..baaec003f6 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 3f0643cd66..bf9a308ae5 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.18", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 17419a804c..7360154c87 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 5cf5e9520f..9c5043419a 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index bd1d3c11a7..88b6f18761 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index ce61a8db48..84f2aa52e7 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index f5c0fddc56..447ba8a472 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 9645930e27..8a5cf976a4 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index d41d2d9669..f302b6b39b 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.16", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index d087cb22a0..47d6bc142a 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 32c96d9da0..120249feb4 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index c7caaf0541..7ec0793d15 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index ff667cd8ac..3c6f2e68a0 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.18", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 7a129e2f81..c46f19fb00 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 7086488ff9..a7e3f1fe26 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.18", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 3cf1baeadf..8470bfb78d 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 40d2899982..617b4edfcb 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.18", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 35ebde725b..2e74e6cc8d 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index ef86ffc7aa..6f2bec755c 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 2f45aefb58..4ad645cb3d 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.17", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 143eb7c49d..44f1380a72 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 2b971e4a82..dc2454fac1 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.15", + "version": "1.120.4-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6eb68b6af1..3edf8a6414 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5118,7 +5118,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5158,7 +5158,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5192,7 +5192,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5232,7 +5232,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5278,7 +5278,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5321,7 +5321,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5361,7 +5361,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5404,7 +5404,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5493,7 +5493,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5536,7 +5536,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.15 + specifier: ^1.120.4-alpha.19 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From b9017930f735dc67b00ed782df0bfbd6f3e3a1c2 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 14:30:34 -0600 Subject: [PATCH 061/126] fix: spa-mode (#4177) --- docs/start/config.json | 8 +- .../react/{spa-shell.md => spa-mode.md} | 82 ++++++++++++------- docs/start/framework/solid/spa-mode.md | 3 + docs/start/framework/solid/spa-shell.md | 3 - e2e/react-start/basic/tests/redirect.spec.ts | 4 +- e2e/solid-start/basic/tests/redirect.spec.ts | 12 +-- .../react/start-basic-static/vite.config.ts | 2 +- .../solid/start-basic-static/vite.config.ts | 2 +- packages/server-functions-plugin/README.md | 2 +- .../src/nitro/nitro-plugin.ts | 6 +- packages/start-plugin-core/src/prerender.ts | 8 -- packages/start-plugin-core/src/schema.ts | 6 +- .../src/server-functions-handler.ts | 2 +- 13 files changed, 80 insertions(+), 60 deletions(-) rename docs/start/framework/react/{spa-shell.md => spa-mode.md} (53%) create mode 100644 docs/start/framework/solid/spa-mode.md delete mode 100644 docs/start/framework/solid/spa-shell.md diff --git a/docs/start/config.json b/docs/start/config.json index fe1d31bc1c..6967df720e 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -54,8 +54,8 @@ "to": "framework/react/ssr" }, { - "label": "SPA Shell", - "to": "framework/react/spa-shell" + "label": "SPA Mode", + "to": "framework/react/spa-mode" }, { "label": "Hosting", @@ -127,8 +127,8 @@ "to": "framework/solid/ssr" }, { - "label": "SPA Shell", - "to": "framework/solid/spa-shell" + "label": "SPA Mode", + "to": "framework/solid/spa-mode" }, { "label": "Hosting", diff --git a/docs/start/framework/react/spa-shell.md b/docs/start/framework/react/spa-mode.md similarity index 53% rename from docs/start/framework/react/spa-shell.md rename to docs/start/framework/react/spa-mode.md index d3b921c461..c2d5450c5b 100644 --- a/docs/start/framework/react/spa-shell.md +++ b/docs/start/framework/react/spa-mode.md @@ -1,46 +1,49 @@ --- -id: spa-shell -title: SPA Shell +id: spa-mode +title: SPA mode --- -## What the heck is an SPA Shell? +## What the heck is SPA mode? -For applications that do not require SSR for either SEO, crawlers, or performance reasons, it may be desirable to ship a single HTML document to your users containing the "shell" of your application, or more specifically, the bare-minimum `html`, `head`, and `body` tags necessary to bootstrap your application only on the client. +For applications that do not require SSR for either SEO, crawlers, or performance reasons, it may be desirable to ship static HTML to your users containing the "shell" of your application (or even prerendered HTML for specific routes) that contain the necessary `html`, `head`, and `body` tags to bootstrap your application only on the client. -## Why use Start to create an SPA Shell? +## Why use Start without SSR? -**No SSR doesn't mean giving up server-side features!** SPA Shells actually pair very nicely with server-side features like server functions and/or server routes. It **simply means that the initial document will not contain the fully rendered HTML of your application until it has been rendered on the client using JS**. +**No SSR doesn't mean giving up server-side features!** SPA modes actually pair very nicely with server-side features like server functions and/or server routes or even other external APIs. It **simply means that the initial document will not contain the fully rendered HTML of your application until it has been rendered on the client using JavaScript**. -## Benefits of an SPA Shell +## Benefits of SPA mode - **Easier to deploy** - A CDN that can serve static assets is all you need. - **Cheaper** to host - CDNs are cheap compared to Lambda functions or long-running processes. - **Client-side Only is simpler** - No SSR means less to go wrong with hydration, rendering, and routing. -## Caveats of an SPA Shell +## Caveats of SPA mode - **Slower time to full content** - Time to full content is longer since all JS must download and execute before anything below the shell can be rendered. - **Less SEO friendly** - Robots, crawlers and link unfurlers _may_ have a harder time indexing your application unless they are configured to execute JS and your application can render within a reasonable amount of time. ## How does it work? -After enabling the SPA Shell mode, running a Start build will have an additional prerendering step afterwards to generate the shell. This is done by: +After enabling the SPA mode, running a Start build will have an additional prerendering step afterwards to generate the shell. This is done by: - **Prerendering** your application's **root route only** - Where your application would normally render your matched routes, your router's configured **pending fallback component is rendered instead**. - The resulting HTML is stored to a static HTML page called `/_shell.html` (configurable) -- Default rewrites are configured to redirect all 404 requests to the SPA shell +- Default rewrites are configured to redirect all 404 requests to the SPA mode shell -## Enabling the SPA Shell +> [!NOTE] +> Other routes may also be prerendered and it is recommended to prerender as much as you can in SPA mode, but this is not required for SPA mode to work. + +## Configuring SPA mode -To configure the SPA shell, you can add the following to your Start plugin's options: +To configure SPA mode, there are a few options you can add to your Start plugin's options: ```tsx // vite.config.ts export default defineConfig({ plugins: [ TanStackStart({ - shell: { + spa: { enabled: true, }, }), @@ -48,9 +51,41 @@ export default defineConfig({ }) ``` +## Use Necessary Redirects + +Deploying a purely client-side SPA to a host or CDN often requires the use of redirects to ensure that urls are properly rewritten to the SPA shell. The goal of any deployment should include these priorities in this order: + +1. Ensure that static assets will always be served if they exist, e.g. /about.html. This is usually the default behavior for most CDNs +2. (Optional) Allow-list specific subpaths to be routed through to any dynamic server handlers, e.g. /api/\*\* (More on this below) +3. Ensure that all 404 requests are rewritten to the SPA shell, e.g. a catch-all redirect to /\_shell.html (or if you have configured your shell output path to be something custom, use that instead) + +## Basic Redirects Example + +Let's use Netlify's `_redirects` file to rewrite all 404 requests to the SPA shell. + +``` +# Catch all other 404 requests and rewrite them to the SPA shell +/* /_shell.html 200 +``` + +## Allowing Server Functions and Server Routes + +Again, using Netlify's `_redirects` file, we can allow-list specific subpaths to be routed through to the server. + +``` +# Allow requests to /_serverFn/* to be routed through to the server (If you have configured your server function base path to be something other than /_serverFn, use that instead) +/_serverFn/* /_serverFn/:splat 200 + +# Allow any requests to /api/* to be routed through to the server (Server routes can be created at any path, so you must ensure that any server routes you want to use are under this path, or simply add additional redirects for each server route base you want to expose) +/api/* /api/:splat 200 + +# Catch all other 404 requests and rewrite them to the SPA shell +/* /_shell.html 200 +``` + ## Shell Mask Path -The default pathname used to generate the shell is `/`. We call this the **shell mask path**. Since matched routes are not included, the pathname used to generate the shell is mostly irrelevant, but it's still configurable. +The default pathname used to generate the SPA shell is `/`. We call this the **shell mask path**. Since matched routes are not included, the pathname used to generate the shell is mostly irrelevant, but it's still configurable. > [!NOTE] > It's recommended to keep the default value of `/` as the shell mask path. @@ -60,7 +95,7 @@ The default pathname used to generate the shell is `/`. We call this the **shell export default defineConfig({ plugins: [ TanStackStart({ - shell: { + spa: { maskPath: '/app', }, }), @@ -68,17 +103,6 @@ export default defineConfig({ }) ``` -## Auto Redirects - -When shell mode is enabled, the default behavior is to add a catch-all redirect from all 404 requests to the output shell HTML file. This behavior can be disabled by setting the `autoRedirect` option to `false`. - -```tsx -// vite.config.ts -export default defineConfig({ - plugins: [TanStackStart({ shell: { autoRedirect: false } })], -}) -``` - ## Prerendering Options The prerender option is used to configure the prerendering behavior of the SPA shell, and accepts the same prerender options as found in our prerendering guide. @@ -98,7 +122,7 @@ You can always override these options by providing your own prerender options: export default defineConfig({ plugins: [ TanStackStart({ - shell: { + spa: { prerender: { outputPath: '/custom-shell', crawlLinks: true, @@ -110,9 +134,9 @@ export default defineConfig({ }) ``` -## Customizing the SPA Shell +## Customized rendering in SPA mode -Customizing the SPA shell can be useful if you want to: +Customizing the HTML output of the SPA shell can be useful if you want to: - Provide generic head tags for SPA routes - Provide a custom pending fallback component diff --git a/docs/start/framework/solid/spa-mode.md b/docs/start/framework/solid/spa-mode.md new file mode 100644 index 0000000000..0124b857d2 --- /dev/null +++ b/docs/start/framework/solid/spa-mode.md @@ -0,0 +1,3 @@ +--- +ref: docs/start/framework/react/spa-mode.md +--- diff --git a/docs/start/framework/solid/spa-shell.md b/docs/start/framework/solid/spa-shell.md deleted file mode 100644 index 4f3d298428..0000000000 --- a/docs/start/framework/solid/spa-shell.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -ref: docs/start/framework/react/spa-shell.md ---- diff --git a/e2e/react-start/basic/tests/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts index 4fa712bb32..3403243ff0 100644 --- a/e2e/react-start/basic/tests/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -44,7 +44,9 @@ test.describe('redirects', () => { const requestPromise = new Promise((resolve) => { page.on('request', (request) => { - if (request.url().startsWith(`http://localhost:${PORT}/_server/`)) { + if ( + request.url().startsWith(`http://localhost:${PORT}/_serverFn/`) + ) { requestHappened = true resolve() } diff --git a/e2e/solid-start/basic/tests/redirect.spec.ts b/e2e/solid-start/basic/tests/redirect.spec.ts index 4f4cb73b1c..1664d16a50 100644 --- a/e2e/solid-start/basic/tests/redirect.spec.ts +++ b/e2e/solid-start/basic/tests/redirect.spec.ts @@ -1,10 +1,10 @@ +import queryString from 'node:querystring' import { expect } from '@playwright/test' import combinateImport from 'combinate' import { derivePort, localDummyServer } from '@tanstack/router-e2e-utils' import packageJson from '../package.json' with { type: 'json' } import { test } from './fixture' -import { Server } from 'node:http' -import queryString from 'node:querystring' +import type { Server } from 'node:http' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport @@ -44,7 +44,9 @@ test.describe('redirects', () => { const requestPromise = new Promise((resolve) => { page.on('request', (request) => { - if (request.url().startsWith(`http://localhost:${PORT}/_server/`)) { + if ( + request.url().startsWith(`http://localhost:${PORT}/_serverFn/`) + ) { requestHappened = true resolve() } @@ -104,7 +106,7 @@ test.describe('redirects', () => { test(`external target: scenario: ${scenario}, thrower: ${thrower}`, async ({ page, }) => { - let q = queryString.stringify({ + const q = queryString.stringify({ externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) @@ -138,7 +140,7 @@ test.describe('redirects', () => { page, }) => { let fullPageLoad = false - let q = queryString.stringify({ + const q = queryString.stringify({ externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) diff --git a/examples/react/start-basic-static/vite.config.ts b/examples/react/start-basic-static/vite.config.ts index 71a9b8a656..285d21f055 100644 --- a/examples/react/start-basic-static/vite.config.ts +++ b/examples/react/start-basic-static/vite.config.ts @@ -11,7 +11,7 @@ export default defineConfig({ projects: ['./tsconfig.json'], }), tanstackStart({ - shell: { + spa: { enabled: true, }, }), diff --git a/examples/solid/start-basic-static/vite.config.ts b/examples/solid/start-basic-static/vite.config.ts index 6ff67ad90b..213bd9189e 100644 --- a/examples/solid/start-basic-static/vite.config.ts +++ b/examples/solid/start-basic-static/vite.config.ts @@ -11,7 +11,7 @@ export default defineConfig({ projects: ['./tsconfig.json'], }), tanstackStart({ - shell: { + spa: { enabled: true, }, }), diff --git a/packages/server-functions-plugin/README.md b/packages/server-functions-plugin/README.md index 7f4b22702f..9dacb9f0b1 100644 --- a/packages/server-functions-plugin/README.md +++ b/packages/server-functions-plugin/README.md @@ -44,7 +44,7 @@ Each runtime replacement should be implemented by your framework. Generally, on ```ts function createClientRpc(functionId: string) { - const url = `${process.env.YOUR_SERVER_BASE}/_server-fn/${functionId}` + const url = `${process.env.YOUR_SERVER_BASE}/_serverFn/${functionId}` const fn = async (...args: any[]) => { const res = await fetch(url, { diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 34465fed18..f331073eda 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -89,14 +89,14 @@ export function nitroPlugin( await buildNitroEnvironment(nitro, () => build(nitro)) - if (options.shell?.enabled) { + if (options.spa?.enabled) { options.prerender = { ...options.prerender, enabled: true, } const maskUrl = new URL( - options.shell.maskPath, + options.spa.maskPath, 'http://localhost', ) @@ -104,7 +104,7 @@ export function nitroPlugin( options.pages.push({ path: maskUrl.toString().replace('http://localhost', ''), - prerender: options.shell.prerender, + prerender: options.spa.prerender, sitemap: { exclude: true, }, diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index 7a8d808d52..934c0ab83f 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -47,14 +47,6 @@ export async function prerender({ const nodeNitro = await createNitro({ ...nitro.options._config, - routeRules: { - // Filter out our shell redirect rule if it exists - ...Object.fromEntries( - Object.entries(nitro.options._config.routeRules ?? {}).filter( - ([_, value]) => !(value as any).__TSS_SHELL, - ), - ), - }, preset: 'nitro-prerender', logLevel: 0, output: { diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index 6a311ae7f7..065675bce2 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -100,7 +100,7 @@ export function createTanStackStartOptionsSchema( .default({}), serverFns: z .object({ - base: z.string().optional().default('/_server'), + base: z.string().optional().default('/_serverFn'), }) .optional() .default({}), @@ -129,7 +129,7 @@ export function createTanStackStartOptionsSchema( }) .and(pagePrerenderOptionsSchema.optional()) .optional(), - shell: shellSchema.optional(), + spa: spaSchema.optional(), }) .optional() .default({}) @@ -196,7 +196,7 @@ const pagePrerenderOptionsSchema = z.object({ .optional(), }) -const shellSchema = z.object({ +const spaSchema = z.object({ enabled: z.boolean().optional().default(true), maskPath: z.string().optional().default('/'), prerender: pagePrerenderOptionsSchema diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index c85591c170..3bb154abaf 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -32,7 +32,7 @@ export const handleServerAction = async ({ request }: { request: Request }) => { const method = request.method const url = new URL(request.url, 'http://localhost:3000') - // extract the serverFnId from the url as host/_server/:serverFnId + // extract the serverFnId from the url as host/_serverFn/:serverFnId // Define a regex to match the path and extract the :thing part const regex = new RegExp( `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`, From 4aa766b988a4ba93ac7dbe0e5645a49ff7f4a053 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 20:42:37 +0000 Subject: [PATCH 062/126] release: v1.120.4-alpha.20 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 300589b9b1..a8140111dd 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 1adabba072..1cdbd35c57 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index d50ff2ab13..e134ff237e 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 1f9ccc00fe..eaef7d7634 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 8ecb75be84..b988dba735 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 860c798b6b..4df6b4548f 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 679ca9b572..47014dc624 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 9f81539dfa..a54d285c57 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 5bb31fd62f..d3dcb9b6ac 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 7a5d862cd2..d7ebfe32ef 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 8e934b4a42..039c061a86 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 7bb090e1c5..c9711cb940 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 73130bd28f..3c30597114 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 94491a7099..9b55845b92 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 49deac6e35..66de683b84 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index b201456c7c..e2acf6fd1d 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index c74f26c838..0c4e850d9f 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.19", + "@tanstack/react-start": "^1.120.4-alpha.20", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 86e3a7aa2e..ed0ba68449 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.20", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index cdb7b6e77c..3d1a5c8a55 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.20", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 0173039d98..5ab4faed7e 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.19", + "@tanstack/solid-start": "^1.120.4-alpha.20", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 903bbc795d..72737d38e0 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index baaec003f6..33311890fa 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index bf9a308ae5..5d382a203a 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 3c6f2e68a0..5e69af71af 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index c46f19fb00..4095c34be3 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a7e3f1fe26..8996cc6ac8 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 617b4edfcb..f9fe06c0fc 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 2e74e6cc8d..f13e736774 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.19", + "version": "1.120.4-alpha.20", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From b424cadc8a69974a66a7b2bfca31d8ae29850d31 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 15:41:28 -0600 Subject: [PATCH 063/126] fix: no `@fs` in dev for client entry (#4179) --- README.md | 2 +- packages/start-plugin-core/src/plugin.ts | 2 +- packages/start-server-core/src/ssr-server.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4dc5f701b1..7aa0f3d0d4 100644 --- a/README.md +++ b/README.md @@ -87,4 +87,4 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer To run example React projects with Tanstack Router, see [CONTRIBUTING.md](./CONTRIBUTING.md) - + diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 1d42e200ad..65c0848c3d 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -138,7 +138,7 @@ export function TanStackStartVitePluginCore( define: { ...injectDefineEnv('TSS_PUBLIC_BASE', startConfig.public.base), ...injectDefineEnv('TSS_CLIENT_BASE', startConfig.client.base), - ...injectDefineEnv('TSS_CLIENT_ENTRY', `/@fs${getClientEntryPath(startConfig)}`), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved + ...injectDefineEnv('TSS_CLIENT_ENTRY', getClientEntryPath(startConfig)), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), }, diff --git a/packages/start-server-core/src/ssr-server.ts b/packages/start-server-core/src/ssr-server.ts index f647a78078..2c3e897fdf 100644 --- a/packages/start-server-core/src/ssr-server.ts +++ b/packages/start-server-core/src/ssr-server.ts @@ -105,7 +105,8 @@ export function dehydrateRouter(router: AnyRouter) { const dehydratedRouter: DehydratedRouter = { manifest: router.ssr!.manifest, dehydratedData: router.options.dehydrate?.(), - lastMatchId: router.state.matches[router.state.matches.length - 1]!.id, + lastMatchId: + router.state.matches[router.state.matches.length - 1]?.id || '', } router.serverSsr!.injectScript( From b5affb2631600a99c8f34bb48cdcdfe15c2c6919 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 21:42:53 +0000 Subject: [PATCH 064/126] release: v1.120.4-alpha.21 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index a8140111dd..502fb6a09c 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 1cdbd35c57..1f115726f0 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index e134ff237e..d509224b28 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index eaef7d7634..025851d369 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index b988dba735..49cd4fe0da 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 4df6b4548f..4459435dad 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 47014dc624..7d64222251 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index a54d285c57..449523e1a6 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index d3dcb9b6ac..7cf2e9298c 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index d7ebfe32ef..2289245e78 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 039c061a86..672965b258 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index c9711cb940..61ffddefff 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 3c30597114..7226cb0cb8 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 9b55845b92..6905857e45 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 66de683b84..bbb5abf61d 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index e2acf6fd1d..3ff7d35f73 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 0c4e850d9f..8f16661c3e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.20", + "@tanstack/react-start": "^1.120.4-alpha.21", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index ed0ba68449..dd7c9bc967 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.20", + "@tanstack/solid-start": "^1.120.4-alpha.21", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 3d1a5c8a55..825c563f8f 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.20", + "@tanstack/solid-start": "^1.120.4-alpha.21", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 5ab4faed7e..8443a00c9d 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.20", + "@tanstack/solid-start": "^1.120.4-alpha.21", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 72737d38e0..8dab5c6bb3 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 33311890fa..84e522ef2f 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 5d382a203a..33b695de0b 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 5e69af71af..e6a9e9539c 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 4095c34be3..a1aa08e4f4 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 8996cc6ac8..ab9cd99cd4 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f9fe06c0fc..b10829d799 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index f13e736774..50f6082313 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.20", + "version": "1.120.4-alpha.21", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From f209861069dd00bf9bb4713499facbc15e925dd5 Mon Sep 17 00:00:00 2001 From: Yeoh Joer Date: Fri, 16 May 2025 06:48:39 +0800 Subject: [PATCH 065/126] fix: resolve custom `server` entry path on windows fs (#4180) Co-authored-by: SeanCassiere <33615041+SeanCassiere@users.noreply.github.com> --- e2e/react-start/basic/src/server.ts | 11 +++++++++++ e2e/solid-start/basic/src/server.ts | 11 +++++++++++ packages/react-start-plugin/src/index.ts | 11 ++++++++--- packages/solid-start-plugin/src/index.ts | 11 ++++++++--- 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 e2e/react-start/basic/src/server.ts create mode 100644 e2e/solid-start/basic/src/server.ts diff --git a/e2e/react-start/basic/src/server.ts b/e2e/react-start/basic/src/server.ts new file mode 100644 index 0000000000..159c2558df --- /dev/null +++ b/e2e/react-start/basic/src/server.ts @@ -0,0 +1,11 @@ +// DO NOT DELETE THIS FILE!!! +// This file is a good smoke test to make sure the custom server entry is working +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/react-start/server' +import { createRouter } from './router' + +export default createStartHandler({ + createRouter, +})(defaultStreamHandler) diff --git a/e2e/solid-start/basic/src/server.ts b/e2e/solid-start/basic/src/server.ts new file mode 100644 index 0000000000..c82fab000e --- /dev/null +++ b/e2e/solid-start/basic/src/server.ts @@ -0,0 +1,11 @@ +// DO NOT DELETE THIS FILE!!! +// This file is a good smoke test to make sure the custom server entry is working +import { + createStartHandler, + defaultStreamHandler, +} from '@tanstack/solid-start/server' +import { createRouter } from './router' + +export default createStartHandler({ + createRouter, +})(defaultStreamHandler) diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 25fa215b23..f27f0aadc4 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -5,6 +5,7 @@ import { TanStackStartServerRoutesVite, TanStackStartVitePluginCore, } from '@tanstack/start-plugin-core' +import * as vite from 'vite' import { getTanStackStartOptions } from './schema' import type { TanStackStartInputConfig, WithReactPlugin } from './schema' import type { PluginOption, ResolvedConfig } from 'vite' @@ -60,10 +61,14 @@ export function TanStackStartVitePlugin( ) if (id === '/~start/server-entry.tsx') { - const ssrEntryPath = path.resolve( - resolvedConfig.root, - options.serverEntryPath, + const ssrEntryPath = options.serverEntryPath.startsWith( + '/~start/default-server-entry', ) + ? options.serverEntryPath + : vite.normalizePath( + path.resolve(resolvedConfig.root, options.serverEntryPath), + ) + return ` import { toWebRequest, defineEventHandler } from '@tanstack/react-start/server'; import serverEntry from '${ssrEntryPath}'; diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index 844b1dcd23..43fc2c24d9 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -5,6 +5,7 @@ import { TanStackStartServerRoutesVite, TanStackStartVitePluginCore, } from '@tanstack/start-plugin-core' +import * as vite from 'vite' import { getTanStackStartOptions } from './schema' import type { PluginOption, ResolvedConfig } from 'vite' import type { TanStackStartInputConfig, WithSolidPlugin } from './schema' @@ -57,10 +58,14 @@ export function TanStackStartVitePlugin( ) if (id === '/~start/server-entry.tsx') { - const ssrEntryPath = path.resolve( - resolvedConfig.root, - options.serverEntryPath, + const ssrEntryPath = options.serverEntryPath.startsWith( + '/~start/default-server-entry', ) + ? options.serverEntryPath + : vite.normalizePath( + path.resolve(resolvedConfig.root, options.serverEntryPath), + ) + return ` import { toWebRequest, defineEventHandler } from '@tanstack/solid-start/server'; import serverEntry from '${ssrEntryPath}'; From 7cf6487c55ccff1f795e64f5895ebb993fc0ab47 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 22:54:58 +0000 Subject: [PATCH 066/126] release: v1.120.4-alpha.22 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 502fb6a09c..66a8b04e1b 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 1f115726f0..dd5bd64aee 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index d509224b28..96eb1f12c8 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 025851d369..6e9238d737 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 49cd4fe0da..f2e5a3a69a 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 4459435dad..a40cbf198a 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 7d64222251..190d0456aa 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 449523e1a6..e4bfb94295 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 7cf2e9298c..f152ffca74 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 2289245e78..b5bef6b66d 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 672965b258..3bd7d4aea7 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 61ffddefff..eb5fb410ca 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 7226cb0cb8..bcc98270d4 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 6905857e45..c2b8bdb406 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index bbb5abf61d..3cbe860aed 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 3ff7d35f73..f0fcc9d1df 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 8f16661c3e..8f26a60ae9 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.21", + "@tanstack/react-start": "^1.120.4-alpha.22", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index dd7c9bc967..763921c5de 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.21", + "@tanstack/solid-start": "^1.120.4-alpha.22", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 825c563f8f..745695d575 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.21", + "@tanstack/solid-start": "^1.120.4-alpha.22", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 8443a00c9d..b719e422ae 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.21", + "@tanstack/solid-start": "^1.120.4-alpha.22", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 8dab5c6bb3..8ac51c89ea 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.22", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 33b695de0b..13eab3872b 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.22", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index e6a9e9539c..c46686052a 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.22", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index ab9cd99cd4..ddff8b0bf8 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.22", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", From b339e6721fab6b68dde909ec857686b96283a1ab Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 16 May 2025 11:40:59 +1200 Subject: [PATCH 067/126] fix: resolve custom `client` entry path on windows fs (#4181) --- e2e/react-start/basic/src/client.tsx | 4 ++++ e2e/react-start/basic/src/server.ts | 2 ++ e2e/solid-start/basic/src/client.tsx | 4 ++++ e2e/solid-start/basic/src/server.ts | 2 ++ packages/start-plugin-core/src/plugin.ts | 6 +++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/e2e/react-start/basic/src/client.tsx b/e2e/react-start/basic/src/client.tsx index 7c4afb9d55..5fcd1c5f19 100644 --- a/e2e/react-start/basic/src/client.tsx +++ b/e2e/react-start/basic/src/client.tsx @@ -1,8 +1,12 @@ +// DO NOT DELETE THIS FILE!!! +// This file is a good smoke test to make sure the custom client entry is working import { StrictMode, startTransition } from 'react' import { hydrateRoot } from 'react-dom/client' import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' +console.log("[client-entry]: using custom client entry in 'src/client.tsx'") + const router = createRouter() startTransition(() => { diff --git a/e2e/react-start/basic/src/server.ts b/e2e/react-start/basic/src/server.ts index 159c2558df..77cb4a1316 100644 --- a/e2e/react-start/basic/src/server.ts +++ b/e2e/react-start/basic/src/server.ts @@ -6,6 +6,8 @@ import { } from '@tanstack/react-start/server' import { createRouter } from './router' +console.log("[server-entry]: using custom server entry in 'src/server.ts'") + export default createStartHandler({ createRouter, })(defaultStreamHandler) diff --git a/e2e/solid-start/basic/src/client.tsx b/e2e/solid-start/basic/src/client.tsx index fa83c45012..b2fdcc9505 100644 --- a/e2e/solid-start/basic/src/client.tsx +++ b/e2e/solid-start/basic/src/client.tsx @@ -1,7 +1,11 @@ +// DO NOT DELETE THIS FILE!!! +// This file is a good smoke test to make sure the custom client entry is working import { hydrate } from 'solid-js/web' import { StartClient } from '@tanstack/solid-start' import { createRouter } from './router' +console.log("[client-entry]: using custom client entry in 'src/client.tsx'") + const router = createRouter() hydrate(() => , document.body) diff --git a/e2e/solid-start/basic/src/server.ts b/e2e/solid-start/basic/src/server.ts index c82fab000e..f9fbb3a2d5 100644 --- a/e2e/solid-start/basic/src/server.ts +++ b/e2e/solid-start/basic/src/server.ts @@ -6,6 +6,8 @@ import { } from '@tanstack/solid-start/server' import { createRouter } from './router' +console.log("[server-entry]: using custom server entry in 'src/server.ts'") + export default createStartHandler({ createRouter, })(defaultStreamHandler) diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 65c0848c3d..e5046b0c54 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -1,6 +1,7 @@ import path from 'node:path' import { createNitro } from 'nitropack' import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' +import * as vite from 'vite' import { createTanStackConfig, createTanStackStartOptionsSchema, @@ -66,7 +67,10 @@ export function TanStackStartVitePluginCore( '/~start/default-client-entry', ) ? startConfig.clientEntryPath - : path.resolve(startConfig.root, startConfig.clientEntryPath) + : vite.normalizePath( + path.resolve(startConfig.root, startConfig.clientEntryPath), + ) + return entry } From cb21bb52e0c8ef0d490ab940c7f185e16eda9f03 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 15 May 2025 23:42:22 +0000 Subject: [PATCH 068/126] release: v1.120.4-alpha.23 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 66a8b04e1b..dc7069fbcc 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index dd5bd64aee..8c424f3927 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 96eb1f12c8..e0abb29396 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 6e9238d737..59291ed119 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index f2e5a3a69a..33aad14136 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index a40cbf198a..9b3c04ceea 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 190d0456aa..cb0d1c9124 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index e4bfb94295..0198285924 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index f152ffca74..ab606ffe1d 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index b5bef6b66d..ad637184f9 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 3bd7d4aea7..b6565c5fd5 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index eb5fb410ca..848371ee5c 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index bcc98270d4..0bc9594e04 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index c2b8bdb406..c61537950d 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 3cbe860aed..816f5721e6 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index f0fcc9d1df..4d3ff12457 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 8f26a60ae9..0d943f66c5 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.22", + "@tanstack/react-start": "^1.120.4-alpha.23", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 763921c5de..b744a25bad 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.22", + "@tanstack/solid-start": "^1.120.4-alpha.23", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 745695d575..4808884521 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.22", + "@tanstack/solid-start": "^1.120.4-alpha.23", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index b719e422ae..1a264a61e0 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.22", + "@tanstack/solid-start": "^1.120.4-alpha.23", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 8ac51c89ea..204e46e2ff 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.22", + "version": "1.120.4-alpha.23", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 13eab3872b..9263d1f36e 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.22", + "version": "1.120.4-alpha.23", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index c46686052a..b5b2e2e142 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.22", + "version": "1.120.4-alpha.23", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index ddff8b0bf8..ffb1582cd6 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.22", + "version": "1.120.4-alpha.23", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index b10829d799..f556d34401 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.23", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From f43056085c8f74527853491bba12137a64b62118 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 16 May 2025 22:29:20 +1200 Subject: [PATCH 069/126] feat(start-server-core): resolve relative requests to the same origin (#4183) Adds in the same "interceptor" functionality which `undici` previously fulfilled. --- .../src/createStartHandler.ts | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 6acbf749ae..d6f6892a4e 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -53,7 +53,47 @@ export function createStartHandler({ createRouter: () => TRouter }): CustomizeStartHandler { return (cb) => { - return requestHandler(async ({ request }) => { + const originalFetch = globalThis.fetch + + const startRequestResolver: RequestHandler = async ({ request }) => { + // Patching fetch function to use our request resolver + // if the input starts with `/` which is a common pattern for + // client-side routing. + // When we encounter similar requests, we can assume that the + // user wants to use the same origin as the current request. + globalThis.fetch = async function (input, init) { + function resolve(url: URL, requestOptions: RequestInit | undefined) { + const fetchRequest = new Request(url, requestOptions) + return startRequestResolver({ request: fetchRequest }) + } + + function getOrigin() { + return ( + request.headers.get('Origin') || + request.headers.get('Referer') || + 'http://localhost' + ) + } + + if (typeof input === 'string' && input.startsWith('/')) { + // e.g: fetch('/api/data') + const url = new URL(input, getOrigin()) + return resolve(url, init) + } else if ( + typeof input === 'object' && + 'url' in input && + typeof input.url === 'string' && + input.url.startsWith('/') + ) { + // e.g: fetch(new Request('/api/data')) + const url = new URL(input.url, getOrigin()) + return resolve(url, init) + } + + // If not, it should just use the original fetch + return originalFetch(input, init) + } + const url = new URL(request.url) const href = url.href.replace(url.origin, '') @@ -222,7 +262,9 @@ export function createStartHandler({ } return response - }) + } + + return requestHandler(startRequestResolver) } } From 7a6cbeeec811f3522e805572527f6f148d76fd2c Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 16 May 2025 10:30:30 +0000 Subject: [PATCH 070/126] release: v1.120.4-alpha.24 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-server-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index dc7069fbcc..deb684c083 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 8c424f3927..2929156f0c 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index e0abb29396..63b27b01c4 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 59291ed119..fddb91ebda 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 33aad14136..4c5d221db3 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 9b3c04ceea..2409073b56 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index cb0d1c9124..5b45016e10 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 0198285924..4ca2193dd7 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index ab606ffe1d..9aa708d17d 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index ad637184f9..91bbf6dd3c 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index b6565c5fd5..ba2addaab9 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 848371ee5c..cb2fb932cf 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 0bc9594e04..26c74e5217 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index c61537950d..6cb02dba1e 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 816f5721e6..c2e44075a3 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 4d3ff12457..6238392d9b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 0d943f66c5..cf36e5ac7e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.23", + "@tanstack/react-start": "^1.120.4-alpha.24", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index b744a25bad..e547dd0218 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.23", + "@tanstack/solid-start": "^1.120.4-alpha.24", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 4808884521..b39edc318d 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.23", + "@tanstack/solid-start": "^1.120.4-alpha.24", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 1a264a61e0..1a0736852a 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.23", + "@tanstack/solid-start": "^1.120.4-alpha.24", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 84e522ef2f..f441b6b7b4 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.24", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 9263d1f36e..0f3c883df6 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.23", + "version": "1.120.4-alpha.24", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index a1aa08e4f4..cee4c2263c 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.24", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index ffb1582cd6..45e4102d25 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.23", + "version": "1.120.4-alpha.24", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 50f6082313..9063d29633 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.21", + "version": "1.120.4-alpha.24", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 9e0d2d6d817b0a39e40cc10fffeabf0dd1e7db15 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sat, 17 May 2025 00:52:04 +1200 Subject: [PATCH 071/126] fix(start-plugin-core): enable pre-rendering with just `pages` (#4185) Pre-rendering should be enabled, if any of the `config.pages` specify that it should be (i.e `config.pages = [{ path: '/posts', prerender: { enabled: true } }]`. However, if the user has explicitly set `config.prerender.enabled = false`, then even `config.pages` will NOT override the global `config.prerender.enabled` setting. --- .../start-plugin-core/src/nitro/nitro-plugin.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index f331073eda..00066af162 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -89,6 +89,18 @@ export function nitroPlugin( await buildNitroEnvironment(nitro, () => build(nitro)) + // If the user has not set a prerender option, we need to set it to true + // if the pages array is not empty and has sub options requiring for prerendering + if (options.prerender?.enabled !== false) { + options.prerender = { + ...options.prerender, + enabled: options.pages.some((d) => + typeof d === 'string' ? false : !!d.prerender?.enabled, + ), + } + } + + // Setup the options for prerendering the SPA shell (i.e `src/routes/__root.tsx`) if (options.spa?.enabled) { options.prerender = { ...options.prerender, @@ -111,7 +123,8 @@ export function nitroPlugin( }) } - if (options.prerender?.enabled) { + // Start prerendering!!! + if (options.prerender.enabled) { await prerender({ options, nitro, From fda41798f8ed585209d26263139744e02da5b100 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 16 May 2025 12:53:27 +0000 Subject: [PATCH 072/126] release: v1.120.4-alpha.25 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index deb684c083..453ef2d729 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 2929156f0c..3686b11097 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 63b27b01c4..8d759e96ab 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index fddb91ebda..04514a009e 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 4c5d221db3..870aa9d5f4 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 2409073b56..aa4cb1f2a3 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 5b45016e10..1b4d92ac5d 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 4ca2193dd7..7295431bdd 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 9aa708d17d..4094de3148 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 91bbf6dd3c..8096afc54f 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index ba2addaab9..a0f557530f 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index cb2fb932cf..129078ebe0 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 26c74e5217..f130e4bb77 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 6cb02dba1e..e44f6e9487 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-with-query": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index c2e44075a3..db87b13e85 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 6238392d9b..d8bf6e9e70 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index cf36e5ac7e..0255ed3531 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.120.4-alpha.19", "@tanstack/react-router-devtools": "^1.120.4-alpha.19", "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.24", + "@tanstack/react-start": "^1.120.4-alpha.25", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index e547dd0218..4ce09c6ed4 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.24", + "@tanstack/solid-start": "^1.120.4-alpha.25", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index b39edc318d..b0e7d87b32 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.24", + "@tanstack/solid-start": "^1.120.4-alpha.25", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 1a0736852a..e3276c5027 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.120.4-alpha.19", "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.24", + "@tanstack/solid-start": "^1.120.4-alpha.25", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 204e46e2ff..0979d12156 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.23", + "version": "1.120.4-alpha.25", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 0f3c883df6..419ec98c98 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.24", + "version": "1.120.4-alpha.25", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index b5b2e2e142..650978ddbe 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.23", + "version": "1.120.4-alpha.25", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 45e4102d25..a7b2ee1542 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.24", + "version": "1.120.4-alpha.25", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f556d34401..2c775adb2d 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.23", + "version": "1.120.4-alpha.25", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 15b8ed6af384f6748c6a1179c8ad933adaccb4d4 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Fri, 16 May 2025 19:51:24 +0200 Subject: [PATCH 073/126] chore: various fixes (#4187) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .gitignore | 7 +- .../routing/installation-with-esbuild.md | 10 +- .../react/routing/installation-with-rspack.md | 8 +- .../routing/installation-with-webpack.md | 10 +- .../framework/react/build-from-scratch.md | 9 +- docs/start/framework/react/hosting.md | 36 +- .../start/framework/react/learn-the-basics.md | 3 +- docs/start/framework/react/server-routes.md | 1 - docs/start/framework/react/ssr.md | 30 - .../framework/solid/build-from-scratch.md | 26 +- .../start/framework/solid/learn-the-basics.md | 29 +- docs/start/framework/solid/ssr.md | 4 - .../src/esbuild.config.js | 4 +- .../rspack-basic-file-based/rsbuild.config.ts | 4 +- .../rsbuild.config.ts | 4 +- .../src/esbuild.config.js | 4 +- .../rspack-basic-file-based/rsbuild.config.ts | 6 +- .../rsbuild.config.ts | 4 +- .../esbuild.config.js | 6 +- .../rsbuild.config.ts | 6 +- .../webpack.config.js | 4 +- .../react/start-material-ui/src/client.tsx | 7 - examples/react/start-workos/src/client.tsx | 7 - packages/react-start-plugin/package.json | 1 - packages/react-start-plugin/src/index.ts | 17 +- packages/router-generator/src/utils.ts | 19 +- .../src/core/code-splitter/compilers.ts | 543 ++++++++---------- .../src/core/route-autoimport-plugin.ts | 2 +- .../src/core/router-composed-plugin.ts | 4 +- packages/router-plugin/src/esbuild.ts | 5 +- packages/router-plugin/src/rspack.ts | 5 +- packages/router-plugin/src/webpack.ts | 4 +- packages/solid-start-plugin/package.json | 1 - packages/solid-start-plugin/src/index.ts | 17 +- packages/start-plugin-core/package.json | 1 + packages/start-plugin-core/src/index.ts | 8 - packages/start-plugin-core/src/plugin.ts | 13 + pnpm-lock.yaml | 9 +- 38 files changed, 380 insertions(+), 498 deletions(-) delete mode 100644 docs/start/framework/react/ssr.md delete mode 100644 docs/start/framework/solid/ssr.md delete mode 100644 examples/react/start-material-ui/src/client.tsx delete mode 100644 examples/react/start-workos/src/client.tsx diff --git a/.gitignore b/.gitignore index d2b926625e..1db161db9d 100644 --- a/.gitignore +++ b/.gitignore @@ -60,19 +60,14 @@ nx-cloud.env gpt/db.json -app.config.timestamp-* vite.config.timestamp-* vite.config.js.timestamp-* vite.config.ts.timestamp-* -app.config.js.timestamp-* -app.config.ts.timestamp-* -app.config.timestamp_* vite.config.timestamp_* vite.config.js.timestamp_* vite.config.ts.timestamp_* -app.config.js.timestamp_* -app.config.ts.timestamp_* + .idea *.vitest-temp.json diff --git a/docs/router/framework/react/routing/installation-with-esbuild.md b/docs/router/framework/react/routing/installation-with-esbuild.md index 262213f386..da3cd9f857 100644 --- a/docs/router/framework/react/routing/installation-with-esbuild.md +++ b/docs/router/framework/react/routing/installation-with-esbuild.md @@ -14,12 +14,16 @@ Once installed, you'll need to add the plugin to your configuration. ```tsx // esbuild.config.js -import { TanStackRouterEsbuild } from '@tanstack/router-plugin/esbuild' +import { tanstackRouter } from '@tanstack/router-plugin/esbuild' export default { // ... plugins: [ - TanStackRouterEsbuild({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), ], } ``` @@ -74,6 +78,6 @@ When using the TanStack Router Plugin with Esbuild for File-based routing, it co } ``` -If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `TanStackRouterEsbuild` function. +If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-rspack.md b/docs/router/framework/react/routing/installation-with-rspack.md index 820254384d..741978192e 100644 --- a/docs/router/framework/react/routing/installation-with-rspack.md +++ b/docs/router/framework/react/routing/installation-with-rspack.md @@ -16,14 +16,18 @@ Once installed, you'll need to add the plugin to your configuration. // rsbuild.config.ts import { defineConfig } from '@rsbuild/core' import { pluginReact } from '@rsbuild/plugin-react' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' export default defineConfig({ plugins: [pluginReact()], tools: { rspack: { plugins: [ - TanStackRouterRspack({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), ], }, }, diff --git a/docs/router/framework/react/routing/installation-with-webpack.md b/docs/router/framework/react/routing/installation-with-webpack.md index f98a9a1cd2..e89288e2e0 100644 --- a/docs/router/framework/react/routing/installation-with-webpack.md +++ b/docs/router/framework/react/routing/installation-with-webpack.md @@ -14,11 +14,15 @@ Once installed, you'll need to add the plugin to your configuration. ```tsx // webpack.config.ts -import { TanStackRouterWebpack } from '@tanstack/router-plugin/webpack' +import { tanstackRouter } from '@tanstack/router-plugin/webpack' export default { plugins: [ - TanStackRouterWebpack({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ + target: 'react', + autoCodeSplitting: true, + verboseFileRoutes: false, + }), ], } ``` @@ -73,6 +77,6 @@ When using the TanStack Router Plugin with Webpack for File-based routing, it co } ``` -If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `TanStackRouterWebpack` function. +If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). diff --git a/docs/start/framework/react/build-from-scratch.md b/docs/start/framework/react/build-from-scratch.md index 401d82ed8f..6143199b6c 100644 --- a/docs/start/framework/react/build-from-scratch.md +++ b/docs/start/framework/react/build-from-scratch.md @@ -55,7 +55,7 @@ To install them, run: npm i @tanstack/react-start @tanstack/react-router vite ``` -You'll also need React:: +You'll also need React: ```shell npm i react react-dom @@ -69,7 +69,7 @@ npm i -D typescript @types/react @types/react-dom vite-tsconfig-paths ## Update Configuration Files -We'll then update our `package.json` to set `"type": "module"`: +We'll then update our `package.json` to use Vite's CLI and set `"type": "module"`: ```json { @@ -77,13 +77,12 @@ We'll then update our `package.json` to set `"type": "module"`: "type": "module", "scripts": { "dev": "vite dev", - "build": "vite build", - "start": "vite start" + "build": "vite build" } } ``` -Then configure TanStack Start's `vite.config.ts` file: +Then configure TanStack Start's Vite plugin in `vite.config.ts`: ```ts // vite.config.ts diff --git a/docs/start/framework/react/hosting.md b/docs/start/framework/react/hosting.md index 5082039f48..85d3185d0a 100644 --- a/docs/start/framework/react/hosting.md +++ b/docs/start/framework/react/hosting.md @@ -31,7 +31,7 @@ Netlify is a leading hosting platform that provides a fast, secure, and reliable > [!WARNING] > The page is still a work in progress. We'll keep updating this page with guides on deployment to different hosting providers soon! -When a TanStack Start application is being deployed, the `server.preset` value in the `app.config.ts` file determines the deployment target. The deployment target can be set to one of the following values: +When a TanStack Start application is being deployed, the `target` value in the TanStack Start Vite plugin in the`vite.config.ts` file determines the deployment target. The deployment target can be set to one of the following values: - [`netlify`](#netlify): Deploy to Netlify - [`vercel`](#vercel): Deploy to Vercel @@ -44,48 +44,34 @@ Once you've chosen a deployment target, you can follow the deployment guidelines ### Netlify -Set the `server.preset` value to `netlify` in your `app.config.ts` file. +Set the `target` value to `'netlify'` in the TanStack Start Vite plugin in `vite.config.ts` file. ```ts -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' +// vite.config.ts +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' export default defineConfig({ - server: { - preset: 'netlify', - }, + plugins: [tanstackStart({ target: 'netlify' })], }) ``` -Or you can use the `--preset` flag with the `build` command to specify the deployment target when building the application: - -```sh -npm run build --preset netlify -``` - Deploy your application to Netlify using their one-click deployment process, and you're ready to go! ### Vercel -Deploying your TanStack Start application to Vercel is easy and straightforward. Just set the `server.preset` value to `vercel` in your `app.config.ts` file, and you're ready to deploy your application to Vercel. +Set the `target` value to `'vercel'` in the TanStack Start Vite plugin in `vite.config.ts` file. ```ts -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' +// vite.config.ts +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import { defineConfig } from 'vite' export default defineConfig({ - server: { - preset: 'vercel', - }, + plugins: [tanstackStart({ target: 'vercel' })], }) ``` -Or you can use the `--preset` flag with the `build` command to specify the deployment target when building the application: - -```sh -npm run build --preset vercel -``` - Deploy your application to Vercel using their one-click deployment process, and you're ready to go! ### Cloudflare Pages diff --git a/docs/start/framework/react/learn-the-basics.md b/docs/start/framework/react/learn-the-basics.md index 3f67d2e3dc..a3da690428 100644 --- a/docs/start/framework/react/learn-the-basics.md +++ b/docs/start/framework/react/learn-the-basics.md @@ -64,10 +64,9 @@ export default createStartHandler({ })(defaultStreamHandler) ``` -Whether we are statically generating our app or serving it dynamically, the `server.tsx` file is the entry point for doing all SSR-related work. +Whether we are statically generating our app or serving it dynamically, the `server.ts` file is the entry point for doing all SSR-related work. - It's important that a new router is created for each request. This ensures that any data handled by the router is unique to the request. -- The `getRouterManifest` function is used to generate the router manifest, which is used to determine many aspects of asset management and preloading for our application. - The `defaultStreamHandler` function is used to render our application to a stream, allowing us to take advantage of streaming HTML to the client. (This is the default handler, but you can also use other handlers like `defaultRenderHandler`, or even build your own) ## The Client Entry Point (Optional) diff --git a/docs/start/framework/react/server-routes.md b/docs/start/framework/react/server-routes.md index 0dfbf0b147..9b905a1802 100644 --- a/docs/start/framework/react/server-routes.md +++ b/docs/start/framework/react/server-routes.md @@ -124,7 +124,6 @@ import { createStartHandler } from '@tanstack/react-start/server' export default defineHandler((event) => { const startHandler = createStartHandler({ createRouter, - getRouterManifest, })(defaultStreamHandler) return startHandler(event) diff --git a/docs/start/framework/react/ssr.md b/docs/start/framework/react/ssr.md deleted file mode 100644 index 1ccf937573..0000000000 --- a/docs/start/framework/react/ssr.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -id: ssr -title: SSR ---- - -Server-side rendering (SSR) is the process of rendering your application on the server and sending or streaming the rendered HTML to the client. This can be useful for both improving the performance of your application and improving SEO, as it allows users to see the content of your application faster and allows search engines to crawl your application more easily. - -## SSR Basics - -TanStack Start supports server-side rendering out of the box. To enable server-side rendering, create an `src/server.ts` file in your project: - -```tsx -// src/server.ts -import { - createStartHandler, - defaultStreamHandler, -} from '@tanstack/react-start/server' -import { createRouter } from './router' - -export default createStartHandler({ - createRouter, -})(defaultStreamHandler) -``` - -This file exports a function that creates a server-side rendering handler. The handler is created using the `createStartHandler` function from `@tanstack/react-start/server`, which takes an object with the following properties: - -- `createRouter`: A function that creates a router for your application. This function should return a new router instance each time it is called. -- `getRouterManifest`: A function that returns a manifest of all the routes in your application. - -The handler is then called with the `defaultStreamHandler` function from `@tanstack/react-start/server`, which is a function that streams the response to the client. diff --git a/docs/start/framework/solid/build-from-scratch.md b/docs/start/framework/solid/build-from-scratch.md index c6b95b9e96..4549c6f0ba 100644 --- a/docs/start/framework/solid/build-from-scratch.md +++ b/docs/start/framework/solid/build-from-scratch.md @@ -48,11 +48,7 @@ We highly recommend using TypeScript with TanStack Start. Create a `tsconfig.jso ## Install Dependencies -TanStack Start is powered by: - -- [**TanStack Router**](https://tanstack.com/router) - A router for building web applications. -- [**Vite**](https://vite.dev/) - A build tool for building web applications. -- [**Nitro**](https://nitro.unjs.io/) - A framework for building server applications. +TanStack Start is powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router) and requires them as dependencies. To install them, run: @@ -82,8 +78,7 @@ We'll then update our `package.json` to use Vite's CLI and set `"type": "module" "type": "module", "scripts": { "dev": "vite dev", - "build": "vite build", - "start": "vite start" + "build": "vite build" } } ``` @@ -106,25 +101,22 @@ export default defineConfig({ ## Add the Basic Templating -There are four required files for TanStack Start usage: +There are 2 required files for TanStack Start usage: 1. The router configuration -2. The server entry point -3. The client entry point -4. The root of your application +2. The root of your application Once configuration is done, we'll have a file tree that looks like the following: ``` . -├── app/ +├── src/ │ ├── routes/ │ │ └── `__root.tsx` -│ ├── `client.tsx` │ ├── `router.tsx` │ ├── `routeTree.gen.ts` ├── `.gitignore` -├── `app.config.ts` +├── `vite.config.ts` ├── `package.json` └── `tsconfig.json` ``` @@ -138,7 +130,7 @@ from the default [preloading functionality](/router/latest/docs/framework/solid/ > You won't have a `routeTree.gen.ts` file yet. This file will be generated when you run TanStack Start for the first time. ```tsx -// app/router.tsx +// src/router.tsx import { createRouter as createTanStackRouter } from '@tanstack/solid-router' import { routeTree } from './routeTree.gen' @@ -166,7 +158,7 @@ declare module '@tanstack/solid-router' { Finally, we need to create the root of our application. This is the entry point for all other routes. The code in this file will wrap all other routes in the application. ```tsx -// app/routes/__root.tsx +// src/routes/__root.tsx import { Outlet, createRootRoute, @@ -202,7 +194,7 @@ function RootComponent() { Now that we have the basic templating setup, we can write our first route. This is done by creating a new file in the `app/routes` directory. ```tsx -// app/routes/index.tsx +// src/routes/index.tsx import * as fs from 'node:fs' import { useRouter } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' diff --git a/docs/start/framework/solid/learn-the-basics.md b/docs/start/framework/solid/learn-the-basics.md index 4634dd54f7..a7a7d2c545 100644 --- a/docs/start/framework/solid/learn-the-basics.md +++ b/docs/start/framework/solid/learn-the-basics.md @@ -7,11 +7,10 @@ This guide will help you learn the basics behind how TanStack Start works, regar ## Dependencies -TanStack Start is powered by: +TanStack Start is powered by [Vite](https://vite.dev/) and [TanStack Router](https://tanstack.com/router). -- [**TanStack Router**](https://tanstack.com/router): A router for building web applications. -- [**Vite**](https://vite.dev/): A build tool for building web applications. -- [**Nitro**](https://nitro.unjs.io/): A framework for building server applications. +- **TanStack Router**: A router for building web applications. +- **Vite**: A build tool for bundling your application. ## It all "Starts" with the Router @@ -45,18 +44,20 @@ declare module '@tanstack/solid-router' { The `routeTree.gen.ts` file is generated when you run TanStack Start (via `npm run dev` or `npm run start`) for the first time. This file contains the generated route tree and a handful of TS utilities that make TanStack Start fully type-safe. -## The Server Entry Point +## The Server Entry Point (Optional) -Although TanStack Start is designed with client-first APIs, it is by and large, a full-stack framework. This means that all use cases, including both dynamic and static rely on a server or build-time entry to render our application's initial HTML payload. +> [!NOTE] +> The server entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the server entry point for you using the below as a default. -This is done via the `app/ssr.ts` file: +This is done via the `src/server.ts` file: ```tsx -// app/ssr.ts +// src/server.ts import { createStartHandler, defaultStreamHandler, -} from '@tanstack/react-start/server' +} from '@tanstack/solid-start/server' + import { createRouter } from './router' export default createStartHandler({ @@ -64,13 +65,15 @@ export default createStartHandler({ })(defaultStreamHandler) ``` -Whether we are statically generating our app or serving it dynamically, the `ssr.tsx` file is the entry point for doing all SSR-related work. +Whether we are statically generating our app or serving it dynamically, the `server.ts` file is the entry point for doing all SSR-related work. - It's important that a new router is created for each request. This ensures that any data handled by the router is unique to the request. -- The `getRouterManifest` function is used to generate the router manifest, which is used to determine many aspects of asset management and preloading for our application. - The `defaultStreamHandler` function is used to render our application to a stream, allowing us to take advantage of streaming HTML to the client. (This is the default handler, but you can also use other handlers like `defaultRenderHandler`, or even build your own) -## The Client Entry Point +## The Client Entry Point (Optional) + +> [!NOTE] +> The client entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the client entry point for you using the below as a default. Getting our html to the client is only half the battle. Once there, we need to hydrate our client-side JavaScript once the route resolves to the client. We do this by hydrating the root of our application with the `StartClient` component: @@ -89,7 +92,7 @@ This enables us to kick off client-side routing once the user's initial server r ## The Root of Your Application -Other than the client entry point, the `__root` route of your application is the entry point for your application. The code in this file will wrap all other routes in the app, including your home page. It behaves like a pathless layout route for your whole application. +Other than the client entry point (which is optional by default), the `__root` route of your application is the entry point for your application. The code in this file will wrap all other routes in the app, including your home page. It behaves like a pathless layout route for your whole application. Because it is **always rendered**, it is the perfect place to construct your application shell and take care of any global logic. diff --git a/docs/start/framework/solid/ssr.md b/docs/start/framework/solid/ssr.md deleted file mode 100644 index c99a3d9280..0000000000 --- a/docs/start/framework/solid/ssr.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -ref: docs/start/framework/react/ssr.md -replace: { 'react': 'solid' } ---- diff --git a/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js index 9deed8a53d..5f0f4fce03 100644 --- a/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/react-router/basic-esbuild-file-based/src/esbuild.config.js @@ -1,9 +1,9 @@ -import { TanStackRouterEsbuild } from '@tanstack/router-plugin/esbuild' +import { tanstackRouter } from '@tanstack/router-plugin/esbuild' export default { // ... plugins: [ - TanStackRouterEsbuild({ + tanstackRouter({ autoCodeSplitting: true, }), ], diff --git a/e2e/react-router/rspack-basic-file-based/rsbuild.config.ts b/e2e/react-router/rspack-basic-file-based/rsbuild.config.ts index 0bdde399a7..f52856821e 100644 --- a/e2e/react-router/rspack-basic-file-based/rsbuild.config.ts +++ b/e2e/react-router/rspack-basic-file-based/rsbuild.config.ts @@ -1,13 +1,13 @@ import { defineConfig } from '@rsbuild/core' import { pluginReact } from '@rsbuild/plugin-react' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' export default defineConfig({ plugins: [pluginReact()], tools: { rspack: { plugins: [ - TanStackRouterRspack({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, }), diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts index 7cff654e20..61be0d3631 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts @@ -1,13 +1,13 @@ import { defineConfig } from '@rsbuild/core' import { pluginReact } from '@rsbuild/plugin-react' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' export default defineConfig({ plugins: [pluginReact()], tools: { rspack: { plugins: [ - TanStackRouterRspack({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, virtualRouteConfig: './routes.ts', diff --git a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js index a361b1d4f1..2d6ea80c1b 100644 --- a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js @@ -1,10 +1,10 @@ -import { TanStackRouterEsbuild } from '@tanstack/router-plugin/esbuild' +import { tanstackRouter } from '@tanstack/router-plugin/esbuild' import { solidPlugin } from 'esbuild-plugin-solid' export default { // ... plugins: [ - TanStackRouterEsbuild({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, }), diff --git a/e2e/solid-router/rspack-basic-file-based/rsbuild.config.ts b/e2e/solid-router/rspack-basic-file-based/rsbuild.config.ts index 19909e9d77..27be8f1dfa 100644 --- a/e2e/solid-router/rspack-basic-file-based/rsbuild.config.ts +++ b/e2e/solid-router/rspack-basic-file-based/rsbuild.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from '@rsbuild/core' import { pluginSolid } from '@rsbuild/plugin-solid' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' import { pluginBabel } from '@rsbuild/plugin-babel' export default defineConfig({ @@ -12,9 +12,7 @@ export default defineConfig({ ], tools: { rspack: { - plugins: [ - TanStackRouterRspack({ target: 'solid', autoCodeSplitting: true }), - ], + plugins: [tanstackRouter({ target: 'solid', autoCodeSplitting: true })], }, }, }) diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts index f7b2c574f6..956d9edb08 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from '@rsbuild/core' import { pluginSolid } from '@rsbuild/plugin-solid' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' import { pluginBabel } from '@rsbuild/plugin-babel' export default defineConfig({ @@ -13,7 +13,7 @@ export default defineConfig({ tools: { rspack: { plugins: [ - TanStackRouterRspack({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, virtualRouteConfig: './routes.ts', diff --git a/examples/react/quickstart-esbuild-file-based/esbuild.config.js b/examples/react/quickstart-esbuild-file-based/esbuild.config.js index 7edf067879..fb7950d1fa 100644 --- a/examples/react/quickstart-esbuild-file-based/esbuild.config.js +++ b/examples/react/quickstart-esbuild-file-based/esbuild.config.js @@ -1,4 +1,4 @@ -import { TanStackRouterEsbuild } from '@tanstack/router-plugin/esbuild' +import { tanstackRouter } from '@tanstack/router-plugin/esbuild' export default { jsx: 'transform', @@ -7,7 +7,5 @@ export default { bundle: true, format: 'esm', target: ['esnext'], - plugins: [ - TanStackRouterEsbuild({ target: 'react', autoCodeSplitting: true }), - ], + plugins: [tanstackRouter({ target: 'react', autoCodeSplitting: true })], } diff --git a/examples/react/quickstart-rspack-file-based/rsbuild.config.ts b/examples/react/quickstart-rspack-file-based/rsbuild.config.ts index f9df4a1f45..faeba3dd9d 100644 --- a/examples/react/quickstart-rspack-file-based/rsbuild.config.ts +++ b/examples/react/quickstart-rspack-file-based/rsbuild.config.ts @@ -1,14 +1,12 @@ import { defineConfig } from '@rsbuild/core' import { pluginReact } from '@rsbuild/plugin-react' -import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack' +import { tanstackRouter } from '@tanstack/router-plugin/rspack' export default defineConfig({ plugins: [pluginReact()], tools: { rspack: { - plugins: [ - TanStackRouterRspack({ target: 'react', autoCodeSplitting: true }), - ], + plugins: [tanstackRouter({ target: 'react', autoCodeSplitting: true })], }, }, }) diff --git a/examples/react/quickstart-webpack-file-based/webpack.config.js b/examples/react/quickstart-webpack-file-based/webpack.config.js index 3ffe6281bd..d83e2bea10 100644 --- a/examples/react/quickstart-webpack-file-based/webpack.config.js +++ b/examples/react/quickstart-webpack-file-based/webpack.config.js @@ -1,7 +1,7 @@ import path from 'path' import { fileURLToPath } from 'url' import HtmlWebpackPlugin from 'html-webpack-plugin' -import { TanStackRouterWebpack } from '@tanstack/router-plugin/webpack' +import { tanstackRouter } from '@tanstack/router-plugin/webpack' const __dirname = fileURLToPath(new URL('.', import.meta.url)) @@ -23,7 +23,7 @@ export default ({ WEBPACK_SERVE }) => ({ template: path.resolve(__dirname, './public/index.html'), filename: 'index.html', }), - TanStackRouterWebpack({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), ], module: { rules: [ diff --git a/examples/react/start-material-ui/src/client.tsx b/examples/react/start-material-ui/src/client.tsx deleted file mode 100644 index c5fbaa3c67..0000000000 --- a/examples/react/start-material-ui/src/client.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from './router' - -const router = createRouter() - -hydrateRoot(document, ) diff --git a/examples/react/start-workos/src/client.tsx b/examples/react/start-workos/src/client.tsx deleted file mode 100644 index 253f9bc7ea..0000000000 --- a/examples/react/start-workos/src/client.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { StartClient } from '@tanstack/react-start'; -import { hydrateRoot } from 'react-dom/client'; -import { createRouter } from './router'; - -const router = createRouter(); - -hydrateRoot(document, ); diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 0979d12156..1da1e091d8 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -65,7 +65,6 @@ "node": ">=12" }, "dependencies": { - "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", "zod": "^3.24.2" diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index f27f0aadc4..83c3857ac3 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -1,10 +1,6 @@ import path from 'node:path' -import { tanstackRouter } from '@tanstack/router-plugin/vite' import viteReact from '@vitejs/plugin-react' -import { - TanStackStartServerRoutesVite, - TanStackStartVitePluginCore, -} from '@tanstack/start-plugin-core' +import { TanStackStartVitePluginCore } from '@tanstack/start-plugin-core' import * as vite from 'vite' import { getTanStackStartOptions } from './schema' import type { TanStackStartInputConfig, WithReactPlugin } from './schema' @@ -26,13 +22,6 @@ export function TanStackStartVitePlugin( let resolvedConfig: ResolvedConfig return [ - tanstackRouter({ - verboseFileRoutes: false, - ...options.tsr, - target: 'react', - enableRouteGeneration: true, - autoCodeSplitting: true, - }), TanStackStartVitePluginCore({ framework: 'react' }, options), { name: 'tanstack-react-start:resolve-entries', @@ -114,10 +103,6 @@ export default createStartHandler({ return null }, }, - TanStackStartServerRoutesVite({ - ...options.tsr, - target: 'react', - }), viteReact(options.react), ] } diff --git a/packages/router-generator/src/utils.ts b/packages/router-generator/src/utils.ts index 0280e9186e..76b7fc4a6c 100644 --- a/packages/router-generator/src/utils.ts +++ b/packages/router-generator/src/utils.ts @@ -1,4 +1,4 @@ -import * as fs from 'node:fs' +import * as fsp from 'node:fs/promises' import * as prettier from 'prettier' export function multiSortBy( @@ -212,7 +212,7 @@ export async function writeIfDifferent( ): Promise { if (content !== incomingContent) { callbacks?.beforeWrite?.() - fs.writeFileSync(filepath, incomingContent) + await fsp.writeFile(filepath, incomingContent) callbacks?.afterWrite?.() return true } @@ -253,3 +253,18 @@ export function resetRegex(regex: RegExp) { regex.lastIndex = 0 return } + +/** + * This function checks if a file exists. + * + * @param file The path to the file + * @returns Whether the file exists + */ +export async function checkFileExists(file: string) { + try { + await fsp.access(file, fsp.constants.F_OK) + return true + } catch { + return false + } +} diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 7b4aeb7f38..71243f30a1 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -14,27 +14,6 @@ import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils' import type { CodeSplitGroupings, SplitRouteIdentNodes } from '../constants' import type { Config } from '../config' -// eslint-disable-next-line unused-imports/no-unused-vars -const debug = process.env.TSR_VITE_DEBUG - -type SplitModulesById = Record< - string, - { id: string; node: t.FunctionExpression } -> - -interface State { - filename: string - opts: { - minify: boolean - root: string - } - imported: Record - refs: Set - serverIndex: number - splitIndex: number - splitModulesById: SplitModulesById -} - type SplitNodeMeta = { routeIdent: SplitRouteIdentNodes splitStrategy: 'lazyFn' | 'lazyRouteComponent' @@ -139,9 +118,7 @@ export function compileCodeSplitReferenceRoute( babel.traverse(ast, { Program: { - enter(programPath, programState) { - const state = programState as unknown as State - + enter(programPath) { /** * If the component for the route is being imported from * another file, this is to track the path to that file @@ -153,236 +130,228 @@ export function compileCodeSplitReferenceRoute( */ const removableImportPaths = new Set([]) - programPath.traverse( - { - CallExpression: (path) => { - if (!t.isIdentifier(path.node.callee)) { - return - } - - if ( - !( - path.node.callee.name === 'createRoute' || - path.node.callee.name === 'createFileRoute' - ) - ) { - return - } + programPath.traverse({ + CallExpression: (path) => { + if (!t.isIdentifier(path.node.callee)) { + return + } - function babelHandleReference(routeOptions: t.Node | undefined) { - const hasImportedOrDefinedIdentifier = (name: string) => { - return programPath.scope.hasBinding(name) - } + if ( + !( + path.node.callee.name === 'createRoute' || + path.node.callee.name === 'createFileRoute' + ) + ) { + return + } - if (t.isObjectExpression(routeOptions)) { - routeOptions.properties.forEach((prop) => { - if (t.isObjectProperty(prop)) { - if (t.isIdentifier(prop.key)) { - // If the user has not specified a split grouping for this key - // then we should not split it - const codeSplitGroupingByKey = findIndexForSplitNode( - prop.key.name, - ) - if (codeSplitGroupingByKey === -1) { - return - } - const codeSplitGroup = [ - ...new Set( - opts.codeSplitGroupings[codeSplitGroupingByKey], - ), - ] - - const key = prop.key.name - // find key in nodeSplitConfig - const isNodeConfigAvailable = SPLIT_NODES_CONFIG.has( - key as any, - ) - - if (!isNodeConfigAvailable) { - return - } + function babelHandleReference(routeOptions: t.Node | undefined) { + const hasImportedOrDefinedIdentifier = (name: string) => { + return programPath.scope.hasBinding(name) + } - const splitNodeMeta = SPLIT_NODES_CONFIG.get( - key as any, - )! + if (t.isObjectExpression(routeOptions)) { + routeOptions.properties.forEach((prop) => { + if (t.isObjectProperty(prop)) { + if (t.isIdentifier(prop.key)) { + // If the user has not specified a split grouping for this key + // then we should not split it + const codeSplitGroupingByKey = findIndexForSplitNode( + prop.key.name, + ) + if (codeSplitGroupingByKey === -1) { + return + } + const codeSplitGroup = [ + ...new Set( + opts.codeSplitGroupings[codeSplitGroupingByKey], + ), + ] + + const key = prop.key.name + // find key in nodeSplitConfig + const isNodeConfigAvailable = SPLIT_NODES_CONFIG.has( + key as any, + ) + + if (!isNodeConfigAvailable) { + return + } - // We need to extract the existing search params from the filename, if any - // and add the relevant codesplitPrefix to them, then write them back to the filename - const splitUrl = addSplitSearchParamToFilename( - opts.filename, - codeSplitGroup, - ) + const splitNodeMeta = SPLIT_NODES_CONFIG.get(key as any)! - if ( - splitNodeMeta.splitStrategy === 'lazyRouteComponent' - ) { - const value = prop.value - - let shouldSplit = true - - if (t.isIdentifier(value)) { - const existingImportPath = - getImportSpecifierAndPathFromLocalName( - programPath, - value.name, - ).path - if (existingImportPath) { - removableImportPaths.add(existingImportPath) - } + // We need to extract the existing search params from the filename, if any + // and add the relevant codesplitPrefix to them, then write them back to the filename + const splitUrl = addSplitSearchParamToFilename( + opts.filename, + codeSplitGroup, + ) - // exported identifiers should not be split - // since they are already being imported - // and need to be retained in the compiled file - const isExported = hasExport(ast, value) - shouldSplit = !isExported + if ( + splitNodeMeta.splitStrategy === 'lazyRouteComponent' + ) { + const value = prop.value - if (shouldSplit) { - removeIdentifierLiteral(path, value) - } - } + let shouldSplit = true - if (!shouldSplit) { - return + if (t.isIdentifier(value)) { + const existingImportPath = + getImportSpecifierAndPathFromLocalName( + programPath, + value.name, + ).path + if (existingImportPath) { + removableImportPaths.add(existingImportPath) } - // Prepend the import statement to the program along with the importer function - // Check to see if lazyRouteComponent is already imported before attempting - // to import it again + // exported identifiers should not be split + // since they are already being imported + // and need to be retained in the compiled file + const isExported = hasExport(ast, value) + shouldSplit = !isExported - if ( - !hasImportedOrDefinedIdentifier( - LAZY_ROUTE_COMPONENT_IDENT, - ) - ) { - programPath.unshiftContainer('body', [ - template.statement( - `import { ${LAZY_ROUTE_COMPONENT_IDENT} } from '${PACKAGE}'`, - )(), - ]) + if (shouldSplit) { + removeIdentifierLiteral(path, value) } + } - // Check to see if the importer function is already defined - // If not, define it with the dynamic import statement - if ( - !hasImportedOrDefinedIdentifier( - splitNodeMeta.localImporterIdent, - ) - ) { - programPath.unshiftContainer('body', [ - template.statement( - `const ${splitNodeMeta.localImporterIdent} = () => import('${splitUrl}')`, - )(), - ]) - } + if (!shouldSplit) { + return + } - // If it's a component, we need to pass the function to check the Route.ssr value - if (key === 'component') { - prop.value = template.expression( - `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}', () => Route.ssr)`, - )() - } else { - prop.value = template.expression( - `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, - )() - } + // Prepend the import statement to the program along with the importer function + // Check to see if lazyRouteComponent is already imported before attempting + // to import it again - // add HMR handling - if (opts.runtimeEnv !== 'prod') { - programPath.pushContainer('body', routeHmrStatement) - } + if ( + !hasImportedOrDefinedIdentifier( + LAZY_ROUTE_COMPONENT_IDENT, + ) + ) { + programPath.unshiftContainer('body', [ + template.statement( + `import { ${LAZY_ROUTE_COMPONENT_IDENT} } from '${PACKAGE}'`, + )(), + ]) } - if (splitNodeMeta.splitStrategy === 'lazyFn') { - const value = prop.value + // Check to see if the importer function is already defined + // If not, define it with the dynamic import statement + if ( + !hasImportedOrDefinedIdentifier( + splitNodeMeta.localImporterIdent, + ) + ) { + programPath.unshiftContainer('body', [ + template.statement( + `const ${splitNodeMeta.localImporterIdent} = () => import('${splitUrl}')`, + )(), + ]) + } - let shouldSplit = true + // If it's a component, we need to pass the function to check the Route.ssr value + if (key === 'component') { + prop.value = template.expression( + `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}', () => Route.ssr)`, + )() + } else { + prop.value = template.expression( + `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, + )() + } - if (t.isIdentifier(value)) { - const existingImportPath = - getImportSpecifierAndPathFromLocalName( - programPath, - value.name, - ).path - if (existingImportPath) { - removableImportPaths.add(existingImportPath) - } + // add HMR handling + if (opts.runtimeEnv !== 'prod') { + programPath.pushContainer('body', routeHmrStatement) + } + } - // exported identifiers should not be split - // since they are already being imported - // and need to be retained in the compiled file - const isExported = hasExport(ast, value) - shouldSplit = !isExported + if (splitNodeMeta.splitStrategy === 'lazyFn') { + const value = prop.value - if (shouldSplit) { - removeIdentifierLiteral(path, value) - } - } + let shouldSplit = true - if (!shouldSplit) { - return + if (t.isIdentifier(value)) { + const existingImportPath = + getImportSpecifierAndPathFromLocalName( + programPath, + value.name, + ).path + if (existingImportPath) { + removableImportPaths.add(existingImportPath) } - // Prepend the import statement to the program along with the importer function - if (!hasImportedOrDefinedIdentifier(LAZY_FN_IDENT)) { - programPath.unshiftContainer( - 'body', - template.smart( - `import { ${LAZY_FN_IDENT} } from '${PACKAGE}'`, - )(), - ) - } + // exported identifiers should not be split + // since they are already being imported + // and need to be retained in the compiled file + const isExported = hasExport(ast, value) + shouldSplit = !isExported - // Check to see if the importer function is already defined - // If not, define it with the dynamic import statement - if ( - !hasImportedOrDefinedIdentifier( - splitNodeMeta.localImporterIdent, - ) - ) { - programPath.unshiftContainer('body', [ - template.statement( - `const ${splitNodeMeta.localImporterIdent} = () => import('${splitUrl}')`, - )(), - ]) + if (shouldSplit) { + removeIdentifierLiteral(path, value) } + } - // Add the lazyFn call with the dynamic import to the prop value - prop.value = template.expression( - `${LAZY_FN_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, - )() + if (!shouldSplit) { + return } + + // Prepend the import statement to the program along with the importer function + if (!hasImportedOrDefinedIdentifier(LAZY_FN_IDENT)) { + programPath.unshiftContainer( + 'body', + template.smart( + `import { ${LAZY_FN_IDENT} } from '${PACKAGE}'`, + )(), + ) + } + + // Check to see if the importer function is already defined + // If not, define it with the dynamic import statement + if ( + !hasImportedOrDefinedIdentifier( + splitNodeMeta.localImporterIdent, + ) + ) { + programPath.unshiftContainer('body', [ + template.statement( + `const ${splitNodeMeta.localImporterIdent} = () => import('${splitUrl}')`, + )(), + ]) + } + + // Add the lazyFn call with the dynamic import to the prop value + prop.value = template.expression( + `${LAZY_FN_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, + )() } } + } - programPath.scope.crawl() - }) - } + programPath.scope.crawl() + }) } + } - if (t.isCallExpression(path.parentPath.node)) { - // createFileRoute('/')({ ... }) - const options = resolveIdentifier( - path, - path.parentPath.node.arguments[0], - ) + if (t.isCallExpression(path.parentPath.node)) { + // createFileRoute('/')({ ... }) + const options = resolveIdentifier( + path, + path.parentPath.node.arguments[0], + ) - babelHandleReference(options) - } else if (t.isVariableDeclarator(path.parentPath.node)) { - // createFileRoute({ ... }) - const caller = resolveIdentifier( - path, - path.parentPath.node.init, - ) + babelHandleReference(options) + } else if (t.isVariableDeclarator(path.parentPath.node)) { + // createFileRoute({ ... }) + const caller = resolveIdentifier(path, path.parentPath.node.init) - if (t.isCallExpression(caller)) { - const options = resolveIdentifier(path, caller.arguments[0]) - babelHandleReference(options) - } + if (t.isCallExpression(caller)) { + const options = resolveIdentifier(path, caller.arguments[0]) + babelHandleReference(options) } - }, + } }, - state, - ) + }) /** * If the component for the route is being imported, @@ -428,9 +397,7 @@ export function compileCodeSplitVirtualRoute( babel.traverse(ast, { Program: { - enter(programPath, programState) { - const state = programState as unknown as State - + enter(programPath) { const trackedNodesToSplitByType: Record< SplitRouteIdentNodes, { node: t.Node | undefined; meta: SplitNodeMeta } | undefined @@ -443,91 +410,85 @@ export function compileCodeSplitVirtualRoute( } // Find and track all the known split-able nodes - programPath.traverse( - { - CallExpression: (path) => { - if (!t.isIdentifier(path.node.callee)) { - return - } + programPath.traverse({ + CallExpression: (path) => { + if (!t.isIdentifier(path.node.callee)) { + return + } - if ( - !( - path.node.callee.name === 'createRoute' || - path.node.callee.name === 'createFileRoute' - ) - ) { - return - } + if ( + !( + path.node.callee.name === 'createRoute' || + path.node.callee.name === 'createFileRoute' + ) + ) { + return + } - function babelHandleVirtual(options: t.Node | undefined) { - if (t.isObjectExpression(options)) { - options.properties.forEach((prop) => { - if (t.isObjectProperty(prop)) { - // do not use `intendedSplitNodes` here - // since we have special considerations that need - // to be accounted for like (not splitting exported identifiers) - KNOWN_SPLIT_ROUTE_IDENTS.forEach((splitType) => { - if ( - !t.isIdentifier(prop.key) || - prop.key.name !== splitType - ) { - return - } + function babelHandleVirtual(options: t.Node | undefined) { + if (t.isObjectExpression(options)) { + options.properties.forEach((prop) => { + if (t.isObjectProperty(prop)) { + // do not use `intendedSplitNodes` here + // since we have special considerations that need + // to be accounted for like (not splitting exported identifiers) + KNOWN_SPLIT_ROUTE_IDENTS.forEach((splitType) => { + if ( + !t.isIdentifier(prop.key) || + prop.key.name !== splitType + ) { + return + } - const value = prop.value + const value = prop.value - let isExported = false - if (t.isIdentifier(value)) { - isExported = hasExport(ast, value) - if (isExported) { - knownExportedIdents.add(value.name) - } + let isExported = false + if (t.isIdentifier(value)) { + isExported = hasExport(ast, value) + if (isExported) { + knownExportedIdents.add(value.name) } + } - // If the node is exported, we need to remove - // the export from the split file - if (isExported && t.isIdentifier(value)) { - removeExports(ast, value) - } else { - const meta = SPLIT_NODES_CONFIG.get(splitType)! - trackedNodesToSplitByType[splitType] = { - node: prop.value, - meta, - } + // If the node is exported, we need to remove + // the export from the split file + if (isExported && t.isIdentifier(value)) { + removeExports(ast, value) + } else { + const meta = SPLIT_NODES_CONFIG.get(splitType)! + trackedNodesToSplitByType[splitType] = { + node: prop.value, + meta, } - }) - } - }) + } + }) + } + }) - // Remove all of the options - options.properties = [] - } + // Remove all of the options + options.properties = [] } + } - if (t.isCallExpression(path.parentPath.node)) { - // createFileRoute('/')({ ... }) - const options = resolveIdentifier( - path, - path.parentPath.node.arguments[0], - ) + if (t.isCallExpression(path.parentPath.node)) { + // createFileRoute('/')({ ... }) + const options = resolveIdentifier( + path, + path.parentPath.node.arguments[0], + ) - babelHandleVirtual(options) - } else if (t.isVariableDeclarator(path.parentPath.node)) { - // createFileRoute({ ... }) - const caller = resolveIdentifier( - path, - path.parentPath.node.init, - ) + babelHandleVirtual(options) + } else if (t.isVariableDeclarator(path.parentPath.node)) { + // createFileRoute({ ... }) + const caller = resolveIdentifier(path, path.parentPath.node.init) - if (t.isCallExpression(caller)) { - const options = resolveIdentifier(path, caller.arguments[0]) - babelHandleVirtual(options) - } + if (t.isCallExpression(caller)) { + const options = resolveIdentifier(path, caller.arguments[0]) + babelHandleVirtual(options) } - }, + } }, - state, - ) + }) // Start the transformation to only exported the intended split nodes intendedSplitNodes.forEach((SPLIT_TYPE) => { diff --git a/packages/router-plugin/src/core/route-autoimport-plugin.ts b/packages/router-plugin/src/core/route-autoimport-plugin.ts index 36e6447e6e..4774d528a7 100644 --- a/packages/router-plugin/src/core/route-autoimport-plugin.ts +++ b/packages/router-plugin/src/core/route-autoimport-plugin.ts @@ -9,7 +9,7 @@ import type { UnpluginFactory } from 'unplugin' /** * This plugin adds imports for createFileRoute and createLazyFileRoute to the file route. */ -export const unpluginRouteAutoimportFactory: UnpluginFactory< +export const unpluginRouteAutoImportFactory: UnpluginFactory< Partial | undefined > = (options = {}) => { let ROOT: string = process.cwd() diff --git a/packages/router-plugin/src/core/router-composed-plugin.ts b/packages/router-plugin/src/core/router-composed-plugin.ts index 31d661d6a7..f138e1f2df 100644 --- a/packages/router-plugin/src/core/router-composed-plugin.ts +++ b/packages/router-plugin/src/core/router-composed-plugin.ts @@ -1,7 +1,7 @@ import { unpluginRouterGeneratorFactory } from './router-generator-plugin' import { unpluginRouterCodeSplitterFactory } from './router-code-splitter-plugin' import { unpluginRouterHmrFactory } from './router-hmr-plugin' -import { unpluginRouteAutoimportFactory } from './route-autoimport-plugin' +import { unpluginRouteAutoImportFactory } from './route-autoimport-plugin' import type { Config } from './config' import type { UnpluginFactory } from 'unplugin' @@ -18,7 +18,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< const routerGenerator = getPlugin(unpluginRouterGeneratorFactory) const routerCodeSplitter = getPlugin(unpluginRouterCodeSplitterFactory) - const routeAutoImport = getPlugin(unpluginRouteAutoimportFactory) + const routeAutoImport = getPlugin(unpluginRouteAutoImportFactory) const result = [...routerGenerator, ...routerCodeSplitter, ...routeAutoImport] diff --git a/packages/router-plugin/src/esbuild.ts b/packages/router-plugin/src/esbuild.ts index 10ffdaae57..c29c0e4d85 100644 --- a/packages/router-plugin/src/esbuild.ts +++ b/packages/router-plugin/src/esbuild.ts @@ -37,13 +37,13 @@ const TanStackRouterCodeSplitterEsbuild = createEsbuildPlugin( * @example * ```ts * export default { - * plugins: [TanStackRouterEsbuild()], + * plugins: [tanstackRouter()], * // ... * } * ``` */ const TanStackRouterEsbuild = createEsbuildPlugin(unpluginRouterComposedFactory) - +const tanstackRouter = TanStackRouterEsbuild export default TanStackRouterEsbuild export { @@ -51,6 +51,7 @@ export { TanStackRouterGeneratorEsbuild, TanStackRouterCodeSplitterEsbuild, TanStackRouterEsbuild, + tanstackRouter, } export type { Config } diff --git a/packages/router-plugin/src/rspack.ts b/packages/router-plugin/src/rspack.ts index ebcafb8b30..4f82e24560 100644 --- a/packages/router-plugin/src/rspack.ts +++ b/packages/router-plugin/src/rspack.ts @@ -47,7 +47,7 @@ const TanStackRouterCodeSplitterRspack = /* #__PURE__ */ createRspackPlugin( * // ... * tools: { * rspack: { - * plugins: [TanStackRouterRspack()], + * plugins: [tanstackRouter()], * }, * }, * }) @@ -56,12 +56,13 @@ const TanStackRouterCodeSplitterRspack = /* #__PURE__ */ createRspackPlugin( const TanStackRouterRspack = /* #__PURE__ */ createRspackPlugin( unpluginRouterComposedFactory, ) - +const tanstackRouter = TanStackRouterRspack export default TanStackRouterRspack export { configSchema, TanStackRouterRspack, TanStackRouterGeneratorRspack, TanStackRouterCodeSplitterRspack, + tanstackRouter, } export type { Config } diff --git a/packages/router-plugin/src/webpack.ts b/packages/router-plugin/src/webpack.ts index 45e8c173eb..3b44448aa5 100644 --- a/packages/router-plugin/src/webpack.ts +++ b/packages/router-plugin/src/webpack.ts @@ -37,7 +37,7 @@ const TanStackRouterCodeSplitterWebpack = /* #__PURE__ */ createWebpackPlugin( * ```ts * export default { * // ... - * plugins: [TanStackRouterWebpack()], + * plugins: [tanstackRouter()], * } * ``` */ @@ -45,11 +45,13 @@ const TanStackRouterWebpack = /* #__PURE__ */ createWebpackPlugin( unpluginRouterComposedFactory, ) +const tanstackRouter = TanStackRouterWebpack export default TanStackRouterWebpack export { configSchema, TanStackRouterWebpack, TanStackRouterGeneratorWebpack, TanStackRouterCodeSplitterWebpack, + tanstackRouter, } export type { Config } diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 650978ddbe..10e3d3f752 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -65,7 +65,6 @@ "node": ">=12" }, "dependencies": { - "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", "@tanstack/start-plugin-core": "workspace:^", "zod": "^3.24.2" diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index 43fc2c24d9..73986b51f1 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -1,10 +1,6 @@ import path from 'node:path' -import { tanstackRouter } from '@tanstack/router-plugin/vite' import viteSolid from 'vite-plugin-solid' -import { - TanStackStartServerRoutesVite, - TanStackStartVitePluginCore, -} from '@tanstack/start-plugin-core' +import { TanStackStartVitePluginCore } from '@tanstack/start-plugin-core' import * as vite from 'vite' import { getTanStackStartOptions } from './schema' import type { PluginOption, ResolvedConfig } from 'vite' @@ -26,13 +22,6 @@ export function TanStackStartVitePlugin( let resolvedConfig: ResolvedConfig return [ - tanstackRouter({ - verboseFileRoutes: false, - ...options.tsr, - target: 'solid', - enableRouteGeneration: true, - autoCodeSplitting: true, - }), TanStackStartVitePluginCore({ framework: 'solid' }, options), { name: 'tanstack-solid-start:resolve-entries', @@ -103,10 +92,6 @@ export default createStartHandler({ return null }, }, - TanStackStartServerRoutesVite({ - ...options.tsr, - target: 'solid', - }), viteSolid({ ...options.solid, ssr: true }), ] } diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 2c775adb2d..f8476f7549 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -71,6 +71,7 @@ "@babel/types": "^7.26.8", "@tanstack/router-core": "workspace:^", "@tanstack/router-generator": "workspace:^", + "@tanstack/router-plugin": "workspace:^", "@tanstack/router-utils": "workspace:^", "@tanstack/server-functions-plugin": "workspace:^", "@types/babel__code-frame": "^7.0.6", diff --git a/packages/start-plugin-core/src/index.ts b/packages/start-plugin-core/src/index.ts index 28b8cbdab0..38e3ede06a 100644 --- a/packages/start-plugin-core/src/index.ts +++ b/packages/start-plugin-core/src/index.ts @@ -1,10 +1,3 @@ -export type { CompileOptions, IdentifierConfig } from './compilers' - -export { compileStartOutputFactory } from './compilers' - -export type { PagesJson } from './nitro/build-sitemap' -export { buildSitemap } from './nitro/build-sitemap' - export { createTanStackConfig, createTanStackStartOptionsSchema, @@ -12,4 +5,3 @@ export { } from './schema' export { TanStackStartVitePluginCore } from './plugin' -export { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin' diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index e5046b0c54..ffe7cb2ad4 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -1,5 +1,6 @@ import path from 'node:path' import { createNitro } from 'nitropack' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import * as vite from 'vite' import { @@ -10,6 +11,7 @@ import { nitroPlugin } from './nitro/nitro-plugin' import { startManifestPlugin } from './routesManifestPlugin' import { TanStackStartCompilerPlugin } from './start-compiler-plugin' import { VITE_ENVIRONMENT_NAMES } from './constants' +import { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin' import type { PluginOption, Rollup } from 'vite' import type { z } from 'zod' import type { CompileStartFrameworkOptions } from './compilers' @@ -42,6 +44,13 @@ export function TanStackStartVitePluginCore( startConfig: TanStackStartOutputConfig, ): Array { return [ + tanstackRouter({ + verboseFileRoutes: false, + ...startConfig.tsr, + target: opts.framework, + enableRouteGeneration: true, + autoCodeSplitting: true, + }), { name: 'tanstack-start-core:config-client', async config() { @@ -184,6 +193,10 @@ export function TanStackStartVitePluginCore( }), startManifestPlugin(startConfig), nitroPlugin(startConfig, () => ssrBundle), + TanStackStartServerRoutesVite({ + ...startConfig.tsr, + target: opts.framework, + }), ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3edf8a6414..0056bd5241 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5826,9 +5826,6 @@ importers: packages/react-start-plugin: dependencies: - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../router-plugin '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils @@ -6290,9 +6287,6 @@ importers: packages/solid-start-plugin: dependencies: - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../router-plugin '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils @@ -6394,6 +6388,9 @@ importers: '@tanstack/router-generator': specifier: workspace:* version: link:../router-generator + '@tanstack/router-plugin': + specifier: workspace:* + version: link:../router-plugin '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils From f2d1d54541d22dc3203696dc60607cd62f56ac94 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Fri, 16 May 2025 23:19:49 +0200 Subject: [PATCH 074/126] merge main (#4191) Co-authored-by: Dane Grant Co-authored-by: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Co-authored-by: Tanner Linsley Co-authored-by: Luis Merino Co-authored-by: ThaumRystra <9525416+ThaumRystra@users.noreply.github.com> Co-authored-by: Tanner Linsley --- docs/router/framework/react/comparison.md | 10 +- .../framework/react/guide/not-found-errors.md | 2 +- .../react/guide/scroll-restoration.md | 4 +- .../start/framework/react/server-functions.md | 2 +- .../package.disabled.json | 8 +- .../package.disabled.json | 8 +- .../react-router/src/ScrollRestoration.tsx | 2 +- packages/react-router/tests/Scripts.test.tsx | 4 +- packages/react-router/tests/route.test.tsx | 80 ++++++++++++ packages/router-core/src/route.ts | 19 ++- packages/router-core/src/router.ts | 121 +++++++++--------- .../router-core/src/scroll-restoration.ts | 71 ++++++---- .../solid-router/src/ScrollRestoration.tsx | 2 +- 13 files changed, 221 insertions(+), 112 deletions(-) diff --git a/docs/router/framework/react/comparison.md b/docs/router/framework/react/comparison.md index 4ef92b2667..62e10a054e 100644 --- a/docs/router/framework/react/comparison.md +++ b/docs/router/framework/react/comparison.md @@ -10,8 +10,8 @@ Before you commit to a new tool, it's always nice to know how it stacks up again Feature/Capability Key: - ✅ 1st-class, built-in, and ready to use with no added configuration or code -- 🔵 Supported via addon package - 🟡 Partial Support (on a scale of 5) +- 🟠 Supported via addon/community package - 🔶 Possible, but requires custom code/implementation/casting - 🛑 Not officially supported @@ -39,9 +39,9 @@ Feature/Capability Key: | Ranked Routes | ✅ | ✅ | ✅ | | Active Link Customization | ✅ | ✅ | ✅ | | Optimistic UI | ✅ | ✅ | 🔶 | -| Typesafe Absolute + Relative Navigation | ✅ | 🛑 | 🛑 | +| Typesafe Absolute + Relative Navigation | ✅ | 🟡 (1/5 via `buildHref` util) | 🟠 (IDE plugin) | | Route Mount/Transition/Unmount Events | ✅ | 🛑 | 🛑 | -| Devtools | ✅ | 🛑 | 🛑 | +| Devtools | ✅ | 🟠 | 🛑 | | Basic Search Params | ✅ | ✅ | ✅ | | Search Param Hooks | ✅ | ✅ | ✅ | | ``/`useNavigate` Search Param API | ✅ | 🟡 (search-string only via the `to`/`search` options) | 🟡 (search-string only via the `to`/`search` options) | @@ -54,7 +54,7 @@ Feature/Capability Key: | Suspense Route Elements | ✅ | ✅ | ✅ | | Route Error Elements | ✅ | ✅ | ✅ | | Route Pending Elements | ✅ | ✅ | ✅ | -| ``/`useBlocker` | ✅ | 🔶 | ❓ | +| ``/`useBlocker` | ✅ | 🔶 (no hard reloads or cross-origin navigation) | 🛑 | | Deferred Primitives | ✅ | ✅ | ✅ | | Navigation Scroll Restoration | ✅ | ✅ | ❓ | | ElementScroll Restoration | ✅ | 🛑 | 🛑 | @@ -72,7 +72,7 @@ Feature/Capability Key: | React Server Function Middleware | ✅ | 🛑 | 🛑 | | API Routes | ✅ | ✅ | ✅ | | API Middleware | ✅ | 🛑 | ✅ | -| React Server Components | 🛑 | 🛑 | ✅ | +| React Server Components | 🛑 | 🟡 (Experimental) | ✅ | | `
` API | 🛑 | ✅ | ✅ | [bp-tanstack-router]: https://badgen.net/bundlephobia/minzip/@tanstack/react-router diff --git a/docs/router/framework/react/guide/not-found-errors.md b/docs/router/framework/react/guide/not-found-errors.md index 08dec747b0..739e2b20cb 100644 --- a/docs/router/framework/react/guide/not-found-errors.md +++ b/docs/router/framework/react/guide/not-found-errors.md @@ -16,7 +16,7 @@ There are 2 uses for not-found errors in TanStack Router: - Attempting to access `/posts/1/edit` when the route tree only handles `/posts/$postId` - **Missing resources**: When a resource cannot be found, such as a post with a given ID or any asynchronous data that is not available or does not exist - **You, the developer** must throw a not-found error when a resource cannot be found. This can be done in the `beforeLoad` or `loader` functions using the `notFound` utility. - - Will be handled by the nearest parent route with a `notFoundComponent` or the root route + - Will be handled by the nearest parent route with a `notFoundComponent` (when `notFound` is called within `loader`) or the root route. - Examples: - Attempting to access `/posts/1` when the post with ID 1 does not exist - Attempting to access `/docs/path/to/document` when the document does not exist diff --git a/docs/router/framework/react/guide/scroll-restoration.md b/docs/router/framework/react/guide/scroll-restoration.md index 77634d03e9..034b9465a7 100644 --- a/docs/router/framework/react/guide/scroll-restoration.md +++ b/docs/router/framework/react/guide/scroll-restoration.md @@ -177,12 +177,12 @@ function Component() { ## Scroll Behavior -To control the scroll behavior when navigating between pages, you can use the `scrollBehavior` option. This allows you to make the transition between pages instant instead of a smooth scroll. The global configuration of scroll restoration behavior has the same options as those supported by the browser, which are `smooth`, `instant`, and `auto` (see [MDN](https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView#behavior) for more information). +To control the scroll behavior when navigating between pages, you can use the `scrollRestorationBehavior` option. This allows you to make the transition between pages instant instead of a smooth scroll. The global configuration of scroll restoration behavior has the same options as those supported by the browser, which are `smooth`, `instant`, and `auto` (see [MDN](https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView#behavior) for more information). ```tsx import { createRouter } from '@tanstack/react-router' const router = createRouter({ - scrollBehavior: 'instant', + scrollRestorationBehavior: 'instant', }) ``` diff --git a/docs/start/framework/react/server-functions.md b/docs/start/framework/react/server-functions.md index 26a99a8c94..e4d8e43a9f 100644 --- a/docs/start/framework/react/server-functions.md +++ b/docs/start/framework/react/server-functions.md @@ -7,7 +7,7 @@ title: Server Functions Server functions allow you to specify logic that can be invoked almost anywhere (even the client), but run **only** on the server. In fact, they are not so different from an API Route, but with a few key differences: -- They do not have stable public URL (but you'll be able to do this very soon!) +- They do not have stable public URL. - They can be called from anywhere in your application, including loaders, hooks, components, server routes etc. However, they are similar to regular API Routes in that: diff --git a/examples/react/basic-ssr-file-based/package.disabled.json b/examples/react/basic-ssr-file-based/package.disabled.json index 64b96d1ff4..13e5720a64 100644 --- a/examples/react/basic-ssr-file-based/package.disabled.json +++ b/examples/react/basic-ssr-file-based/package.disabled.json @@ -11,10 +11,10 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.120.5", + "@tanstack/react-router-devtools": "^1.120.5", + "@tanstack/router-plugin": "^1.120.5", + "@tanstack/react-start": "^1.120.5", "get-port": "^7.1.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-ssr-streaming-file-based/package.disabled.json b/examples/react/basic-ssr-streaming-file-based/package.disabled.json index 7bfb79e1f3..49ba54908c 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.disabled.json +++ b/examples/react/basic-ssr-streaming-file-based/package.disabled.json @@ -11,10 +11,10 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.120.3", - "@tanstack/react-router-devtools": "^1.120.3", - "@tanstack/router-plugin": "^1.120.3", - "@tanstack/react-start": "^1.120.3", + "@tanstack/react-router": "^1.120.5", + "@tanstack/react-router-devtools": "^1.120.5", + "@tanstack/router-plugin": "^1.120.5", + "@tanstack/react-start": "^1.120.5", "get-port": "^7.1.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/packages/react-router/src/ScrollRestoration.tsx b/packages/react-router/src/ScrollRestoration.tsx index 063d93914f..71d472723d 100644 --- a/packages/react-router/src/ScrollRestoration.tsx +++ b/packages/react-router/src/ScrollRestoration.tsx @@ -64,6 +64,6 @@ export function useElementScrollRestoration( } const restoreKey = getKey(router.latestLocation) - const byKey = scrollRestorationCache.state[restoreKey] + const byKey = scrollRestorationCache?.state[restoreKey] return byKey?.[elementSelector] } diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx index b4ab8623a7..315b3e528e 100644 --- a/packages/react-router/tests/Scripts.test.tsx +++ b/packages/react-router/tests/Scripts.test.tsx @@ -139,7 +139,7 @@ describe('ssr HeadContent', () => { }, { name: 'description', - content: loaderData.description, + content: loaderData?.description, }, { name: 'image', @@ -176,7 +176,7 @@ describe('ssr HeadContent', () => { }, { name: 'description', - content: loaderData.description, + content: loaderData?.description, }, { name: 'last-modified', diff --git a/packages/react-router/tests/route.test.tsx b/packages/react-router/tests/route.test.tsx index 8b4d6dabab..ba30768dea 100644 --- a/packages/react-router/tests/route.test.tsx +++ b/packages/react-router/tests/route.test.tsx @@ -9,6 +9,7 @@ import { createRoute, createRouter, getRouteApi, + notFound, } from '../src' import type { RouterHistory } from '../src' @@ -282,6 +283,85 @@ describe('route.head', () => { ]) }) + test('meta is set when loader throws notFound', async () => { + const rootRoute = createRootRoute({ + head: () => ({ + meta: [ + { title: 'Root' }, + { + charSet: 'utf-8', + }, + ], + }), + }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + head: () => ({ + meta: [{ title: 'Index' }], + }), + loader: async () => { + throw notFound() + }, + component: () =>
Index
, + }) + const routeTree = rootRoute.addChildren([indexRoute]) + const router = createRouter({ routeTree }) + render() + expect(await screen.findByText('Not Found')).toBeInTheDocument() + + const metaState = router.state.matches.map((m) => m.meta) + expect(metaState).toEqual([ + [ + { title: 'Root' }, + { + charSet: 'utf-8', + }, + ], + [{ title: 'Index' }], + ]) + }) + + test('meta is set when loader throws an error', async () => { + const rootRoute = createRootRoute({ + head: () => ({ + meta: [ + { title: 'Root' }, + { + charSet: 'utf-8', + }, + ], + }), + }) + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + head: () => ({ + meta: [{ title: 'Index' }], + }), + loader: async () => { + throw new Error('Fly, you fools!') + }, + component: () =>
Index
, + }) + const routeTree = rootRoute.addChildren([indexRoute]) + const router = createRouter({ routeTree }) + render() + + expect(await screen.findByText('Fly, you fools!')).toBeInTheDocument() + + const metaState = router.state.matches.map((m) => m.meta) + expect(metaState).toEqual([ + [ + { title: 'Root' }, + { + charSet: 'utf-8', + }, + ], + [{ title: 'Index' }], + ]) + }) + test('scripts', async () => { const rootRoute = createRootRoute({ head: () => ({ diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index fd5bbe46fa..e8c42e952d 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -982,7 +982,7 @@ type AssetFnContextOptions< TLoaderDeps > params: ResolveAllParamsFromParent - loaderData: ResolveLoaderData + loaderData?: ResolveLoaderData } export interface DefaultUpdatableRouteOptionsExtensions { @@ -1092,9 +1092,20 @@ export interface UpdatableRouteOptions< TLoaderDeps >, ) => void - headers?: (ctx: { - loaderData: ResolveLoaderData - }) => Record + headers?: ( + ctx: AssetFnContextOptions< + TRouteId, + TFullPath, + TParentRoute, + TParams, + TSearchValidator, + TLoaderFn, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps + >, + ) => Record head?: ( ctx: AssetFnContextOptions< TRouteId, diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 94a6c9bda2..6bcaed0ee3 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -1363,26 +1363,6 @@ export class RouterCore< ...match.__beforeLoadContext, } } - - // If it's already a success, update headers and head content - // These may get updated again if the match is refreshed - // due to being stale - if (match.status === 'success') { - match.headers = route.options.headers?.({ - loaderData: match.loaderData, - }) - const assetContext = { - matches, - match, - params: match.params, - loaderData: match.loaderData, - } - const headFnContent = route.options.head?.(assetContext) - match.links = headFnContent?.links - match.headScripts = headFnContent?.scripts - match.meta = headFnContent?.meta - match.scripts = route.options.scripts?.(assetContext) - } }) return matches @@ -2508,6 +2488,35 @@ export class RouterCore< !this.state.matches.find((d) => d.id === matchId), })) + const executeHead = () => { + const match = this.getMatch(matchId) + // in case of a redirecting match during preload, the match does not exist + if (!match) { + return + } + const assetContext = { + matches, + match, + params: match.params, + loaderData: match.loaderData, + } + const headFnContent = route.options.head?.(assetContext) + const meta = headFnContent?.meta + const links = headFnContent?.links + const headScripts = headFnContent?.scripts + + const scripts = route.options.scripts?.(assetContext) + const headers = route.options.headers?.(assetContext) + updateMatch(matchId, (prev) => ({ + ...prev, + meta, + links, + headScripts, + headers, + scripts, + })) + } + const runLoader = async () => { try { // If the Matches component rendered @@ -2548,40 +2557,21 @@ export class RouterCore< await potentialPendingMinPromise() - const assetContext = { - matches, - match: this.getMatch(matchId)!, - params: this.getMatch(matchId)!.params, - loaderData, - } - const headFnContent = - route.options.head?.(assetContext) - const meta = headFnContent?.meta - const links = headFnContent?.links - const headScripts = headFnContent?.scripts - - const scripts = route.options.scripts?.(assetContext) - const headers = route.options.headers?.({ - loaderData, - }) - // Last but not least, wait for the the components // to be preloaded before we resolve the match await route._componentsPromise - updateMatch(matchId, (prev) => ({ - ...prev, - error: undefined, - status: 'success', - isFetching: false, - updatedAt: Date.now(), - loaderData, - meta, - links, - headScripts, - headers, - scripts, - })) + batch(() => { + updateMatch(matchId, (prev) => ({ + ...prev, + error: undefined, + status: 'success', + isFetching: false, + updatedAt: Date.now(), + loaderData, + })) + executeHead() + }) } catch (e) { let error = e @@ -2599,12 +2589,15 @@ export class RouterCore< ) } - updateMatch(matchId, (prev) => ({ - ...prev, - error, - status: 'error', - isFetching: false, - })) + batch(() => { + updateMatch(matchId, (prev) => ({ + ...prev, + error, + status: 'error', + isFetching: false, + })) + executeHead() + }) } this.serverSsr?.onMatchSettled({ @@ -2612,10 +2605,13 @@ export class RouterCore< match: this.getMatch(matchId)!, }) } catch (err) { - updateMatch(matchId, (prev) => ({ - ...prev, - loaderPromise: undefined, - })) + batch(() => { + updateMatch(matchId, (prev) => ({ + ...prev, + loaderPromise: undefined, + })) + executeHead() + }) handleRedirectAndNotFound(this.getMatch(matchId)!, err) } } @@ -2651,6 +2647,11 @@ export class RouterCore< (loaderShouldRunAsync && sync) ) { await runLoader() + } else { + // if the loader did not run, still update head. + // reason: parent's beforeLoad may have changed the route context + // and only now do we know the route context (and that the loader would not run) + executeHead() } } if (!loaderIsRunningAsync) { diff --git a/packages/router-core/src/scroll-restoration.ts b/packages/router-core/src/scroll-restoration.ts index 7efa94a908..1e3270534f 100644 --- a/packages/router-core/src/scroll-restoration.ts +++ b/packages/router-core/src/scroll-restoration.ts @@ -18,12 +18,22 @@ export type ScrollRestorationOptions = { scrollBehavior?: ScrollToOptions['behavior'] } +function getSafeSessionStorage() { + try { + if ( + typeof window !== 'undefined' && + typeof window.sessionStorage === 'object' + ) { + return window.sessionStorage + } + } catch { + return undefined + } + return undefined +} + export const storageKey = 'tsr-scroll-restoration-v1_3' -let sessionsStorage = false -try { - sessionsStorage = - typeof window !== 'undefined' && typeof window.sessionStorage === 'object' -} catch {} + const throttle = (fn: (...args: Array) => void, wait: number) => { let timeout: any return (...args: Array) => { @@ -35,28 +45,32 @@ const throttle = (fn: (...args: Array) => void, wait: number) => { } } } -export const scrollRestorationCache: ScrollRestorationCache = sessionsStorage - ? (() => { - const state: ScrollRestorationByKey = - JSON.parse(window.sessionStorage.getItem(storageKey) || 'null') || {} - - return { - state, - // This setter is simply to make sure that we set the sessionStorage right - // after the state is updated. It doesn't necessarily need to be a functional - // update. - set: (updater) => ( - (scrollRestorationCache.state = - functionalUpdate(updater, scrollRestorationCache.state) || - scrollRestorationCache.state), - window.sessionStorage.setItem( - storageKey, - JSON.stringify(scrollRestorationCache.state), - ) - ), - } - })() - : (undefined as any) + +function createScrollRestorationCache(): ScrollRestorationCache | undefined { + const safeSessionStorage = getSafeSessionStorage() + if (!safeSessionStorage) { + return undefined + } + + const persistedState = safeSessionStorage.getItem(storageKey) + let state: ScrollRestorationByKey = persistedState + ? JSON.parse(persistedState) + : {} + + return { + state, + // This setter is simply to make sure that we set the sessionStorage right + // after the state is updated. It doesn't necessarily need to be a functional + // update. + set: (updater) => ( + (state = functionalUpdate(updater, state) || state), + safeSessionStorage.setItem(storageKey, JSON.stringify(state)) + ), + } +} + +export const scrollRestorationCache = createScrollRestorationCache() + /** * The default `getKey` function for `useScrollRestoration`. * It returns the `key` from the location state or the `href` of the location. @@ -176,6 +190,9 @@ export function restoreScroll( } export function setupScrollRestoration(router: AnyRouter, force?: boolean) { + if (scrollRestorationCache === undefined) { + return + } const shouldScrollRestoration = force ?? router.options.scrollRestoration ?? false diff --git a/packages/solid-router/src/ScrollRestoration.tsx b/packages/solid-router/src/ScrollRestoration.tsx index 063d93914f..71d472723d 100644 --- a/packages/solid-router/src/ScrollRestoration.tsx +++ b/packages/solid-router/src/ScrollRestoration.tsx @@ -64,6 +64,6 @@ export function useElementScrollRestoration( } const restoreKey = getKey(router.latestLocation) - const byKey = scrollRestorationCache.state[restoreKey] + const byKey = scrollRestorationCache?.state[restoreKey] return byKey?.[elementSelector] } From e03ad0c9dacab897aa399ab3a204d9c8aa64330c Mon Sep 17 00:00:00 2001 From: SeanCassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sat, 17 May 2025 10:09:02 +1200 Subject: [PATCH 075/126] fix: RELEASE_ALL RELEASE_ALL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7aa0f3d0d4..8bfc4db239 100644 --- a/README.md +++ b/README.md @@ -87,4 +87,4 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer To run example React projects with Tanstack Router, see [CONTRIBUTING.md](./CONTRIBUTING.md) - + From ed337062e85a58da4cbc61f7df901da51cd32444 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 16 May 2025 22:10:48 +0000 Subject: [PATCH 076/126] release: v1.121.0-alpha.1 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 8 +++---- .../package.json | 8 +++---- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 ++--- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 ++--- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 6 ++--- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- .../directive-functions-plugin/package.json | 2 +- packages/eslint-plugin-router/package.json | 2 +- packages/history/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-utils/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/virtual-file-routes/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 101 files changed, 229 insertions(+), 229 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 36967ad7bf..18b2cc89ed 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 0c78d5945f..8664d12e76 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 37dc70f772..634ee9adc1 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 9645fd5dd8..f00b5cc37c 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 8e8f2a8fcd..7b8c2f1a3a 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index c60d8b3d15..481fed3ff6 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index c2b88ee228..8e69f444ff 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index add72b2d2c..3e3921b2db 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index c5c2fee119..370b10b407 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 5d6ad04150..b9c102f40a 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,10 +9,10 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/virtual-file-routes": "^1.120.4-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 9861cdd95d..99cbc7efa7 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 094387ef86..a373bdea84 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index c629ca4095..8609d893a3 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 637c9dfa08..1332ce2f55 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 26916c558b..779a73f6cb 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index b81ca30dd4..35e70c8154 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 778d99afd9..6d269136f1 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 6495ec4e3e..770c8834fd 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index a276807d82..bb86281d19 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index dd643babb6..527ab69e92 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index e9f27b651e..1f774b4340 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 669cd9133d..c28450341d 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 908a934a01..231b5da021 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 09f66d7449..af4fa9445e 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index a55502a0d5..2efecdcb9f 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 2083b70264..b2cb755bd2 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index eaa7033849..220d5b44c1 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -8,10 +8,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.120.4-alpha.1", + "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 3e4f41a618..1efb270a4f 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index e31eed93ea..b12ea5c56b 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 6cc9901f71..91d1a42ae2 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/history": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index fb8ea2f831..008dab138c 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index e0101154c5..289440db3a 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 6653b73029..294732344e 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -8,9 +8,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@tanstack/history": "^1.120.4-alpha.1", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/history": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index dc4d195aa2..d5ca1aa8ad 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 134484a9b0..e95cdcf0f7 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.120.4-alpha.19", + "@tanstack/arktype-adapter": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/valibot-adapter": "^1.120.4-alpha.19", - "@tanstack/zod-adapter": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/valibot-adapter": "^1.121.0-alpha.1", + "@tanstack/zod-adapter": "^1.121.0-alpha.1", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 453ef2d729..05c1bd9284 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 3686b11097..bee072a510 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 8d759e96ab..529656251d 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-with-query": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-with-query": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 04514a009e..e574a9414f 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 870aa9d5f4..bcba239722 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index aa4cb1f2a3..32be87d348 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 1b4d92ac5d..0a60473a60 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 7295431bdd..7806fecb46 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-with-query": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-with-query": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 4094de3148..1fa0fb3d1f 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 8096afc54f..15ebdfa5e4 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index a0f557530f..eda8e0f87c 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 129078ebe0..82258163a5 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index f130e4bb77..7241e53018 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index e44f6e9487..3fead6f7be 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-with-query": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-with-query": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index db87b13e85..59d4844281 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 463a1fef18..ea4aa2c0bb 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 264a167d3b..f6d601efb4 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index d8bf6e9e70..5b867baa9c 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 0255ed3531..d77ac23625 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.120.4-alpha.19", - "@tanstack/react-router-devtools": "^1.120.4-alpha.19", - "@tanstack/router-plugin": "^1.120.4-alpha.19", - "@tanstack/react-start": "^1.120.4-alpha.25", + "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.1", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 55e562ace3..260ea37a20 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index b3362f06f0..83db84d52f 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 7a8366b9da..19bb97118d 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index eea51dda8d..cc5335d917 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 15b7b3bc74..2bc3f5555e 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index ab9ce90d11..a6044e4b05 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 76309473b8..95a0483c7c 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index ed85041b1f..d5d0d9ae03 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.120.4-alpha.19", + "@tanstack/router-plugin": "^1.121.0-alpha.1", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 4ce09c6ed4..c128153735 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.25", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index b0e7d87b32..045c987720 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.25", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index e3276c5027..84aa719c50 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.120.4-alpha.19", - "@tanstack/solid-router-devtools": "^1.120.4-alpha.19", - "@tanstack/solid-start": "^1.120.4-alpha.25", + "@tanstack/solid-router": "^1.121.0-alpha.1", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index c35b580393..dc58a5e1fb 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 65fce9c2f9..183c6f4b46 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.120.4-alpha.3", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/eslint-plugin-router/package.json b/packages/eslint-plugin-router/package.json index d399104411..34ca334a7e 100644 --- a/packages/eslint-plugin-router/package.json +++ b/packages/eslint-plugin-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/eslint-plugin-router", - "version": "1.120.4-alpha.1", + "version": "1.121.0-alpha.1", "description": "ESLint plugin for TanStack Router", "author": "Manuel Schiller", "license": "MIT", diff --git a/packages/history/package.json b/packages/history/package.json index c20e3b6592..ae12d350d3 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.120.4-alpha.1", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 8aea4109cd..0289026fc5 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index f9bf9170c8..a2630278a6 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 7f173edd24..f430a480bb 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 5f502fc371..0e59d50488 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 1da1e091d8..37bad813ea 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.120.4-alpha.25", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index f441b6b7b4..4ba388ab0f 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.120.4-alpha.24", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 419ec98c98..0b0111fe0a 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.120.4-alpha.25", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 7360154c87..5641752381 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 9c5043419a..be004b70c0 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 88b6f18761..a423ee8dec 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 84f2aa52e7..03a53672fb 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 447ba8a472..f09657efe8 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 8a5cf976a4..3abd540cbd 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-utils/package.json b/packages/router-utils/package.json index 780cfc89c0..f0f9662c21 100644 --- a/packages/router-utils/package.json +++ b/packages/router-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-utils", - "version": "1.120.4-alpha.1", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index f302b6b39b..f8bb1b6580 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 0340ed34cc..3a58182cb4 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.120.4-alpha.16", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 47d6bc142a..05d0433eeb 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 120249feb4..9b9334d7e5 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 7ec0793d15..755d812f9b 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 10e3d3f752..29e30a5669 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.120.4-alpha.25", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index cee4c2263c..f81e2ed934 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.120.4-alpha.24", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a7b2ee1542..498f4d9331 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.120.4-alpha.25", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 8470bfb78d..8155ceea59 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f8476f7549..0b90413a6c 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.120.4-alpha.25", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 9063d29633..947fa3521c 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.120.4-alpha.24", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 6f2bec755c..9a8b2d520c 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 4ad645cb3d..53ad1122df 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 08bb51aa50..4d56a62d70 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.120.4-alpha.16", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 44f1380a72..0af75574a6 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/virtual-file-routes/package.json b/packages/virtual-file-routes/package.json index 665070eb60..d2fcd9e066 100644 --- a/packages/virtual-file-routes/package.json +++ b/packages/virtual-file-routes/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/virtual-file-routes", - "version": "1.120.4-alpha.1", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index dc2454fac1..4e9925e771 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.120.4-alpha.19", + "version": "1.121.0-alpha.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0056bd5241..75c41c2a44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5118,7 +5118,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5158,7 +5158,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5192,7 +5192,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5232,7 +5232,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5278,7 +5278,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5321,7 +5321,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5361,7 +5361,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5404,7 +5404,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5493,7 +5493,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5536,7 +5536,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.120.4-alpha.19 + specifier: ^1.121.0-alpha.1 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 6187e2411eab276e0ed97f1b53f20eec36e4bf22 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 17 May 2025 18:56:21 +0200 Subject: [PATCH 077/126] fix: add support for 'using' (#4194) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .../react/1-default/development/using.tsx | 46 +++++++++++++++++++ .../1-default/development/using@component.tsx | 2 + .../development/using@errorComponent.tsx | 2 + .../development/using@notFoundComponent.tsx | 5 ++ .../react/1-default/production/using.tsx | 25 ++++++++++ .../1-default/production/using@component.tsx | 2 + .../production/using@errorComponent.tsx | 2 + .../production/using@notFoundComponent.tsx | 5 ++ .../development/using.tsx | 33 +++++++++++++ ...--notFoundComponent---pendingComponent.tsx | 7 +++ .../development/using@loader.tsx | 18 ++++++++ .../production/using.tsx | 12 +++++ ...--notFoundComponent---pendingComponent.tsx | 7 +++ .../production/using@loader.tsx | 18 ++++++++ .../development/using.tsx | 33 +++++++++++++ ...--notFoundComponent---pendingComponent.tsx | 23 ++++++++++ .../development/using@errorComponent.tsx | 2 + .../production/using.tsx | 12 +++++ ...--notFoundComponent---pendingComponent.tsx | 23 ++++++++++ .../production/using@errorComponent.tsx | 2 + .../code-splitter/test-files/react/using.tsx | 15 ++++++ packages/router-utils/src/ast.ts | 2 +- 22 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@loader.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@loader.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx create mode 100644 packages/router-plugin/tests/code-splitter/test-files/react/using.tsx diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx new file mode 100644 index 0000000000..d04c22f712 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx @@ -0,0 +1,46 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=notFoundComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +export const Route = createFileRoute({ + loader: ({ + params: { + postId + } + }) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; + }, + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx new file mode 100644 index 0000000000..8af50b061d --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitComponent as component }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx new file mode 100644 index 0000000000..301cd75bd6 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitErrorComponent as errorComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx new file mode 100644 index 0000000000..afcff02bbc --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx @@ -0,0 +1,5 @@ +import { Route } from "using.tsx"; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx new file mode 100644 index 0000000000..fae4fdfc26 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx @@ -0,0 +1,25 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=notFoundComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +export const Route = createFileRoute({ + loader: ({ + params: { + postId + } + }) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; + }, + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx new file mode 100644 index 0000000000..8af50b061d --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitComponent as component }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx new file mode 100644 index 0000000000..301cd75bd6 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitErrorComponent as errorComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx new file mode 100644 index 0000000000..afcff02bbc --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx @@ -0,0 +1,5 @@ +import { Route } from "using.tsx"; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx new file mode 100644 index 0000000000..beca8d394b --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx @@ -0,0 +1,33 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); +import { lazyFn } from '@tanstack/react-router'; +export const Route = createFileRoute({ + loader: lazyFn($$splitLoaderImporter, 'loader'), + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..83b06e84ac --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,7 @@ +import { Route } from "using.tsx"; +export { SplitComponent as component }; +export { SplitErrorComponent as errorComponent }; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@loader.tsx new file mode 100644 index 0000000000..ae4bc0c74c --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@loader.tsx @@ -0,0 +1,18 @@ +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +import { Route } from "using.tsx"; +const SplitLoader = ({ + params: { + postId + } +}) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; +}; +export { SplitLoader as loader }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx new file mode 100644 index 0000000000..5f1486aa4c --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx @@ -0,0 +1,12 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); +import { lazyFn } from '@tanstack/react-router'; +export const Route = createFileRoute({ + loader: lazyFn($$splitLoaderImporter, 'loader'), + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..83b06e84ac --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,7 @@ +import { Route } from "using.tsx"; +export { SplitComponent as component }; +export { SplitErrorComponent as errorComponent }; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@loader.tsx new file mode 100644 index 0000000000..ae4bc0c74c --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@loader.tsx @@ -0,0 +1,18 @@ +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +import { Route } from "using.tsx"; +const SplitLoader = ({ + params: { + postId + } +}) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; +}; +export { SplitLoader as loader }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx new file mode 100644 index 0000000000..c83cd76e96 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx @@ -0,0 +1,33 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +import { lazyFn } from '@tanstack/react-router'; +export const Route = createFileRoute({ + loader: lazyFn($$splitLoaderImporter, 'loader'), + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} +if (import.meta.hot) { + import.meta.hot.accept(newModule => { + if (newModule.Route && typeof newModule.Route.clone === 'function') { + newModule.Route.clone(Route); + } + }); +} \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..9e23ebf710 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,23 @@ +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +import { Route } from "using.tsx"; +const SplitLoader = ({ + params: { + postId + } +}) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; +}; +export { SplitLoader as loader }; +export { SplitComponent as component }; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx new file mode 100644 index 0000000000..301cd75bd6 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitErrorComponent as errorComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx new file mode 100644 index 0000000000..790ff29580 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx @@ -0,0 +1,12 @@ +const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); +import { lazyRouteComponent } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); +import { lazyFn } from '@tanstack/react-router'; +export const Route = createFileRoute({ + loader: lazyFn($$splitLoaderImporter, 'loader'), + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), + component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx new file mode 100644 index 0000000000..9e23ebf710 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -0,0 +1,23 @@ +const DummyPostResource = (postId: string) => ({ + postData: { + id: postId, + title: 'dummy', + body: 'dummy' + }, + [Symbol.dispose]: () => console.log('disposing!') +}); +import { Route } from "using.tsx"; +const SplitLoader = ({ + params: { + postId + } +}) => { + using dummyPost = DummyPostResource(postId); + return dummyPost.postData; +}; +export { SplitLoader as loader }; +export { SplitComponent as component }; +const SplitNotFoundComponent = () => { + return Post not found; +}; +export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx new file mode 100644 index 0000000000..301cd75bd6 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx @@ -0,0 +1,2 @@ +import { Route } from "using.tsx"; +export { SplitErrorComponent as errorComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx b/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx new file mode 100644 index 0000000000..e1ed815dc9 --- /dev/null +++ b/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx @@ -0,0 +1,15 @@ +const DummyPostResource = (postId: string) => ({ + postData: { id: postId, title: 'dummy', body: 'dummy' }, + [Symbol.dispose]: () => console.log('disposing!'), +}) +export const Route = createFileRoute({ + loader: ({ params: { postId } }) => { + using dummyPost = DummyPostResource(postId) + return dummyPost.postData + }, + errorComponent: PostErrorComponent, + component: PostComponent, + notFoundComponent: () => { + return Post not found + }, +}) diff --git a/packages/router-utils/src/ast.ts b/packages/router-utils/src/ast.ts index 586f1efb90..829471ad97 100644 --- a/packages/router-utils/src/ast.ts +++ b/packages/router-utils/src/ast.ts @@ -13,7 +13,7 @@ export function parseAst({ ...opts }: ParseAstOptions): ParseResult<_babel_types.File> { return parse(code, { - plugins: ['jsx', 'typescript'], + plugins: ['jsx', 'typescript', 'explicitResourceManagement'], sourceType: 'module', ...opts, }) From 8fee26d040ad0eb535d569432ae7ecfe448a6fc0 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 17 May 2025 16:57:41 +0000 Subject: [PATCH 078/126] release: v1.121.0-alpha.2 --- examples/react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- examples/react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../react/kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- examples/react/quickstart-rspack-file-based/package.json | 2 +- examples/react/quickstart-webpack-file-based/package.json | 2 +- examples/react/router-monorepo-react-query/package.json | 2 +- .../router-monorepo-react-query/packages/router/package.json | 2 +- examples/react/router-monorepo-simple-lazy/package.json | 2 +- .../router-monorepo-simple-lazy/packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../react/router-monorepo-simple/packages/router/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/view-transitions/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 4 ++-- examples/react/with-trpc/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 2 +- examples/solid/basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- examples/solid/kitchen-sink-file-based/package.json | 2 +- examples/solid/quickstart-file-based/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/directive-functions-plugin/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-utils/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 58 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 18b2cc89ed..3d94162ab7 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 8664d12e76..9434aa6c2f 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 7b8c2f1a3a..33df11ecc5 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 8e69f444ff..cd1ef5d785 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 370b10b407..2733be56ee 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index b9c102f40a..3053c76b70 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 8609d893a3..dc91e55e75 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 1332ce2f55..fee921aa14 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 6d269136f1..eaf2f8ea4d 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 527ab69e92..0ef029169c 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 1f774b4340..7ba1ffab3d 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index c28450341d..ad57ddbce1 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 231b5da021..9258eb67d3 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 2efecdcb9f..c5a21ee625 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 220d5b44c1..ae76461395 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,7 +11,7 @@ "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 1efb270a4f..3047821826 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 91d1a42ae2..9f87aec9d7 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 008dab138c..6d0b4130d6 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 294732344e..36d724f341 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index e95cdcf0f7..d72b993a80 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "@tanstack/valibot-adapter": "^1.121.0-alpha.1", "@tanstack/zod-adapter": "^1.121.0-alpha.1", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 05c1bd9284..e623d4872b 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index bee072a510..d6357ca081 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 529656251d..5d7cb5130f 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-with-query": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index e574a9414f..3b5a9fbcd3 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index bcba239722..b88115a5c1 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 32be87d348..fe057b6882 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 0a60473a60..c2548b89cf 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 7806fecb46..c32b4c0656 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-with-query": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 1fa0fb3d1f..54474b7adb 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 15ebdfa5e4..cfac97c689 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index eda8e0f87c..b988c3df31 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 82258163a5..edc87b17f3 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 7241e53018..9e55e82e1e 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 3fead6f7be..211d9ac0d2 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-with-query": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 59d4844281..bfd56323b8 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/react-start": "^1.121.0-alpha.2", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index ea4aa2c0bb..12bf49022b 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 5b867baa9c..ed72e918dc 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -12,8 +12,8 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-start": "^1.121.0-alpha.2", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index d77ac23625..e8cb94aaf9 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.1", "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-start": "^1.121.0-alpha.2", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 83db84d52f..c4f133bfaa 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index cc5335d917..6cb00c97a9 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 2bc3f5555e..d0f8022ea9 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 95a0483c7c..fc2d8fdc60 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index d5d0d9ae03..df962866b5 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.1", + "@tanstack/router-plugin": "^1.121.0-alpha.2", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index c128153735..4f358bc6cc 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.1", "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.2", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 045c987720..088ee478a9 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.1", "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.2", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 84aa719c50..2f8f816b51 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.1", "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.1", + "@tanstack/solid-start": "^1.121.0-alpha.2", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/directive-functions-plugin/package.json b/packages/directive-functions-plugin/package.json index 183c6f4b46..c857c27d07 100644 --- a/packages/directive-functions-plugin/package.json +++ b/packages/directive-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/directive-functions-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 37bad813ea..deae8cc81a 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 0b0111fe0a..8488e47939 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 3abd540cbd..3bc55df4e8 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-utils/package.json b/packages/router-utils/package.json index f0f9662c21..7091b1126f 100644 --- a/packages/router-utils/package.json +++ b/packages/router-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-utils", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index f8bb1b6580..81fedbcfb5 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 3a58182cb4..16adff6290 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 29e30a5669..5ddfc98d6f 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 498f4d9331..bb4f01d918 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 0b90413a6c..327e28d9d4 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 9a8b2d520c..199f916e57 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 4d56a62d70..0a112653e9 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 3f8dacda35deaedcef62c391f90e7cdd569b1e97 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 17 May 2025 21:00:13 +0200 Subject: [PATCH 079/126] chore: simplify test for 'using' (#4196) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- .../react/1-default/development/using.tsx | 32 ++----------------- .../1-default/development/using@component.tsx | 3 +- .../development/using@errorComponent.tsx | 3 +- .../development/using@notFoundComponent.tsx | 6 +--- .../react/1-default/production/using.tsx | 9 +----- .../1-default/production/using@component.tsx | 3 +- .../production/using@errorComponent.tsx | 3 +- .../production/using@notFoundComponent.tsx | 6 +--- .../development/using.tsx | 32 ++----------------- ...--notFoundComponent---pendingComponent.tsx | 8 +---- .../production/using.tsx | 9 +----- ...--notFoundComponent---pendingComponent.tsx | 8 +---- .../development/using.tsx | 32 ++----------------- ...--notFoundComponent---pendingComponent.tsx | 7 +--- .../development/using@errorComponent.tsx | 3 +- .../production/using.tsx | 9 +----- ...--notFoundComponent---pendingComponent.tsx | 7 +--- .../production/using@errorComponent.tsx | 3 +- .../code-splitter/test-files/react/using.tsx | 5 --- 19 files changed, 21 insertions(+), 167 deletions(-) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx index d04c22f712..abe0e68a9b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using.tsx @@ -1,7 +1,3 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=notFoundComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const DummyPostResource = (postId: string) => ({ postData: { id: postId, @@ -18,29 +14,5 @@ export const Route = createFileRoute({ }) => { using dummyPost = DummyPostResource(postId); return dummyPost.postData; - }, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} \ No newline at end of file + } +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx index 8af50b061d..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@component.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitComponent as component }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx index 301cd75bd6..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@errorComponent.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx index afcff02bbc..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/using@notFoundComponent.tsx @@ -1,5 +1 @@ -import { Route } from "using.tsx"; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx index fae4fdfc26..abe0e68a9b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using.tsx @@ -1,7 +1,3 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=notFoundComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const DummyPostResource = (postId: string) => ({ postData: { id: postId, @@ -18,8 +14,5 @@ export const Route = createFileRoute({ }) => { using dummyPost = DummyPostResource(postId); return dummyPost.postData; - }, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') + } }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx index 8af50b061d..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@component.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitComponent as component }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx index 301cd75bd6..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@errorComponent.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx index afcff02bbc..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/using@notFoundComponent.tsx @@ -1,5 +1 @@ -import { Route } from "using.tsx"; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx index beca8d394b..c58f0f663b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using.tsx @@ -1,33 +1,5 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); import { lazyFn } from '@tanstack/react-router'; export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader') +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx index 83b06e84ac..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/using@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1 @@ -import { Route } from "using.tsx"; -export { SplitComponent as component }; -export { SplitErrorComponent as errorComponent }; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx index 5f1486aa4c..c58f0f663b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using.tsx @@ -1,12 +1,5 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); import { lazyFn } from '@tanstack/react-router'; export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') + loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx index 83b06e84ac..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/using@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1 @@ -import { Route } from "using.tsx"; -export { SplitComponent as component }; -export { SplitErrorComponent as errorComponent }; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx index c83cd76e96..140f394f60 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using.tsx @@ -1,33 +1,5 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); import { lazyFn } from '@tanstack/react-router'; export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} -if (import.meta.hot) { - import.meta.hot.accept(newModule => { - if (newModule.Route && typeof newModule.Route.clone === 'function') { - newModule.Route.clone(Route); - } - }); -} \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader') +}); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx index 9e23ebf710..ae4bc0c74c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -15,9 +15,4 @@ const SplitLoader = ({ using dummyPost = DummyPostResource(postId); return dummyPost.postData; }; -export { SplitLoader as loader }; -export { SplitComponent as component }; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +export { SplitLoader as loader }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx index 301cd75bd6..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/using@errorComponent.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx index 790ff29580..140f394f60 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using.tsx @@ -1,12 +1,5 @@ -const $$splitNotFoundComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitErrorComponentImporter = () => import('using.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); import { lazyFn } from '@tanstack/react-router'; export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') + loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx index 9e23ebf710..ae4bc0c74c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -15,9 +15,4 @@ const SplitLoader = ({ using dummyPost = DummyPostResource(postId); return dummyPost.postData; }; -export { SplitLoader as loader }; -export { SplitComponent as component }; -const SplitNotFoundComponent = () => { - return Post not found; -}; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +export { SplitLoader as loader }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx index 301cd75bd6..ac756d42a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/using@errorComponent.tsx @@ -1,2 +1 @@ -import { Route } from "using.tsx"; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { Route } from "using.tsx"; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx b/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx index e1ed815dc9..e9b7173804 100644 --- a/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx +++ b/packages/router-plugin/tests/code-splitter/test-files/react/using.tsx @@ -7,9 +7,4 @@ export const Route = createFileRoute({ using dummyPost = DummyPostResource(postId) return dummyPost.postData }, - errorComponent: PostErrorComponent, - component: PostComponent, - notFoundComponent: () => { - return Post not found - }, }) From 0f12171ac2ddb2eb376344bce31627469ead4805 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sun, 18 May 2025 12:41:46 +0200 Subject: [PATCH 080/126] chore: router plugin restructuring (#4199) --- .../basic-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../js-only-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../basic-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../react/authenticated-routes/vite.config.js | 4 +-- .../react/basic-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../react/basic-ssr-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../kitchen-sink-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../react/large-file-based/vite.config.js | 4 +-- .../quickstart-file-based/vite.config.js | 4 +-- .../react/view-transitions/vite.config.js | 4 +-- .../react/with-trpc-react-query/app.config.js | 4 +-- examples/react/with-trpc/app.config.js | 4 +-- .../solid/basic-file-based/vite.config.js | 4 +-- .../vite.config.js | 4 +-- .../kitchen-sink-file-based/vite.config.js | 4 +-- .../quickstart-file-based/vite.config.js | 4 +-- packages/router-plugin/src/vite.ts | 33 +++++++++++-------- 25 files changed, 68 insertions(+), 61 deletions(-) diff --git a/e2e/react-router/basic-file-based/vite.config.js b/e2e/react-router/basic-file-based/vite.config.js index 1a57a64b22..172112dd72 100644 --- a/e2e/react-router/basic-file-based/vite.config.js +++ b/e2e/react-router/basic-file-based/vite.config.js @@ -1,8 +1,8 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [TanStackRouterVite({ target: 'react' }), react()], + plugins: [tanstackRouter({ target: 'react' }), react()], }) diff --git a/e2e/react-router/basic-react-query-file-based/vite.config.js b/e2e/react-router/basic-react-query-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/e2e/react-router/basic-react-query-file-based/vite.config.js +++ b/e2e/react-router/basic-react-query-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/e2e/react-router/js-only-file-based/vite.config.js b/e2e/react-router/js-only-file-based/vite.config.js index 412b7c6338..926b55a02e 100644 --- a/e2e/react-router/js-only-file-based/vite.config.js +++ b/e2e/react-router/js-only-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', disableTypes: true, disableManifestGeneration: true, diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/vite.config.js b/e2e/react-router/scroll-restoration-sandbox-vite/vite.config.js index 1a57a64b22..172112dd72 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/vite.config.js +++ b/e2e/react-router/scroll-restoration-sandbox-vite/vite.config.js @@ -1,8 +1,8 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [TanStackRouterVite({ target: 'react' }), react()], + plugins: [tanstackRouter({ target: 'react' }), react()], }) diff --git a/e2e/solid-router/basic-file-based/vite.config.js b/e2e/solid-router/basic-file-based/vite.config.js index 0d2f08b695..1fc0fce40a 100644 --- a/e2e/solid-router/basic-file-based/vite.config.js +++ b/e2e/solid-router/basic-file-based/vite.config.js @@ -1,8 +1,8 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [TanStackRouterVite({ target: 'solid' }), solid()], + plugins: [tanstackRouter({ target: 'solid' }), solid()], }) diff --git a/e2e/solid-router/basic-solid-query-file-based/vite.config.js b/e2e/solid-router/basic-solid-query-file-based/vite.config.js index 4af89e7520..1660a56c17 100644 --- a/e2e/solid-router/basic-solid-query-file-based/vite.config.js +++ b/e2e/solid-router/basic-solid-query-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ target: 'solid', autoCodeSplitting: true }), solid(), ], }) diff --git a/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js b/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js index 0d2f08b695..1fc0fce40a 100644 --- a/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js +++ b/e2e/solid-router/scroll-restoration-sandbox-vite/vite.config.js @@ -1,8 +1,8 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [TanStackRouterVite({ target: 'solid' }), solid()], + plugins: [tanstackRouter({ target: 'solid' }), solid()], }) diff --git a/examples/react/authenticated-routes-firebase/vite.config.js b/examples/react/authenticated-routes-firebase/vite.config.js index f22a7fa76f..47e327b746 100644 --- a/examples/react/authenticated-routes-firebase/vite.config.js +++ b/examples/react/authenticated-routes-firebase/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, }), diff --git a/examples/react/authenticated-routes/vite.config.js b/examples/react/authenticated-routes/vite.config.js index f22a7fa76f..47e327b746 100644 --- a/examples/react/authenticated-routes/vite.config.js +++ b/examples/react/authenticated-routes/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, }), diff --git a/examples/react/basic-file-based/vite.config.js b/examples/react/basic-file-based/vite.config.js index f22a7fa76f..47e327b746 100644 --- a/examples/react/basic-file-based/vite.config.js +++ b/examples/react/basic-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, }), diff --git a/examples/react/basic-react-query-file-based/vite.config.js b/examples/react/basic-react-query-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/basic-react-query-file-based/vite.config.js +++ b/examples/react/basic-react-query-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/basic-ssr-file-based/vite.config.js b/examples/react/basic-ssr-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/basic-ssr-file-based/vite.config.js +++ b/examples/react/basic-ssr-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/basic-ssr-streaming-file-based/vite.config.js b/examples/react/basic-ssr-streaming-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/basic-ssr-streaming-file-based/vite.config.js +++ b/examples/react/basic-ssr-streaming-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/kitchen-sink-file-based/vite.config.js b/examples/react/kitchen-sink-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/kitchen-sink-file-based/vite.config.js +++ b/examples/react/kitchen-sink-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/kitchen-sink-react-query-file-based/vite.config.js b/examples/react/kitchen-sink-react-query-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/kitchen-sink-react-query-file-based/vite.config.js +++ b/examples/react/kitchen-sink-react-query-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/large-file-based/vite.config.js b/examples/react/large-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/large-file-based/vite.config.js +++ b/examples/react/large-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/quickstart-file-based/vite.config.js b/examples/react/quickstart-file-based/vite.config.js index b819774577..ab615485ae 100644 --- a/examples/react/quickstart-file-based/vite.config.js +++ b/examples/react/quickstart-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'react', autoCodeSplitting: true }), + tanstackRouter({ target: 'react', autoCodeSplitting: true }), react(), ], }) diff --git a/examples/react/view-transitions/vite.config.js b/examples/react/view-transitions/vite.config.js index f22a7fa76f..47e327b746 100644 --- a/examples/react/view-transitions/vite.config.js +++ b/examples/react/view-transitions/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, }), diff --git a/examples/react/with-trpc-react-query/app.config.js b/examples/react/with-trpc-react-query/app.config.js index 0f15246c33..394f58c645 100644 --- a/examples/react/with-trpc-react-query/app.config.js +++ b/examples/react/with-trpc-react-query/app.config.js @@ -1,6 +1,6 @@ import { defineConfig } from 'vite' import reactRefresh from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // TODO: Need to migrate this to vite and the new TanStack Start plugin @@ -31,7 +31,7 @@ export default defineConfig({ handler: './index.html', target: 'browser', plugins: () => [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, routesDirectory: './src/routes', diff --git a/examples/react/with-trpc/app.config.js b/examples/react/with-trpc/app.config.js index 0f15246c33..394f58c645 100644 --- a/examples/react/with-trpc/app.config.js +++ b/examples/react/with-trpc/app.config.js @@ -1,6 +1,6 @@ import { defineConfig } from 'vite' import reactRefresh from '@vitejs/plugin-react' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // TODO: Need to migrate this to vite and the new TanStack Start plugin @@ -31,7 +31,7 @@ export default defineConfig({ handler: './index.html', target: 'browser', plugins: () => [ - TanStackRouterVite({ + tanstackRouter({ target: 'react', autoCodeSplitting: true, routesDirectory: './src/routes', diff --git a/examples/solid/basic-file-based/vite.config.js b/examples/solid/basic-file-based/vite.config.js index 2b2f26819d..74e9ca3db3 100644 --- a/examples/solid/basic-file-based/vite.config.js +++ b/examples/solid/basic-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, }), diff --git a/examples/solid/basic-solid-query-file-based/vite.config.js b/examples/solid/basic-solid-query-file-based/vite.config.js index 4af89e7520..1660a56c17 100644 --- a/examples/solid/basic-solid-query-file-based/vite.config.js +++ b/examples/solid/basic-solid-query-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ target: 'solid', autoCodeSplitting: true }), solid(), ], }) diff --git a/examples/solid/kitchen-sink-file-based/vite.config.js b/examples/solid/kitchen-sink-file-based/vite.config.js index 59c70c1244..a4b5a71096 100644 --- a/examples/solid/kitchen-sink-file-based/vite.config.js +++ b/examples/solid/kitchen-sink-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' import solidPlugin from 'vite-plugin-solid' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ target: 'solid', autoCodeSplitting: true }), + tanstackRouter({ target: 'solid', autoCodeSplitting: true }), solidPlugin(), ], }) diff --git a/examples/solid/quickstart-file-based/vite.config.js b/examples/solid/quickstart-file-based/vite.config.js index 2b2f26819d..74e9ca3db3 100644 --- a/examples/solid/quickstart-file-based/vite.config.js +++ b/examples/solid/quickstart-file-based/vite.config.js @@ -1,11 +1,11 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { tanstackRouter } from '@tanstack/router-plugin/vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ - TanStackRouterVite({ + tanstackRouter({ target: 'solid', autoCodeSplitting: true, }), diff --git a/packages/router-plugin/src/vite.ts b/packages/router-plugin/src/vite.ts index aad06e20cc..155f8ad159 100644 --- a/packages/router-plugin/src/vite.ts +++ b/packages/router-plugin/src/vite.ts @@ -4,32 +4,34 @@ import { configSchema } from './core/config' import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin' import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin' import { unpluginRouterComposedFactory } from './core/router-composed-plugin' - +import { unpluginRouteAutoImportFactory } from './core/route-autoimport-plugin' import type { Config } from './core/config' +const tanstackRouterAutoImport = createVitePlugin( + unpluginRouteAutoImportFactory, +) + /** * @example * ```ts * export default defineConfig({ - * plugins: [TanStackRouterGeneratorVite()], + * plugins: [tanstackRouterGenerator()], * // ... * }) * ``` */ -const TanStackRouterGeneratorVite = createVitePlugin( - unpluginRouterGeneratorFactory, -) +const tanstackRouterGenerator = createVitePlugin(unpluginRouterGeneratorFactory) /** * @example * ```ts * export default defineConfig({ - * plugins: [TanStackRouterCodeSplitterVite()], + * plugins: [tanStackRouterCodeSplitter()], * // ... * }) * ``` */ -const TanStackRouterCodeSplitterVite = createVitePlugin( +const tanStackRouterCodeSplitter = createVitePlugin( unpluginRouterCodeSplitterFactory, ) @@ -37,19 +39,24 @@ const TanStackRouterCodeSplitterVite = createVitePlugin( * @example * ```ts * export default defineConfig({ - * plugins: [TanStackRouterVite()], + * plugins: [tanstackRouter()], * // ... * }) * ``` */ -const TanStackRouterVite = createVitePlugin(unpluginRouterComposedFactory) -const tanstackRouter = TanStackRouterVite +const tanstackRouter = createVitePlugin(unpluginRouterComposedFactory) + +/** + * @deprecated Use `tanstackRouter` instead. + */ +const TanStackRouterVite = tanstackRouter -export default TanStackRouterVite +export default tanstackRouter export { configSchema, - TanStackRouterGeneratorVite, - TanStackRouterCodeSplitterVite, + tanstackRouterAutoImport, + tanStackRouterCodeSplitter, + tanstackRouterGenerator, TanStackRouterVite, tanstackRouter, } From 487d1bc84f54baa737bf79c62e5a74501c567727 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Tue, 20 May 2025 22:14:11 +0200 Subject: [PATCH 081/126] fix: allow head to be async (#4213) --- packages/router-core/src/route.ts | 9 +- packages/router-core/src/router.ts | 82 +++++++++---------- packages/router-core/src/utils.ts | 1 + packages/solid-router/tests/route.test.tsx | 32 ++++++-- packages/start-client-core/src/ssr-client.tsx | 82 ++++++++++--------- 5 files changed, 112 insertions(+), 94 deletions(-) diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index e8c42e952d..c87b77fe9e 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -18,6 +18,7 @@ import type { AnyRouter, RegisteredRouter } from './router' import type { BuildLocationFn, NavigateFn } from './RouterProvider' import type { Assign, + Awaitable, Constrain, Expand, IntersectAssign, @@ -1105,7 +1106,7 @@ export interface UpdatableRouteOptions< TBeforeLoadFn, TLoaderDeps >, - ) => Record + ) => Awaitable> head?: ( ctx: AssetFnContextOptions< TRouteId, @@ -1119,11 +1120,11 @@ export interface UpdatableRouteOptions< TBeforeLoadFn, TLoaderDeps >, - ) => { + ) => Awaitable<{ links?: AnyRouteMatch['links'] scripts?: AnyRouteMatch['headScripts'] meta?: AnyRouteMatch['meta'] - } + }> scripts?: ( ctx: AssetFnContextOptions< TRouteId, @@ -1137,7 +1138,7 @@ export interface UpdatableRouteOptions< TBeforeLoadFn, TLoaderDeps >, - ) => AnyRouteMatch['scripts'] + ) => Awaitable ssr?: boolean codeSplitGroupings?: Array< Array< diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 6bcaed0ee3..ced0007c82 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2488,7 +2488,7 @@ export class RouterCore< !this.state.matches.find((d) => d.id === matchId), })) - const executeHead = () => { + const executeHead = async () => { const match = this.getMatch(matchId) // in case of a redirecting match during preload, the match does not exist if (!match) { @@ -2500,21 +2500,17 @@ export class RouterCore< params: match.params, loaderData: match.loaderData, } - const headFnContent = route.options.head?.(assetContext) + const headFnContent = + await route.options.head?.(assetContext) const meta = headFnContent?.meta const links = headFnContent?.links const headScripts = headFnContent?.scripts - const scripts = route.options.scripts?.(assetContext) - const headers = route.options.headers?.(assetContext) - updateMatch(matchId, (prev) => ({ - ...prev, - meta, - links, - headScripts, - headers, - scripts, - })) + const scripts = + await route.options.scripts?.(assetContext) + const headers = + await route.options.headers?.(assetContext) + return { meta, links, headScripts, headers, scripts } } const runLoader = async () => { @@ -2561,17 +2557,19 @@ export class RouterCore< // to be preloaded before we resolve the match await route._componentsPromise - batch(() => { - updateMatch(matchId, (prev) => ({ - ...prev, - error: undefined, - status: 'success', - isFetching: false, - updatedAt: Date.now(), - loaderData, - })) - executeHead() - }) + updateMatch(matchId, (prev) => ({ + ...prev, + error: undefined, + status: 'success', + isFetching: false, + updatedAt: Date.now(), + loaderData, + })) + const head = await executeHead() + updateMatch(matchId, (prev) => ({ + ...prev, + ...head, + })) } catch (e) { let error = e @@ -2588,16 +2586,14 @@ export class RouterCore< onErrorError, ) } - - batch(() => { - updateMatch(matchId, (prev) => ({ - ...prev, - error, - status: 'error', - isFetching: false, - })) - executeHead() - }) + const head = await executeHead() + updateMatch(matchId, (prev) => ({ + ...prev, + error, + status: 'error', + isFetching: false, + ...head, + })) } this.serverSsr?.onMatchSettled({ @@ -2605,13 +2601,13 @@ export class RouterCore< match: this.getMatch(matchId)!, }) } catch (err) { - batch(() => { - updateMatch(matchId, (prev) => ({ - ...prev, - loaderPromise: undefined, - })) - executeHead() - }) + const head = await executeHead() + + updateMatch(matchId, (prev) => ({ + ...prev, + loaderPromise: undefined, + ...head, + })) handleRedirectAndNotFound(this.getMatch(matchId)!, err) } } @@ -2651,7 +2647,11 @@ export class RouterCore< // if the loader did not run, still update head. // reason: parent's beforeLoad may have changed the route context // and only now do we know the route context (and that the loader would not run) - executeHead() + const head = await executeHead() + updateMatch(matchId, (prev) => ({ + ...prev, + ...head, + })) } } if (!loaderIsRunningAsync) { diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 2b522a284b..5a9c1ba71a 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -1,6 +1,7 @@ import type { RouteIds } from './routeInfo' import type { AnyRouter } from './router' +export type Awaitable = T | Promise export type NoInfer = [T][T extends any ? 0 : never] export type IsAny = 1 extends 0 & TValue ? TYesResult diff --git a/packages/solid-router/tests/route.test.tsx b/packages/solid-router/tests/route.test.tsx index 7a8f776a61..f0a2a8e591 100644 --- a/packages/solid-router/tests/route.test.tsx +++ b/packages/solid-router/tests/route.test.tsx @@ -1,15 +1,26 @@ -import { afterEach, describe, expect, it, test, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest' import { cleanup, render, screen } from '@solidjs/testing-library' import { RouterProvider, + createBrowserHistory, createRootRoute, createRoute, createRouter, getRouteApi, } from '../src' +import type { RouterHistory } from '../src' + +let history: RouterHistory + +beforeEach(() => { + history = createBrowserHistory() + expect(window.location.pathname).toBe('/') +}) + afterEach(() => { + history.destroy() vi.resetAllMocks() window.history.replaceState(null, 'root', '/') cleanup() @@ -161,7 +172,7 @@ describe('onEnter event', () => { }, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree, context: { foo: 'bar' } }) + const router = createRouter({ routeTree, history, context: { foo: 'bar' } }) await router.load() @@ -182,7 +193,7 @@ describe('onEnter event', () => { }, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree, context: { foo: 'bar' } }) + const router = createRouter({ routeTree, history, context: { foo: 'bar' } }) render(() => ) @@ -214,8 +225,9 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) + await router.load() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -254,7 +266,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -286,8 +298,9 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) + await router.load() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -316,7 +329,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -343,8 +356,9 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) + await router.load() const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() @@ -373,7 +387,7 @@ describe('route.head', () => { component: () =>
Index
, }) const routeTree = rootRoute.addChildren([indexRoute]) - const router = createRouter({ routeTree }) + const router = createRouter({ routeTree, history }) render(() => ) const indexElem = await screen.findByText('Index') expect(indexElem).toBeInTheDocument() diff --git a/packages/start-client-core/src/ssr-client.tsx b/packages/start-client-core/src/ssr-client.tsx index f4ef371931..b1b43f269a 100644 --- a/packages/start-client-core/src/ssr-client.tsx +++ b/packages/start-client-core/src/ssr-client.tsx @@ -179,50 +179,52 @@ export async function hydrate(router: AnyRouter): Promise { // now that all necessary data is hydrated: // 1) fully reconstruct the route context // 2) execute `head()` and `scripts()` for each match - router.state.matches.forEach((match) => { - const route = router.looseRoutesById[match.routeId]! - - const parentMatch = router.state.matches[match.index - 1] - const parentContext = parentMatch?.context ?? router.options.context ?? {} - - // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed - // so run it again and merge route context - const contextFnContext: RouteContextOptions = { - deps: match.loaderDeps, - params: match.params, - context: parentContext, - location: router.state.location, - navigate: (opts: any) => - router.navigate({ ...opts, _fromLocation: router.state.location }), - buildLocation: router.buildLocation, - cause: match.cause, - abortController: match.abortController, - preload: false, - matches, - } - match.__routeContext = route.options.context?.(contextFnContext) ?? {} + await Promise.all( + router.state.matches.map(async (match) => { + const route = router.looseRoutesById[match.routeId]! - match.context = { - ...parentContext, - ...match.__routeContext, - ...match.__beforeLoadContext, - } + const parentMatch = router.state.matches[match.index - 1] + const parentContext = parentMatch?.context ?? router.options.context ?? {} + + // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed + // so run it again and merge route context + const contextFnContext: RouteContextOptions = { + deps: match.loaderDeps, + params: match.params, + context: parentContext, + location: router.state.location, + navigate: (opts: any) => + router.navigate({ ...opts, _fromLocation: router.state.location }), + buildLocation: router.buildLocation, + cause: match.cause, + abortController: match.abortController, + preload: false, + matches, + } + match.__routeContext = route.options.context?.(contextFnContext) ?? {} - const assetContext = { - matches: router.state.matches, - match, - params: match.params, - loaderData: match.loaderData, - } - const headFnContent = route.options.head?.(assetContext) + match.context = { + ...parentContext, + ...match.__routeContext, + ...match.__beforeLoadContext, + } - const scripts = route.options.scripts?.(assetContext) + const assetContext = { + matches: router.state.matches, + match, + params: match.params, + loaderData: match.loaderData, + } + const headFnContent = await route.options.head?.(assetContext) - match.meta = headFnContent?.meta - match.links = headFnContent?.links - match.headScripts = headFnContent?.scripts - match.scripts = scripts - }) + const scripts = await route.options.scripts?.(assetContext) + + match.meta = headFnContent?.meta + match.links = headFnContent?.links + match.headScripts = headFnContent?.scripts + match.scripts = scripts + }), + ) if (matches[matches.length - 1]!.id !== lastMatchId) { return await Promise.all([routeChunkPromise, router.load()]) From e5e8e02c9ef1a8ea859e26fd4c348259a428e064 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 20 May 2025 20:15:27 +0000 Subject: [PATCH 082/126] release: v1.121.0-alpha.3 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 94 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 3d94162ab7..698a1f8a2b 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 9434aa6c2f..ceed797c55 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 634ee9adc1..b9f7c1ecf4 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index f00b5cc37c..3ff0aab2b0 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 33df11ecc5..5e7d15043a 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 481fed3ff6..22d9153c99 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index cd1ef5d785..4498c2e83a 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 3e3921b2db..ab563d8577 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 2733be56ee..cbe82e72f1 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 3053c76b70..37f16737f8 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 99cbc7efa7..50e311b245 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index a373bdea84..fce1b3f64d 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index dc91e55e75..fc7e39ccb1 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index fee921aa14..2f95c27820 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 779a73f6cb..789b4a2ce7 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 35e70c8154..1c14a75ae6 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index eaf2f8ea4d..718927dd90 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 770c8834fd..0310c67850 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index bb86281d19..4e686aafe5 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 0ef029169c..eb766595e4 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 7ba1ffab3d..9af43e9fb2 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index ad57ddbce1..4feceb59ff 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 9258eb67d3..9e108e8465 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index af4fa9445e..22567c8be3 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index c5a21ee625..7c1decf0f8 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index b2cb755bd2..2509dfdba2 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index ae76461395..e26231df45 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 3047821826..2986e30b92 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index b12ea5c56b..6ea1b711f3 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 9f87aec9d7..ce5ffb8038 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 6d0b4130d6..3f252374ff 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 289440db3a..41c655e3db 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 36d724f341..9f2a92d0b4 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index d5ca1aa8ad..1986e2d29a 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index d72b993a80..9f3a4b7a02 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.121.0-alpha.1", + "@tanstack/arktype-adapter": "^1.121.0-alpha.3", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", - "@tanstack/valibot-adapter": "^1.121.0-alpha.1", - "@tanstack/zod-adapter": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/valibot-adapter": "^1.121.0-alpha.3", + "@tanstack/zod-adapter": "^1.121.0-alpha.3", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index e623d4872b..8f5bfe5ab8 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index d6357ca081..efa18684fe 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 5d7cb5130f..41e12bc262 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-with-query": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-with-query": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 3b5a9fbcd3..172b59ff92 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index b88115a5c1..1f0b03dec3 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index fe057b6882..1d7f0f2426 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index c2548b89cf..b5e09e94fa 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index c32b4c0656..b30c8f9342 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-with-query": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-with-query": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 54474b7adb..b86ab9c52b 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index cfac97c689..516d82bd94 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index b988c3df31..1df4b85d15 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index edc87b17f3..41c2b8f499 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 9e55e82e1e..81c7d4a1c2 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 211d9ac0d2..756baa009c 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-with-query": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-with-query": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index bfd56323b8..ccd70f48cc 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 12bf49022b..0ac05dfa57 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index f6d601efb4..4dd71b993f 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index ed72e918dc..de0243e410 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index e8cb94aaf9..253c89def5 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.1", - "@tanstack/react-router-devtools": "^1.121.0-alpha.1", - "@tanstack/router-plugin": "^1.121.0-alpha.2", - "@tanstack/react-start": "^1.121.0-alpha.2", + "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.3", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 260ea37a20..3ed9096da1 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index c4f133bfaa..c03c516937 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 19bb97118d..e556c41d7b 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 6cb00c97a9..971ca62b98 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index d0f8022ea9..75a715987f 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index a6044e4b05..a005be48f9 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index fc2d8fdc60..d9a06cd0eb 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index df962866b5..3beb23ef51 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.2", + "@tanstack/router-plugin": "^1.121.0-alpha.3", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 4f358bc6cc..567a993c3d 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.2", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 088ee478a9..2df43c24e8 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.2", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 2f8f816b51..44a6211bae 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.1", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.1", - "@tanstack/solid-start": "^1.121.0-alpha.2", + "@tanstack/solid-router": "^1.121.0-alpha.3", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.3", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index dc58a5e1fb..3c81a51d90 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 0289026fc5..66c13baa0d 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index a2630278a6..94d70eed84 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index f430a480bb..723b08d96e 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 0e59d50488..77e5b68174 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index deae8cc81a..2177c22f84 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 4ba388ab0f..854aedbd5b 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 8488e47939..ca7cfe5179 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 5641752381..e67452afb9 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index be004b70c0..57fb1d8ae0 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index a423ee8dec..96231b8fef 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 03a53672fb..d92bb4a834 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index f09657efe8..1fa0fb67cf 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 3bc55df4e8..24d644c8cd 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 81fedbcfb5..0ec71673a5 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 05d0433eeb..bbb80a6bbe 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 9b9334d7e5..c4c19e2df1 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 755d812f9b..dcebcb5664 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 5ddfc98d6f..717d0f51a9 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index f81e2ed934..0a830c5275 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index bb4f01d918..dd38955a9b 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 8155ceea59..4ca575513c 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 327e28d9d4..5cf8e11068 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 947fa3521c..65ebc3fc1c 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 199f916e57..6eeda38d1e 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 53ad1122df..8a9749e61c 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 0af75574a6..853019ce14 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 4e9925e771..9c2ca4d5ac 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.121.0-alpha.1", + "version": "1.121.0-alpha.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 75c41c2a44..5455205ec9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5118,7 +5118,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5158,7 +5158,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5192,7 +5192,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5232,7 +5232,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5278,7 +5278,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5321,7 +5321,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5361,7 +5361,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5404,7 +5404,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5493,7 +5493,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5536,7 +5536,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.1 + specifier: ^1.121.0-alpha.3 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 3a5a7649a7463ff1edafa9ecda98f44cdbc36da7 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Wed, 21 May 2025 20:47:27 +1200 Subject: [PATCH 083/126] refactor(start-plugin-core): omit `autoCodeSplitting` configuration option in `tsr` (#4218) --- packages/router-plugin/src/core/config.ts | 2 ++ packages/router-plugin/src/index.ts | 4 ++-- packages/start-plugin-core/src/schema.ts | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/router-plugin/src/core/config.ts b/packages/router-plugin/src/core/config.ts index cdcbac4414..4a0015ec1b 100644 --- a/packages/router-plugin/src/core/config.ts +++ b/packages/router-plugin/src/core/config.ts @@ -78,3 +78,5 @@ export const getConfig = (inlineConfig: Partial, root: string) => { } export type Config = z.infer +export type ConfigInput = z.input +export type ConfigOutput = z.output diff --git a/packages/router-plugin/src/index.ts b/packages/router-plugin/src/index.ts index 43e52c85d7..49d96dd9a6 100644 --- a/packages/router-plugin/src/index.ts +++ b/packages/router-plugin/src/index.ts @@ -1,4 +1,4 @@ -export { configSchema } from './core/config' +export { configSchema, getConfig } from './core/config' export { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin' export { unpluginRouterGeneratorFactory } from './core/router-generator-plugin' -export type { Config } from './core/config' +export type { Config, ConfigInput, ConfigOutput } from './core/config' diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index 065675bce2..b70d7262f4 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -4,9 +4,12 @@ import { z } from 'zod' import { configSchema, getConfig } from '@tanstack/router-generator' import type { NitroConfig } from 'nitropack' -const tsrConfig = configSchema.partial().extend({ - srcDirectory: z.string().optional().default('src'), -}) +const tsrConfig = configSchema + .omit({ autoCodeSplitting: true }) + .partial() + .extend({ + srcDirectory: z.string().optional().default('src'), + }) export function createTanStackConfig< TFrameworkPlugin extends Record, From 6461704e338ac365fb0b269b58921c02b8afaa3b Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 08:48:42 +0000 Subject: [PATCH 084/126] release: v1.121.0-alpha.4 --- examples/react/authenticated-routes-firebase/package.json | 2 +- examples/react/authenticated-routes/package.json | 2 +- examples/react/basic-file-based/package.json | 2 +- examples/react/basic-react-query-file-based/package.json | 2 +- examples/react/basic-virtual-file-based/package.json | 2 +- examples/react/basic-virtual-inside-file-based/package.json | 2 +- examples/react/kitchen-sink-file-based/package.json | 2 +- .../react/kitchen-sink-react-query-file-based/package.json | 2 +- examples/react/large-file-based/package.json | 2 +- examples/react/quickstart-esbuild-file-based/package.json | 2 +- examples/react/quickstart-file-based/package.json | 2 +- examples/react/quickstart-rspack-file-based/package.json | 2 +- examples/react/quickstart-webpack-file-based/package.json | 2 +- examples/react/router-monorepo-react-query/package.json | 2 +- .../router-monorepo-react-query/packages/router/package.json | 2 +- examples/react/router-monorepo-simple-lazy/package.json | 2 +- .../router-monorepo-simple-lazy/packages/router/package.json | 2 +- examples/react/router-monorepo-simple/package.json | 2 +- .../react/router-monorepo-simple/packages/router/package.json | 2 +- examples/react/search-validator-adapters/package.json | 2 +- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/view-transitions/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 4 ++-- examples/react/with-trpc/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 2 +- examples/solid/basic-solid-query-file-based/package.json | 2 +- examples/solid/basic-solid-query/package.json | 2 +- examples/solid/kitchen-sink-file-based/package.json | 2 +- examples/solid/quickstart-file-based/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 53 files changed, 55 insertions(+), 55 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 698a1f8a2b..24e8451d6b 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index ceed797c55..f16c4416d9 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 5e7d15043a..97a84a8410 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 4498c2e83a..4c15427b17 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index cbe82e72f1..8777956c57 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 37f16737f8..c9ba3f9a62 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index fc7e39ccb1..eb89fd49d7 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 2f95c27820..a09e82b736 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -13,7 +13,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 718927dd90..f563140d88 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index eb766595e4..5a324ff0f7 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 9af43e9fb2..a036a5d83f 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 4feceb59ff..b244c81d81 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 9e108e8465..b59e45c573 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 7c1decf0f8..48b6e5c27a 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index e26231df45..ecdbd16701 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,7 +11,7 @@ "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 2986e30b92..9ae2ab4b55 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index ce5ffb8038..9721b84df5 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 3f252374ff..da6c628c7d 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 9f2a92d0b4..3bef1237dc 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -10,7 +10,7 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 9f3a4b7a02..47b2cddb5c 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "@tanstack/valibot-adapter": "^1.121.0-alpha.3", "@tanstack/zod-adapter": "^1.121.0-alpha.3", "arktype": "^2.1.7", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 8f5bfe5ab8..0bddd1cb3e 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index efa18684fe..f7f49abf0c 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 41e12bc262..825767ac0c 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-with-query": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 172b59ff92..c8dd75975c 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 1f0b03dec3..b8599b84a5 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 1d7f0f2426..df9b35eb3b 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index b5e09e94fa..16fd72b5d8 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index b30c8f9342..1afc535fef 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-with-query": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index b86ab9c52b..528922820f 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 516d82bd94..0c2399cda3 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 1df4b85d15..c7da520321 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 41c2b8f499..5f2205bbf2 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 81c7d4a1c2..dde038bae8 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 756baa009c..39a3f99d70 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-with-query": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index ccd70f48cc..205e72fc30 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/react-start": "^1.121.0-alpha.4", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 0ac05dfa57..a4151a10e2 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index de0243e410..7a72faece0 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -12,8 +12,8 @@ "@tanstack/react-query-devtools": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-start": "^1.121.0-alpha.4", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 253c89def5..e470be9c1a 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.3", "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-start": "^1.121.0-alpha.4", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index c03c516937..cb45b347d4 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 971ca62b98..2bf3e0720f 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 75a715987f..6aadd906cc 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index d9a06cd0eb..b4b887c4ba 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index 3beb23ef51..fd0beceee8 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.3", + "@tanstack/router-plugin": "^1.121.0-alpha.4", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 567a993c3d..0fda175863 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.3", "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.4", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 2df43c24e8..fba3a6437b 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.3", "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.4", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 44a6211bae..a297256dd1 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.3", "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.3", + "@tanstack/solid-start": "^1.121.0-alpha.4", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 2177c22f84..626dba918c 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index ca7cfe5179..5b1232d354 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 24d644c8cd..e30c356ffa 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 0ec71673a5..53ebd8c3d0 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 717d0f51a9..dada12a202 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index dd38955a9b..4aa5564336 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 5cf8e11068..f6f0147eb0 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.4", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From cf9e5bcb05a118132e991547a6580abbb8b7e412 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 13:47:52 -0600 Subject: [PATCH 085/126] fix: buildLocation (#4210) Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- packages/react-router/src/link.tsx | 30 +- packages/react-router/src/useNavigate.tsx | 4 +- packages/react-router/tests/link.test.tsx | 19 +- .../react-router/tests/useNavigate.test.tsx | 31 +- packages/router-core/src/index.ts | 1 - packages/router-core/src/link.ts | 2 +- packages/router-core/src/redirect.ts | 8 + packages/router-core/src/router.ts | 388 +++++++++--------- packages/solid-router/src/useNavigate.tsx | 2 +- packages/solid-router/tests/link.test.tsx | 5 - 10 files changed, 271 insertions(+), 219 deletions(-) diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 3b4b195439..4af45ed112 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -106,7 +106,7 @@ export function useLinkProps< structuralSharing: true as any, }) - const isRelativeFromPath = options.relative === 'path' + const isRelativeFromPath = options.unsafeRelative === 'path' // when `from` is not supplied, use the nearest parent match's full path as the `from` location // so relative routing works as expected. Try to stay out of rerenders as much as possible. @@ -125,20 +125,20 @@ export function useLinkProps< const from = options.from ?? (isRelativeFromPath ? leafFrom : nearestFrom) // Use it as the default `from` location - const _options = React.useMemo(() => ({ ...options, from }), [options, from]) + options = { ...options, from } const next = React.useMemo( - () => router.buildLocation(_options as any), + () => router.buildLocation(options as any), // eslint-disable-next-line react-hooks/exhaustive-deps - [router, _options, currentSearch], + [router, options, currentSearch], ) const preload = React.useMemo(() => { - if (_options.reloadDocument) { + if (options.reloadDocument) { return false } return userPreload ?? router.options.defaultPreload - }, [router.options.defaultPreload, userPreload, _options.reloadDocument]) + }, [router.options.defaultPreload, userPreload, options.reloadDocument]) const preloadDelay = userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0 @@ -189,11 +189,11 @@ export function useLinkProps< }) const doPreload = React.useCallback(() => { - router.preloadRoute(_options as any).catch((err) => { + router.preloadRoute(options as any).catch((err) => { console.warn(err) console.warn(preloadWarning) }) - }, [_options, router]) + }, [options, router]) const preloadViewportIoCallback = React.useCallback( (entry: IntersectionObserverEntry | undefined) => { @@ -263,14 +263,14 @@ export function useLinkProps< // All is well? Navigate! // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing return router.navigate({ - ..._options, + ...options, replace, resetScroll, hashScrollIntoView, startTransition, viewTransition, ignoreBlocker, - } as any) + }) } } @@ -293,10 +293,14 @@ export function useLinkProps< return } - eventTarget.preloadTimeout = setTimeout(() => { - eventTarget.preloadTimeout = null + if (!preloadDelay) { doPreload() - }, preloadDelay) + } else { + eventTarget.preloadTimeout = setTimeout(() => { + eventTarget.preloadTimeout = null + doPreload() + }, preloadDelay) + } } } diff --git a/packages/react-router/src/useNavigate.tsx b/packages/react-router/src/useNavigate.tsx index 6ba40ab280..ad88544ce4 100644 --- a/packages/react-router/src/useNavigate.tsx +++ b/packages/react-router/src/useNavigate.tsx @@ -26,7 +26,7 @@ export function useNavigate< return React.useCallback( (options: NavigateOptions) => { - const isRelativeFromPath = options.relative === 'path' + const isRelativeFromPath = options.unsafeRelative === 'path' const from = options.from ?? @@ -37,7 +37,7 @@ export function useNavigate< return navigate({ ...options, - from: from, + from, }) }, // eslint-disable-next-line react-hooks/exhaustive-deps diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 4ab507639a..93ce78b72f 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -2449,6 +2449,8 @@ describe('Link', () => { }) test('when navigating from /invoices to ./invoiceId and the current route is /posts/$postId/details', async () => { + const consoleWarnSpy = vi.spyOn(console, 'warn') + const rootRoute = createRootRoute() const indexRoute = createRoute({ @@ -2579,16 +2581,19 @@ describe('Link', () => { render() - const postsLink = await screen.findByRole('link', { name: 'To first post' }) + const postsLink = await screen.findByRole('link', { + name: 'To first post', + }) expect(postsLink).toHaveAttribute('href', '/posts/id1/details') await act(() => fireEvent.click(postsLink)) - const invoicesErrorText = await screen.findByText( - 'Invariant failed: Could not find match for from: /invoices', + expect(consoleWarnSpy).toHaveBeenCalledWith( + 'Could not find match for from: /invoices', ) - expect(invoicesErrorText).toBeInTheDocument() + + consoleWarnSpy.mockRestore() }) test('when navigating to /posts/$postId/info which is declaratively masked as /posts/$postId', async () => { @@ -3215,7 +3220,11 @@ describe('Link', () => { return ( <>

Index

- + To first post diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index ddb42abfcf..95d5742ea3 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1050,6 +1050,8 @@ test('when navigating from /invoices to ./invoiceId and the current route is /po history, }) + const consoleWarn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + render() const postsButton = await screen.findByRole('button', { @@ -1064,7 +1066,11 @@ test('when navigating from /invoices to ./invoiceId and the current route is /po fireEvent.click(invoicesButton) - expect(await screen.findByText('Something went wrong!')).toBeInTheDocument() + expect(consoleWarn).toHaveBeenCalledWith( + 'Could not find match for from: /invoices', + ) + + consoleWarn.mockRestore() }) test('when navigating to /posts/$postId/info which is masked as /posts/$postId', async () => { @@ -1558,6 +1564,11 @@ describe('relative useNavigate', () => { <>

Param Route

+ ) @@ -1719,4 +1730,22 @@ describe('relative useNavigate', () => { expect(window.location.pathname).toBe('/param/foo') }) + + test('should navigate to same route with different params', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + const parentLink = await screen.findByText('Link to . with param:bar') + + await act(async () => { + fireEvent.click(parentLink) + }) + + expect(window.location.pathname).toBe('/param/bar/a/b') + }) }) diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 361a0697dd..9f47c3ac3a 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -243,7 +243,6 @@ export type { ControllablePromise, InjectedHtmlEntry, RouterErrorSerializer, - MatchedRoutesResult, EmitFn, LoadFn, GetMatchFn, diff --git a/packages/router-core/src/link.ts b/packages/router-core/src/link.ts index fe44bb83d5..e41c5faa6e 100644 --- a/packages/router-core/src/link.ts +++ b/packages/router-core/src/link.ts @@ -424,7 +424,7 @@ export type ToSubOptionsProps< hash?: true | Updater state?: true | NonNullableUpdater from?: FromPathOption & {} - relative?: 'route' | 'path' + unsafeRelative?: 'route' | 'path' } export type ParamsReducerFn< diff --git a/packages/router-core/src/redirect.ts b/packages/router-core/src/redirect.ts index 450d422afd..02e85221b9 100644 --- a/packages/router-core/src/redirect.ts +++ b/packages/router-core/src/redirect.ts @@ -64,6 +64,14 @@ export function redirect< opts: RedirectOptions, ): Redirect { opts.statusCode = opts.statusCode || opts.code || 307 + + if (!opts.reloadDocument) { + try { + new URL(`${opts.href}`) + opts.reloadDocument = true + } catch {} + } + const headers = new Headers(opts.headers || {}) const response = new Response(null, { diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index ced0007c82..bc4ea7bfca 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -521,11 +521,6 @@ export interface RouterErrorSerializer { deserialize: (err: TSerializedError) => unknown } -export interface MatchedRoutesResult { - matchedRoutes: Array - routeParams: Record -} - export type PreloadRouteFn< TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, @@ -1071,9 +1066,9 @@ export class RouterCore< } as ParsedLocation, opts, ) - } else { - return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts) } + + return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts) } private matchRoutesInternal( @@ -1334,7 +1329,8 @@ export class RouterCore< const route = this.looseRoutesById[match.routeId]! const existingMatch = this.getMatch(match.id) - // only execute `context` if we are not just building a location + // only execute `context` if we are not calling from router.buildLocation + if (!existingMatch && opts?._buildLocation !== true) { const parentMatch = matches[index - 1] const parentContext = getParentContext(parentMatch) @@ -1403,75 +1399,64 @@ export class RouterCore< dest: BuildNextOptions & { unmaskOnReload?: boolean } = {}, - matchedRoutesResult?: MatchedRoutesResult, ): ParsedLocation => { - const fromMatches = dest._fromLocation - ? this.matchRoutes(dest._fromLocation, { _buildLocation: true }) - : this.state.matches - - const fromMatch = - dest.from != null - ? fromMatches.find((d) => - matchPathname(this.basepath, trimPathRight(d.pathname), { - to: dest.from, - caseSensitive: false, - fuzzy: false, - }), - ) - : undefined + // We allow the caller to override the current location + const currentLocation = dest._fromLocation || this.latestLocation - const fromPath = fromMatch?.pathname || this.latestLocation.pathname + const allFromMatches = this.matchRoutes(currentLocation, { + _buildLocation: true, + }) - invariant( - dest.from == null || fromMatch != null, - 'Could not find match for from: ' + dest.from, - ) + const lastMatch = last(allFromMatches)! - const fromSearch = this.state.pendingMatches?.length - ? last(this.state.pendingMatches)?.search - : last(fromMatches)?.search || this.latestLocation.search + // First let's find the starting pathname + // By default, start with the current location + let fromId = lastMatch.fullPath - const stayingMatches = matchedRoutesResult?.matchedRoutes.filter((d) => - fromMatches.find((e) => e.routeId === d.id), - ) - let pathname: string - if (dest.to) { - const resolvePathTo = - fromMatch?.fullPath || - last(fromMatches)?.fullPath || - this.latestLocation.pathname - pathname = this.resolvePathWithBase(resolvePathTo, `${dest.to}`) - } else { - const fromRouteByFromPathRouteId = - this.routesById[ - stayingMatches?.find((route) => { - const interpolatedPath = interpolatePath({ - path: route.fullPath, - params: matchedRoutesResult?.routeParams ?? {}, - decodeCharMap: this.pathParamsDecodeCharMap, - }).interpolatedPath - const pathname = joinPaths([this.basepath, interpolatedPath]) - return pathname === fromPath - })?.id as keyof this['routesById'] - ] - pathname = this.resolvePathWithBase( - fromPath, - fromRouteByFromPathRouteId?.to ?? fromPath, - ) + // If there is a to, it means we are changing the path in some way + // So we need to find the relative fromPath + if (dest.to && dest.from) { + fromId = dest.from + } + + const existingFrom = [...allFromMatches].reverse().find((d) => { + return d.fullPath === fromId || d.fullPath === joinPaths([fromId, '/']) + }) + + if (!existingFrom) { + console.warn(`Could not find match for from: ${dest.from}`) } - const prevParams = { ...last(fromMatches)?.params } + // From search should always use the current location + const fromSearch = lastMatch.search + // Same with params. It can't hurt to provide as many as possible + const fromParams = { ...lastMatch.params } + + // Resolve the next to + const nextTo = dest.to + ? this.resolvePathWithBase(fromId, `${dest.to}`) + : fromId + // Resolve the next params let nextParams = (dest.params ?? true) === true - ? prevParams + ? fromParams : { - ...prevParams, - ...functionalUpdate(dest.params as any, prevParams), + ...fromParams, + ...functionalUpdate(dest.params as any, fromParams), } + const destRoutes = this.matchRoutes( + nextTo, + {}, + { + _buildLocation: true, + }, + ).map((d) => this.looseRoutesById[d.routeId]!) + + // If there are any params, we need to stringify them if (Object.keys(nextParams).length > 0) { - matchedRoutesResult?.matchedRoutes + destRoutes .map((route) => { return ( route.options.params?.stringify ?? route.options.stringifyParams @@ -1483,25 +1468,27 @@ export class RouterCore< }) } - pathname = interpolatePath({ - path: pathname, + // Interpolate the next to into the next pathname + const nextPathname = interpolatePath({ + path: nextTo, params: nextParams ?? {}, leaveWildcards: false, leaveParams: opts.leaveParams, decodeCharMap: this.pathParamsDecodeCharMap, }).interpolatedPath - let search = fromSearch + // Resolve the next search + let nextSearch = fromSearch if (opts._includeValidateSearch && this.options.search?.strict) { let validatedSearch = {} - matchedRoutesResult?.matchedRoutes.forEach((route) => { + destRoutes.forEach((route) => { try { if (route.options.validateSearch) { validatedSearch = { ...validatedSearch, ...(validateSearch(route.options.validateSearch, { ...validatedSearch, - ...search, + ...nextSearch, }) ?? {}), } } @@ -1509,137 +1496,52 @@ export class RouterCore< // ignore errors here because they are already handled in matchRoutes } }) - search = validatedSearch + nextSearch = validatedSearch } - const applyMiddlewares = (search: any) => { - const allMiddlewares = - matchedRoutesResult?.matchedRoutes.reduce( - (acc, route) => { - const middlewares: Array> = [] - if ('search' in route.options) { - if (route.options.search?.middlewares) { - middlewares.push(...route.options.search.middlewares) - } - } - // TODO remove preSearchFilters and postSearchFilters in v2 - else if ( - route.options.preSearchFilters || - route.options.postSearchFilters - ) { - const legacyMiddleware: SearchMiddleware = ({ - search, - next, - }) => { - let nextSearch = search - if ( - 'preSearchFilters' in route.options && - route.options.preSearchFilters - ) { - nextSearch = route.options.preSearchFilters.reduce( - (prev, next) => next(prev), - search, - ) - } - const result = next(nextSearch) - if ( - 'postSearchFilters' in route.options && - route.options.postSearchFilters - ) { - return route.options.postSearchFilters.reduce( - (prev, next) => next(prev), - result, - ) - } - return result - } - middlewares.push(legacyMiddleware) - } - if (opts._includeValidateSearch && route.options.validateSearch) { - const validate: SearchMiddleware = ({ search, next }) => { - const result = next(search) - try { - const validatedSearch = { - ...result, - ...(validateSearch( - route.options.validateSearch, - result, - ) ?? {}), - } - return validatedSearch - } catch { - // ignore errors here because they are already handled in matchRoutes - return result - } - } - middlewares.push(validate) - } - return acc.concat(middlewares) - }, - [] as Array>, - ) ?? [] - - // the chain ends here since `next` is not called - const final: SearchMiddleware = ({ search }) => { - if (!dest.search) { - return {} - } - if (dest.search === true) { - return search - } - return functionalUpdate(dest.search, search) - } - allMiddlewares.push(final) - - const applyNext = (index: number, currentSearch: any): any => { - // no more middlewares left, return the current search - if (index >= allMiddlewares.length) { - return currentSearch - } - - const middleware = allMiddlewares[index]! - - const next = (newSearch: any): any => { - return applyNext(index + 1, newSearch) - } - - return middleware({ search: currentSearch, next }) - } - - // Start applying middlewares - return applyNext(0, search) - } + nextSearch = applySearchMiddleware({ + search: nextSearch, + dest, + destRoutes, + _includeValidateSearch: opts._includeValidateSearch, + }) - search = applyMiddlewares(search) + // Replace the equal deep + nextSearch = replaceEqualDeep(fromSearch, nextSearch) - search = replaceEqualDeep(fromSearch, search) - const searchStr = this.options.stringifySearch(search) + // Stringify the next search + const searchStr = this.options.stringifySearch(nextSearch) + // Resolve the next hash const hash = dest.hash === true - ? this.latestLocation.hash + ? currentLocation.hash : dest.hash - ? functionalUpdate(dest.hash, this.latestLocation.hash) + ? functionalUpdate(dest.hash, currentLocation.hash) : undefined + // Resolve the next hash string const hashStr = hash ? `#${hash}` : '' + // Resolve the next state let nextState = dest.state === true - ? this.latestLocation.state + ? currentLocation.state : dest.state - ? functionalUpdate(dest.state, this.latestLocation.state) + ? functionalUpdate(dest.state, currentLocation.state) : {} - nextState = replaceEqualDeep(this.latestLocation.state, nextState) + // Replace the equal deep + nextState = replaceEqualDeep(currentLocation.state, nextState) + // Return the next location return { - pathname, - search, + pathname: nextPathname, + search: nextSearch, searchStr, state: nextState as any, hash: hash ?? '', - href: `${pathname}${searchStr}${hashStr}`, + href: `${nextPathname}${searchStr}${hashStr}`, unmaskOnReload: dest.unmaskOnReload, } } @@ -1649,6 +1551,7 @@ export class RouterCore< maskedDest?: BuildNextOptions, ) => { const next = build(dest) + let maskedNext = maskedDest ? build(maskedDest) : undefined if (!maskedNext) { @@ -1680,22 +1583,12 @@ export class RouterCore< } } - const nextMatches = this.getMatchedRoutes( - next.pathname, - dest.to as string, - ) - const final = build(dest, nextMatches) - if (maskedNext) { - const maskedMatches = this.getMatchedRoutes( - maskedNext.pathname, - maskedDest?.to as string, - ) - const maskedFinal = build(maskedDest, maskedMatches) - final.maskedLocation = maskedFinal + const maskedFinal = build(maskedDest) + next.maskedLocation = maskedFinal } - return final + return next } if (opts.mask) { @@ -2873,6 +2766,7 @@ export class RouterCore< if (err.options.reloadDocument) { return undefined } + return await this.preloadRoute({ ...err.options, _fromLocation: next, @@ -3329,3 +3223,117 @@ export function getMatchedRoutes({ return { matchedRoutes, routeParams, foundRoute } } + +function applySearchMiddleware({ + search, + dest, + destRoutes, + _includeValidateSearch, +}: { + search: any + dest: BuildNextOptions + destRoutes: Array + _includeValidateSearch: boolean | undefined +}) { + const allMiddlewares = + destRoutes.reduce( + (acc, route) => { + const middlewares: Array> = [] + + if ('search' in route.options) { + if (route.options.search?.middlewares) { + middlewares.push(...route.options.search.middlewares) + } + } + // TODO remove preSearchFilters and postSearchFilters in v2 + else if ( + route.options.preSearchFilters || + route.options.postSearchFilters + ) { + const legacyMiddleware: SearchMiddleware = ({ + search, + next, + }) => { + let nextSearch = search + + if ( + 'preSearchFilters' in route.options && + route.options.preSearchFilters + ) { + nextSearch = route.options.preSearchFilters.reduce( + (prev, next) => next(prev), + search, + ) + } + + const result = next(nextSearch) + + if ( + 'postSearchFilters' in route.options && + route.options.postSearchFilters + ) { + return route.options.postSearchFilters.reduce( + (prev, next) => next(prev), + result, + ) + } + + return result + } + middlewares.push(legacyMiddleware) + } + + if (_includeValidateSearch && route.options.validateSearch) { + const validate: SearchMiddleware = ({ search, next }) => { + const result = next(search) + try { + const validatedSearch = { + ...result, + ...(validateSearch(route.options.validateSearch, result) ?? {}), + } + return validatedSearch + } catch { + // ignore errors here because they are already handled in matchRoutes + return result + } + } + + middlewares.push(validate) + } + + return acc.concat(middlewares) + }, + [] as Array>, + ) ?? [] + + // the chain ends here since `next` is not called + const final: SearchMiddleware = ({ search }) => { + if (!dest.search) { + return {} + } + if (dest.search === true) { + return search + } + return functionalUpdate(dest.search, search) + } + + allMiddlewares.push(final) + + const applyNext = (index: number, currentSearch: any): any => { + // no more middlewares left, return the current search + if (index >= allMiddlewares.length) { + return currentSearch + } + + const middleware = allMiddlewares[index]! + + const next = (newSearch: any): any => { + return applyNext(index + 1, newSearch) + } + + return middleware({ search: currentSearch, next }) + } + + // Start applying middlewares + return applyNext(0, search) +} diff --git a/packages/solid-router/src/useNavigate.tsx b/packages/solid-router/src/useNavigate.tsx index d63e7b9bd2..9347b5c98c 100644 --- a/packages/solid-router/src/useNavigate.tsx +++ b/packages/solid-router/src/useNavigate.tsx @@ -17,7 +17,7 @@ export function useNavigate< const { navigate } = useRouter() return ((options: NavigateOptions) => { - return navigate({ from: _defaultOpts?.from, ...options }) + return navigate({ from: _defaultOpts?.from as any, ...options }) }) as UseNavigateResult } diff --git a/packages/solid-router/tests/link.test.tsx b/packages/solid-router/tests/link.test.tsx index d10af4ecf8..6385efc3bb 100644 --- a/packages/solid-router/tests/link.test.tsx +++ b/packages/solid-router/tests/link.test.tsx @@ -2551,11 +2551,6 @@ describe('Link', () => { expect(postsLink).toHaveAttribute('href', '/posts/id1/details') fireEvent.click(postsLink) - - const invoicesErrorText = await screen.findByText( - 'Invariant failed: Could not find match for from: /invoices', - ) - expect(invoicesErrorText).toBeInTheDocument() }) test('when navigating to /posts/$postId/info which is declaratively masked as /posts/$postId', async () => { From 2b17f1514868886dcfc92fda00c88b41eb7adb4f Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 19:49:10 +0000 Subject: [PATCH 086/126] release: v1.121.0-alpha.5 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 94 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 24e8451d6b..4f65db9a6e 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index f16c4416d9..9ad04c8086 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index b9f7c1ecf4..e1e8eea6ec 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 3ff0aab2b0..5bcbec8eb5 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 97a84a8410..30001a9d59 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 22d9153c99..10ba1f53fb 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 4c15427b17..717056b9d4 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index ab563d8577..6baeef960e 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 8777956c57..03cd12aaec 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index c9ba3f9a62..6e6216397e 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 50e311b245..159f5eb768 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index fce1b3f64d..9087943e8f 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index eb89fd49d7..5352a41020 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index a09e82b736..2b9bb1ea72 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 789b4a2ce7..3f9c594fef 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 1c14a75ae6..5145fcc641 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index f563140d88..59ee045693 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 0310c67850..6106854198 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 4e686aafe5..51103ef2fb 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 5a324ff0f7..0d718e4bf3 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index a036a5d83f..0aef72b5ff 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index b244c81d81..7472221ae5 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index b59e45c573..97478ed3eb 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 22567c8be3..47c4c670b8 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 48b6e5c27a..62b30dc748 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 2509dfdba2..7279c918ad 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index ecdbd16701..52c55f4969 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 9ae2ab4b55..39e2b02175 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 6ea1b711f3..b24373f60b 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 9721b84df5..59af78eb7b 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index da6c628c7d..0eb498e4ec 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 41c655e3db..37242b1c1c 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 3bef1237dc..c69a542cec 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index 1986e2d29a..aa1194cf9a 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 47b2cddb5c..27a439f777 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.121.0-alpha.3", + "@tanstack/arktype-adapter": "^1.121.0-alpha.5", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", - "@tanstack/valibot-adapter": "^1.121.0-alpha.3", - "@tanstack/zod-adapter": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/valibot-adapter": "^1.121.0-alpha.5", + "@tanstack/zod-adapter": "^1.121.0-alpha.5", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 0bddd1cb3e..86dba24df7 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index f7f49abf0c..ec67ea9c4e 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 825767ac0c..5c2005af83 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-with-query": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-with-query": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index c8dd75975c..1516ed4ef4 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index b8599b84a5..a2f67d4d87 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index df9b35eb3b..817ada561a 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 16fd72b5d8..7527085aaf 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 1afc535fef..31518f50a1 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-with-query": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-with-query": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 528922820f..3b9394ce2b 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 0c2399cda3..12700b500b 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index c7da520321..b8e1d6bf44 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 5f2205bbf2..8aa8107a18 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index dde038bae8..0e9bcbac9e 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 39a3f99d70..7090978c78 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-with-query": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-with-query": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 205e72fc30..25c22383b4 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index a4151a10e2..5277eb99ec 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 4dd71b993f..59ddcc1c51 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 7a72faece0..646523f28e 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index e470be9c1a..06a23bae0e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.3", - "@tanstack/react-router-devtools": "^1.121.0-alpha.3", - "@tanstack/router-plugin": "^1.121.0-alpha.4", - "@tanstack/react-start": "^1.121.0-alpha.4", + "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.5", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 3ed9096da1..e8c777c116 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index cb45b347d4..b3892120fb 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index e556c41d7b..051bd2f9a0 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 2bf3e0720f..4b1f4d3e29 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 6aadd906cc..96d85e4b62 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index a005be48f9..2b8a6af8db 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index b4b887c4ba..673e0a4fbf 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index fd0beceee8..de7a50feba 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.4", + "@tanstack/router-plugin": "^1.121.0-alpha.5", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 0fda175863..dd91c50087 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.4", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index fba3a6437b..829067ba7a 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.4", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index a297256dd1..8150a50080 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.3", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.3", - "@tanstack/solid-start": "^1.121.0-alpha.4", + "@tanstack/solid-router": "^1.121.0-alpha.5", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.5", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 3c81a51d90..139c6c63f3 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 66c13baa0d..41d5e643e1 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index 94d70eed84..fe8a430f97 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 723b08d96e..a724ba9781 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 77e5b68174..5f759677d9 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 626dba918c..c02833bdd2 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 854aedbd5b..b8d59ec013 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 5b1232d354..035910a555 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index e67452afb9..7b2dd92ff8 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 57fb1d8ae0..773ed0e07c 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 96231b8fef..9555315444 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index d92bb4a834..0ba15c9048 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 1fa0fb67cf..ab347d9ac0 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index e30c356ffa..001d3dda30 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index 53ebd8c3d0..d706e06770 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index bbb80a6bbe..18ed802b83 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index c4c19e2df1..83511d788f 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index dcebcb5664..e38b84196a 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index dada12a202..c0bca9bff2 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 0a830c5275..eb0bf67dca 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 4aa5564336..388c10dadb 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 4ca575513c..21d64a8198 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f6f0147eb0..5dd308b86f 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.4", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index 65ebc3fc1c..f94c93e864 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 6eeda38d1e..791f79d8b0 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 8a9749e61c..480f49cc9c 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index 853019ce14..f47739eb9b 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 9c2ca4d5ac..19d2fb8ad5 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.121.0-alpha.3", + "version": "1.121.0-alpha.5", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5455205ec9..d756438409 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5118,7 +5118,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5158,7 +5158,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5192,7 +5192,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5232,7 +5232,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5278,7 +5278,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5321,7 +5321,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5361,7 +5361,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5404,7 +5404,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5493,7 +5493,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5536,7 +5536,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.3 + specifier: ^1.121.0-alpha.5 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From a5d2740c64794042acbfd9cc02ec7528c823e07d Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 14:42:22 -0600 Subject: [PATCH 087/126] fix: sitemap support (#4217) --- .../react/start-basic-static/vite.config.ts | 6 + .../start-plugin-core/src/build-sitemap.ts | 210 ++++++++++++++++++ .../src/nitro/build-sitemap.ts | 79 ------- .../src/nitro/nitro-plugin.ts | 22 +- packages/start-plugin-core/src/prerender.ts | 10 +- packages/start-plugin-core/src/schema.ts | 11 +- 6 files changed, 231 insertions(+), 107 deletions(-) create mode 100644 packages/start-plugin-core/src/build-sitemap.ts delete mode 100644 packages/start-plugin-core/src/nitro/build-sitemap.ts diff --git a/examples/react/start-basic-static/vite.config.ts b/examples/react/start-basic-static/vite.config.ts index 285d21f055..303ac171c9 100644 --- a/examples/react/start-basic-static/vite.config.ts +++ b/examples/react/start-basic-static/vite.config.ts @@ -13,6 +13,12 @@ export default defineConfig({ tanstackStart({ spa: { enabled: true, + prerender: { + crawlLinks: true, + }, + }, + sitemap: { + host: 'https://localhost:3000', }, }), ], diff --git a/packages/start-plugin-core/src/build-sitemap.ts b/packages/start-plugin-core/src/build-sitemap.ts new file mode 100644 index 0000000000..eec071438b --- /dev/null +++ b/packages/start-plugin-core/src/build-sitemap.ts @@ -0,0 +1,210 @@ +import { writeFileSync } from 'node:fs' +import path from 'node:path' +import { create } from 'xmlbuilder2' +import type { TanStackStartOutputConfig } from './plugin' +import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' + +export type SitemapUrl = { + loc: string + lastmod: string + priority?: number + changefreq?: + | 'always' + | 'hourly' + | 'daily' + | 'weekly' + | 'monthly' + | 'yearly' + | 'never' + alternateRefs?: Array<{ + href: string + hreflang?: string + }> + images?: Array<{ + loc: string + title?: string + caption?: string + }> + news?: { + publication: { + name: string + language: string + } + publicationDate: string | Date + title: string + } +} + +export type SitemapData = { + urls: Array +} + +function buildSitemapJson( + pages: TanStackStartOutputConfig['pages'], + host: string, +): SitemapData { + const slash = checkSlash(host) + + const urls: Array = pages + .filter((page) => { + return page.sitemap?.exclude !== true + }) + .map((page) => ({ + loc: `${host}${slash}${page.path.replace(/^\/+/g, '')}`, + lastmod: page.sitemap?.lastmod + ? new Date(page.sitemap.lastmod).toISOString().split('T')[0]! + : new Date().toISOString().split('T')[0]!, + priority: page.sitemap?.priority, + changefreq: page.sitemap?.changefreq, + alternateRefs: page.sitemap?.alternateRefs, + images: page.sitemap?.images, + news: page.sitemap?.news, + })) + + return { urls } +} + +function jsonToXml(sitemapData: SitemapData): string { + const sitemap = createXml('urlset') + + for (const item of sitemapData.urls) { + const page = sitemap.ele('url') + page.ele('loc').txt(item.loc) + page.ele('lastmod').txt(item.lastmod) + + if (item.priority !== undefined) { + page.ele('priority').txt(item.priority.toString()) + } + if (item.changefreq) { + page.ele('changefreq').txt(item.changefreq) + } + + // Add alternate references + if (item.alternateRefs?.length) { + for (const ref of item.alternateRefs) { + const alternateRef = page.ele('xhtml:link') + alternateRef.att('rel', 'alternate') + alternateRef.att('href', ref.href) + if (ref.hreflang) { + alternateRef.att('hreflang', ref.hreflang) + } + } + } + + // Add images + if (item.images?.length) { + for (const image of item.images) { + const imageElement = page.ele('image:image') + imageElement.ele('image:loc').txt(image.loc) + if (image.title) { + imageElement.ele('image:title').txt(image.title) + } + if (image.caption) { + imageElement.ele('image:caption').txt(image.caption) + } + } + } + + // Add news + if (item.news) { + const newsElement = page.ele('news:news') + const publication = newsElement.ele('news:publication') + publication.ele('news:name').txt(item.news.publication.name) + publication.ele('news:language').txt(item.news.publication.language) + newsElement + .ele('news:publication_date') + .txt(new Date(item.news.publicationDate).toISOString().split('T')[0]!) + newsElement.ele('news:title').txt(item.news.title) + } + } + + return sitemap.end({ prettyPrint: true }) +} + +export async function buildSitemap({ + options, + publicDir, +}: { + options: TanStackStartOutputConfig + publicDir: string +}) { + let sitemapOptions = options.sitemap + + if (!sitemapOptions && options.pages.length) { + sitemapOptions = { enabled: true, outputPath: 'sitemap.xml' } + } + + if (!sitemapOptions?.enabled) { + throw new Error('Sitemap is not enabled') + } + + const { host, outputPath } = sitemapOptions + + if (!host) { + if (!options.sitemap) { + console.info( + 'Hint: Pages found, but no sitemap host has been set. To enable sitemap generation, set the `sitemap.host` option.', + ) + return + } + throw new Error( + 'Sitemap host is not set and required to build the sitemap.', + ) + } + + if (!outputPath) { + throw new Error('Sitemap output path is not set') + } + + const { pages } = options + + if (!pages.length) { + console.log('No pages were found to build the sitemap. Skipping...') + return + } + + console.log('Building Sitemap...') + + // Build the sitemap data + const sitemapData = buildSitemapJson(pages, host) + + // Generate output paths + const xmlOutputPath = path.join(publicDir, outputPath) + const pagesOutputPath = path.join(publicDir, 'pages.json') + + try { + // Write XML sitemap + console.log(`Writing sitemap XML at ${xmlOutputPath}`) + writeFileSync(xmlOutputPath, jsonToXml(sitemapData)) + + // Write pages data for runtime use + console.log(`Writing pages data at ${pagesOutputPath}`) + writeFileSync( + pagesOutputPath, + JSON.stringify( + { + pages, + host, + lastBuilt: new Date().toISOString(), + }, + null, + 2, + ), + ) + } catch (e) { + console.error(`Unable to write sitemap files`, e) + } +} + +function createXml(elementName: 'urlset' | 'sitemapindex'): XMLBuilder { + return create({ version: '1.0', encoding: 'UTF-8' }) + .ele(elementName, { + xmlns: 'https://www.sitemaps.org/schemas/sitemap/0.9', + }) + .com(`This file was automatically generated by TanStack Start.`) +} + +function checkSlash(host: string): string { + const finalChar = host.slice(-1) + return finalChar === '/' ? '' : '/' +} diff --git a/packages/start-plugin-core/src/nitro/build-sitemap.ts b/packages/start-plugin-core/src/nitro/build-sitemap.ts deleted file mode 100644 index c06ed77d0e..0000000000 --- a/packages/start-plugin-core/src/nitro/build-sitemap.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { writeFileSync } from 'node:fs' -import { resolve } from 'node:path' -import { create } from 'xmlbuilder2' -import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' - -export type PagesJson = { - page: string - lastMod: string -} - -export async function buildSitemap({ - host, - routes, - outputDir, -}: { - host: string - routes: Array | (() => Promise>) - outputDir: string -}) { - const routeList: Array = await optionHasRoutes(routes) - - if (routeList.length) { - const slash = checkSlash(host) - const sitemapData: Array = routeList.map((page: string) => ({ - page: `${host}${slash}${page.replace(/^\/+/g, '')}`, - lastMod: new Date().toISOString().split('T')[0]!, - })) - - const sitemap = createXml('urlset') - - for (const item of sitemapData) { - const page = sitemap.ele('url') - page.ele('loc').txt(item.page) - page.ele('lastmod').txt(item.lastMod) - } - - const mapPath = `${resolve(outputDir)}/sitemap.xml` - try { - console.log(`Writing sitemap at ${mapPath}`) - writeFileSync(mapPath, sitemap.end({ prettyPrint: true })) - } catch (e) { - console.error(`Unable to write file at ${mapPath}`, e) - } - } -} - -function createXml(elementName: 'urlset' | 'sitemapindex'): XMLBuilder { - return create({ version: '1.0', encoding: 'UTF-8' }) - .ele(elementName, { - xmlns: 'https://www.sitemaps.org/schemas/sitemap/0.9', - }) - .com(`This file was automatically generated by Analog.`) -} - -function checkSlash(host: string): string { - const finalChar = host.slice(-1) - return finalChar === '/' ? '' : '/' -} - -async function optionHasRoutes( - routes: - | Array - | (() => Promise>), -): Promise> { - let routeList: Array - - if (typeof routes === 'function') { - // returns an array or undefined - routeList = await routes() - } else if (Array.isArray(routes)) { - // returns an array of strings - routeList = routes - } else { - // default it to an empty of array - routeList = [] - } - - return routeList.filter(Boolean) as Array -} diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 00066af162..3a3bf00b14 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -5,6 +5,7 @@ import { dirname, resolve } from 'pathe' import { clientDistDir, ssrEntryFile } from '../plugin' import { prerender } from '../prerender' import { VITE_ENVIRONMENT_NAMES } from '../constants' +import { buildSitemap } from '../build-sitemap' import { devServerPlugin } from './dev-server-plugin' import { buildNitroEnvironment } from './build-nitro' import type { EnvironmentOptions, PluginOption, Rollup } from 'vite' @@ -132,19 +133,14 @@ export function nitroPlugin( }) } - // if (nitroConfig.prerender?.routes?.length && options.sitemap) { - // console.log('Building Sitemap...') - // // sitemap needs to be built after all directories are built - // await buildSitemap({ - // host: options.sitemap.host, - // routes: nitroConfig.prerender.routes, - // outputDir: resolve(options.root, 'dist/public'), - // }) - // } - - // console.log( - // `\n\n✅ Client and server bundles successfully built.`, - // ) + if (options.pages.length) { + await buildSitemap({ + options, + publicDir: nitro.options.output.publicDir, + }) + } + + console.log(`\n✅ Client and server bundles successfully built.`) }, }, } diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index 934c0ab83f..9f12ff0ac4 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -129,15 +129,7 @@ export async function prerender({ console.info(`Concurrency: ${concurrency}`) const queue = new Queue({ concurrency }) - options.pages.forEach((_page) => { - let page = _page as Page - - if (typeof _page === 'string') { - page = { path: _page } - } - - addCrawlPageTask(page) - }) + options.pages.forEach((page) => addCrawlPageTask(page)) await queue.start() diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index b70d7262f4..71e1420daa 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -114,13 +114,12 @@ export function createTanStackStartOptionsSchema( }) .optional() .default({}), - pages: z - .array(z.union([z.string(), pageSchema])) - .optional() - .default([]), - sitemap: pagePrerenderOptionsSchema - .extend({ + pages: z.array(pageSchema).optional().default([]), + sitemap: z + .object({ + enabled: z.boolean().optional().default(true), host: z.string().optional(), + outputPath: z.string().optional().default('sitemap.xml'), }) .optional(), prerender: z From 7670d79977ce9abaf712b0965789ce4c33b0c930 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 20:43:32 +0000 Subject: [PATCH 088/126] release: v1.121.0-alpha.6 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 86dba24df7..e9bd54c128 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index ec67ea9c4e..f69aaade81 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 5c2005af83..f8017ac9c7 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 1516ed4ef4..87a6cdadb7 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index a2f67d4d87..2fd367e58d 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 817ada561a..584ccfcf16 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 7527085aaf..f408f39ca5 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 31518f50a1..24ecdc35f5 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 3b9394ce2b..0af6b3a36b 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 12700b500b..149231213a 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index b8e1d6bf44..8233126a21 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 8aa8107a18..b794f720c9 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 0e9bcbac9e..1d50079c8d 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 7090978c78..d344a96bd9 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 25c22383b4..9b091c51c4 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 646523f28e..bdbe67fbcc 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 06a23bae0e..1f5288a81f 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.5", + "@tanstack/react-start": "^1.121.0-alpha.6", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index dd91c50087..9fc360ef95 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.6", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 829067ba7a..b2aa58fbfb 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.6", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 8150a50080..b6fe8b8a3f 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.5", + "@tanstack/solid-start": "^1.121.0-alpha.6", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index c02833bdd2..b0c2eacda1 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 035910a555..8057587262 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index c0bca9bff2..d72a94470d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.6", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 388c10dadb..95d9442f16 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.6", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 5dd308b86f..0d371f3be3 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From b8db2d9d4a8f185635807a1e49749b29676d29fa Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 15:13:19 -0600 Subject: [PATCH 089/126] fix: one more test --- packages/react-router/tests/link.test.tsx | 60 ++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 93ce78b72f..200fb0a7b6 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -4517,6 +4517,12 @@ describe('relative links', () => { <>

Param Route

Link to ./a + + Link to c + + + Link to ../c + ) @@ -4559,11 +4565,21 @@ describe('relative links', () => { }, }) + const paramCRoute = createRoute({ + getParentRoute: () => paramARoute, + path: 'c', + component: () => { + return

Param C Route

+ }, + }) + return createRouter({ routeTree: rootRoute.addChildren([ indexRoute, aRoute.addChildren([bRoute]), - paramRoute.addChildren([paramARoute, paramBRoute]), + paramRoute.addChildren([ + paramARoute.addChildren([paramBRoute, paramCRoute]), + ]), ]), history, }) @@ -4676,4 +4692,46 @@ describe('relative links', () => { expect(window.location.pathname).toBe('/param/foo') }) + + test.only('should navigate to a child link based on pathname', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to c') + expect(relativeLink.getAttribute('href')).toBe('/param/foo/a/b/c') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a/b/c') + }) + + test.only('should navigate to a relative link based on pathname', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/param/foo/a/b') + }) + + // Inspect the relative link to ./a + const relativeLink = await screen.findByText('Link to ../c') + expect(relativeLink.getAttribute('href')).toBe('/param/foo/a/c') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/param/foo/a/c') + }) }) From a769bc99483f3e0a826b6d44e18646a157c9b413 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 21 May 2025 15:31:21 -0600 Subject: [PATCH 090/126] fix: all tests --- packages/react-router/tests/link.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 200fb0a7b6..768878a111 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -4693,7 +4693,7 @@ describe('relative links', () => { expect(window.location.pathname).toBe('/param/foo') }) - test.only('should navigate to a child link based on pathname', async () => { + test('should navigate to a child link based on pathname', async () => { const router = setupRouter() render() @@ -4714,7 +4714,7 @@ describe('relative links', () => { expect(window.location.pathname).toBe('/param/foo/a/b/c') }) - test.only('should navigate to a relative link based on pathname', async () => { + test('should navigate to a relative link based on pathname', async () => { const router = setupRouter() render() From 389207ea9c69a523e1b1c05dbf28cc6f6f7fabf7 Mon Sep 17 00:00:00 2001 From: chorobin Date: Thu, 22 May 2025 22:49:31 +0200 Subject: [PATCH 091/126] feat: add poc of seroval serialiser adapter on the type level --- examples/react/start-basic/package.json | 2 + examples/react/start-basic/src/router.tsx | 13 ++ packages/react-router/src/index.tsx | 11 +- packages/react-router/src/router.ts | 9 +- packages/router-core/package.json | 3 +- packages/router-core/src/index.ts | 16 +- packages/router-core/src/router.ts | 42 ++++- packages/router-core/src/serializer.ts | 140 ++++++++++++++-- .../start-client-core/src/createMiddleware.ts | 129 ++++++++++++--- .../start-client-core/src/createServerFn.ts | 154 +++++++++++++++--- .../tests/createServerMiddleware.test-d.ts | 26 +-- .../src/index.ts | 9 +- pnpm-lock.yaml | 27 ++- 13 files changed, 471 insertions(+), 110 deletions(-) diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index fe057b6882..5f331b52d5 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -14,6 +14,8 @@ "@tanstack/react-start": "^1.121.0-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0", + "seroval": "^1.3.1", + "seroval-plugins": "^1.3.1", "tailwind-merge": "^2.6.0", "vite": "^6.3.5", "zod": "^3.24.2" diff --git a/examples/react/start-basic/src/router.tsx b/examples/react/start-basic/src/router.tsx index c76eb0210c..4e94c73aa4 100644 --- a/examples/react/start-basic/src/router.tsx +++ b/examples/react/start-basic/src/router.tsx @@ -2,6 +2,16 @@ import { createRouter as createTanStackRouter } from '@tanstack/react-router' import { routeTree } from './routeTree.gen' import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' import { NotFound } from './components/NotFound' +import { serovalSerializer } from '@tanstack/react-router' +import { FormDataPlugin, HeadersPlugin } from 'seroval-plugins/web' +import { createServerFn } from '@tanstack/react-start' + +const fn = createServerFn().handler(() => { + return { + formData: new FormData(), + headers: new Headers(), + } +}) export function createRouter() { const router = createTanStackRouter({ @@ -10,6 +20,9 @@ export function createRouter() { defaultErrorComponent: DefaultCatchBoundary, defaultNotFoundComponent: () => , scrollRestoration: true, + serializer: serovalSerializer({ + plugins: [FormDataPlugin, HeadersPlugin], + }), }) return router diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index c662c21fc0..7099a02fa4 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -35,16 +35,17 @@ export { createControlledPromise, retainSearchParams, stripSearchParams, + serovalSerializer, } from '@tanstack/router-core' export type { AnyRoute, StartSerializer, - Serializable, - SerializerParse, - SerializerParseBy, - SerializerStringify, - SerializerStringifyBy, + DefaultTypeSerializable, + TypeSerializerParse, + TypeSerializerParseBy, + TypeSerializerStringify, + TypeSerializerStringifyBy, DeferredPromiseState, DeferredPromise, ParsedLocation, diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts index 3680337ba6..4ec7f995f6 100644 --- a/packages/react-router/src/router.ts +++ b/packages/react-router/src/router.ts @@ -5,6 +5,8 @@ import type { AnyRoute, CreateRouterFn, RouterConstructorOptions, + Serializer, + SerovalSerializer, TrailingSlashOption, } from '@tanstack/router-core' @@ -87,12 +89,14 @@ export class Router< in out TDefaultStructuralSharingOption extends boolean = false, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, + in out TSerializer extends Serializer = SerovalSerializer, > extends RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer > { constructor( options: RouterConstructorOptions< @@ -100,7 +104,8 @@ export class Router< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, ) { super(options) diff --git a/packages/router-core/package.json b/packages/router-core/package.json index be004b70c0..59a98de0ac 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -61,6 +61,7 @@ "dependencies": { "@tanstack/history": "workspace:*", "@tanstack/store": "^0.7.0", - "tiny-invariant": "^1.3.3" + "tiny-invariant": "^1.3.3", + "seroval": "^1.3.1" } } diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 361a0697dd..55221ee902 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -67,14 +67,19 @@ export type { export type { StartSerializer, - Serializable, - SerializerParse, - SerializerParseBy, - SerializerStringify, - SerializerStringifyBy, + TypeSerializerParse, + TypeSerializerParseBy, + TypeSerializerStringify, + TypeSerializerStringifyBy, SerializerExtensions, + DefaultTypeSerializable, + DefaultTypeSerializer, + Serializer, + SerovalSerializer, } from './serializer' +export { serovalSerializer } from './serializer' + export type { ParsedLocation } from './location' export type { Manifest, RouterManagedTag } from './manifest' export { isMatch } from './Matches' @@ -257,6 +262,7 @@ export type { ServerSrr, ClearCacheFn, CreateRouterFn, + InferSerializer, } from './router' export type { diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index 6bcaed0ee3..0978d206c7 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -76,7 +76,11 @@ import type { NavigateFn, } from './RouterProvider' import type { Manifest } from './manifest' -import type { StartSerializer } from './serializer' +import type { + Serializer, + SerovalSerializer, + StartSerializer, +} from './serializer' import type { AnySchema, AnyValidator } from './validators' import type { NavigateOptions, ResolveRelativePath, ToOptions } from './link' import type { NotFoundError } from './not-found' @@ -119,6 +123,7 @@ export interface RouterOptions< TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record = Record, + TSerializer extends Serializer = SerovalSerializer, > extends RouterOptionsExtensions { /** * The history object that will be used to manage the browser history. @@ -399,6 +404,8 @@ export interface RouterOptions< * @default ['window'] */ scrollToTopSelectors?: Array + + serializer?: TSerializer } export interface RouterState< @@ -498,19 +505,26 @@ export type RouterContextOptions = context: InferRouterContext } +export type InferSerializer = + unknown extends NonNullable + ? SerovalSerializer + : NonNullable + export type RouterConstructorOptions< TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record, + TSerializer extends Serializer, > = Omit< RouterOptions< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, 'context' > & @@ -580,13 +594,15 @@ export type UpdateFn< TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record, + TSerializer extends Serializer, > = ( newOptions: RouterConstructorOptions< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, ) => void @@ -672,10 +688,11 @@ export type AnyRouterWithContext = RouterCore< any, any, any, + any, any > -export type AnyRouter = RouterCore +export type AnyRouter = RouterCore export interface ViewTransitionOptions { types: @@ -751,6 +768,7 @@ export type CreateRouterFn = < TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record = Record, + TSerializer extends Serializer = SerovalSerializer, >( options: undefined extends number ? 'strictNullChecks must be enabled in tsconfig.json' @@ -759,14 +777,16 @@ export type CreateRouterFn = < TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, ) => RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer > export class RouterCore< @@ -775,6 +795,7 @@ export class RouterCore< in out TDefaultStructuralSharingOption extends boolean, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, + in out TSerializer extends Serializer = SerovalSerializer, > { // Option-independent properties tempLocationKey: string | undefined = `${Math.round( @@ -796,7 +817,8 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, 'stringifySearch' | 'parseSearch' | 'context' > @@ -819,7 +841,8 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, ) { this.update({ @@ -851,7 +874,8 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer > = (newOptions) => { if (newOptions.notFoundRoute) { console.warn( diff --git a/packages/router-core/src/serializer.ts b/packages/router-core/src/serializer.ts index 58b886bd89..6aa9781436 100644 --- a/packages/router-core/src/serializer.ts +++ b/packages/router-core/src/serializer.ts @@ -1,3 +1,6 @@ +import type { Plugin } from 'seroval' +import type { Constrain } from './utils' + export interface StartSerializer { stringify: (obj: unknown) => string parse: (str: string) => unknown @@ -5,19 +8,29 @@ export interface StartSerializer { decode: (value: T) => T } -export type SerializerStringifyBy = T extends TSerializable - ? T - : T extends (...args: Array) => any - ? 'Function is not serializable' - : { [K in keyof T]: SerializerStringifyBy } +// help me fill in the runtime +export interface Serializer { + '~types': { + serializer: unknown + } + stringify: (obj: unknown) => string + parse: (str: string) => unknown +} + +export type TypeSerializerStringifyBy = + T extends TSerializable + ? T + : T extends (...args: Array) => any + ? 'Function is not serializable' + : { [K in keyof T]: TypeSerializerStringifyBy } -export type SerializerParseBy = T extends TSerializable +export type TypeSerializerParseBy = T extends TSerializable ? T : unknown extends SerializerExtensions['ReadableStream'] - ? { [K in keyof T]: SerializerParseBy } + ? { [K in keyof T]: TypeSerializerParseBy } : T extends SerializerExtensions['ReadableStream'] ? ReadableStream - : { [K in keyof T]: SerializerParseBy } + : { [K in keyof T]: TypeSerializerParseBy } export interface DefaultSerializerExtensions { ReadableStream: unknown @@ -25,8 +38,113 @@ export interface DefaultSerializerExtensions { export interface SerializerExtensions extends DefaultSerializerExtensions {} -export type Serializable = Date | undefined | Error | FormData | bigint +export type DefaultTypeSerializable = + | Date + | undefined + | Error + | FormData + | bigint + +export type DefaultTypeSerializerStringify = TypeSerializerStringifyBy< + T, + DefaultTypeSerializable +> + +export type DefaultTypeSerializerParse = TypeSerializerParseBy< + T, + DefaultTypeSerializable +> + +export interface TypeSerializer { + value: unknown + parse: unknown + stringify: unknown +} + +export interface TypeSerializerValue { + value: T +} + +export type TypeSerializerApply< + TSerializer extends TypeSerializer, + T, +> = TSerializer & TypeSerializerValue + +export interface DefaultTypeSerializer extends TypeSerializer { + parse: DefaultTypeSerializerParse + stringify: DefaultTypeSerializerStringify +} + +export type TypeSerializerParse< + TSerializer extends TypeSerializer, + T, +> = TypeSerializerApply['parse'] + +export type TypeSerializerStringify< + TSerializer extends TypeSerializer, + T, +> = TypeSerializerApply['stringify'] + +export interface SerovalSerializerOptions { + plugins?: Constrain>> +} + +export const serovalSerializer = ( + options?: SerovalSerializerOptions, +): SerovalSerializer => { + // please help with the runtime + return undefined as any +} + +export interface SerovalSerializer extends Serializer { + '~types': { + serializer: SerovalTypeSerializer + } +} + +export interface SerovalTypeSerializer extends TypeSerializer { + stringify: SerovalTypeStringify + parse: DefaultTypeSerializerParse +} + +export type SerovalTypeStringify = unknown extends T + ? T + : T extends SerovalTypeSerializable + ? T + : T extends (...args: Array) => any + ? 'Function is not serializable' + : T extends Set + ? SerovalTypeSetStringify + : T extends Map + ? SerovalTypeMapStringify + : { [K in keyof T]: SerovalTypeStringify } + +export type SerovalTypeSerializable = + | RegExp + | Date + | undefined + | Error + | SerovalPluginsTypeSerializable + +export type SerovalTypeSetStringify = + T extends Set + ? Set> + : never -export type SerializerStringify = SerializerStringifyBy +export type SerovalTypeMapStringify = + T extends Map + ? Map< + SerovalTypeStringify, + SerovalTypeStringify + > + : never -export type SerializerParse = SerializerParseBy +export type SerovalPluginsTypeSerializable = unknown extends TPlugins + ? never + : TPlugins extends ReadonlyArray> + ? TPlugins[number] extends infer TPlugin + ? TPlugin extends Plugin + ? TValue + : never + : never + : never diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index 357adea2f2..7ff876b7d4 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -5,33 +5,41 @@ import type { ServerFnTypeOrTypeFn, } from './createServerFn' import type { + AnyRouter, Assign, Constrain, Expand, + InferSerializer, IntersectAssign, + RegisteredRouter, ResolveValidatorInput, ResolveValidatorOutput, - SerializerStringify, + TypeSerializerStringify, } from '@tanstack/router-core' -export function createMiddleware( +export function createMiddleware< + TType extends MiddlewareType, + TRouter extends AnyRouter = RegisteredRouter, +>( options: { type: TType validateClient?: boolean }, __opts?: FunctionMiddlewareOptions< + TRouter, unknown, undefined, undefined, undefined, ServerFnResponseType >, -): CreateMiddlewareResult { +): CreateMiddlewareResult { // const resolvedOptions = (__opts || options) as MiddlewareOptions< const resolvedOptions = { type: 'function', ...(__opts || (options as FunctionMiddlewareOptions< + TRouter, unknown, undefined, undefined, @@ -66,31 +74,44 @@ export function createMiddleware( Object.assign(resolvedOptions, { server }), ) as any }, - } as unknown as CreateMiddlewareResult + } as unknown as CreateMiddlewareResult } export type MiddlewareType = 'request' | 'function' -export type CreateMiddlewareResult = - 'function' extends TType - ? FunctionMiddleware - : RequestMiddleware +export type CreateMiddlewareResult< + TRouter extends AnyRouter, + TType extends MiddlewareType, +> = 'function' extends TType + ? FunctionMiddleware + : RequestMiddleware export interface FunctionMiddleware< + TRouter extends AnyRouter, TServerFnResponseType extends ServerFnResponseType, -> extends FunctionMiddlewareAfterMiddleware { +> extends FunctionMiddlewareAfterMiddleware< + TRouter, + unknown, + TServerFnResponseType + > { middleware: ( middlewares: Constrain< TNewMiddlewares, ReadonlyArray >, - ) => FunctionMiddlewareAfterMiddleware + ) => FunctionMiddlewareAfterMiddleware< + TRouter, + TNewMiddlewares, + TServerFnResponseType + > } export interface FunctionMiddlewareAfterMiddleware< + TRouter extends AnyRouter, TMiddlewares, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< + TRouter, TMiddlewares, undefined, undefined, @@ -100,16 +121,23 @@ export interface FunctionMiddlewareAfterMiddleware< TServerFnResponseType >, FunctionMiddlewareServer< + TRouter, TMiddlewares, undefined, undefined, undefined, TServerFnResponseType >, - FunctionMiddlewareClient, - FunctionMiddlewareValidator {} + FunctionMiddlewareClient< + TRouter, + TMiddlewares, + undefined, + TServerFnResponseType + >, + FunctionMiddlewareValidator {} export interface FunctionMiddlewareWithTypes< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerContext, @@ -127,6 +155,7 @@ export interface FunctionMiddlewareWithTypes< TClientSendContext > options: FunctionMiddlewareOptions< + TRouter, TMiddlewares, TValidator, TServerContext, @@ -217,6 +246,7 @@ export type AnyFunctionMiddleware = FunctionMiddlewareWithTypes< any, any, any, + any, any > @@ -308,6 +338,7 @@ export type AssignAllClientSendContext< > export interface FunctionMiddlewareOptions< + in out TRouter extends AnyRouter, in out TMiddlewares, in out TValidator, in out TServerContext, @@ -318,6 +349,7 @@ export interface FunctionMiddlewareOptions< middleware?: TMiddlewares validator?: ConstrainValidator client?: FunctionMiddlewareClientFn< + TRouter, TMiddlewares, TValidator, TServerContext, @@ -325,6 +357,7 @@ export interface FunctionMiddlewareOptions< TServerFnResponseType > server?: FunctionMiddlewareServerFn< + TRouter, TMiddlewares, TValidator, TServerContext, @@ -334,18 +367,22 @@ export interface FunctionMiddlewareOptions< > } -export type FunctionMiddlewareClientNextFn = < - TSendContext = undefined, - TNewClientContext = undefined, ->(ctx?: { +export type FunctionMiddlewareClientNextFn< + TRouter extends AnyRouter, + TMiddlewares, +> = (ctx?: { context?: TNewClientContext - sendContext?: SerializerStringify + sendContext?: TypeSerializerStringify< + InferSerializer['~types']['serializer'], + TSendContext + > headers?: HeadersInit }) => Promise< FunctionClientResultWithContext > export interface FunctionMiddlewareServer< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerSendContext, @@ -354,6 +391,7 @@ export interface FunctionMiddlewareServer< > { server: ( server: FunctionMiddlewareServerFn< + TRouter, TMiddlewares, TValidator, TServerSendContext, @@ -362,6 +400,7 @@ export interface FunctionMiddlewareServer< TServerFnResponseType >, ) => FunctionMiddlewareAfterServer< + TRouter, TMiddlewares, TValidator, TNewServerContext, @@ -371,7 +410,9 @@ export interface FunctionMiddlewareServer< ServerFnResponseType > } + export type FunctionMiddlewareServerFn< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerSendContext, @@ -380,6 +421,7 @@ export type FunctionMiddlewareServerFn< TServerFnResponseType extends ServerFnResponseType, > = ( options: FunctionMiddlewareServerFnOptions< + TRouter, TMiddlewares, TValidator, TServerSendContext, @@ -393,23 +435,32 @@ export type FunctionMiddlewareServerFn< > export interface RequestMiddlewareServerFnOptions< + in out TRouter extends AnyRouter, in out TMiddlewares, in out TServerSendContext, > { request: Request context: Expand> - next: FunctionMiddlewareServerNextFn + next: FunctionMiddlewareServerNextFn< + TRouter, + TMiddlewares, + TServerSendContext + > response: Response method: Method signal: AbortSignal } -export type FunctionMiddlewareServerNextFn = < - TNewServerContext = undefined, - TSendContext = undefined, ->(ctx?: { +export type FunctionMiddlewareServerNextFn< + TRouter extends AnyRouter, + TMiddlewares, + TServerSendContext, +> = (ctx?: { context?: TNewServerContext - sendContext?: SerializerStringify + sendContext?: TypeSerializerStringify< + InferSerializer['~types']['serializer'], + TSendContext + > }) => Promise< FunctionServerResultWithContext< TMiddlewares, @@ -437,6 +488,7 @@ export type FunctionServerResultWithContext< } export interface FunctionMiddlewareServerFnOptions< + in out TRouter extends AnyRouter, in out TMiddlewares, in out TValidator, in out TServerSendContext, @@ -444,7 +496,11 @@ export interface FunctionMiddlewareServerFnOptions< > { data: Expand> context: Expand> - next: FunctionMiddlewareServerNextFn + next: FunctionMiddlewareServerNextFn< + TRouter, + TMiddlewares, + TServerSendContext + > response: TServerFnResponseType method: Method filename: string @@ -474,6 +530,7 @@ export type FunctionMiddlewareServerFnResult< > export interface FunctionMiddlewareAfterServer< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerContext, @@ -482,6 +539,7 @@ export interface FunctionMiddlewareAfterServer< TClientSendContext, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< + TRouter, TMiddlewares, TValidator, TServerContext, @@ -492,12 +550,14 @@ export interface FunctionMiddlewareAfterServer< > {} export interface FunctionMiddlewareClient< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerFnResponseType extends ServerFnResponseType, > { client: ( client: FunctionMiddlewareClientFn< + TRouter, TMiddlewares, TValidator, TSendServerContext, @@ -505,6 +565,7 @@ export interface FunctionMiddlewareClient< TServerFnResponseType >, ) => FunctionMiddlewareAfterClient< + TRouter, TMiddlewares, TValidator, TSendServerContext, @@ -514,6 +575,7 @@ export interface FunctionMiddlewareClient< } export type FunctionMiddlewareClientFn< + TRouter extends AnyRouter, TMiddlewares, TValidator, TSendContext, @@ -521,6 +583,7 @@ export type FunctionMiddlewareClientFn< TServerFnResponseType extends ServerFnResponseType, > = ( options: FunctionMiddlewareClientFnOptions< + TRouter, TMiddlewares, TValidator, TServerFnResponseType @@ -532,6 +595,7 @@ export type FunctionMiddlewareClientFn< > export interface FunctionMiddlewareClientFnOptions< + in out TRouter extends AnyRouter, in out TMiddlewares, in out TValidator, in out TServerFnResponseType extends ServerFnResponseType, @@ -542,7 +606,7 @@ export interface FunctionMiddlewareClientFnOptions< method: Method response: TServerFnResponseType signal: AbortSignal - next: FunctionMiddlewareClientNextFn + next: FunctionMiddlewareClientNextFn filename: string functionId: string type: ServerFnTypeOrTypeFn< @@ -579,12 +643,14 @@ export type FunctionClientResultWithContext< } export interface FunctionMiddlewareAfterClient< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerSendContext, TClientContext, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< + TRouter, TMiddlewares, TValidator, undefined, @@ -594,6 +660,7 @@ export interface FunctionMiddlewareAfterClient< TServerFnResponseType >, FunctionMiddlewareServer< + TRouter, TMiddlewares, TValidator, TServerSendContext, @@ -602,12 +669,14 @@ export interface FunctionMiddlewareAfterClient< > {} export interface FunctionMiddlewareValidator< + TRouter extends AnyRouter, TMiddlewares, TServerFnResponseType extends ServerFnResponseType, > { validator: ( input: ConstrainValidator, ) => FunctionMiddlewareAfterValidator< + TRouter, TMiddlewares, TNewValidator, TServerFnResponseType @@ -615,10 +684,12 @@ export interface FunctionMiddlewareValidator< } export interface FunctionMiddlewareAfterValidator< + TRouter extends AnyRouter, TMiddlewares, TValidator, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< + TRouter, TMiddlewares, TValidator, undefined, @@ -628,13 +699,19 @@ export interface FunctionMiddlewareAfterValidator< ServerFnResponseType >, FunctionMiddlewareServer< + TRouter, TMiddlewares, TValidator, undefined, undefined, TServerFnResponseType >, - FunctionMiddlewareClient {} + FunctionMiddlewareClient< + TRouter, + TMiddlewares, + TValidator, + ServerFnResponseType + > {} export interface RequestMiddleware extends RequestMiddlewareAfterMiddleware { diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index 14c1b26001..b31a98177d 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -5,13 +5,16 @@ import { startSerializer } from './serializer' import { mergeHeaders } from './headers' import { globalMiddleware } from './registerGlobalMiddleware' import type { + AnyRouter, AnyValidator, Constrain, Expand, + InferSerializer, + RegisteredRouter, ResolveValidatorInput, - SerializerParse, - SerializerStringify, - SerializerStringifyBy, + TypeSerializerParse, + TypeSerializerStringify, + TypeSerializerStringifyBy, Validator, } from '@tanstack/router-core' import type { Readable } from 'node:stream' @@ -33,6 +36,7 @@ export function createServerFn< TResponse = unknown, TMiddlewares = undefined, TValidator = undefined, + TRouter extends AnyRouter = RegisteredRouter, >( options?: { method?: TMethod @@ -46,7 +50,7 @@ export function createServerFn< TMiddlewares, TValidator >, -): ServerFnBuilder { +): ServerFnBuilder { const resolvedOptions = (__opts || options || {}) as ServerFnBaseOptions< TMethod, ServerFnResponseType, @@ -292,6 +296,7 @@ export type CompiledFetcherFnOptions = { } export type Fetcher< + TRouter extends AnyRouter, TMiddlewares, TValidator, TResponse, @@ -299,12 +304,14 @@ export type Fetcher< > = undefined extends IntersectAllValidatorInputs ? OptionalFetcher< + TRouter, TMiddlewares, TValidator, TResponse, TServerFnResponseType > : RequiredFetcher< + TRouter, TMiddlewares, TValidator, TResponse, @@ -324,16 +331,18 @@ export interface FetcherBase { } export type FetchResult< + TRouter extends AnyRouter, TMiddlewares, TResponse, TServerFnResponseType extends ServerFnResponseType, > = TServerFnResponseType extends 'raw' ? Promise : TServerFnResponseType extends 'full' - ? Promise> - : Promise> + ? Promise> + : Promise> export interface OptionalFetcher< + TRouter extends AnyRouter, TMiddlewares, TValidator, TResponse, @@ -341,10 +350,11 @@ export interface OptionalFetcher< > extends FetcherBase { ( options?: OptionalFetcherDataOptions, - ): FetchResult + ): FetchResult } export interface RequiredFetcher< + TRouter extends AnyRouter, TMiddlewares, TValidator, TResponse, @@ -352,7 +362,7 @@ export interface RequiredFetcher< > extends FetcherBase { ( opts: RequiredFetcherDataOptions, - ): FetchResult + ): FetchResult } export type FetcherBaseOptions = { @@ -373,16 +383,26 @@ export interface RequiredFetcherDataOptions data: Expand> } -export interface FullFetcherData { +export interface FullFetcherData< + TRouter extends AnyRouter, + TMiddlewares, + TResponse, +> { error: unknown - result: FetcherData + result: FetcherData context: AssignAllClientSendContext } -export type FetcherData = +export type FetcherData = TResponse extends JsonResponse - ? SerializerParse> - : SerializerParse + ? TypeSerializerParse< + InferSerializer['~types']['serializer'], + ReturnType + > + : TypeSerializerParse< + InferSerializer['~types']['serializer'], + TResponse + > export type RscStream = { __cacheState: T @@ -399,7 +419,17 @@ export type ServerFnReturnType< TResponse, > = TServerFnResponseType extends 'raw' ? RawResponse | Promise - : Promise> | SerializerStringify + : + | Promise< + TypeSerializerStringify< + InferSerializer['~types']['serializer'], + TResponse + > + > + | TypeSerializerStringify< + InferSerializer['~types']['serializer'], + TResponse + > export type ServerFn< TMethod, @@ -464,7 +494,7 @@ export type ServerFnBaseOptions< > } -export type ValidatorInputStringify = SerializerStringifyBy< +export type ValidatorInputStringify = TypeSerializerStringifyBy< ResolveValidatorInput, Date | undefined | FormData > @@ -483,6 +513,7 @@ export type ConstrainValidator = | ValidatorSerializerStringify export interface ServerFnMiddleware< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TValidator, @@ -493,6 +524,7 @@ export interface ServerFnMiddleware< ReadonlyArray >, ) => ServerFnAfterMiddleware< + TRouter, TMethod, TServerFnResponseType, TNewMiddlewares, @@ -501,21 +533,41 @@ export interface ServerFnMiddleware< } export interface ServerFnAfterMiddleware< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, -> extends ServerFnValidator, - ServerFnTyper, - ServerFnHandler {} +> extends ServerFnValidator< + TRouter, + TMethod, + TServerFnResponseType, + TMiddlewares + >, + ServerFnTyper< + TRouter, + TMethod, + TServerFnResponseType, + TMiddlewares, + TValidator + >, + ServerFnHandler< + TRouter, + TMethod, + TServerFnResponseType, + TMiddlewares, + TValidator + > {} export type ValidatorFn< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, > = ( validator: ConstrainValidator, ) => ServerFnAfterValidator< + TRouter, TMethod, TServerFnResponseType, TMiddlewares, @@ -523,24 +575,44 @@ export type ValidatorFn< > export interface ServerFnValidator< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, > { - validator: ValidatorFn + validator: ValidatorFn } export interface ServerFnAfterValidator< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, -> extends ServerFnMiddleware, - ServerFnTyper, - ServerFnHandler {} +> extends ServerFnMiddleware< + TRouter, + TMethod, + TServerFnResponseType, + TValidator + >, + ServerFnTyper< + TRouter, + TMethod, + TServerFnResponseType, + TMiddlewares, + TValidator + >, + ServerFnHandler< + TRouter, + TMethod, + TServerFnResponseType, + TMiddlewares, + TValidator + > {} // Typer export interface ServerFnTyper< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, @@ -554,6 +626,7 @@ export interface ServerFnTyper< TValidator >, ) => ServerFnAfterTyper< + TRouter, TMethod, TServerFnResponseType, TMiddlewares, @@ -578,11 +651,13 @@ export type ServerFnTypeOrTypeFn< ) => ServerFnType) export interface ServerFnAfterTyper< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, > extends ServerFnHandler< + TRouter, TMethod, TServerFnResponseType, TMiddlewares, @@ -591,6 +666,7 @@ export interface ServerFnAfterTyper< // Handler export interface ServerFnHandler< + TRouter extends AnyRouter, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, @@ -604,16 +680,40 @@ export interface ServerFnHandler< TValidator, TNewResponse >, - ) => Fetcher + ) => Fetcher< + TRouter, + TMiddlewares, + TValidator, + TNewResponse, + TServerFnResponseType + > } export interface ServerFnBuilder< + TRouter extends AnyRouter, TMethod extends Method = 'GET', TServerFnResponseType extends ServerFnResponseType = 'data', -> extends ServerFnMiddleware, - ServerFnValidator, - ServerFnTyper, - ServerFnHandler { +> extends ServerFnMiddleware< + TRouter, + TMethod, + TServerFnResponseType, + undefined + >, + ServerFnValidator, + ServerFnTyper< + TRouter, + TMethod, + TServerFnResponseType, + undefined, + undefined + >, + ServerFnHandler< + TRouter, + TMethod, + TServerFnResponseType, + undefined, + undefined + > { options: ServerFnBaseOptions< TMethod, TServerFnResponseType, diff --git a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts index 5e61c970c8..0b6b3f2cdf 100644 --- a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts +++ b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts @@ -442,7 +442,7 @@ test('createMiddleware merges server context and client context, sends server co fromClient3: string fromClient4: string } - sendContext: { toServer1: 'toServer1' } + sendContext: { toServer1: string } headers: HeadersInit }>() @@ -453,7 +453,7 @@ test('createMiddleware merges server context and client context, sends server co fromServer1: string fromServer2: string fromServer3: string - toServer1: 'toServer1' + toServer1: string }>() const result = await options.next({ @@ -468,7 +468,7 @@ test('createMiddleware merges server context and client context, sends server co fromServer4: string } sendContext: { - toClient1: 'toClient1' + toClient1: string } } context: { @@ -476,9 +476,9 @@ test('createMiddleware merges server context and client context, sends server co fromServer2: string fromServer3: string fromServer4: string - toServer1: 'toServer1' + toServer1: string } - sendContext: { toClient1: 'toClient1' } + sendContext: { toClient1: string } }>() return result @@ -507,9 +507,9 @@ test('createMiddleware merges server context and client context, sends server co fromClient3: string fromClient4: string fromClient5: string - toClient1: 'toClient1' + toClient1: string } - sendContext: { toServer1: 'toServer1'; toServer2: 'toServer2' } + sendContext: { toServer1: string; toServer2: string } headers: HeadersInit }>() @@ -521,8 +521,8 @@ test('createMiddleware merges server context and client context, sends server co fromServer2: string fromServer3: string fromServer4: string - toServer1: 'toServer1' - toServer2: 'toServer2' + toServer1: string + toServer2: string }>() const result = await options.next({ @@ -537,7 +537,7 @@ test('createMiddleware merges server context and client context, sends server co fromServer5: string } sendContext: { - toClient2: 'toClient2' + toClient2: string } } context: { @@ -546,10 +546,10 @@ test('createMiddleware merges server context and client context, sends server co fromServer3: string fromServer4: string fromServer5: string - toServer1: 'toServer1' - toServer2: 'toServer2' + toServer1: string + toServer2: string } - sendContext: { toClient1: 'toClient1'; toClient2: 'toClient2' } + sendContext: { toClient1: string; toClient2: string } }>() return result diff --git a/packages/start-server-functions-fetcher/src/index.ts b/packages/start-server-functions-fetcher/src/index.ts index 8908d0652c..03b72bb56e 100644 --- a/packages/start-server-functions-fetcher/src/index.ts +++ b/packages/start-server-functions-fetcher/src/index.ts @@ -18,7 +18,12 @@ export async function serverFnFetcher( // If createServerFn was used to wrap the fetcher, // We need to handle the arguments differently if (isPlainObject(_first) && _first.method) { - const first = _first as FunctionMiddlewareClientFnOptions & { + const first = _first as FunctionMiddlewareClientFnOptions< + any, + any, + any, + any + > & { headers: HeadersInit } const type = first.data instanceof FormData ? 'formData' : 'payload' @@ -92,7 +97,7 @@ export async function serverFnFetcher( } function getFetcherRequestOptions( - opts: FunctionMiddlewareClientFnOptions, + opts: FunctionMiddlewareClientFnOptions, ) { if (opts.method === 'POST') { if (opts.data instanceof FormData) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 75c41c2a44..e743624fa8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4166,6 +4166,12 @@ importers: react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) + seroval: + specifier: ^1.3.1 + version: 1.3.1 + seroval-plugins: + specifier: ^1.3.1 + version: 1.3.1(seroval@1.3.1) tailwind-merge: specifier: ^2.6.0 version: 2.6.0 @@ -5922,6 +5928,9 @@ importers: '@tanstack/store': specifier: ^0.7.0 version: 0.7.0 + seroval: + specifier: ^1.3.1 + version: 1.3.1 tiny-invariant: specifier: ^1.3.3 version: 1.3.3 @@ -13395,14 +13404,14 @@ packages: serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - seroval-plugins@1.2.0: - resolution: {integrity: sha512-hULTbfzSe81jGWLH8TAJjkEvw6JWMqOo9Uq+4V4vg+HNq53hyHldM9ZOfjdzokcFysiTp9aFdV2vJpZFqKeDjQ==} + seroval-plugins@1.3.1: + resolution: {integrity: sha512-dOlUoiI3fgZbQIcj6By+l865pzeWdP3XCSLdI3xlKnjCk5983yLWPsXytFOUI0BUZKG9qwqbj78n9yVcVwUqaQ==} engines: {node: '>=10'} peerDependencies: seroval: ^1.0 - seroval@1.2.0: - resolution: {integrity: sha512-GURoU99ko2UiAgUC3qDCk59Jb3Ss4Po8VIMGkG8j5PFo2Q7y0YSMP8QG9NuL/fJCoTz9V1XZUbpNIMXPOfaGpA==} + seroval@1.3.1: + resolution: {integrity: sha512-F+T9EQPdLzgdewgxnBh4mSc+vde+EOkU6dC9BDuu/bfGb+UyUlqM6t8znFCTPQSuai/ZcfFg0gu79h+bVW2O0w==} engines: {node: '>=10'} serve-index@1.9.1: @@ -21994,11 +22003,11 @@ snapshots: dependencies: randombytes: 2.1.0 - seroval-plugins@1.2.0(seroval@1.2.0): + seroval-plugins@1.3.1(seroval@1.3.1): dependencies: - seroval: 1.2.0 + seroval: 1.3.1 - seroval@1.2.0: {} + seroval@1.3.1: {} serve-index@1.9.1: dependencies: @@ -22119,8 +22128,8 @@ snapshots: solid-js@1.9.5: dependencies: csstype: 3.1.3 - seroval: 1.2.0 - seroval-plugins: 1.2.0(seroval@1.2.0) + seroval: 1.3.1 + seroval-plugins: 1.3.1(seroval@1.3.1) solid-refresh@0.6.3(solid-js@1.9.5): dependencies: From 05a19c3ea798187d297fa54786ab1b4c7d0171b7 Mon Sep 17 00:00:00 2001 From: chorobin Date: Thu, 22 May 2025 23:12:55 +0200 Subject: [PATCH 092/126] chore: fix solid types --- packages/solid-router/src/index.tsx | 10 +++++----- packages/solid-router/src/router.ts | 9 +++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index 2d7204db62..a7daa25b35 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -39,11 +39,11 @@ export { export type { StartSerializer, - Serializable, - SerializerParse, - SerializerParseBy, - SerializerStringify, - SerializerStringifyBy, + DefaultTypeSerializable, + TypeSerializerParse, + TypeSerializerParseBy, + TypeSerializerStringify, + TypeSerializerStringifyBy, DeferredPromiseState, DeferredPromise, ParsedLocation, diff --git a/packages/solid-router/src/router.ts b/packages/solid-router/src/router.ts index bc5af4f758..69a6da9d27 100644 --- a/packages/solid-router/src/router.ts +++ b/packages/solid-router/src/router.ts @@ -5,6 +5,8 @@ import type { AnyRoute, CreateRouterFn, RouterConstructorOptions, + Serializer, + SerovalSerializer, TrailingSlashOption, } from '@tanstack/router-core' import type { @@ -83,12 +85,14 @@ export class Router< in out TDefaultStructuralSharingOption extends boolean = false, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, + in out TSerializer extends Serializer = SerovalSerializer, > extends RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer > { constructor( options: RouterConstructorOptions< @@ -96,7 +100,8 @@ export class Router< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated + TDehydrated, + TSerializer >, ) { super(options) From 8a76fa7102ce8004543a8631d9b9995881728d40 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 23 May 2025 09:46:03 +1200 Subject: [PATCH 093/126] refactor: consistent virtual module naming and resolve using Rollup conventions (#4226) Renames the following virtual modules as such to have them be both consistent and more easily readable should there be an error when importing them. | Before | After | |--------|--------| | `tanstack:server-fn-manifest` | `tanstack-start-server-fn-manifest:v` | | `tanstack:start-manifest` | `tanstack-start-router-manifest:v` | | `tanstack:server-rotues` | `tanstack-start-server-routes-manifest:v` | Additionally, the [Rollup convention for resolving virtual modules](https://vite.dev/guide/api-plugin#virtual-modules-convention) is being applied to these modules. --- packages/react-start-server/vite.config.ts | 6 +++- packages/server-functions-plugin/src/index.ts | 30 +++++++++++++++---- packages/solid-start-server/vite.config.ts | 6 +++- packages/start-plugin-core/src/index.ts | 1 + packages/start-plugin-core/src/plugin.ts | 6 ++-- .../src/routesManifestPlugin.ts | 10 +++++-- .../src/start-server-routes-plugin/plugin.ts | 3 +- packages/start-plugin-core/src/utils.ts | 3 ++ .../src/createStartHandler.ts | 10 +++---- .../start-server-core/src/router-manifest.ts | 2 +- .../src/server-functions-handler.ts | 2 +- .../start-server-core/src/tanstack-start.d.ts | 2 +- packages/start-server-core/vite.config.ts | 6 ++-- 13 files changed, 61 insertions(+), 26 deletions(-) create mode 100644 packages/start-plugin-core/src/utils.ts diff --git a/packages/react-start-server/vite.config.ts b/packages/react-start-server/vite.config.ts index 010f101521..3a4c1c54ef 100644 --- a/packages/react-start-server/vite.config.ts +++ b/packages/react-start-server/vite.config.ts @@ -19,6 +19,10 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', - externalDeps: ['tanstack:server-fn-manifest', 'tanstack:start-manifest'], + externalDeps: [ + 'tanstack-start-server-fn-manifest:v', + 'tanstack-start-router-manifest:v', + 'tanstack-start-server-routes-manifest:v', + ], }), ) diff --git a/packages/server-functions-plugin/src/index.ts b/packages/server-functions-plugin/src/index.ts index 89c6959f30..e0a1b01a08 100644 --- a/packages/server-functions-plugin/src/index.ts +++ b/packages/server-functions-plugin/src/index.ts @@ -141,9 +141,17 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { // so the manifest is like a serialized state from the client build to the server build name: 'tanstack-start-server-fn-vite-plugin-manifest-server', enforce: 'pre', - resolveId: (id) => (id === opts.manifestVirtualImportId ? id : null), + resolveId(id) { + if (id === opts.manifestVirtualImportId) { + return resolveViteId(id) + } + + return undefined + }, load(id) { - if (id !== opts.manifestVirtualImportId) return null + if (id !== resolveViteId(opts.manifestVirtualImportId)) { + return undefined + } // In development, we **can** use the in-memory manifest, and we should // since it will be incrementally updated as we use the app and dynamic @@ -255,7 +263,6 @@ export function TanStackServerFnPluginEnv( const directiveLabel = 'Server Function' return [ - // client: [ // The client plugin is used to compile the client directives // and save them so we can create a manifest TanStackDirectiveFunctionsPluginEnv({ @@ -325,9 +332,17 @@ export function TanStackServerFnPluginEnv( // applyToEnvironment(environment) { // return environment.name === opts.server.envName // }, - resolveId: (id) => (id === opts.manifestVirtualImportId ? id : null), + resolveId(id) { + if (id === opts.manifestVirtualImportId) { + return resolveViteId(id) + } + + return undefined + }, load(id) { - if (id !== opts.manifestVirtualImportId) return null + if (id !== resolveViteId(opts.manifestVirtualImportId)) { + return undefined + } // In development, we **can** use the in-memory manifest, and we should // since it will be incrementally updated as we use the app and dynamic @@ -360,6 +375,9 @@ export function TanStackServerFnPluginEnv( return manifestWithImports }, }, - // ], ] } + +function resolveViteId(id: string) { + return `\0${id}` +} diff --git a/packages/solid-start-server/vite.config.ts b/packages/solid-start-server/vite.config.ts index d973bb3b08..79aa39295e 100644 --- a/packages/solid-start-server/vite.config.ts +++ b/packages/solid-start-server/vite.config.ts @@ -22,6 +22,10 @@ export default mergeConfig( tanstackViteConfig({ srcDir: './src', entry: './src/index.tsx', - externalDeps: ['tanstack:server-fn-manifest', 'tanstack:start-manifest'], + externalDeps: [ + 'tanstack-start-server-fn-manifest:v', + 'tanstack-start-router-manifest:v', + 'tanstack-start-server-routes-manifest:v', + ], }), ) diff --git a/packages/start-plugin-core/src/index.ts b/packages/start-plugin-core/src/index.ts index 38e3ede06a..fe6dd7fa90 100644 --- a/packages/start-plugin-core/src/index.ts +++ b/packages/start-plugin-core/src/index.ts @@ -5,3 +5,4 @@ export { } from './schema' export { TanStackStartVitePluginCore } from './plugin' +export { resolveViteId } from './utils' diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index ffe7cb2ad4..8870def71a 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -141,8 +141,8 @@ export function TanStackStartVitePluginCore( '@tanstack/start-router-manifest', '@tanstack/start-config', '@tanstack/server-functions-plugin', - 'tanstack:start-manifest', - 'tanstack:server-fn-manifest', + 'tanstack-start-router-manifest:v', + 'tanstack-start-server-fn-manifest:v', 'nitropack', '@tanstack/**', ], @@ -166,7 +166,7 @@ export function TanStackStartVitePluginCore( TanStackServerFnPluginEnv({ // This is the ID that will be available to look up and import // our server function manifest and resolve its module - manifestVirtualImportId: 'tanstack:server-fn-manifest', + manifestVirtualImportId: 'tanstack-start-server-fn-manifest:v', client: { getRuntimeCode: () => `import { createClientRpc } from '@tanstack/${opts.framework}-start/server-functions-client'`, diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/routesManifestPlugin.ts index e323dc792d..c46dbb4577 100644 --- a/packages/start-plugin-core/src/routesManifestPlugin.ts +++ b/packages/start-plugin-core/src/routesManifestPlugin.ts @@ -2,6 +2,7 @@ import { readFileSync } from 'node:fs' import path from 'node:path' import { joinURL } from 'ufo' import { rootRouteId } from '@tanstack/router-core' +import { resolveViteId } from './utils' import type { PluginOption, ResolvedConfig, @@ -16,6 +17,9 @@ export function startManifestPlugin( ): PluginOption { let config: ResolvedConfig + const moduleId = 'tanstack-start-router-manifest:v' + const resolvedModuleId = resolveViteId(moduleId) + return { name: 'tsr-routes-manifest', enforce: 'pre', @@ -27,13 +31,13 @@ export function startManifestPlugin( // config = envConfig. // }, resolveId(id) { - if (id === 'tanstack:start-manifest') { - return id + if (id === moduleId) { + return resolvedModuleId } return }, load(id) { - if (id === 'tanstack:start-manifest') { + if (id === resolvedModuleId) { if (this.environment.config.consumer !== 'server') { // this will ultimately fail the build if the plugin is used outside the server environment // TODO: do we need special handling for `serve`? diff --git a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts index d149f76534..0ff4bf0e1a 100644 --- a/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts +++ b/packages/start-plugin-core/src/start-server-routes-plugin/plugin.ts @@ -30,6 +30,7 @@ const setLock = (bool: boolean) => { export function TanStackStartServerRoutesVite(config: Config): Plugin { let ROOT: string = process.cwd() + const moduleId = 'tanstack-start-server-routes-manifest:v' const getRoutesDirectoryPath = () => { return isAbsolute(config.routesDirectory) @@ -80,7 +81,7 @@ export function TanStackStartServerRoutesVite(config: Config): Plugin { }, sharedDuringBuild: true, resolveId(id) { - if (id === 'tanstack:server-routes') { + if (id === moduleId) { const generatedRouteTreePath = getGeneratedRouteTreePath(ROOT) return generatedRouteTreePath } diff --git a/packages/start-plugin-core/src/utils.ts b/packages/start-plugin-core/src/utils.ts new file mode 100644 index 0000000000..e31da4350a --- /dev/null +++ b/packages/start-plugin-core/src/utils.ts @@ -0,0 +1,3 @@ +export function resolveViteId(id: string) { + return `\0${id}` +} diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index d6f6892a4e..0765fb4cfa 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -135,10 +135,10 @@ export function createStartHandler({ // Then move on to attempting to load server routes const serverRouteTreeModule = await (async () => { try { - // @ts-expect-error - return (await import('tanstack:server-routes')) as { - routeTree: AnyServerRoute - } + return (await import( + // @ts-expect-error + 'tanstack-start-server-routes-manifest:v' + )) as { routeTree: AnyServerRoute } } catch (e) { console.log(e) return undefined @@ -347,7 +347,7 @@ async function handleServerRoutes({ function handlerToMiddleware( handler: AnyServerRouteWithTypes['options']['methods'][string], ) { - return async ({ next, ...rest }: TODO) => ({ + return async ({ next: _next, ...rest }: TODO) => ({ response: await handler(rest), }) } diff --git a/packages/start-server-core/src/router-manifest.ts b/packages/start-server-core/src/router-manifest.ts index 53f999ca35..ca08026e62 100644 --- a/packages/start-server-core/src/router-manifest.ts +++ b/packages/start-server-core/src/router-manifest.ts @@ -1,4 +1,4 @@ -import { tsrStartManifest } from 'tanstack:start-manifest' +import { tsrStartManifest } from 'tanstack-start-router-manifest:v' import { rootRouteId } from '@tanstack/router-core' declare global { diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 3bb154abaf..460711e54c 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -2,7 +2,7 @@ import { isNotFound } from '@tanstack/router-core' import invariant from 'tiny-invariant' import { startSerializer } from '@tanstack/start-client-core' // @ts-expect-error -import _serverFnManifest from 'tanstack:server-fn-manifest' +import _serverFnManifest from 'tanstack-start-server-fn-manifest:v' import { getEvent, getResponseStatus } from './h3' const serverFnManifest = _serverFnManifest as Record< diff --git a/packages/start-server-core/src/tanstack-start.d.ts b/packages/start-server-core/src/tanstack-start.d.ts index 760f7c0a5a..62f36aeb9b 100644 --- a/packages/start-server-core/src/tanstack-start.d.ts +++ b/packages/start-server-core/src/tanstack-start.d.ts @@ -1,4 +1,4 @@ -declare module 'tanstack:start-manifest' { +declare module 'tanstack-start-router-manifest:v' { import type { Manifest } from '@tanstack/router-core' export const tsrStartManifest: () => Manifest diff --git a/packages/start-server-core/vite.config.ts b/packages/start-server-core/vite.config.ts index edc06db539..acf5a7e3ee 100644 --- a/packages/start-server-core/vite.config.ts +++ b/packages/start-server-core/vite.config.ts @@ -20,9 +20,9 @@ export default mergeConfig( srcDir: './src', entry: './src/index.tsx', externalDeps: [ - 'tanstack:server-fn-manifest', - 'tanstack:start-manifest', - 'tanstack:server-routes', + 'tanstack-start-server-fn-manifest:v', + 'tanstack-start-router-manifest:v', + 'tanstack-start-server-routes-manifest:v', ], }), ) From f06a29b2624c9a5ca0ed8d6515f0ae2d1028b707 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 22 May 2025 21:47:33 +0000 Subject: [PATCH 094/126] release: v1.121.0-alpha.7 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index e9bd54c128..a760ae8ca3 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index f69aaade81..409781f371 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index f8017ac9c7..72f3500ae2 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 87a6cdadb7..6bad74fa92 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 2fd367e58d..27a486f712 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 584ccfcf16..ac4cfdf5e7 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index f408f39ca5..0c2ca5a10a 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 24ecdc35f5..7fb552e05e 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 0af6b3a36b..9ba81e0b75 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 149231213a..655920555d 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 8233126a21..298f7c3c27 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index b794f720c9..b8cbdc515b 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 1d50079c8d..97efc8eea8 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index d344a96bd9..e47526817b 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 9b091c51c4..796afadd99 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index bdbe67fbcc..c2275a7b67 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 1f5288a81f..bbdc14ca12 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.6", + "@tanstack/react-start": "^1.121.0-alpha.7", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 9fc360ef95..caebe3fe0c 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.6", + "@tanstack/solid-start": "^1.121.0-alpha.7", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index b2aa58fbfb..f615a086c8 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.6", + "@tanstack/solid-start": "^1.121.0-alpha.7", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index b6fe8b8a3f..19da07a1f0 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.6", + "@tanstack/solid-start": "^1.121.0-alpha.7", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index b0c2eacda1..542612acd1 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.6", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index b8d59ec013..0a6ebd9e58 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 8057587262..8bccc894f0 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.6", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 16adff6290..8330fb4c4c 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index d72a94470d..c518b58e5d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.6", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index eb0bf67dca..4609e76175 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 95d9442f16..1635c16502 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.6", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 0d371f3be3..a204d5ecb6 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.6", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index f94c93e864..df7871139f 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 791f79d8b0..cef9bcdfd1 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 0a112653e9..73b23b0079 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.121.0-alpha.2", + "version": "1.121.0-alpha.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From baf6a52e2ee549274ae83d6fc8adf1b6029c1280 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 23 May 2025 10:24:39 +1200 Subject: [PATCH 095/126] feat(server-functions-plugin): make the manifest output path configurable (#4232) As part of the devinxi changes, the following hard-coded output path of the server functions manifest file was changed. This would have had breaking changes in the user DX for downstream frameworks building upon the `@tanstack/server-functions-plugin` package - (i.e. SolidStart). This change makes the output path of the manifest file for the `server-functions-plugin` package, configurable. --- packages/server-functions-plugin/README.md | 6 ++-- packages/server-functions-plugin/src/index.ts | 36 +++++++++++++++++-- packages/start-plugin-core/src/plugin.ts | 2 ++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/packages/server-functions-plugin/README.md b/packages/server-functions-plugin/README.md index 9dacb9f0b1..6c0c32bdcc 100644 --- a/packages/server-functions-plugin/README.md +++ b/packages/server-functions-plugin/README.md @@ -8,8 +8,8 @@ Create a new instance of the plugin with the following options: ```ts const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ - // This is the ID that will be available to look up and import - // our server function manifest and resolve its module + // This is the ID (virtual module) that will be made available to look up + // and import our server function manifest and resolve its modules. manifestVirtualImportId: 'tanstack:server-fn-manifest', client: { getRuntimeCode: () => @@ -86,5 +86,5 @@ export const handler = async (req: Request) => { const args = await req.json() return await fnModule(...args) - +} ``` diff --git a/packages/server-functions-plugin/src/index.ts b/packages/server-functions-plugin/src/index.ts index e0a1b01a08..2221ccf40c 100644 --- a/packages/server-functions-plugin/src/index.ts +++ b/packages/server-functions-plugin/src/index.ts @@ -22,15 +22,28 @@ declare global { } export type ServerFnPluginOpts = { + /** + * The virtual import ID that will be used to import the server function manifest. + * This virtual import ID will be used in the server build to import the manifest + * and its modules. + */ manifestVirtualImportId: string + /** + * The path to the manifest file that will be created during the build process. + * This file will be used to import the modules for the server functions in your + * server handler. + * + * @default 'node_modules/.tanstack-start/server-functions-manifest.json' + */ + manifestOutputFilename?: string client: ServerFnPluginEnvOpts ssr: ServerFnPluginEnvOpts server: ServerFnPluginEnvOpts importer?: (fn: DirectiveFn) => Promise } -const manifestFilename = - '.tanstack-start/build/server/server-functions-manifest.json' +const defaultManifestFilename = + 'node_modules/.tanstack-start/server-functions-manifest.json' export type ServerFnPluginEnvOpts = { getRuntimeCode: () => string @@ -71,6 +84,9 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { ) } + const manifestFilename = + opts.manifestOutputFilename || defaultManifestFilename + const directive = 'use server' const directiveLabel = 'Server Function' @@ -201,7 +217,20 @@ export function createTanStackServerFnPlugin(opts: ServerFnPluginOpts): { } export interface TanStackServerFnPluginEnvOpts { + /** + * The virtual import ID that will be used to import the server function manifest. + * This virtual import ID will be used in the server build to import the manifest + * and its modules. + */ manifestVirtualImportId: string + /** + * The path to the manifest file that will be created during the build process. + * This file will be used to import the modules for the server functions in your + * server handler. + * + * @default 'node_modules/.tanstack-start/server-functions-manifest.json' + */ + manifestOutputFilename?: string client: { envName?: string getRuntimeCode: () => string @@ -259,6 +288,9 @@ export function TanStackServerFnPluginEnv( ) } + const manifestFilename = + opts.manifestOutputFilename || defaultManifestFilename + const directive = 'use server' const directiveLabel = 'Server Function' diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 8870def71a..59d85a07ed 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -167,6 +167,8 @@ export function TanStackStartVitePluginCore( // This is the ID that will be available to look up and import // our server function manifest and resolve its module manifestVirtualImportId: 'tanstack-start-server-fn-manifest:v', + manifestOutputFilename: + '.tanstack-start/build/server/server-functions-manifest.json', client: { getRuntimeCode: () => `import { createClientRpc } from '@tanstack/${opts.framework}-start/server-functions-client'`, From dd34efe87f68b32a894b62f3a3764c3e7996626e Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 22 May 2025 22:26:00 +0000 Subject: [PATCH 096/126] release: v1.121.0-alpha.8 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/server-functions-plugin/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- packages/start-server-functions-server/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index a760ae8ca3..51be8c981b 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 409781f371..0f58fb160e 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 72f3500ae2..d87b3e3661 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 6bad74fa92..e9dcf3f58f 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 27a486f712..f759dfc80f 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ac4cfdf5e7..ffa96f999c 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 0c2ca5a10a..e7924c2526 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 7fb552e05e..1ac1cb1a3e 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 9ba81e0b75..4633e6ec2f 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 655920555d..7a57608de5 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 298f7c3c27..8b595b4cac 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index b8cbdc515b..a160f7b1f0 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 97efc8eea8..feeb92281a 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index e47526817b..aa5ec5012b 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 796afadd99..f2a76815f1 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index c2275a7b67..348e5e0a13 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index bbdc14ca12..71f16a6376 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.7", + "@tanstack/react-start": "^1.121.0-alpha.8", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index caebe3fe0c..a6563966b5 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.7", + "@tanstack/solid-start": "^1.121.0-alpha.8", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index f615a086c8..9a2f8f387b 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.7", + "@tanstack/solid-start": "^1.121.0-alpha.8", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 19da07a1f0..a46e433130 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.7", + "@tanstack/solid-start": "^1.121.0-alpha.8", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 542612acd1..5f4947128e 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 8bccc894f0..b667172c18 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/server-functions-plugin/package.json b/packages/server-functions-plugin/package.json index 8330fb4c4c..f8d97dccd9 100644 --- a/packages/server-functions-plugin/package.json +++ b/packages/server-functions-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/server-functions-plugin", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index c518b58e5d..559eb1720c 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 1635c16502..c7ab6095a8 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index a204d5ecb6..ce998bfeee 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index cef9bcdfd1..a597ebe4d9 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 73b23b0079..0463b26718 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-server", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.8", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 42e075cdf50d6611865a42fbb1482159d39a1713 Mon Sep 17 00:00:00 2001 From: Yeoh Joer Date: Fri, 23 May 2025 07:44:39 +0800 Subject: [PATCH 097/126] fix(start-plugin-core): prepend `/@fs` when a custom client entry is detected (#4184) --- packages/start-plugin-core/src/plugin.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 59d85a07ed..60daa41b3e 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -77,7 +77,10 @@ export function TanStackStartVitePluginCore( ) ? startConfig.clientEntryPath : vite.normalizePath( - path.resolve(startConfig.root, startConfig.clientEntryPath), + path.join( + '/@fs', + path.resolve(startConfig.root, startConfig.clientEntryPath), + ), ) return entry From fad6b0be74a67b1b13b3f982ac4335c7b8f3ca21 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 22 May 2025 23:50:36 +0000 Subject: [PATCH 098/126] release: v1.121.0-alpha.9 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 51be8c981b..237d049e5a 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 0f58fb160e..876852080b 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index d87b3e3661..1c69779153 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index e9dcf3f58f..0f2d326eb2 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index f759dfc80f..41148787ff 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index ffa96f999c..614c4c86cc 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index e7924c2526..0a17302b38 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 1ac1cb1a3e..e5afd6d0cb 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 4633e6ec2f..f78462494e 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 7a57608de5..013ce04451 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 8b595b4cac..543ec86d6b 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index a160f7b1f0..f2e1fed4ea 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index feeb92281a..7ac8073b1f 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index aa5ec5012b..b22bf21b4a 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index f2a76815f1..5048f664c7 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 348e5e0a13..5f319588e5 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 71f16a6376..3b19582947 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.8", + "@tanstack/react-start": "^1.121.0-alpha.9", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index a6563966b5..a9f3043231 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.8", + "@tanstack/solid-start": "^1.121.0-alpha.9", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 9a2f8f387b..dae190f160 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.8", + "@tanstack/solid-start": "^1.121.0-alpha.9", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index a46e433130..beadd317b5 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.8", + "@tanstack/solid-start": "^1.121.0-alpha.9", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 5f4947128e..296ce68026 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index b667172c18..f89ceaf47f 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 559eb1720c..2cd6b4874b 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.9", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index c7ab6095a8..1332c2faef 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.9", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index ce998bfeee..65e4520ffd 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.9", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 496fac3efc185a3cdf104b66386c5ec33e8ae5ea Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Fri, 23 May 2025 14:44:40 +1200 Subject: [PATCH 099/126] fix: make sitemap accessible via public assets (#4235) --- .../start-plugin-core/src/build-sitemap.ts | 17 +- .../src/nitro/build-nitro.ts | 27 --- .../src/nitro/nitro-plugin.ts | 154 +++++++++++------- packages/start-plugin-core/src/prerender.ts | 19 ++- packages/start-plugin-core/src/utils.ts | 11 ++ 5 files changed, 128 insertions(+), 100 deletions(-) delete mode 100644 packages/start-plugin-core/src/nitro/build-nitro.ts diff --git a/packages/start-plugin-core/src/build-sitemap.ts b/packages/start-plugin-core/src/build-sitemap.ts index eec071438b..180ac876b2 100644 --- a/packages/start-plugin-core/src/build-sitemap.ts +++ b/packages/start-plugin-core/src/build-sitemap.ts @@ -1,6 +1,7 @@ import { writeFileSync } from 'node:fs' import path from 'node:path' import { create } from 'xmlbuilder2' +import { createLogger } from './utils' import type { TanStackStartOutputConfig } from './plugin' import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' @@ -121,13 +122,15 @@ function jsonToXml(sitemapData: SitemapData): string { return sitemap.end({ prettyPrint: true }) } -export async function buildSitemap({ +export function buildSitemap({ options, publicDir, }: { options: TanStackStartOutputConfig publicDir: string }) { + const logger = createLogger('sitemap') + let sitemapOptions = options.sitemap if (!sitemapOptions && options.pages.length) { @@ -142,7 +145,7 @@ export async function buildSitemap({ if (!host) { if (!options.sitemap) { - console.info( + logger.info( 'Hint: Pages found, but no sitemap host has been set. To enable sitemap generation, set the `sitemap.host` option.', ) return @@ -159,11 +162,11 @@ export async function buildSitemap({ const { pages } = options if (!pages.length) { - console.log('No pages were found to build the sitemap. Skipping...') + logger.info('No pages were found to build the sitemap. Skipping...') return } - console.log('Building Sitemap...') + logger.info('Building Sitemap...') // Build the sitemap data const sitemapData = buildSitemapJson(pages, host) @@ -174,11 +177,11 @@ export async function buildSitemap({ try { // Write XML sitemap - console.log(`Writing sitemap XML at ${xmlOutputPath}`) + logger.info(`Writing sitemap XML at ${xmlOutputPath}`) writeFileSync(xmlOutputPath, jsonToXml(sitemapData)) // Write pages data for runtime use - console.log(`Writing pages data at ${pagesOutputPath}`) + logger.info(`Writing pages data at ${pagesOutputPath}`) writeFileSync( pagesOutputPath, JSON.stringify( @@ -192,7 +195,7 @@ export async function buildSitemap({ ), ) } catch (e) { - console.error(`Unable to write sitemap files`, e) + logger.error(`Unable to write sitemap files`, e) } } diff --git a/packages/start-plugin-core/src/nitro/build-nitro.ts b/packages/start-plugin-core/src/nitro/build-nitro.ts deleted file mode 100644 index 918248c3a9..0000000000 --- a/packages/start-plugin-core/src/nitro/build-nitro.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { promises as fsp } from 'node:fs' -import path from 'node:path' -import { copyPublicAssets, prepare } from 'nitropack' -import type { Nitro } from 'nitropack' - -export async function buildNitroEnvironment( - nitro: Nitro, - build: () => Promise, -) { - await prepare(nitro) - await copyPublicAssets(nitro) - await build() - - const publicDir = nitro.options.output.publicDir - - // As a part of the build process, the `.vite/` directory - // is copied over from `.tanstack-start/build/client-dist/` - // to the `publicDir` (e.g. `.output/public/`). - // This directory (containing the vite manifest) should not be - // included in the final build, so we remove it here. - const viteDir = path.resolve(publicDir, '.vite') - if (await fsp.stat(viteDir).catch(() => false)) { - await fsp.rm(viteDir, { recursive: true, force: true }) - } - - await nitro.close() -} diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 3a3bf00b14..2e8df9fad3 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -1,15 +1,20 @@ import path from 'node:path' import { rmSync } from 'node:fs' -import { build, createNitro } from 'nitropack' +import * as fsp from 'node:fs/promises' +import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' import { dirname, resolve } from 'pathe' import { clientDistDir, ssrEntryFile } from '../plugin' import { prerender } from '../prerender' import { VITE_ENVIRONMENT_NAMES } from '../constants' import { buildSitemap } from '../build-sitemap' import { devServerPlugin } from './dev-server-plugin' -import { buildNitroEnvironment } from './build-nitro' -import type { EnvironmentOptions, PluginOption, Rollup } from 'vite' -import type { NitroConfig } from 'nitropack' +import type { + EnvironmentOptions, + PluginOption, + Rollup, + ViteBuilder, +} from 'vite' +import type { Nitro, NitroConfig } from 'nitropack' import type { TanStackStartOutputConfig } from '../plugin' export function nitroPlugin( @@ -88,59 +93,7 @@ export function nitroPlugin( const nitro = await createNitro(nitroConfig) - await buildNitroEnvironment(nitro, () => build(nitro)) - - // If the user has not set a prerender option, we need to set it to true - // if the pages array is not empty and has sub options requiring for prerendering - if (options.prerender?.enabled !== false) { - options.prerender = { - ...options.prerender, - enabled: options.pages.some((d) => - typeof d === 'string' ? false : !!d.prerender?.enabled, - ), - } - } - - // Setup the options for prerendering the SPA shell (i.e `src/routes/__root.tsx`) - if (options.spa?.enabled) { - options.prerender = { - ...options.prerender, - enabled: true, - } - - const maskUrl = new URL( - options.spa.maskPath, - 'http://localhost', - ) - - maskUrl.searchParams.set('__TSS_SHELL', 'true') - - options.pages.push({ - path: maskUrl.toString().replace('http://localhost', ''), - prerender: options.spa.prerender, - sitemap: { - exclude: true, - }, - }) - } - - // Start prerendering!!! - if (options.prerender.enabled) { - await prerender({ - options, - nitro, - builder, - }) - } - - if (options.pages.length) { - await buildSitemap({ - options, - publicDir: nitro.options.output.publicDir, - }) - } - - console.log(`\n✅ Client and server bundles successfully built.`) + await buildNitroApp(builder, nitro, options) }, }, } @@ -149,6 +102,93 @@ export function nitroPlugin( ] } +/** + * Correctly co-ordinates the nitro app build process to make sure that the + * app is built, while also correctly handling the prerendering and sitemap + * generation and including their outputs in the final build. + */ +async function buildNitroApp( + builder: ViteBuilder, + nitro: Nitro, + options: TanStackStartOutputConfig, +) { + // Cleans the public and server directories for a fresh build + // i.e the `.output/public` and `.output/server` directories + await prepare(nitro) + + // Creates the `.output/public` directory and copies the public assets + await copyPublicAssets(nitro) + + // If the user has not set a prerender option, we need to set it to true + // if the pages array is not empty and has sub options requiring for prerendering + if (options.prerender?.enabled !== false) { + options.prerender = { + ...options.prerender, + enabled: options.pages.some((d) => + typeof d === 'string' ? false : !!d.prerender?.enabled, + ), + } + } + + // Setup the options for prerendering the SPA shell (i.e `src/routes/__root.tsx`) + if (options.spa?.enabled) { + options.prerender = { + ...options.prerender, + enabled: true, + } + + const maskUrl = new URL(options.spa.maskPath, 'http://localhost') + + maskUrl.searchParams.set('__TSS_SHELL', 'true') + + options.pages.push({ + path: maskUrl.toString().replace('http://localhost', ''), + prerender: options.spa.prerender, + sitemap: { + exclude: true, + }, + }) + } + + // Run the prerendering process + if (options.prerender.enabled) { + await prerender({ + options, + nitro, + builder, + }) + } + + // Run the sitemap build process + if (options.pages.length) { + buildSitemap({ + options, + publicDir: nitro.options.output.publicDir, + }) + } + + // Build the nitro app + await build(nitro) + + // Cleanup the vite public directory + // As a part of the build process, a `.vite/` directory + // is copied over from `.tanstack-start/build/client-dist/` + // to the nitro `publicDir` (e.g. `.output/public/`). + // This directory (and its contents including the vite client manifest) + // should not be included in the final build, so we remove it. + const nitroPublicDir = nitro.options.output.publicDir + const viteDir = path.resolve(nitroPublicDir, '.vite') + if (await fsp.stat(viteDir).catch(() => false)) { + await fsp.rm(viteDir, { recursive: true, force: true }) + } + + // Close the nitro instance + await nitro.close() + nitro.logger.success( + 'Client and Server bundles for TanStack Start have been successfully built.', + ) +} + function virtualBundlePlugin(ssrBundle: Rollup.OutputBundle): Rollup.Plugin { type VirtualModule = { code: string; map: string | null } const _modules = new Map() diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index 9f12ff0ac4..36606c0d90 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -5,8 +5,8 @@ import { getRollupConfig } from 'nitropack/rollup' import { build as buildNitro, createNitro } from 'nitropack' import { joinURL, withBase, withoutBase } from 'ufo' import { Queue } from './queue' -import { buildNitroEnvironment } from './nitro/build-nitro' import { VITE_ENVIRONMENT_NAMES } from './constants' +import { createLogger } from './utils' import type { ViteBuilder } from 'vite' import type { $Fetch, Nitro } from 'nitropack' import type { TanStackStartOutputConfig } from './plugin' @@ -21,7 +21,8 @@ export async function prerender({ nitro: Nitro builder: ViteBuilder }) { - console.info('Prendering pages...') + const logger = createLogger('prerender') + logger.info('Prendering pages...') // If prerender is enabled but no pages are provided, default to prerendering the root page if (options.prerender?.enabled && !options.pages.length) { @@ -72,7 +73,7 @@ export async function prerender({ }, } - await buildNitroEnvironment(nodeNitro, () => buildNitro(nodeNitro)) + await buildNitro(nodeNitro) // Import renderer entry const serverFilename = @@ -93,14 +94,14 @@ export async function prerender({ // Crawl all pages const pages = await prerenderPages() - console.info(`Prerendered ${pages.length} pages:`) + logger.info(`Prerendered ${pages.length} pages:`) pages.forEach((page) => { - console.info(`- ${page}`) + logger.info(`- ${page}`) }) // TODO: Write the prerendered pages to the output directory } catch (error) { - console.error(error) + logger.error(error) } finally { // Ensure server is always closed // server.process.kill() @@ -126,7 +127,7 @@ export async function prerender({ const seen = new Set() const retriesByPath = new Map() const concurrency = options.prerender?.concurrency ?? os.cpus().length - console.info(`Concurrency: ${concurrency}`) + logger.info(`Concurrency: ${concurrency}`) const queue = new Queue({ concurrency }) options.pages.forEach((page) => addCrawlPageTask(page)) @@ -160,7 +161,7 @@ export async function prerender({ // Add the task queue.add(async () => { - console.info(`Crawling: ${page.path}`) + logger.info(`Crawling: ${page.path}`) const retries = retriesByPath.get(page.path) || 0 try { // Fetch the route @@ -228,7 +229,7 @@ export async function prerender({ } } catch (error) { if (retries < (prerenderOptions.retryCount ?? 0)) { - console.warn(`Encountered error, retrying: ${page.path} in 500ms`) + logger.warn(`Encountered error, retrying: ${page.path} in 500ms`) await new Promise((resolve) => setTimeout(resolve, prerenderOptions.retryDelay), ) diff --git a/packages/start-plugin-core/src/utils.ts b/packages/start-plugin-core/src/utils.ts index e31da4350a..252712ef66 100644 --- a/packages/start-plugin-core/src/utils.ts +++ b/packages/start-plugin-core/src/utils.ts @@ -1,3 +1,14 @@ export function resolveViteId(id: string) { return `\0${id}` } + +export function createLogger(prefix: string) { + const label = `[${prefix}]` + return { + log: (...args: any) => console.log(label, ...args), + debug: (...args: any) => console.debug(label, ...args), + info: (...args: any) => console.info(label, ...args), + warn: (...args: any) => console.warn(label, ...args), + error: (...args: any) => console.error(label, ...args), + } +} From bcbd08a68a2d03b76fcb105d97c15bd17212dd73 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 23 May 2025 02:45:47 +0000 Subject: [PATCH 100/126] release: v1.121.0-alpha.10 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 237d049e5a..536a3df3eb 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 876852080b..fda7ab0f65 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 1c69779153..abc1fe8d6b 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 0f2d326eb2..54d6f0e8b1 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 41148787ff..0c312755c1 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 614c4c86cc..0b3669e387 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 0a17302b38..763fb5a523 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index e5afd6d0cb..45d456a298 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index f78462494e..61ae0cbe70 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 013ce04451..d796fe51ca 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 543ec86d6b..85ee10c600 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index f2e1fed4ea..1dd72eb948 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 7ac8073b1f..1ac427906e 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index b22bf21b4a..ee22ec1a97 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-with-query": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 5048f664c7..1e9663fc7a 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 5f319588e5..b40a78f5bd 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 3b19582947..a8b5f0158f 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.5", "@tanstack/react-router-devtools": "^1.121.0-alpha.5", "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.9", + "@tanstack/react-start": "^1.121.0-alpha.10", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index a9f3043231..19e4094d50 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.9", + "@tanstack/solid-start": "^1.121.0-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index dae190f160..8b50764efb 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.9", + "@tanstack/solid-start": "^1.121.0-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index beadd317b5..e7068df187 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.5", "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.9", + "@tanstack/solid-start": "^1.121.0-alpha.10", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 296ce68026..1407179737 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.9", + "version": "1.121.0-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index f89ceaf47f..99c60e8516 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.9", + "version": "1.121.0-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 2cd6b4874b..704b10b11d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.9", + "version": "1.121.0-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 1332c2faef..a2558696db 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.9", + "version": "1.121.0-alpha.10", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 65e4520ffd..f8f1d0d03d 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.9", + "version": "1.121.0-alpha.10", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 5a3f7adcb8a8fa82540af4510f529dbe29117324 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 22 May 2025 23:30:41 -0600 Subject: [PATCH 101/126] fix: better unsafeRelative, support router.navigate() (#4236) --- packages/react-router/src/link.tsx | 16 +--- packages/react-router/src/useNavigate.tsx | 6 +- packages/react-router/tests/link.test.tsx | 82 +++++++++++++++++++ packages/react-router/tests/navigate.test.tsx | 17 ++++ packages/router-core/src/link.ts | 2 +- packages/router-core/src/router.ts | 30 ++++--- 6 files changed, 120 insertions(+), 33 deletions(-) diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index 4af45ed112..58a5ed6862 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -17,7 +17,6 @@ import { } from './utils' import { useMatch } from './useMatch' -import { useMatches } from './Matches' import type { AnyRouter, Constrain, @@ -106,23 +105,12 @@ export function useLinkProps< structuralSharing: true as any, }) - const isRelativeFromPath = options.unsafeRelative === 'path' - - // when `from` is not supplied, use the nearest parent match's full path as the `from` location - // so relative routing works as expected. Try to stay out of rerenders as much as possible. const nearestFrom = useMatch({ strict: false, - select: (match) => (isRelativeFromPath ? undefined : match.fullPath), - }) - - // When no from and relative is path, use the leaf match as the from location - // Avoid rerenders as much as possible. - const leafFrom = useMatches({ - select: (matches) => - isRelativeFromPath ? matches[matches.length - 1]!.fullPath : undefined, + select: (match) => match.fullPath, }) - const from = options.from ?? (isRelativeFromPath ? leafFrom : nearestFrom) + const from = options.from ?? nearestFrom // Use it as the default `from` location options = { ...options, from } diff --git a/packages/react-router/src/useNavigate.tsx b/packages/react-router/src/useNavigate.tsx index ad88544ce4..1fcef97967 100644 --- a/packages/react-router/src/useNavigate.tsx +++ b/packages/react-router/src/useNavigate.tsx @@ -26,14 +26,10 @@ export function useNavigate< return React.useCallback( (options: NavigateOptions) => { - const isRelativeFromPath = options.unsafeRelative === 'path' - const from = options.from ?? _defaultOpts?.from ?? - (isRelativeFromPath - ? state.matches[state.matches.length - 1]!.fullPath - : state.matches[matchIndex]!.fullPath) + state.matches[matchIndex]!.fullPath return navigate({ ...options, diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 768878a111..fe5672f7af 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -4573,6 +4573,27 @@ describe('relative links', () => { }, }) + const splatRoute = createRoute({ + getParentRoute: () => rootRoute, + path: 'splat/$', + component: () => { + return ( + <> +

Splat Route

+ + Unsafe link to .. + + + Unsafe link to . + + + Unsafe link to ./child + + + ) + }, + }) + return createRouter({ routeTree: rootRoute.addChildren([ indexRoute, @@ -4580,6 +4601,7 @@ describe('relative links', () => { paramRoute.addChildren([ paramARoute.addChildren([paramBRoute, paramCRoute]), ]), + splatRoute, ]), history, }) @@ -4734,4 +4756,64 @@ describe('relative links', () => { expect(window.location.pathname).toBe('/param/foo/a/c') }) + + test('should navigate to parent inside of splat route based on pathname', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/splat/a/b/c/d') + }) + + const relativeLink = await screen.findByText('Unsafe link to ..') + expect(relativeLink.getAttribute('href')).toBe('/splat/a/b/c') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/splat/a/b/c') + }) + + test('should navigate to same route inside of splat route based on pathname', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/splat/a/b/c') + }) + + const relativeLink = await screen.findByText('Unsafe link to .') + expect(relativeLink.getAttribute('href')).toBe('/splat/a/b/c') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/splat/a/b/c') + }) + + test('should navigate to child route inside of splat route based on pathname', async () => { + const router = setupRouter() + + render() + + await act(async () => { + history.push('/splat/a/b/c') + }) + + const relativeLink = await screen.findByText('Unsafe link to ./child') + expect(relativeLink.getAttribute('href')).toBe('/splat/a/b/c/child') + + // Click the link and ensure the new location + await act(async () => { + fireEvent.click(relativeLink) + }) + + expect(window.location.pathname).toBe('/splat/a/b/c/child') + }) }) diff --git a/packages/react-router/tests/navigate.test.tsx b/packages/react-router/tests/navigate.test.tsx index b0175eb26b..033b9702db 100644 --- a/packages/react-router/tests/navigate.test.tsx +++ b/packages/react-router/tests/navigate.test.tsx @@ -566,4 +566,21 @@ describe('relative navigation', () => { expect(router.state.location.pathname).toBe('/posts/tkdodo') }) + + it('should navigate to a parent route with .. from unsafe relative path', async () => { + const { router } = createTestRouter( + createMemoryHistory({ initialEntries: ['/posts/tanner/child'] }), + ) + + await router.load() + + expect(router.state.location.pathname).toBe('/posts/tanner/child') + + await router.navigate({ + to: '..', + unsafeRelative: 'path', + }) + + expect(router.state.location.pathname).toBe('/posts/tanner') + }) }) diff --git a/packages/router-core/src/link.ts b/packages/router-core/src/link.ts index e41c5faa6e..6f488b10cc 100644 --- a/packages/router-core/src/link.ts +++ b/packages/router-core/src/link.ts @@ -424,7 +424,7 @@ export type ToSubOptionsProps< hash?: true | Updater state?: true | NonNullableUpdater from?: FromPathOption & {} - unsafeRelative?: 'route' | 'path' + unsafeRelative?: 'path' } export type ParamsReducerFn< diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index bc4ea7bfca..7c45828fa1 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -433,8 +433,9 @@ export interface BuildNextOptions { unmaskOnReload?: boolean } from?: string - _fromLocation?: ParsedLocation href?: string + _fromLocation?: ParsedLocation + unsafeRelative?: 'path' } type NavigationEventInfo = { @@ -1411,20 +1412,23 @@ export class RouterCore< // First let's find the starting pathname // By default, start with the current location - let fromId = lastMatch.fullPath + let fromPath = lastMatch.fullPath // If there is a to, it means we are changing the path in some way // So we need to find the relative fromPath - if (dest.to && dest.from) { - fromId = dest.from - } - - const existingFrom = [...allFromMatches].reverse().find((d) => { - return d.fullPath === fromId || d.fullPath === joinPaths([fromId, '/']) - }) + if (dest.unsafeRelative === 'path') { + fromPath = currentLocation.pathname + } else if (dest.to && dest.from) { + fromPath = dest.from + const existingFrom = [...allFromMatches].reverse().find((d) => { + return ( + d.fullPath === fromPath || d.fullPath === joinPaths([fromPath, '/']) + ) + }) - if (!existingFrom) { - console.warn(`Could not find match for from: ${dest.from}`) + if (!existingFrom) { + console.warn(`Could not find match for from: ${dest.from}`) + } } // From search should always use the current location @@ -1434,8 +1438,8 @@ export class RouterCore< // Resolve the next to const nextTo = dest.to - ? this.resolvePathWithBase(fromId, `${dest.to}`) - : fromId + ? this.resolvePathWithBase(fromPath, `${dest.to}`) + : fromPath // Resolve the next params let nextParams = From 4bdeda8aeb80b7c3b7bc93accde20e072ee01a62 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 23 May 2025 05:32:14 +0000 Subject: [PATCH 102/126] release: v1.121.0-alpha.11 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 94 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 4f65db9a6e..37761f7ba5 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index 9ad04c8086..ae8d80c341 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index e1e8eea6ec..c4d9cd5f00 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 5bcbec8eb5..6a2aa47b6d 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index 30001a9d59..cca2d77598 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 10ba1f53fb..b59b7bddca 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 717056b9d4..21bb9abc0f 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 6baeef960e..9e4b8b2864 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 03cd12aaec..9a1057e796 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 6e6216397e..dbf01cdbbb 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 159f5eb768..e73765ad27 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 9087943e8f..7210b7dbdc 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 5352a41020..fbae548a37 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 2b9bb1ea72..a7e356dc9a 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 3f9c594fef..34a718e4cc 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 5145fcc641..11852f182b 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 59ee045693..05c6f9eecd 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 6106854198..49505885d8 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index 51103ef2fb..eda61f2fb0 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 0d718e4bf3..e8c111dc57 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 0aef72b5ff..b73ee47307 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 7472221ae5..12d6553320 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 97478ed3eb..f78e449fab 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index 47c4c670b8..fe145d93c0 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 62b30dc748..ce390184f4 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 7279c918ad..9ad56dbae2 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 52c55f4969..411d7d396b 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index 39e2b02175..b7668b2185 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index b24373f60b..cf58cd6adf 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 59af78eb7b..66eeae2383 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 0eb498e4ec..1d8fc320e1 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 37242b1c1c..dfc0cc4081 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index c69a542cec..f7f253a0a6 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index aa1194cf9a..f10caa054d 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 27a439f777..ebdfc391cb 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.121.0-alpha.5", + "@tanstack/arktype-adapter": "^1.121.0-alpha.11", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/valibot-adapter": "^1.121.0-alpha.5", - "@tanstack/zod-adapter": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/valibot-adapter": "^1.121.0-alpha.11", + "@tanstack/zod-adapter": "^1.121.0-alpha.11", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 536a3df3eb..f1dab67729 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index fda7ab0f65..33aa4d3678 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index abc1fe8d6b..b470e17a35 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-with-query": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-with-query": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 54d6f0e8b1..4cf291797f 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 0c312755c1..53930db1c5 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 0b3669e387..f1764eae34 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 763fb5a523..3a9ef253d8 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 45d456a298..7a0e5edd0e 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-with-query": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-with-query": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 61ae0cbe70..3bb589bff7 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index d796fe51ca..5bf4907221 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 85ee10c600..ae67daab56 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 1dd72eb948..009839f1a9 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 1ac427906e..8c9a821ecf 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index ee22ec1a97..eca0851c68 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-with-query": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-with-query": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 1e9663fc7a..4d6251869e 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index 5277eb99ec..b1afc49790 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 59ddcc1c51..1d4c3f179c 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index b40a78f5bd..d12f3dae63 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index a8b5f0158f..4aa7d66c3a 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.5", - "@tanstack/react-router-devtools": "^1.121.0-alpha.5", - "@tanstack/router-plugin": "^1.121.0-alpha.5", - "@tanstack/react-start": "^1.121.0-alpha.10", + "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.11", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index e8c777c116..64117109b7 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index b3892120fb..8e8fdb676a 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 051bd2f9a0..d4437db5db 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 4b1f4d3e29..0c88c30965 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 96d85e4b62..850740c6cd 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 2b8a6af8db..9ea2c27c89 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 673e0a4fbf..6463e257dc 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index de7a50feba..ca737eafb4 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.5", + "@tanstack/router-plugin": "^1.121.0-alpha.11", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 19e4094d50..c0abe82f4c 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.10", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 8b50764efb..e566e51305 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.10", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index e7068df187..2580875d57 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.5", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.5", - "@tanstack/solid-start": "^1.121.0-alpha.10", + "@tanstack/solid-router": "^1.121.0-alpha.11", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.11", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 139c6c63f3..56c99f6f71 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 41d5e643e1..8f70f10dd8 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index fe8a430f97..d841497993 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index a724ba9781..d824933002 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 5f759677d9..5680a185b4 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 1407179737..d67c053e03 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.10", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 0a6ebd9e58..a845a9d8e1 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 99c60e8516..761ed13bd6 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.10", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 7b2dd92ff8..fd4a56148c 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 773ed0e07c..c691a964c0 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 9555315444..642c67fa8a 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 0ba15c9048..549286718d 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index ab347d9ac0..00328a6322 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 001d3dda30..fdecca8cbc 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index d706e06770..a488997804 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 18ed802b83..3bd71ac5e1 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 83511d788f..029d21e039 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index e38b84196a..56892f83ac 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 704b10b11d..e4852ca4c5 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.10", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 4609e76175..78c3f1e528 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index a2558696db..99f98ac929 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.10", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 21d64a8198..195dc61f68 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f8f1d0d03d..a75e78259a 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.10", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index df7871139f..e0cc77ac12 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.7", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index a597ebe4d9..d5967dbb63 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.8", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 480f49cc9c..95036205f3 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index f47739eb9b..a4a1f39051 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 19d2fb8ad5..6cb58750f5 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.121.0-alpha.5", + "version": "1.121.0-alpha.11", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d756438409..01d24505d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5118,7 +5118,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5158,7 +5158,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5192,7 +5192,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5232,7 +5232,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5278,7 +5278,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5321,7 +5321,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5361,7 +5361,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5404,7 +5404,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5444,7 +5444,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5493,7 +5493,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5536,7 +5536,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.5 + specifier: ^1.121.0-alpha.11 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From 8895961316f9800e7324c4e26f1a9e99e51fcdfd Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sat, 24 May 2025 00:18:06 +1200 Subject: [PATCH 103/126] refactor: move resolution of virtual entry handlers to core (#4238) --- packages/react-start-plugin/src/index.ts | 90 +++++++----------------- packages/solid-start-plugin/src/index.ts | 83 ++++++---------------- packages/start-plugin-core/src/plugin.ts | 66 +++++++++++++++++ 3 files changed, 112 insertions(+), 127 deletions(-) diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 83c3857ac3..6170d72698 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -1,10 +1,8 @@ -import path from 'node:path' import viteReact from '@vitejs/plugin-react' import { TanStackStartVitePluginCore } from '@tanstack/start-plugin-core' -import * as vite from 'vite' import { getTanStackStartOptions } from './schema' import type { TanStackStartInputConfig, WithReactPlugin } from './schema' -import type { PluginOption, ResolvedConfig } from 'vite' +import type { PluginOption } from 'vite' export type { TanStackStartInputConfig, @@ -19,64 +17,28 @@ export function TanStackStartVitePlugin( WithReactPlugin const options: OptionsWithReact = getTanStackStartOptions(opts) - let resolvedConfig: ResolvedConfig - return [ - TanStackStartVitePluginCore({ framework: 'react' }, options), - { - name: 'tanstack-react-start:resolve-entries', - configResolved: (config) => { - resolvedConfig = config - }, - resolveId(id) { - if ( - [ - '/~start/server-entry', - '/~start/default-server-entry', - '/~start/default-client-entry', - ].includes(id) - ) { - return `${id}.tsx` - } - if (id === '/~start/server-entry.tsx') { - return id - } - - return null - }, - load(id) { - const routerImportPath = JSON.stringify( - path.resolve(options.root, options.tsr.srcDirectory, 'router'), - ) - - if (id === '/~start/server-entry.tsx') { - const ssrEntryPath = options.serverEntryPath.startsWith( - '/~start/default-server-entry', - ) - ? options.serverEntryPath - : vite.normalizePath( - path.resolve(resolvedConfig.root, options.serverEntryPath), - ) - + TanStackStartVitePluginCore( + { + framework: 'react', + getVirtualServerHandlerEntry(ctx) { return ` import { toWebRequest, defineEventHandler } from '@tanstack/react-start/server'; -import serverEntry from '${ssrEntryPath}'; +import serverEntry from '${ctx.ssrEntryFilepath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); return serverEntry({ request }); -}) -` - } - - if (id === '/~start/default-client-entry.tsx') { +});` + }, + getVirtualClientEntry(ctx) { return ` -import { StrictMode, startTransition } from 'react' -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start' -import { createRouter } from ${routerImportPath} +import { StrictMode, startTransition } from 'react'; +import { hydrateRoot } from 'react-dom/client'; +import { StartClient } from '@tanstack/react-start'; +import { createRouter } from '${ctx.routerFilepath}'; -const router = createRouter() +const router = createRouter(); startTransition(() => { hydrateRoot( @@ -84,25 +46,21 @@ startTransition(() => { - ) -}) -` - } - - if (id === '/~start/default-server-entry.tsx') { + ); +});` + }, + getVirtualSsrEntry(ctx) { return ` -import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server' -import { createRouter } from ${routerImportPath} +import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server'; +import { createRouter } from '${ctx.routerFilepath}'; export default createStartHandler({ createRouter, -})(defaultStreamHandler) -` - } - - return null +})(defaultStreamHandler);` + }, }, - }, + options, + ), viteReact(options.react), ] } diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index 73986b51f1..586b5ee425 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -1,9 +1,7 @@ -import path from 'node:path' import viteSolid from 'vite-plugin-solid' import { TanStackStartVitePluginCore } from '@tanstack/start-plugin-core' -import * as vite from 'vite' import { getTanStackStartOptions } from './schema' -import type { PluginOption, ResolvedConfig } from 'vite' +import type { PluginOption } from 'vite' import type { TanStackStartInputConfig, WithSolidPlugin } from './schema' export type { @@ -19,79 +17,42 @@ export function TanStackStartVitePlugin( WithSolidPlugin const options: OptionsWithSolid = getTanStackStartOptions(opts) - let resolvedConfig: ResolvedConfig - return [ - TanStackStartVitePluginCore({ framework: 'solid' }, options), - { - name: 'tanstack-solid-start:resolve-entries', - configResolved: (config) => { - resolvedConfig = config - }, - resolveId(id) { - if ( - [ - '/~start/server-entry', - '/~start/default-server-entry', - '/~start/default-client-entry', - ].includes(id) - ) { - return `${id}.tsx` - } - - return null - }, - load(id) { - const routerImportPath = JSON.stringify( - path.resolve(options.root, options.tsr.srcDirectory, 'router'), - ) - - if (id === '/~start/server-entry.tsx') { - const ssrEntryPath = options.serverEntryPath.startsWith( - '/~start/default-server-entry', - ) - ? options.serverEntryPath - : vite.normalizePath( - path.resolve(resolvedConfig.root, options.serverEntryPath), - ) - + TanStackStartVitePluginCore( + { + framework: 'solid', + getVirtualServerHandlerEntry(ctx) { return ` import { toWebRequest, defineEventHandler } from '@tanstack/solid-start/server'; -import serverEntry from '${ssrEntryPath}'; +import serverEntry from '${ctx.ssrEntryFilepath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); return serverEntry({ request }); -}) -` - } - - if (id === '/~start/default-client-entry.tsx') { +});` + }, + getVirtualClientEntry(ctx) { return ` -import { hydrate } from 'solid-js/web' -import { StartClient } from '@tanstack/solid-start' -import { createRouter } from ${routerImportPath} +import { hydrate } from 'solid-js/web'; +import { StartClient } from '@tanstack/solid-start'; +import { createRouter } from '${ctx.routerFilepath}'; -const router = createRouter() +const router = createRouter(); -hydrate(() => , document.body) -` - } - - if (id === '/~start/default-server-entry.tsx') { +hydrate(() => , document.body);` + }, + getVirtualSsrEntry(ctx) { return ` -import { createStartHandler, defaultStreamHandler } from '@tanstack/solid-start/server' -import { createRouter } from ${routerImportPath} +import { createStartHandler, defaultStreamHandler } from '@tanstack/solid-start/server'; +import { createRouter } from '${ctx.routerFilepath}'; export default createStartHandler({ createRouter, -})(defaultStreamHandler) -` - } - - return null +})(defaultStreamHandler);` + }, }, - }, + options, + ), viteSolid({ ...options.solid, ssr: true }), ] } diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 60daa41b3e..f81cffa513 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -35,6 +35,12 @@ export const ssrEntryFile = 'ssr.mjs' export interface TanStackStartVitePluginCoreOptions { framework: CompileStartFrameworkOptions + getVirtualServerHandlerEntry: (ctx: { + routerFilepath: string + ssrEntryFilepath: string + }) => string + getVirtualSsrEntry: (ctx: { routerFilepath: string }) => string + getVirtualClientEntry: (ctx: { routerFilepath: string }) => string } // this needs to live outside of the TanStackStartVitePluginCore since it will be invoked multiple times by vite let ssrBundle: Rollup.OutputBundle @@ -51,6 +57,7 @@ export function TanStackStartVitePluginCore( enableRouteGeneration: true, autoCodeSplitting: true, }), + resolveVirtualEntriesPlugin(opts, startConfig), { name: 'tanstack-start-core:config-client', async config() { @@ -205,6 +212,65 @@ export function TanStackStartVitePluginCore( ] } +function resolveVirtualEntriesPlugin( + opts: TanStackStartVitePluginCoreOptions, + startConfig: TanStackStartOutputConfig, +): PluginOption { + let resolvedConfig: vite.ResolvedConfig + + const modules = new Set([ + '/~start/server-entry', + '/~start/default-server-entry', + '/~start/default-client-entry', + ]) + + return { + name: 'tanstack-start-core:resolve-virtual-entries', + configResolved(config) { + resolvedConfig = config + }, + resolveId(id) { + if (modules.has(id)) { + return `${id}.tsx` + } + + return undefined + }, + load(id) { + const routerFilepath = path.resolve( + startConfig.root, + startConfig.tsr.srcDirectory, + 'router', + ) + + if (id === '/~start/server-entry.tsx') { + const ssrEntryFilepath = startConfig.serverEntryPath.startsWith( + '/~start/default-server-entry', + ) + ? startConfig.serverEntryPath + : vite.normalizePath( + path.resolve(resolvedConfig.root, startConfig.serverEntryPath), + ) + + return opts.getVirtualServerHandlerEntry({ + routerFilepath, + ssrEntryFilepath, + }) + } + + if (id === '/~start/default-client-entry.tsx') { + return opts.getVirtualClientEntry({ routerFilepath }) + } + + if (id === '/~start/default-server-entry.tsx') { + return opts.getVirtualSsrEntry({ routerFilepath }) + } + + return undefined + }, + } +} + function injectDefineEnv( key: TKey, value: TValue, From 100560f9968f58c943312fe55d12e51b6d14c6be Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 23 May 2025 12:19:24 +0000 Subject: [PATCH 104/126] release: v1.121.0-alpha.12 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index f1dab67729..5890270ec2 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 33aa4d3678..66ef0112ef 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index b470e17a35..332d7814fd 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 4cf291797f..2515445846 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 53930db1c5..9b576131bb 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index f1764eae34..5f441c962e 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 3a9ef253d8..1a0fd9771b 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 7a0e5edd0e..32f8e22b8d 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 3bb589bff7..24ff1a34ea 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 5bf4907221..978c0d29e0 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index ae67daab56..943a9bf2f5 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 009839f1a9..d77e035e83 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 8c9a821ecf..a7b118e796 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index eca0851c68..268ec51969 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 4d6251869e..db39fd2ad0 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index d12f3dae63..33cb6b1af5 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 4aa7d66c3a..39cae89d4e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.11", + "@tanstack/react-start": "^1.121.0-alpha.12", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index c0abe82f4c..c29098b6e8 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index e566e51305..566b40cae6 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 2580875d57..5b15bcc7b1 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.11", + "@tanstack/solid-start": "^1.121.0-alpha.12", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index d67c053e03..e467feebab 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 761ed13bd6..d819923147 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index e4852ca4c5..b145fcb97d 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 99f98ac929..3dadc6212d 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.12", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index a75e78259a..587bcf1b47 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.12", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From aea93b4210921778c76b1605e0e4bd58b1b8dfff Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 24 May 2025 00:44:27 -0600 Subject: [PATCH 105/126] Squashed commit of the following: commit 086f8e500d39c874cb1dc6af159d2e66ae6fca08 Author: Tanner Linsley Date: Fri May 23 23:37:40 2025 -0600 docs: fix documentation links --- docs/router/eslint/eslint-plugin-router.md | 2 +- docs/router/framework/react/api/router.md | 156 +++++++++--------- .../react/api/router/ActiveLinkOptionsType.md | 2 +- .../react/api/router/FileRouteClass.md | 6 +- .../react/api/router/LinkOptionsType.md | 4 +- .../react/api/router/LinkPropsType.md | 4 +- .../react/api/router/NavigateOptionsType.md | 4 +- .../react/api/router/NotFoundRouteClass.md | 4 +- .../react/api/router/RedirectType.md | 2 +- .../react/api/router/RootRouteClass.md | 6 +- .../react/api/router/RouteApiClass.md | 4 +- .../react/api/router/RouteApiType.md | 24 +-- .../framework/react/api/router/RouteClass.md | 6 +- .../react/api/router/RouteMaskType.md | 4 +- .../react/api/router/RouteOptionsType.md | 10 +- .../framework/react/api/router/RouteType.md | 2 +- .../framework/react/api/router/RouterClass.md | 6 +- .../react/api/router/RouterEventsType.md | 4 +- .../react/api/router/RouterOptionsType.md | 8 +- .../react/api/router/RouterStateType.md | 8 +- .../framework/react/api/router/RouterType.md | 8 +- .../react/api/router/ToMaskOptionsType.md | 4 +- .../api/router/UseMatchRouteOptionsType.md | 6 +- .../api/router/catchBoundaryComponent.md | 2 +- .../api/router/createFileRouteFunction.md | 2 +- .../api/router/createLazyFileRouteFunction.md | 6 +- .../api/router/createLazyRouteFunction.md | 6 +- .../api/router/createRootRouteFunction.md | 4 +- .../createRootRouteWithContextFunction.md | 4 +- .../react/api/router/createRouteFunction.md | 6 +- .../api/router/createRouteMaskFunction.md | 4 +- .../react/api/router/createRouterFunction.md | 6 +- .../react/api/router/deferFunction.md | 4 +- .../react/api/router/getRouteApiFunction.md | 4 +- .../react/api/router/isNotFoundFunction.md | 8 +- .../react/api/router/linkComponent.md | 2 +- .../framework/react/api/router/linkOptions.md | 2 +- .../react/api/router/matchRouteComponent.md | 2 +- .../react/api/router/navigateComponent.md | 2 +- .../react/api/router/notFoundFunction.md | 2 +- .../react/api/router/redirectFunction.md | 2 +- .../router/rootRouteWithContextFunction.md | 6 +- .../react/api/router/useBlockerHook.md | 2 +- .../react/api/router/useCanGoBack.md | 2 +- .../react/api/router/useChildMatchesHook.md | 6 +- .../react/api/router/useLinkPropsHook.md | 6 +- .../react/api/router/useLoaderDataHook.md | 4 +- .../react/api/router/useLoaderDepsHook.md | 2 +- .../react/api/router/useLocationHook.md | 6 +- .../react/api/router/useMatchHook.md | 8 +- .../react/api/router/useMatchRouteHook.md | 2 +- .../react/api/router/useMatchesHook.md | 8 +- .../react/api/router/useNavigateHook.md | 2 +- .../react/api/router/useParamsHook.md | 2 +- .../react/api/router/useParentMatchesHook.md | 6 +- .../react/api/router/useRouterHook.md | 6 +- .../react/api/router/useRouterStateHook.md | 8 +- .../react/api/router/useSearchHook.md | 2 +- .../router/framework/react/decisions-on-dx.md | 6 +- docs/router/framework/react/faq.md | 2 +- .../react/guide/authenticated-routes.md | 4 +- .../framework/react/guide/code-splitting.md | 4 +- .../react/guide/creating-a-router.md | 4 +- .../framework/react/guide/custom-link.md | 8 +- .../custom-search-param-serialization.md | 2 +- .../framework/react/guide/data-loading.md | 6 +- .../react/guide/deferred-data-loading.md | 6 +- .../react/guide/external-data-loading.md | 2 +- .../framework/react/guide/history-types.md | 2 +- .../react/guide/navigation-blocking.md | 2 +- .../framework/react/guide/not-found-errors.md | 2 +- .../framework/react/guide/path-params.md | 4 +- .../framework/react/guide/route-masking.md | 2 +- .../framework/react/guide/search-params.md | 4 +- docs/router/framework/react/guide/ssr.md | 4 +- .../framework/react/guide/tanstack-start.md | 2 +- .../framework/react/guide/type-safety.md | 2 +- .../react/migrate-from-react-location.md | 34 ++-- docs/router/framework/react/overview.md | 2 +- docs/router/framework/react/quick-start.md | 2 +- .../react/routing/code-based-routing.md | 14 +- .../react/routing/file-based-routing.md | 14 +- .../react/routing/file-naming-conventions.md | 34 ++-- .../routing/installation-with-esbuild.md | 2 +- .../routing/installation-with-router-cli.md | 2 +- .../react/routing/installation-with-rspack.md | 2 +- .../react/routing/installation-with-vite.md | 2 +- .../routing/installation-with-webpack.md | 2 +- .../framework/react/routing/route-trees.md | 14 +- .../react/routing/routing-concepts.md | 2 +- docs/router/framework/solid/quick-start.md | 2 +- docs/start/framework/react/authentication.md | 4 +- .../framework/react/build-from-scratch.md | 4 +- docs/start/framework/react/middleware.md | 2 +- docs/start/framework/react/quick-start.md | 46 +++--- .../start/framework/react/server-functions.md | 2 +- .../framework/solid/build-from-scratch.md | 4 +- docs/start/framework/solid/quick-start.md | 6 +- package.json | 11 +- pnpm-lock.yaml | 28 ++++ scripts/verify-links.ts | 133 +++++++++++++++ 101 files changed, 515 insertions(+), 351 deletions(-) create mode 100644 scripts/verify-links.ts diff --git a/docs/router/eslint/eslint-plugin-router.md b/docs/router/eslint/eslint-plugin-router.md index a9b5cac93e..54036cb304 100644 --- a/docs/router/eslint/eslint-plugin-router.md +++ b/docs/router/eslint/eslint-plugin-router.md @@ -102,4 +102,4 @@ Alternatively, add `@tanstack/eslint-plugin-router` to the plugins section, and The following rules are available in the TanStack Router ESLint Plugin: -- [@tanstack/router/create-route-property-order](./create-route-property-order.md) +- [@tanstack/router/create-route-property-order](../create-route-property-order.md) diff --git a/docs/router/framework/react/api/router.md b/docs/router/framework/react/api/router.md index ff999e0c5d..ad3a58f851 100644 --- a/docs/router/framework/react/api/router.md +++ b/docs/router/framework/react/api/router.md @@ -4,85 +4,85 @@ title: Router API --- - Functions - - [`createFileRoute`](./router/createFileRouteFunction.md) - - [`createLazyFileRoute`](./router/createLazyFileRouteFunction.md) - - [`createRootRoute`](./router/createRootRouteFunction.md) - - [`createRootRouteWithContext`](./router/createRootRouteWithContextFunction.md) - - [`createRoute`](./router/createRouteFunction.md) - - [`createLazyRoute`](./router/createLazyRouteFunction.md) - - [`createRouteMask`](./router/createRouteMaskFunction.md) - - [`createRouter`](./router/createRouterFunction.md) - - [`defer`](./router/deferFunction.md) - - [`getRouteApi`](./router/getRouteApiFunction.md) - - [`isNotFound`](./router/isNotFoundFunction.md) - - [`isRedirect`](./router/isRedirectFunction.md) - - [`lazyRouteComponent`](./router/lazyRouteComponentFunction.md) - - [`linkOptions`](./router/linkOptions.md) - - [`notFound`](./router/notFoundFunction.md) - - [`redirect`](./router/redirectFunction.md) - - [`retainSearchParams`](./router/retainSearchParamsFunction.md) - - [`stripSearchParams`](./router/stripSearchParamsFunction.md) + - [`createFileRoute`](../router/createFileRouteFunction.md) + - [`createLazyFileRoute`](../router/createLazyFileRouteFunction.md) + - [`createRootRoute`](../router/createRootRouteFunction.md) + - [`createRootRouteWithContext`](../router/createRootRouteWithContextFunction.md) + - [`createRoute`](../router/createRouteFunction.md) + - [`createLazyRoute`](../router/createLazyRouteFunction.md) + - [`createRouteMask`](../router/createRouteMaskFunction.md) + - [`createRouter`](../router/createRouterFunction.md) + - [`defer`](../router/deferFunction.md) + - [`getRouteApi`](../router/getRouteApiFunction.md) + - [`isNotFound`](../router/isNotFoundFunction.md) + - [`isRedirect`](../router/isRedirectFunction.md) + - [`lazyRouteComponent`](../router/lazyRouteComponentFunction.md) + - [`linkOptions`](../router/linkOptions.md) + - [`notFound`](../router/notFoundFunction.md) + - [`redirect`](../router/redirectFunction.md) + - [`retainSearchParams`](../router/retainSearchParamsFunction.md) + - [`stripSearchParams`](../router/stripSearchParamsFunction.md) - Components - - [``](./router/awaitComponent.md) - - [``](./router/catchBoundaryComponent.md) - - [``](./router/catchNotFoundComponent.md) - - [``](./router/clientOnlyComponent.md) - - [``](./router/defaultGlobalNotFoundComponent.md) - - [``](./router/errorComponentComponent.md) - - [``](./router/linkComponent.md) - - [``](./router/matchRouteComponent.md) - - [``](./router/navigateComponent.md) - - [``](./router/outletComponent.md) + - [``](../router/awaitComponent.md) + - [``](../router/catchBoundaryComponent.md) + - [``](../router/catchNotFoundComponent.md) + - [``](../router/clientOnlyComponent.md) + - [``](../router/defaultGlobalNotFoundComponent.md) + - [``](../router/errorComponentComponent.md) + - [``](../router/linkComponent.md) + - [``](../router/matchRouteComponent.md) + - [``](../router/navigateComponent.md) + - [``](../router/outletComponent.md) - Hooks - - [`useAwaited`](./router/useAwaitedHook.md) - - [`useBlocker`](./router/useBlockerHook.md) - - [`useCanGoBack`](./router//useCanGoBack.md) - - [`useChildMatches`](./router/useChildMatchesHook.md) - - [`useLinkProps`](./router/useLinkPropsHook.md) - - [`useLoaderData`](./router/useLoaderDataHook.md) - - [`useLoaderDeps`](./router/useLoaderDepsHook.md) - - [`useLocation`](./router/useLocationHook.md) - - [`useMatch`](./router/useMatchHook.md) - - [`useMatchRoute`](./router/useMatchRouteHook.md) - - [`useMatches`](./router/useMatchesHook.md) - - [`useNavigate`](./router/useNavigateHook.md) - - [`useParentMatches`](./router/useParentMatchesHook.md) - - [`useParams`](./router/useParamsHook.md) - - [`useRouteContext`](./router/useRouteContextHook.md) - - [`useRouter`](./router/useRouterHook.md) - - [`useRouterState`](./router/useRouterStateHook.md) - - [`useSearch`](./router/useSearchHook.md) + - [`useAwaited`](../router/useAwaitedHook.md) + - [`useBlocker`](../router/useBlockerHook.md) + - [`useCanGoBack`](../router//useCanGoBack.md) + - [`useChildMatches`](../router/useChildMatchesHook.md) + - [`useLinkProps`](../router/useLinkPropsHook.md) + - [`useLoaderData`](../router/useLoaderDataHook.md) + - [`useLoaderDeps`](../router/useLoaderDepsHook.md) + - [`useLocation`](../router/useLocationHook.md) + - [`useMatch`](../router/useMatchHook.md) + - [`useMatchRoute`](../router/useMatchRouteHook.md) + - [`useMatches`](../router/useMatchesHook.md) + - [`useNavigate`](../router/useNavigateHook.md) + - [`useParentMatches`](../router/useParentMatchesHook.md) + - [`useParams`](../router/useParamsHook.md) + - [`useRouteContext`](../router/useRouteContextHook.md) + - [`useRouter`](../router/useRouterHook.md) + - [`useRouterState`](../router/useRouterStateHook.md) + - [`useSearch`](../router/useSearchHook.md) - Types - - [`ActiveLinkOptions Type`](./router/ActiveLinkOptionsType.md) - - [`AsyncRouteComponent Type`](./router/AsyncRouteComponentType.md) - - [`HistoryState Interface`](./router/historyStateInterface.md) - - [`LinkOptions Type`](./router/LinkOptionsType.md) - - [`LinkProps Type`](./router/LinkPropsType.md) - - [`MatchRouteOptions Type`](./router/MatchRouteOptionsType.md) - - [`NavigateOptions Type`](./router/NavigateOptionsType.md) - - [`NotFoundError Type`](./router/NotFoundErrorType.md) - - [`ParsedHistoryState Type`](./router/ParsedHistoryStateType.md) - - [`ParsedLocation Type`](./router/ParsedLocationType.md) - - [`Redirect Type`](./router/RedirectType.md) - - [`Register Type`](./router/RegisterType.md) - - [`Route Type`](./router/RouteType.md) - - [`RouteApi Type`](./router/RouteApiType.md) - - [`RouteMask Type`](./router/RouteMaskType.md) - - [`RouteMatch Type`](./router/RouteMatchType.md) - - [`RouteOptions Type`](./router/RouteOptionsType.md) - - [`Router Type`](./router/RouterType.md) - - [`RouterEvents Type`](./router/RouterEventsType.md) - - [`RouterOptions Type`](./router/RouterOptionsType.md) - - [`RouterState Type`](./router/RouterStateType.md) - - [`ToMaskOptions Type`](./router/ToMaskOptionsType.md) - - [`ToOptions Type`](./router/ToOptionsType.md) - - [`UseMatchRouteOptions Type`](./router/UseMatchRouteOptionsType.md) - - [`ViewTransitionOptions Type`](./router/ViewTransitionOptionsType.md) + - [`ActiveLinkOptions Type`](../router/ActiveLinkOptionsType.md) + - [`AsyncRouteComponent Type`](../router/AsyncRouteComponentType.md) + - [`HistoryState Interface`](../router/historyStateInterface.md) + - [`LinkOptions Type`](../router/LinkOptionsType.md) + - [`LinkProps Type`](../router/LinkPropsType.md) + - [`MatchRouteOptions Type`](../router/MatchRouteOptionsType.md) + - [`NavigateOptions Type`](../router/NavigateOptionsType.md) + - [`NotFoundError Type`](../router/NotFoundErrorType.md) + - [`ParsedHistoryState Type`](../router/ParsedHistoryStateType.md) + - [`ParsedLocation Type`](../router/ParsedLocationType.md) + - [`Redirect Type`](../router/RedirectType.md) + - [`Register Type`](../router/RegisterType.md) + - [`Route Type`](../router/RouteType.md) + - [`RouteApi Type`](../router/RouteApiType.md) + - [`RouteMask Type`](../router/RouteMaskType.md) + - [`RouteMatch Type`](../router/RouteMatchType.md) + - [`RouteOptions Type`](../router/RouteOptionsType.md) + - [`Router Type`](../router/RouterType.md) + - [`RouterEvents Type`](../router/RouterEventsType.md) + - [`RouterOptions Type`](../router/RouterOptionsType.md) + - [`RouterState Type`](../router/RouterStateType.md) + - [`ToMaskOptions Type`](../router/ToMaskOptionsType.md) + - [`ToOptions Type`](../router/ToOptionsType.md) + - [`UseMatchRouteOptions Type`](../router/UseMatchRouteOptionsType.md) + - [`ViewTransitionOptions Type`](../router/ViewTransitionOptionsType.md) - ⚠️ Deprecated - - [`FileRoute Class`](./router/FileRouteClass.md) - - [`Route Class`](./router/RouteClass.md) - - [`Router Class`](./router/RouterClass.md) - - [`RouteApi Class`](./router/RouteApiClass.md) - - [`RootRoute Class`](./router/RootRouteClass.md) - - [`NotFoundRoute Class`](./router/NotFoundRouteClass.md) - - [`rootRouteWithContext Function`](./router/rootRouteWithContextFunction.md) + - [`FileRoute Class`](../router/FileRouteClass.md) + - [`Route Class`](../router/RouteClass.md) + - [`Router Class`](../router/RouterClass.md) + - [`RouteApi Class`](../router/RouteApiClass.md) + - [`RootRoute Class`](../router/RootRouteClass.md) + - [`NotFoundRoute Class`](../router/NotFoundRouteClass.md) + - [`rootRouteWithContext Function`](../router/rootRouteWithContextFunction.md) diff --git a/docs/router/framework/react/api/router/ActiveLinkOptionsType.md b/docs/router/framework/react/api/router/ActiveLinkOptionsType.md index 01434bf41a..8f673799e0 100644 --- a/docs/router/framework/react/api/router/ActiveLinkOptionsType.md +++ b/docs/router/framework/react/api/router/ActiveLinkOptionsType.md @@ -3,7 +3,7 @@ id: ActiveLinkOptionsType title: ActiveLinkOptions type --- -The `ActiveLinkOptions` type extends the [`LinkOptions`](./LinkOptionsType.md) type and contains additional options that can be used to describe how a link should be styled when it is active. +The `ActiveLinkOptions` type extends the [`LinkOptions`](../LinkOptionsType.md) type and contains additional options that can be used to describe how a link should be styled when it is active. ```tsx type ActiveLinkOptions = LinkOptions & { diff --git a/docs/router/framework/react/api/router/FileRouteClass.md b/docs/router/framework/react/api/router/FileRouteClass.md index d7745b4580..47f565137f 100644 --- a/docs/router/framework/react/api/router/FileRouteClass.md +++ b/docs/router/framework/react/api/router/FileRouteClass.md @@ -5,7 +5,7 @@ title: FileRoute class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`createFileRoute`](./createFileRouteFunction.md) function instead. +> Please use the [`createFileRoute`](../createFileRouteFunction.md) function instead. The `FileRoute` class is a factory that can be used to create a file-based route instance. This route instance can then be used to automatically generate a route tree with the `tsr generate` and `tsr watch` commands. @@ -34,13 +34,13 @@ The `createRoute` method is a method that can be used to configure the file rout #### .createRoute options - Type: `Omit` -- [`RouteOptions`](./RouteOptionsType.md) +- [`RouteOptions`](../RouteOptionsType.md) - Optional - The same options that are available to the `Route` class, but with the `getParentRoute`, `path`, and `id` options omitted since they are unnecessary for file-based routing. #### .createRoute returns -A [`Route`](./RouteType.md) instance that can be used to configure the route to be inserted into the route-tree. +A [`Route`](../RouteType.md) instance that can be used to configure the route to be inserted into the route-tree. > ⚠️ Note: For `tsr generate` and `tsr watch` to work properly, the file route instance must be exported from the file using the `Route` identifier. diff --git a/docs/router/framework/react/api/router/LinkOptionsType.md b/docs/router/framework/react/api/router/LinkOptionsType.md index 481a5b4a3d..5f81578140 100644 --- a/docs/router/framework/react/api/router/LinkOptionsType.md +++ b/docs/router/framework/react/api/router/LinkOptionsType.md @@ -3,7 +3,7 @@ id: LinkOptionsType title: LinkOptions type --- -The `LinkOptions` type extends the [`NavigateOptions`](./NavigateOptionsType.md) type and contains additional options that can be used by TanStack Router when handling actual anchor element attributes. +The `LinkOptions` type extends the [`NavigateOptions`](../NavigateOptionsType.md) type and contains additional options that can be used by TanStack Router when handling actual anchor element attributes. ```tsx type LinkOptions = NavigateOptions & { @@ -36,7 +36,7 @@ The `LinkOptions` object accepts/contains the following properties: - Type: `false | 'intent' | 'viewport' | 'render'` - Optional - If set, the link's preloading strategy will be set to this value. -- See the [Preloading guide](../../guide/preloading.md) for more information. +- See the [Preloading guide](../../../guide/preloading.md) for more information. ### `preloadDelay` diff --git a/docs/router/framework/react/api/router/LinkPropsType.md b/docs/router/framework/react/api/router/LinkPropsType.md index e8df561a97..4866cb400b 100644 --- a/docs/router/framework/react/api/router/LinkPropsType.md +++ b/docs/router/framework/react/api/router/LinkPropsType.md @@ -3,7 +3,7 @@ id: LinkPropsType title: LinkProps type --- -The `LinkProps` type extends the [`ActiveLinkOptions`](./ActiveLinkOptionsType.md) and `React.AnchorHTMLAttributes` types and contains additional props specific to the `Link` component. +The `LinkProps` type extends the [`ActiveLinkOptions`](../ActiveLinkOptionsType.md) and `React.AnchorHTMLAttributes` types and contains additional props specific to the `Link` component. ```tsx type LinkProps = ActiveLinkOptions & @@ -16,7 +16,7 @@ type LinkProps = ActiveLinkOptions & ## LinkProps properties -- All of the props from [`ActiveLinkOptions`](./ActiveLinkOptionsType.md) +- All of the props from [`ActiveLinkOptions`](../ActiveLinkOptionsType.md) - All of the props from `React.AnchorHTMLAttributes` #### `children` diff --git a/docs/router/framework/react/api/router/NavigateOptionsType.md b/docs/router/framework/react/api/router/NavigateOptionsType.md index c4068d0fc2..4a855774e9 100644 --- a/docs/router/framework/react/api/router/NavigateOptionsType.md +++ b/docs/router/framework/react/api/router/NavigateOptionsType.md @@ -50,7 +50,7 @@ The `NavigateOptions` object accepts the following properties: - Optional - Defaults to `false`. - If `true`, navigation will be called using `document.startViewTransition()`. -- If [`ViewTransitionOptions`](./ViewTransitionOptionsType.md), route navigations will be called using `document.startViewTransition({update, types})` where `types` will be the strings array passed with `ViewTransitionOptions["types"]`. If the browser does not support viewTransition types, the navigation will fall back to normal `document.startTransition()`, same as if `true` was passed. +- If [`ViewTransitionOptions`](../ViewTransitionOptionsType.md), route navigations will be called using `document.startViewTransition({update, types})` where `types` will be the strings array passed with `ViewTransitionOptions["types"]`. If the browser does not support viewTransition types, the navigation will fall back to normal `document.startTransition()`, same as if `true` was passed. - If the browser does not support this api, this option will be ignored. - See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/Document/startViewTransition) for more information on how this function works. - See [Google](https://developer.chrome.com/docs/web-platform/view-transitions/same-document#view-transition-types) for more information on viewTransition types @@ -75,4 +75,4 @@ The `NavigateOptions` object accepts the following properties: - Optional - This can be used instead of `to` to navigate to a fully built href, e.g. pointing to an external target. -- [`ToOptions`](./ToOptionsType.md) +- [`ToOptions`](../ToOptionsType.md) diff --git a/docs/router/framework/react/api/router/NotFoundRouteClass.md b/docs/router/framework/react/api/router/NotFoundRouteClass.md index 1efe0e5dae..bfe954ba00 100644 --- a/docs/router/framework/react/api/router/NotFoundRouteClass.md +++ b/docs/router/framework/react/api/router/NotFoundRouteClass.md @@ -6,7 +6,7 @@ title: NotFoundRoute class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. > Please use the `notFoundComponent` route option that is present during route configuration. -> See the [Not Found Errors guide](../../guide/not-found-errors.md) for more information. +> See the [Not Found Errors guide](../../../guide/not-found-errors.md) for more information. The `NotFoundRoute` class extends the `Route` class and can be used to create a not found route instance. A not found route instance can be passed to the `routerOptions.notFoundRoute` option to configure a default not-found/404 route for every branch of the route tree. @@ -28,7 +28,7 @@ Omit< > ``` -- [RouteOptions](./RouteOptionsType.md) +- [RouteOptions](../RouteOptionsType.md) - Required - The options that will be used to configure the not found route instance. diff --git a/docs/router/framework/react/api/router/RedirectType.md b/docs/router/framework/react/api/router/RedirectType.md index b1727a0689..4955d06cd0 100644 --- a/docs/router/framework/react/api/router/RedirectType.md +++ b/docs/router/framework/react/api/router/RedirectType.md @@ -13,7 +13,7 @@ export type Redirect = { } & NavigateOptions ``` -- [`NavigateOptions`](./NavigateOptionsType.md) +- [`NavigateOptions`](../NavigateOptionsType.md) ## Redirect properties diff --git a/docs/router/framework/react/api/router/RootRouteClass.md b/docs/router/framework/react/api/router/RootRouteClass.md index 1553dd2550..c0e7e2e6f3 100644 --- a/docs/router/framework/react/api/router/RootRouteClass.md +++ b/docs/router/framework/react/api/router/RootRouteClass.md @@ -5,7 +5,7 @@ title: RootRoute class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`createRootRoute`](./createRootRouteFunction.md) function instead. +> Please use the [`createRootRoute`](../createRootRouteFunction.md) function instead. The `RootRoute` class extends the `Route` class and can be used to create a root route instance. A root route instance can then be used to create a route tree. @@ -31,12 +31,12 @@ Omit< > ``` -- [`RouteOptions`](./RouteOptionsType.md) +- [`RouteOptions`](../RouteOptionsType.md) - Optional ## Constructor returns -A new [`Route`](./RouteType.md) instance. +A new [`Route`](../RouteType.md) instance. ## Examples diff --git a/docs/router/framework/react/api/router/RouteApiClass.md b/docs/router/framework/react/api/router/RouteApiClass.md index 387089cdf3..60fa514405 100644 --- a/docs/router/framework/react/api/router/RouteApiClass.md +++ b/docs/router/framework/react/api/router/RouteApiClass.md @@ -5,7 +5,7 @@ title: RouteApi class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`getRouteApi`](./getRouteApiFunction.md) function instead. +> Please use the [`getRouteApi`](../getRouteApiFunction.md) function instead. The `RouteApi` class provides type-safe version of common hooks like `useParams`, `useSearch`, `useRouteContext`, `useNavigate`, `useLoaderData`, and `useLoaderDeps` that are pre-bound to a specific route ID and corresponding registered route types. @@ -21,7 +21,7 @@ The `RouteApi` constructor accepts a single argument: the `options` that will be ## Constructor returns -- An instance of the [`RouteApi`](./RouteApiType.md) that is pre-bound to the route ID that it was called with. +- An instance of the [`RouteApi`](../RouteApiType.md) that is pre-bound to the route ID that it was called with. ## Examples diff --git a/docs/router/framework/react/api/router/RouteApiType.md b/docs/router/framework/react/api/router/RouteApiType.md index a5d806397b..36e1f4c78e 100644 --- a/docs/router/framework/react/api/router/RouteApiType.md +++ b/docs/router/framework/react/api/router/RouteApiType.md @@ -17,7 +17,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useMatch`](./useMatchHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useMatch`](../useMatchHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -27,7 +27,7 @@ The `RouteApi` has the following properties and methods: - Optional - `boolean` - Configures whether structural sharing is enabled for the value returned by `select`. - - See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. + - See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. - Returns - If a `select` function is provided, the return value of the `select` function. - If no `select` function is provided, the `RouteMatch` object or a loosened version of the `RouteMatch` object if `opts.strict` is `false`. @@ -40,7 +40,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useRouteContext`](./useRouteContextHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useRouteContext`](../useRouteContextHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -58,7 +58,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useSearch`](./useSearchHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useSearch`](../useSearchHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -68,7 +68,7 @@ The `RouteApi` has the following properties and methods: - Optional - `boolean` - Configures whether structural sharing is enabled for the value returned by `select`. - - See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. + - See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. - Returns - If a `select` function is provided, the return value of the `select` function. - If no `select` function is provided, the `TFullSearchSchema` object or a loosened version of the `TFullSearchSchema` object if `opts.strict` is `false`. @@ -81,7 +81,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useParams`](./useParamsHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useParams`](../useParamsHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -91,7 +91,7 @@ The `RouteApi` has the following properties and methods: - Optional - `boolean` - Configures whether structural sharing is enabled for the value returned by `select`. - - See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. + - See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. - Returns - If a `select` function is provided, the return value of the `select` function. - If no `select` function is provided, the `TAllParams` object or a loosened version of the `TAllParams` object if `opts.strict` is `false`. @@ -104,7 +104,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useLoaderData`](./useLoaderDataHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useLoaderData`](../useLoaderDataHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -114,7 +114,7 @@ The `RouteApi` has the following properties and methods: - Optional - `boolean` - Configures whether structural sharing is enabled for the value returned by `select`. - - See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. + - See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. - Returns - If a `select` function is provided, the return value of the `select` function. - If no `select` function is provided, the `TLoaderData` object or a loosened version of the `TLoaderData` object if `opts.strict` is `false`. @@ -127,7 +127,7 @@ The `RouteApi` has the following properties and methods: }): TSelected ``` -- A type-safe version of the [`useLoaderDeps`](./useLoaderDepsHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of the [`useLoaderDeps`](../useLoaderDepsHook.md) hook that is pre-bound to the route ID that the `RouteApi` instance was created with. - Options - `opts.select` - Optional @@ -137,7 +137,7 @@ The `RouteApi` has the following properties and methods: - Optional - `boolean` - Configures whether structural sharing is enabled for the value returned by `select`. - - See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. + - See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. - Returns - If a `select` function is provided, the return value of the `select` function. - If no `select` function is provided, the `TLoaderDeps` object. @@ -148,4 +148,4 @@ The `RouteApi` has the following properties and methods: useNavigate(): // navigate function ``` -- A type-safe version of [`useNavigate`](./useNavigateHook.md) that is pre-bound to the route ID that the `RouteApi` instance was created with. +- A type-safe version of [`useNavigate`](../useNavigateHook.md) that is pre-bound to the route ID that the `RouteApi` instance was created with. diff --git a/docs/router/framework/react/api/router/RouteClass.md b/docs/router/framework/react/api/router/RouteClass.md index 514a58cd41..7658092ca4 100644 --- a/docs/router/framework/react/api/router/RouteClass.md +++ b/docs/router/framework/react/api/router/RouteClass.md @@ -5,7 +5,7 @@ title: Route class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`createRoute`](./createRouteFunction.md) function instead. +> Please use the [`createRoute`](../createRouteFunction.md) function instead. The `Route` class implements the `RouteApi` class and can be used to create route instances. A route instance can then be used to create a route tree. @@ -15,13 +15,13 @@ The `Route` constructor accepts an object as its only argument. ### Constructor options -- Type: [`RouteOptions`](./RouteOptionsType.md) +- Type: [`RouteOptions`](../RouteOptionsType.md) - Required - The options that will be used to configure the route instance ### Constructor returns -A new [`Route`](./RouteType.md) instance. +A new [`Route`](../RouteType.md) instance. ## Examples diff --git a/docs/router/framework/react/api/router/RouteMaskType.md b/docs/router/framework/react/api/router/RouteMaskType.md index d3e22c0c0d..9ce6e42e36 100644 --- a/docs/router/framework/react/api/router/RouteMaskType.md +++ b/docs/router/framework/react/api/router/RouteMaskType.md @@ -3,7 +3,7 @@ id: RouteMaskType title: RouteMask type --- -The `RouteMask` type extends the [`ToOptions`](./ToOptionsType.md) type and has other the necessary properties to create a route mask. +The `RouteMask` type extends the [`ToOptions`](../ToOptionsType.md) type and has other the necessary properties to create a route mask. ## RouteMask properties @@ -11,7 +11,7 @@ The `RouteMask` type accepts an object with the following properties: ### `...ToOptions` -- Type: [`ToOptions`](./ToOptionsType.md) +- Type: [`ToOptions`](../ToOptionsType.md) - Required - The options that will be used to configure the route mask diff --git a/docs/router/framework/react/api/router/RouteOptionsType.md b/docs/router/framework/react/api/router/RouteOptionsType.md index 92510684ea..5058dc864c 100644 --- a/docs/router/framework/react/api/router/RouteOptionsType.md +++ b/docs/router/framework/react/api/router/RouteOptionsType.md @@ -109,13 +109,13 @@ type beforeLoad = ( ``` - Optional -- [`ParsedLocation`](./ParsedLocationType.md) +- [`ParsedLocation`](../ParsedLocationType.md) - This async function is called before a route is loaded. If an error is thrown here, the route's loader will not be called and the route will not render. If thrown during a navigation, the navigation will be canceled and the error will be passed to the `onError` function. If thrown during a preload event, the error will be logged to the console and the preload will fail. - If this function returns a promise, the route will be put into a pending state and cause rendering to suspend until the promise resolves. If this route's pendingMs threshold is reached, the `pendingComponent` will be shown until it resolves. If the promise rejects, the route will be put into an error state and the error will be thrown during render. - If this function returns a `TRouteContext` object, that object will be merged into the route's context and be made available in the `loader` and other related route components/methods. - It's common to use this function to check if a user is authenticated and redirect them to a login page if they are not. To do this, you can either return or throw a `redirect` object from this function. -> 🚧 `opts.navigate` has been deprecated and will be removed in the next major release. Use `throw redirect({ to: '/somewhere' })` instead. Read more about the `redirect` function [here](./redirectFunction.md). +> 🚧 `opts.navigate` has been deprecated and will be removed in the next major release. Use `throw redirect({ to: '/somewhere' })` instead. Read more about the `redirect` function [here](../redirectFunction.md). ### `loader` method @@ -138,12 +138,12 @@ type loader = ( ``` - Optional -- [`ParsedLocation`](./ParsedLocationType.md) +- [`ParsedLocation`](../ParsedLocationType.md) - This async function is called when a route is matched and passed the route's match object. If an error is thrown here, the route will be put into an error state and the error will be thrown during render. If thrown during a navigation, the navigation will be canceled and the error will be passed to the `onError` function. If thrown during a preload event, the error will be logged to the console and the preload will fail. - If this function returns a promise, the route will be put into a pending state and cause rendering to suspend until the promise resolves. If this route's pendingMs threshold is reached, the `pendingComponent` will be shown until it resolves. If the promise rejects, the route will be put into an error state and the error will be thrown during render. - If this function returns a `TLoaderData` object, that object will be stored on the route match until the route match is no longer active. It can be accessed using the `useLoaderData` hook in any component that is a child of the route match before another `` is rendered. -> 🚧 `opts.navigate` has been deprecated and will be removed in the next major release. Use `throw redirect({ to: '/somewhere' })` instead. Read more about the `redirect` function [here](./redirectFunction.md). +> 🚧 `opts.navigate` has been deprecated and will be removed in the next major release. Use `throw redirect({ to: '/somewhere' })` instead. Read more about the `redirect` function [here](../redirectFunction.md). ### `loaderDeps` method @@ -241,7 +241,7 @@ type loaderDeps = (opts: { search: TFullSearchSchema }) => Record - Type: `(error: any) => void` - Optional - A function that will be called when an error is thrown during a navigation or preload event. -- If this function throws a [`redirect`](./redirectFunction.md), then the router will process and apply the redirect immediately. +- If this function throws a [`redirect`](../redirectFunction.md), then the router will process and apply the redirect immediately. ### `onEnter` property diff --git a/docs/router/framework/react/api/router/RouteType.md b/docs/router/framework/react/api/router/RouteType.md index 57e23ecc8b..6e2c675c9a 100644 --- a/docs/router/framework/react/api/router/RouteType.md +++ b/docs/router/framework/react/api/router/RouteType.md @@ -28,4 +28,4 @@ An instance of the `Route` has the following properties and methods: ### ...`RouteApi` methods -- All of the methods from [`RouteApi`](./RouteApiType.md) are available. +- All of the methods from [`RouteApi`](../RouteApiType.md) are available. diff --git a/docs/router/framework/react/api/router/RouterClass.md b/docs/router/framework/react/api/router/RouterClass.md index dfb4589b77..24fa525afc 100644 --- a/docs/router/framework/react/api/router/RouterClass.md +++ b/docs/router/framework/react/api/router/RouterClass.md @@ -5,7 +5,7 @@ title: Router Class > [!CAUTION] > This class has been deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`createRouter`](./createRouterFunction.md) function instead. +> Please use the [`createRouter`](../createRouterFunction.md) function instead. The `Router` class is used to instantiate a new router instance. @@ -15,13 +15,13 @@ The `Router` constructor accepts a single argument: the `options` that will be u ### Constructor options -- Type: [`RouterOptions`](./RouterOptionsType.md) +- Type: [`RouterOptions`](../RouterOptionsType.md) - Required - The options that will be used to configure the router instance. ### Constructor returns -- An instance of the [`Router`](./RouterType.md). +- An instance of the [`Router`](../RouterType.md). ## Examples diff --git a/docs/router/framework/react/api/router/RouterEventsType.md b/docs/router/framework/react/api/router/RouterEventsType.md index fd1b6dfb3d..0d31f05ce3 100644 --- a/docs/router/framework/react/api/router/RouterEventsType.md +++ b/docs/router/framework/react/api/router/RouterEventsType.md @@ -66,12 +66,12 @@ Once an event is emitted, the following properties will be present on the event ### `fromLocation` property -- Type: [`ParsedLocation`](./ParsedLocationType.md) +- Type: [`ParsedLocation`](../ParsedLocationType.md) - The location that the router is transitioning from. ### `toLocation` property -- Type: [`ParsedLocation`](./ParsedLocationType.md) +- Type: [`ParsedLocation`](../ParsedLocationType.md) - The location that the router is transitioning to. ### `pathChanged` property diff --git a/docs/router/framework/react/api/router/RouterOptionsType.md b/docs/router/framework/react/api/router/RouterOptionsType.md index 8d78f2719a..2bd2ecea9a 100644 --- a/docs/router/framework/react/api/router/RouterOptionsType.md +++ b/docs/router/framework/react/api/router/RouterOptionsType.md @@ -141,7 +141,7 @@ The `RouterOptions` type accepts an object with the following properties and met - Type: `boolean | ViewTransitionOptions` - Optional - If `true`, route navigations will be called using `document.startViewTransition()`. -- If [`ViewTransitionOptions`](./ViewTransitionOptionsType.md), route navigations will be called using `document.startViewTransition({update, types})` +- If [`ViewTransitionOptions`](../ViewTransitionOptionsType.md), route navigations will be called using `document.startViewTransition({update, types})` where `types` will be the strings array passed with `ViewTransitionOptions["types"]`. If the browser does not support viewTransition types, the navigation will fall back to normal `document.startTransition()`, same as if `true` was passed. - If the browser does not support this api, this option will be ignored. @@ -174,7 +174,7 @@ The `RouterOptions` type accepts an object with the following properties and met ### `context` property - Type: `any` -- Optional or required if the root route was created with [`createRootRouteWithContext()`](./createRootRouteWithContextFunction.md). +- Optional or required if the root route was created with [`createRootRouteWithContext()`](../createRootRouteWithContextFunction.md). - The root context that will be provided to all routes in the route tree. This can be used to provide a context to all routes in the tree without having to provide it to each route individually. ### `dehydrate` method @@ -251,7 +251,7 @@ const router = createRouter({ - Type: `'root' | 'fuzzy'` - Optional - Defaults to `'fuzzy'` -- This property controls how TanStack Router will handle scenarios where it cannot find a route to match the current location. See the [Not Found Errors guide](../../guide/not-found-errors.md) for more information. +- This property controls how TanStack Router will handle scenarios where it cannot find a route to match the current location. See the [Not Found Errors guide](../../../guide/not-found-errors.md) for more information. ### `notFoundRoute` property @@ -295,7 +295,7 @@ const router = createRouter({ - Optional - Defaults to `false` - Configures whether structural sharing is enabled by default for fine-grained selectors. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ### `defaultRemountDeps` property diff --git a/docs/router/framework/react/api/router/RouterStateType.md b/docs/router/framework/react/api/router/RouterStateType.md index 6c4d2aca93..401ffdfef4 100644 --- a/docs/router/framework/react/api/router/RouterStateType.md +++ b/docs/router/framework/react/api/router/RouterStateType.md @@ -38,20 +38,20 @@ The `RouterState` type contains all of the properties that are available on the ### `matches` property -- Type: [`Array`](./RouteMatchType.md) +- Type: [`Array`](../RouteMatchType.md) - An array of all of the route matches that have been resolved and are currently active. ### `pendingMatches` property -- Type: [`Array`](./RouteMatchType.md) +- Type: [`Array`](../RouteMatchType.md) - An array of all of the route matches that are currently pending. ### `location` property -- Type: [`ParsedLocation`](./ParsedLocationType.md) +- Type: [`ParsedLocation`](../ParsedLocationType.md) - The latest location that the router has parsed from the browser history. This location may not be resolved and loaded yet. ### `resolvedLocation` property -- Type: [`ParsedLocation`](./ParsedLocationType.md) +- Type: [`ParsedLocation`](../ParsedLocationType.md) - The location that the router has resolved and loaded. diff --git a/docs/router/framework/react/api/router/RouterType.md b/docs/router/framework/react/api/router/RouterType.md index cd4f4d8504..7f44c8c582 100644 --- a/docs/router/framework/react/api/router/RouterType.md +++ b/docs/router/framework/react/api/router/RouterType.md @@ -16,15 +16,15 @@ An instance of the `Router` has the following properties and methods: ### `state` property -- Type: [`RouterState`](./RouterStateType.md) +- Type: [`RouterState`](../RouterStateType.md) - The current state of the router. -> ⚠️⚠️⚠️ **`router.state` is always up to date, but NOT REACTIVE. If you use `router.state` in a component, the component will not re-render when the router state changes. To get a reactive version of the router state, use the [`useRouterState`](./useRouterStateHook.md) hook.** +> ⚠️⚠️⚠️ **`router.state` is always up to date, but NOT REACTIVE. If you use `router.state` in a component, the component will not re-render when the router state changes. To get a reactive version of the router state, use the [`useRouterState`](../useRouterStateHook.md) hook.** ### `.subscribe` method - Type: `(eventType: TType, fn: ListenerFn) => (event: RouterEvent) => void` -- Subscribes to a [`RouterEvent`](./RouterEventsType.md). +- Subscribes to a [`RouterEvent`](../RouterEventsType.md). - Returns a function that can be used to unsubscribe from the event. - The callback provided to the returned function will be called with the event that was emitted. @@ -100,7 +100,7 @@ Commits a new location object to the browser history. ``` - Properties - `location` - - Type: [`ParsedLocation`](./ParsedLocationType.md) + - Type: [`ParsedLocation`](../ParsedLocationType.md) - Required - The location to commit to the browser history. - `replace` diff --git a/docs/router/framework/react/api/router/ToMaskOptionsType.md b/docs/router/framework/react/api/router/ToMaskOptionsType.md index fa0140fec2..3c725af540 100644 --- a/docs/router/framework/react/api/router/ToMaskOptionsType.md +++ b/docs/router/framework/react/api/router/ToMaskOptionsType.md @@ -3,7 +3,7 @@ id: ToMaskOptionsType title: ToMaskOptions type --- -The `ToMaskOptions` type extends the [`ToOptions`](./ToOptionsType.md) type and describes additional options available when using route masks. +The `ToMaskOptions` type extends the [`ToOptions`](../ToOptionsType.md) type and describes additional options available when using route masks. ```tsx type ToMaskOptions = ToOptions & { @@ -11,4 +11,4 @@ type ToMaskOptions = ToOptions & { } ``` -- [`ToOptions`](./ToOptionsType.md) +- [`ToOptions`](../ToOptionsType.md) diff --git a/docs/router/framework/react/api/router/UseMatchRouteOptionsType.md b/docs/router/framework/react/api/router/UseMatchRouteOptionsType.md index 885b7d26d3..a7e622a319 100644 --- a/docs/router/framework/react/api/router/UseMatchRouteOptionsType.md +++ b/docs/router/framework/react/api/router/UseMatchRouteOptionsType.md @@ -3,11 +3,11 @@ id: UseMatchRouteOptionsType title: UseMatchRouteOptions type --- -The `UseMatchRouteOptions` type extends the [`ToOptions`](./ToOptionsType.md) type and describes additional options available when using the [`useMatchRoute`](./useMatchRouteHook.md) hook. +The `UseMatchRouteOptions` type extends the [`ToOptions`](../ToOptionsType.md) type and describes additional options available when using the [`useMatchRoute`](../useMatchRouteHook.md) hook. ```tsx export type UseMatchRouteOptions = ToOptions & MatchRouteOptions ``` -- [`ToOptions`](./ToOptionsType.md) -- [`MatchRouteOptions`](./MatchRouteOptionsType.md) +- [`ToOptions`](../ToOptionsType.md) +- [`MatchRouteOptions`](../MatchRouteOptionsType.md) diff --git a/docs/router/framework/react/api/router/catchBoundaryComponent.md b/docs/router/framework/react/api/router/catchBoundaryComponent.md index deef0ffa22..ac3871cb21 100644 --- a/docs/router/framework/react/api/router/catchBoundaryComponent.md +++ b/docs/router/framework/react/api/router/catchBoundaryComponent.md @@ -24,7 +24,7 @@ The `CatchBoundary` component accepts the following props: ### `props.errorComponent` prop - Type: `React.ReactNode` -- Optional - [`default: ErrorComponent`](./errorComponentComponent.md) +- Optional - [`default: ErrorComponent`](../errorComponentComponent.md) - The component to render when there is an error. ### `props.onCatch` prop diff --git a/docs/router/framework/react/api/router/createFileRouteFunction.md b/docs/router/framework/react/api/router/createFileRouteFunction.md index 0986d6ccff..86f1498e77 100644 --- a/docs/router/framework/react/api/router/createFileRouteFunction.md +++ b/docs/router/framework/react/api/router/createFileRouteFunction.md @@ -17,7 +17,7 @@ The `createFileRoute` function accepts a single argument of type `string` that r ## createFileRoute returns -A new function that accepts a single argument of type [`RouteOptions`](./RouteOptionsType.md) that will be used to configure the file [`Route`](./RouteType.md) instance. +A new function that accepts a single argument of type [`RouteOptions`](../RouteOptionsType.md) that will be used to configure the file [`Route`](../RouteType.md) instance. > ⚠️ Note: For `tsr generate` and `tsr watch` to work properly, the file route instance must be exported from the file using the `Route` identifier. diff --git a/docs/router/framework/react/api/router/createLazyFileRouteFunction.md b/docs/router/framework/react/api/router/createLazyFileRouteFunction.md index 87e1743ed1..5d00fb7458 100644 --- a/docs/router/framework/react/api/router/createLazyFileRouteFunction.md +++ b/docs/router/framework/react/api/router/createLazyFileRouteFunction.md @@ -3,7 +3,7 @@ id: createLazyFileRouteFunction title: createLazyFileRoute function --- -The `createLazyFileRoute` function is used for creating a partial file-based route route instance that is lazily loaded when matched. This route instance can only be used to configure the [non-critical properties](../../guide/code-splitting.md#how-does-tanstack-router-split-code) of the route, such as `component`, `pendingComponent`, `errorComponent`, and the `notFoundComponent`. +The `createLazyFileRoute` function is used for creating a partial file-based route route instance that is lazily loaded when matched. This route instance can only be used to configure the [non-critical properties](../../../guide/code-splitting.md#how-does-tanstack-router-split-code) of the route, such as `component`, `pendingComponent`, `errorComponent`, and the `notFoundComponent`. ## createLazyFileRoute options @@ -17,7 +17,7 @@ The `createLazyFileRoute` function accepts a single argument of type `string` th ### createLazyFileRoute returns -A new function that accepts a single argument of partial of the type [`RouteOptions`](./RouteOptionsType.md) that will be used to configure the file [`Route`](./RouteType.md) instance. +A new function that accepts a single argument of partial of the type [`RouteOptions`](../RouteOptionsType.md) that will be used to configure the file [`Route`](../RouteType.md) instance. - Type: @@ -28,7 +28,7 @@ Pick< > ``` -- [`RouteOptions`](./RouteOptionsType.md) +- [`RouteOptions`](../RouteOptionsType.md) > ⚠️ Note: For `tsr generate` and `tsr watch` to work properly, the file route instance must be exported from the file using the `Route` identifier. diff --git a/docs/router/framework/react/api/router/createLazyRouteFunction.md b/docs/router/framework/react/api/router/createLazyRouteFunction.md index 48c100c352..57e9fcdc71 100644 --- a/docs/router/framework/react/api/router/createLazyRouteFunction.md +++ b/docs/router/framework/react/api/router/createLazyRouteFunction.md @@ -3,7 +3,7 @@ id: createLazyRouteFunction title: createLazyRoute function --- -The `createLazyRoute` function is used for creating a partial code-based route route instance that is lazily loaded when matched. This route instance can only be used to configure the [non-critical properties](../../guide/code-splitting.md#how-does-tanstack-router-split-code) of the route, such as `component`, `pendingComponent`, `errorComponent`, and the `notFoundComponent`. +The `createLazyRoute` function is used for creating a partial code-based route route instance that is lazily loaded when matched. This route instance can only be used to configure the [non-critical properties](../../../guide/code-splitting.md#how-does-tanstack-router-split-code) of the route, such as `component`, `pendingComponent`, `errorComponent`, and the `notFoundComponent`. ## createLazyRoute options @@ -17,7 +17,7 @@ The `createLazyRoute` function accepts a single argument of type `string` that r ### createLazyRoute returns -A new function that accepts a single argument of partial of the type [`RouteOptions`](./RouteOptionsType.md) that will be used to configure the file [`Route`](./RouteType.md) instance. +A new function that accepts a single argument of partial of the type [`RouteOptions`](../RouteOptionsType.md) that will be used to configure the file [`Route`](../RouteType.md) instance. - Type: @@ -28,7 +28,7 @@ Pick< > ``` -- [`RouteOptions`](./RouteOptionsType.md) +- [`RouteOptions`](../RouteOptionsType.md) > ⚠️ Note: This route instance must be manually lazily loaded against its critical route instance using the `lazy` method returned by the `createRoute` function. diff --git a/docs/router/framework/react/api/router/createRootRouteFunction.md b/docs/router/framework/react/api/router/createRootRouteFunction.md index 27cff72032..6494924a70 100644 --- a/docs/router/framework/react/api/router/createRootRouteFunction.md +++ b/docs/router/framework/react/api/router/createRootRouteFunction.md @@ -23,12 +23,12 @@ Omit< > ``` -- [`RouteOptions`](./RouteOptionsType.md) +- [`RouteOptions`](../RouteOptionsType.md) - Optional ## createRootRoute returns -A new [`Route`](./RouteType.md) instance. +A new [`Route`](../RouteType.md) instance. ## Examples diff --git a/docs/router/framework/react/api/router/createRootRouteWithContextFunction.md b/docs/router/framework/react/api/router/createRootRouteWithContextFunction.md index 7e15737539..38d5c39496 100644 --- a/docs/router/framework/react/api/router/createRootRouteWithContextFunction.md +++ b/docs/router/framework/react/api/router/createRootRouteWithContextFunction.md @@ -17,8 +17,8 @@ The `createRootRouteWithContext` function accepts a single generic argument: ## createRootRouteWithContext returns -- A factory function that can be used to create a new [`createRootRoute`](./createRootRouteFunction.md) instance. -- It accepts a single argument, the same as the [`createRootRoute`](./createRootRouteFunction.md) function. +- A factory function that can be used to create a new [`createRootRoute`](../createRootRouteFunction.md) instance. +- It accepts a single argument, the same as the [`createRootRoute`](../createRootRouteFunction.md) function. ## Examples diff --git a/docs/router/framework/react/api/router/createRouteFunction.md b/docs/router/framework/react/api/router/createRouteFunction.md index 2ca9bdcb2d..7294e6abc7 100644 --- a/docs/router/framework/react/api/router/createRouteFunction.md +++ b/docs/router/framework/react/api/router/createRouteFunction.md @@ -3,17 +3,17 @@ id: createRouteFunction title: createRoute function --- -The `createRoute` function implements returns a [`Route`](./RouteType.md) instance. A route instance can then be passed to a root route's children to create a route tree, which is then passed to the router. +The `createRoute` function implements returns a [`Route`](../RouteType.md) instance. A route instance can then be passed to a root route's children to create a route tree, which is then passed to the router. ## createRoute options -- Type: [`RouteOptions`](./RouteOptionsType.md) +- Type: [`RouteOptions`](../RouteOptionsType.md) - Required - The options that will be used to configure the route instance ## createRoute returns -A new [`Route`](./RouteType.md) instance. +A new [`Route`](../RouteType.md) instance. ## Examples diff --git a/docs/router/framework/react/api/router/createRouteMaskFunction.md b/docs/router/framework/react/api/router/createRouteMaskFunction.md index 64722c57b3..45210ff31d 100644 --- a/docs/router/framework/react/api/router/createRouteMaskFunction.md +++ b/docs/router/framework/react/api/router/createRouteMaskFunction.md @@ -7,13 +7,13 @@ The `createRouteMask` function is a helper function that can be used to create a ## createRouteMask options -- Type: [`RouteMask`](./RouteMaskType.md) +- Type: [`RouteMask`](../RouteMaskType.md) - Required - The options that will be used to configure the route mask ## createRouteMask returns -- A object with the type signature of [`RouteMask`](./RouteMaskType.md) that can be passed to the `RouterOptions.routeMasks` option. +- A object with the type signature of [`RouteMask`](../RouteMaskType.md) that can be passed to the `RouterOptions.routeMasks` option. ## Examples diff --git a/docs/router/framework/react/api/router/createRouterFunction.md b/docs/router/framework/react/api/router/createRouterFunction.md index 7fe5779f7d..d82df5e5a7 100644 --- a/docs/router/framework/react/api/router/createRouterFunction.md +++ b/docs/router/framework/react/api/router/createRouterFunction.md @@ -3,17 +3,17 @@ id: createRouterFunction title: createRouter function --- -The `createRouter` function accepts a [`RouterOptions`](./RouterOptionsType.md) object and creates a new [`Router`](./RouterClass.md) instance. +The `createRouter` function accepts a [`RouterOptions`](../RouterOptionsType.md) object and creates a new [`Router`](../RouterClass.md) instance. ## createRouter options -- Type: [`RouterOptions`](./RouterOptionsType.md) +- Type: [`RouterOptions`](../RouterOptionsType.md) - Required - The options that will be used to configure the router instance. ## createRouter returns -- An instance of the [`Router`](./RouterType.md). +- An instance of the [`Router`](../RouterType.md). ## Examples diff --git a/docs/router/framework/react/api/router/deferFunction.md b/docs/router/framework/react/api/router/deferFunction.md index 929b9d7c63..7c1c1130c1 100644 --- a/docs/router/framework/react/api/router/deferFunction.md +++ b/docs/router/framework/react/api/router/deferFunction.md @@ -6,7 +6,7 @@ title: defer function > [!CAUTION] > You don't need to call `defer` manually anymore, Promises are handled automatically now. -The `defer` function wraps a promise with a deferred state object that can be used to inspect the promise's state. This deferred promise can then be passed to the [`useAwaited`](./useAwaitedHook.md) hook or the [``](./awaitComponent.md) component for suspending until the promise is resolved or rejected. +The `defer` function wraps a promise with a deferred state object that can be used to inspect the promise's state. This deferred promise can then be passed to the [`useAwaited`](../useAwaitedHook.md) hook or the [``](../awaitComponent.md) component for suspending until the promise is resolved or rejected. The `defer` function accepts a single argument, the `promise` to wrap with a deferred state object. @@ -18,7 +18,7 @@ The `defer` function accepts a single argument, the `promise` to wrap with a def ## defer returns -- A promise that can be passed to the [`useAwaited`](./useAwaitedHook.md) hook or the [``](./awaitComponent.md) component. +- A promise that can be passed to the [`useAwaited`](../useAwaitedHook.md) hook or the [``](../awaitComponent.md) component. ## Examples diff --git a/docs/router/framework/react/api/router/getRouteApiFunction.md b/docs/router/framework/react/api/router/getRouteApiFunction.md index cd78075a3a..6aa13b74a9 100644 --- a/docs/router/framework/react/api/router/getRouteApiFunction.md +++ b/docs/router/framework/react/api/router/getRouteApiFunction.md @@ -13,11 +13,11 @@ The `getRouteApi` function accepts a single argument, a `routeId` string literal - Type: `string` - Required -- The route ID to which the [`RouteApi`](./RouteApiClass.md) instance will be bound +- The route ID to which the [`RouteApi`](../RouteApiClass.md) instance will be bound ## getRouteApi returns -- An instance of the [`RouteApi`](./RouteApiType.md) that is pre-bound to the route ID that the `getRouteApi` function was called with. +- An instance of the [`RouteApi`](../RouteApiType.md) that is pre-bound to the route ID that the `getRouteApi` function was called with. ## Examples diff --git a/docs/router/framework/react/api/router/isNotFoundFunction.md b/docs/router/framework/react/api/router/isNotFoundFunction.md index 17411b7bbe..8ace56b353 100644 --- a/docs/router/framework/react/api/router/isNotFoundFunction.md +++ b/docs/router/framework/react/api/router/isNotFoundFunction.md @@ -3,7 +3,7 @@ id: isNotFoundFunction title: isNotFound function --- -The `isNotFound` function can be used to determine if an object is a [`NotFoundError`](./NotFoundErrorType.md) object. +The `isNotFound` function can be used to determine if an object is a [`NotFoundError`](../NotFoundErrorType.md) object. ## isNotFound options @@ -13,13 +13,13 @@ The `isNotFound` function accepts a single argument, an `input`. - Type: `unknown` - Required -- An object to check if it is a [`NotFoundError`](./NotFoundErrorType.md). +- An object to check if it is a [`NotFoundError`](../NotFoundErrorType.md). ## isNotFound returns - Type: `boolean` -- `true` if the object is a [`NotFoundError`](./NotFoundErrorType.md). -- `false` if the object is not a [`NotFoundError`](./NotFoundErrorType.md). +- `true` if the object is a [`NotFoundError`](../NotFoundErrorType.md). +- `false` if the object is not a [`NotFoundError`](../NotFoundErrorType.md). ## Examples diff --git a/docs/router/framework/react/api/router/linkComponent.md b/docs/router/framework/react/api/router/linkComponent.md index 6c973d80df..dd990f1425 100644 --- a/docs/router/framework/react/api/router/linkComponent.md +++ b/docs/router/framework/react/api/router/linkComponent.md @@ -12,7 +12,7 @@ The `Link` component accepts the following props: ### `...props` - Type: `LinkProps & React.RefAttributes` -- [`LinkProps`](./LinkPropsType.md) +- [`LinkProps`](../LinkPropsType.md) ## Link returns diff --git a/docs/router/framework/react/api/router/linkOptions.md b/docs/router/framework/react/api/router/linkOptions.md index 2c828500be..7226afaf8a 100644 --- a/docs/router/framework/react/api/router/linkOptions.md +++ b/docs/router/framework/react/api/router/linkOptions.md @@ -12,7 +12,7 @@ The `linkOptions` accepts the following option: ### `...props` - Type: `LinkProps & React.RefAttributes` -- [`LinkProps`](./LinkPropsType.md) +- [`LinkProps`](../LinkPropsType.md) ## `linkOptions` returns diff --git a/docs/router/framework/react/api/router/matchRouteComponent.md b/docs/router/framework/react/api/router/matchRouteComponent.md index 2deba6762e..be23a0b18e 100644 --- a/docs/router/framework/react/api/router/matchRouteComponent.md +++ b/docs/router/framework/react/api/router/matchRouteComponent.md @@ -11,7 +11,7 @@ The `MatchRoute` component accepts the same options as the `useMatchRoute` hook ### `...props` prop -- Type: [`UseMatchRouteOptions`](./UseMatchRouteOptionsType.md) +- Type: [`UseMatchRouteOptions`](../UseMatchRouteOptionsType.md) ### `children` prop diff --git a/docs/router/framework/react/api/router/navigateComponent.md b/docs/router/framework/react/api/router/navigateComponent.md index a4431eaf87..c66e9dd6ac 100644 --- a/docs/router/framework/react/api/router/navigateComponent.md +++ b/docs/router/framework/react/api/router/navigateComponent.md @@ -11,7 +11,7 @@ The `Navigate` component accepts the following props: ### `...options` -- Type: [`NavigateOptions`](./NavigateOptionsType.md) +- Type: [`NavigateOptions`](../NavigateOptionsType.md) ## Navigate returns diff --git a/docs/router/framework/react/api/router/notFoundFunction.md b/docs/router/framework/react/api/router/notFoundFunction.md index 02bb26bfbc..53848b4af8 100644 --- a/docs/router/framework/react/api/router/notFoundFunction.md +++ b/docs/router/framework/react/api/router/notFoundFunction.md @@ -9,7 +9,7 @@ The `notFound` function returns a new `NotFoundError` object that can be either The `notFound` function accepts a single optional argument, the `options` to create the not-found error object. -- Type: [`Partial`](./NotFoundErrorType.md) +- Type: [`Partial`](../NotFoundErrorType.md) - Optional ## notFound returns diff --git a/docs/router/framework/react/api/router/redirectFunction.md b/docs/router/framework/react/api/router/redirectFunction.md index 1e1c83dfb3..14d70225b6 100644 --- a/docs/router/framework/react/api/router/redirectFunction.md +++ b/docs/router/framework/react/api/router/redirectFunction.md @@ -9,7 +9,7 @@ The `redirect` function returns a new `Redirect` object that can be either retur The `redirect` function accepts a single argument, the `options` to determine the redirect behavior. -- Type: [`Redirect`](./RedirectType.md) +- Type: [`Redirect`](../RedirectType.md) - Required ## redirect returns diff --git a/docs/router/framework/react/api/router/rootRouteWithContextFunction.md b/docs/router/framework/react/api/router/rootRouteWithContextFunction.md index 30cf6d69a6..d2db4f3712 100644 --- a/docs/router/framework/react/api/router/rootRouteWithContextFunction.md +++ b/docs/router/framework/react/api/router/rootRouteWithContextFunction.md @@ -5,7 +5,7 @@ title: rootRouteWithContext function > [!CAUTION] > This function is deprecated and will be removed in the next major version of TanStack Router. -> Please use the [`createRootRouteWithContext`](./createRootRouteWithContextFunction.md) function instead. +> Please use the [`createRootRouteWithContext`](../createRootRouteWithContextFunction.md) function instead. The `rootRouteWithContext` function is a helper function that can be used to create a root route instance that requires a context type to be fulfilled when the router is created. @@ -21,8 +21,8 @@ The `rootRouteWithContext` function accepts a single generic argument: ## rootRouteWithContext returns -- A factory function that can be used to create a new [`createRootRoute`](./createRootRouteFunction.md) instance. -- It accepts a single argument, the same as the [`createRootRoute`](./createRootRouteFunction.md) function. +- A factory function that can be used to create a new [`createRootRoute`](../createRootRouteFunction.md) instance. +- It accepts a single argument, the same as the [`createRootRoute`](../createRootRouteFunction.md) function. ## Examples diff --git a/docs/router/framework/react/api/router/useBlockerHook.md b/docs/router/framework/react/api/router/useBlockerHook.md index 98d4a06c3b..218efc6b4a 100644 --- a/docs/router/framework/react/api/router/useBlockerHook.md +++ b/docs/router/framework/react/api/router/useBlockerHook.md @@ -3,7 +3,7 @@ id: useBlockerHook title: useBlocker hook --- -The `useBlocker` method is a hook that [blocks navigation](../../guide/navigation-blocking.md) when a condition is met. +The `useBlocker` method is a hook that [blocks navigation](../../../guide/navigation-blocking.md) when a condition is met. > ⚠️ The following new `useBlocker` API is currently _experimental_. diff --git a/docs/router/framework/react/api/router/useCanGoBack.md b/docs/router/framework/react/api/router/useCanGoBack.md index 39b84fbdf9..cfae538055 100644 --- a/docs/router/framework/react/api/router/useCanGoBack.md +++ b/docs/router/framework/react/api/router/useCanGoBack.md @@ -14,7 +14,7 @@ The `useCanGoBack` hook returns a boolean representing if the router history can ## Limitations -The router history index is reset after a navigation with [`reloadDocument`](./NavigateOptionsType.md#reloaddocument) set as `true`. This causes the router history to consider the new location as the initial one and will cause `useCanGoBack` to return `false`. +The router history index is reset after a navigation with [`reloadDocument`](../NavigateOptionsType.md#reloaddocument) set as `true`. This causes the router history to consider the new location as the initial one and will cause `useCanGoBack` to return `false`. ## Examples diff --git a/docs/router/framework/react/api/router/useChildMatchesHook.md b/docs/router/framework/react/api/router/useChildMatchesHook.md index cf31d21016..ae4480d822 100644 --- a/docs/router/framework/react/api/router/useChildMatchesHook.md +++ b/docs/router/framework/react/api/router/useChildMatchesHook.md @@ -3,7 +3,7 @@ id: useChildMatchesHook title: useChildMatches hook --- -The `useChildMatches` hook returns all of the child [`RouteMatch`](./RouteMatchType.md) objects from the closest match down to the leaf-most match. **It does not include the current match, which can be obtained using the `useMatch` hook.** +The `useChildMatches` hook returns all of the child [`RouteMatch`](../RouteMatchType.md) objects from the closest match down to the leaf-most match. **It does not include the current match, which can be obtained using the `useMatch` hook.** > [!IMPORTANT] > If the router has pending matches and they are showing their pending component fallbacks, `router.state.pendingMatches` will used instead of `router.state.matches`. @@ -23,12 +23,12 @@ The `useChildMatches` hook accepts a single _optional_ argument, an `options` ob - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useChildMatches returns - If a `select` function is provided, the return value of the `select` function. -- If no `select` function is provided, an array of [`RouteMatch`](./RouteMatchType.md) objects. +- If no `select` function is provided, an array of [`RouteMatch`](../RouteMatchType.md) objects. ## Examples diff --git a/docs/router/framework/react/api/router/useLinkPropsHook.md b/docs/router/framework/react/api/router/useLinkPropsHook.md index 3c29881ba1..d3f70ba0c7 100644 --- a/docs/router/framework/react/api/router/useLinkPropsHook.md +++ b/docs/router/framework/react/api/router/useLinkPropsHook.md @@ -12,9 +12,9 @@ type UseLinkPropsOptions = ActiveLinkOptions & React.AnchorHTMLAttributes ``` -- [`ActiveLinkOptions`](./ActiveLinkOptionsType.md) -- The `useLinkProps` options are used to build a [`LinkProps`](./LinkPropsType.md) object. -- It also extends the `React.AnchorHTMLAttributes` type, so that any additional props that are passed to the `useLinkProps` hook will be merged with the [`LinkProps`](./LinkPropsType.md) object. +- [`ActiveLinkOptions`](../ActiveLinkOptionsType.md) +- The `useLinkProps` options are used to build a [`LinkProps`](../LinkPropsType.md) object. +- It also extends the `React.AnchorHTMLAttributes` type, so that any additional props that are passed to the `useLinkProps` hook will be merged with the [`LinkProps`](../LinkPropsType.md) object. ## useLinkProps returns diff --git a/docs/router/framework/react/api/router/useLoaderDataHook.md b/docs/router/framework/react/api/router/useLoaderDataHook.md index dfcf2d3758..809fd3785e 100644 --- a/docs/router/framework/react/api/router/useLoaderDataHook.md +++ b/docs/router/framework/react/api/router/useLoaderDataHook.md @@ -3,7 +3,7 @@ id: useLoaderDataHook title: useLoaderData hook --- -The `useLoaderData` hook returns the loader data from the closest [`RouteMatch`](./RouteMatchType.md) in the component tree. +The `useLoaderData` hook returns the loader data from the closest [`RouteMatch`](../RouteMatchType.md) in the component tree. ## useLoaderData options @@ -34,7 +34,7 @@ The `useLoaderData` hook accepts an `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useLoaderData returns diff --git a/docs/router/framework/react/api/router/useLoaderDepsHook.md b/docs/router/framework/react/api/router/useLoaderDepsHook.md index bf9a3a35ec..7e3d43e2ca 100644 --- a/docs/router/framework/react/api/router/useLoaderDepsHook.md +++ b/docs/router/framework/react/api/router/useLoaderDepsHook.md @@ -26,7 +26,7 @@ The `useLoaderDepsHook` hook accepts an `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useLoaderDeps returns diff --git a/docs/router/framework/react/api/router/useLocationHook.md b/docs/router/framework/react/api/router/useLocationHook.md index 7bbccad150..d568095852 100644 --- a/docs/router/framework/react/api/router/useLocationHook.md +++ b/docs/router/framework/react/api/router/useLocationHook.md @@ -3,7 +3,7 @@ id: useLocationHook title: useLocation hook --- -The `useLocation` method is a hook that returns the current [`location`](./ParsedLocationType.md) object. This hook is useful for when you want to perform some side effect whenever the current location changes. +The `useLocation` method is a hook that returns the current [`location`](../ParsedLocationType.md) object. This hook is useful for when you want to perform some side effect whenever the current location changes. ## useLocation options @@ -13,11 +13,11 @@ The `useLocation` hook accepts an optional `options` object. - Type: `(state: ParsedLocationType) => TSelected` - Optional -- If supplied, this function will be called with the [`location`](./ParsedLocationType.md) object and the return value will be returned from `useLocation`. +- If supplied, this function will be called with the [`location`](../ParsedLocationType.md) object and the return value will be returned from `useLocation`. ## useLocation returns -- The current [`location`](./ParsedLocationType.md) object or `TSelected` if a `select` function is provided. +- The current [`location`](../ParsedLocationType.md) object or `TSelected` if a `select` function is provided. ## Examples diff --git a/docs/router/framework/react/api/router/useMatchHook.md b/docs/router/framework/react/api/router/useMatchHook.md index 966fd1d7c1..5c43705b04 100644 --- a/docs/router/framework/react/api/router/useMatchHook.md +++ b/docs/router/framework/react/api/router/useMatchHook.md @@ -3,7 +3,7 @@ id: useMatchHook title: useMatch hook --- -The `useMatch` hook returns a [`RouteMatch`](./RouteMatchType.md) in the component tree. The raw route match contains all of the information about a route match in the router and also powers many other hooks under the hood like `useParams`, `useLoaderData`, `useRouteContext`, and `useSearch`. +The `useMatch` hook returns a [`RouteMatch`](../RouteMatchType.md) in the component tree. The raw route match contains all of the information about a route match in the router and also powers many other hooks under the hood like `useParams`, `useLoaderData`, `useRouteContext`, and `useSearch`. ## useMatch options @@ -15,7 +15,7 @@ The `useMatch` hook accepts a single argument, an `options` object. - The route id of a match - Optional, but recommended for full type safety. - If `opts.strict` is `true`, `from` is required and TypeScript will warn for this option if it is not provided. -- If `opts.strict` is `false`, `from` must not be set and TypeScript will provided loosened types for the returned [`RouteMatch`](./RouteMatchType.md). +- If `opts.strict` is `false`, `from` must not be set and TypeScript will provided loosened types for the returned [`RouteMatch`](../RouteMatchType.md). ### `opts.strict` option @@ -35,7 +35,7 @@ The `useMatch` hook accepts a single argument, an `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ### `opts.shouldThrow` option @@ -47,7 +47,7 @@ The `useMatch` hook accepts a single argument, an `options` object. ## useMatch returns - If a `select` function is provided, the return value of the `select` function. -- If no `select` function is provided, the [`RouteMatch`](./RouteMatchType.md) object or a loosened version of the `RouteMatch` object if `opts.strict` is `false`. +- If no `select` function is provided, the [`RouteMatch`](../RouteMatchType.md) object or a loosened version of the `RouteMatch` object if `opts.strict` is `false`. ## Examples diff --git a/docs/router/framework/react/api/router/useMatchRouteHook.md b/docs/router/framework/react/api/router/useMatchRouteHook.md index 01c26d07c6..ab597abef8 100644 --- a/docs/router/framework/react/api/router/useMatchRouteHook.md +++ b/docs/router/framework/react/api/router/useMatchRouteHook.md @@ -17,7 +17,7 @@ The `matchRoute` function is a function that can be used to match a route agains The `matchRoute` function accepts a single argument, an `options` object. -- Type: [`UseMatchRouteOptions`](./UseMatchRouteOptionsType.md) +- Type: [`UseMatchRouteOptions`](../UseMatchRouteOptionsType.md) ### matchRoute function returns diff --git a/docs/router/framework/react/api/router/useMatchesHook.md b/docs/router/framework/react/api/router/useMatchesHook.md index d7a1be8dc3..c8cc3ccaf8 100644 --- a/docs/router/framework/react/api/router/useMatchesHook.md +++ b/docs/router/framework/react/api/router/useMatchesHook.md @@ -3,10 +3,10 @@ id: useMatchesHook title: useMatches hook --- -The `useMatches` hook returns all of the [`RouteMatch`](./RouteMatchType.md) objects from the router **regardless of its callers position in the React component tree**. +The `useMatches` hook returns all of the [`RouteMatch`](../RouteMatchType.md) objects from the router **regardless of its callers position in the React component tree**. > [!TIP] -> If you only want the parent or child matches, then you can use the [`useParentMatches`](./useParentMatchesHook.md) or the [`useChildMatches`](./useChildMatchesHook.md) based on the selection you need. +> If you only want the parent or child matches, then you can use the [`useParentMatches`](../useParentMatchesHook.md) or the [`useChildMatches`](../useChildMatchesHook.md) based on the selection you need. ## useMatches options @@ -23,12 +23,12 @@ The `useMatches` hook accepts a single _optional_ argument, an `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useMatches returns - If a `select` function is provided, the return value of the `select` function. -- If no `select` function is provided, an array of [`RouteMatch`](./RouteMatchType.md) objects. +- If no `select` function is provided, an array of [`RouteMatch`](../RouteMatchType.md) objects. ## Examples diff --git a/docs/router/framework/react/api/router/useNavigateHook.md b/docs/router/framework/react/api/router/useNavigateHook.md index 916d2cd237..5c28804ce6 100644 --- a/docs/router/framework/react/api/router/useNavigateHook.md +++ b/docs/router/framework/react/api/router/useNavigateHook.md @@ -27,7 +27,7 @@ The `navigate` function is a function that can be used to navigate to a new loca The `navigate` function accepts a single argument, an `options` object. -- Type: [`NavigateOptions`](./NavigateOptionsType.md) +- Type: [`NavigateOptions`](../NavigateOptionsType.md) ### navigate function returns diff --git a/docs/router/framework/react/api/router/useParamsHook.md b/docs/router/framework/react/api/router/useParamsHook.md index 0f3ca88fca..b0624c7129 100644 --- a/docs/router/framework/react/api/router/useParamsHook.md +++ b/docs/router/framework/react/api/router/useParamsHook.md @@ -33,7 +33,7 @@ The `useParams` hook accepts an optional `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useParams returns diff --git a/docs/router/framework/react/api/router/useParentMatchesHook.md b/docs/router/framework/react/api/router/useParentMatchesHook.md index fe4068f397..c6c577fbe0 100644 --- a/docs/router/framework/react/api/router/useParentMatchesHook.md +++ b/docs/router/framework/react/api/router/useParentMatchesHook.md @@ -3,7 +3,7 @@ id: useParentMatchesHook title: useParentMatches hook --- -The `useParentMatches` hook returns all of the parent [`RouteMatch`](./RouteMatchType.md) objects from the root down to the immediate parent of the current match in context. **It does not include the current match, which can be obtained using the `useMatch` hook.** +The `useParentMatches` hook returns all of the parent [`RouteMatch`](../RouteMatchType.md) objects from the root down to the immediate parent of the current match in context. **It does not include the current match, which can be obtained using the `useMatch` hook.** > [!IMPORTANT] > If the router has pending matches and they are showing their pending component fallbacks, `router.state.pendingMatches` will used instead of `router.state.matches`. @@ -23,12 +23,12 @@ The `useParentMatches` hook accepts an optional `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useParentMatches returns - If a `select` function is provided, the return value of the `select` function. -- If no `select` function is provided, an array of [`RouteMatch`](./RouteMatchType.md) objects. +- If no `select` function is provided, an array of [`RouteMatch`](../RouteMatchType.md) objects. ## Examples diff --git a/docs/router/framework/react/api/router/useRouterHook.md b/docs/router/framework/react/api/router/useRouterHook.md index 174829c256..14d29a4955 100644 --- a/docs/router/framework/react/api/router/useRouterHook.md +++ b/docs/router/framework/react/api/router/useRouterHook.md @@ -3,13 +3,13 @@ id: useRouterHook title: useRouter hook --- -The `useRouter` method is a hook that returns the current instance of [`Router`](./RouterType.md) from context. This hook is useful for accessing the router instance in a component. +The `useRouter` method is a hook that returns the current instance of [`Router`](../RouterType.md) from context. This hook is useful for accessing the router instance in a component. ## useRouter returns -- The current [`Router`](./RouterType.md) instance. +- The current [`Router`](../RouterType.md) instance. -> ⚠️⚠️⚠️ **`router.state` is always up to date, but NOT REACTIVE. If you use `router.state` in a component, the component will not re-render when the router state changes. To get a reactive version of the router state, use the [`useRouterState`](./useRouterStateHook.md) hook.** +> ⚠️⚠️⚠️ **`router.state` is always up to date, but NOT REACTIVE. If you use `router.state` in a component, the component will not re-render when the router state changes. To get a reactive version of the router state, use the [`useRouterState`](../useRouterStateHook.md) hook.** ## Examples diff --git a/docs/router/framework/react/api/router/useRouterStateHook.md b/docs/router/framework/react/api/router/useRouterStateHook.md index bcded1d415..f83527cc50 100644 --- a/docs/router/framework/react/api/router/useRouterStateHook.md +++ b/docs/router/framework/react/api/router/useRouterStateHook.md @@ -6,7 +6,7 @@ title: useRouterState hook The `useRouterState` method is a hook that returns the current internal state of the router. This hook is useful for accessing the current state of the router in a component. > [!TIP] -> If you want to access the current location or the current matches, you should try out the [`useLocation`](./useLocationHook.md) and [`useMatches`](./useMatchesHook.md) hooks first. These hooks are designed to be more ergonomic and easier to use than accessing the router state directly. +> If you want to access the current location or the current matches, you should try out the [`useLocation`](../useLocationHook.md) and [`useMatches`](../useMatchesHook.md) hooks first. These hooks are designed to be more ergonomic and easier to use than accessing the router state directly. ## useRouterState options @@ -16,18 +16,18 @@ The `useRouterState` hook accepts an optional `options` object. - Type: `(state: RouterState) => TSelected` - Optional -- If supplied, this function will be called with the [`RouterState`](./RouterStateType.md) object and the return value will be returned from `useRouterState`. +- If supplied, this function will be called with the [`RouterState`](../RouterStateType.md) object and the return value will be returned from `useRouterState`. ### `opts.structuralSharing` option - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ## useRouterState returns -- The current [`RouterState`](./RouterStateType.md) object or `TSelected` if a `select` function is provided. +- The current [`RouterState`](../RouterStateType.md) object or `TSelected` if a `select` function is provided. ## Examples diff --git a/docs/router/framework/react/api/router/useSearchHook.md b/docs/router/framework/react/api/router/useSearchHook.md index 39c8ed5d9e..985b42b206 100644 --- a/docs/router/framework/react/api/router/useSearchHook.md +++ b/docs/router/framework/react/api/router/useSearchHook.md @@ -33,7 +33,7 @@ The `useSearch` hook accepts an `options` object. - Type: `boolean` - Optional - Configures whether structural sharing is enabled for the value returned by `select`. -- See the [Render Optimizations guide](../../guide/render-optimizations.md) for more information. +- See the [Render Optimizations guide](../../../guide/render-optimizations.md) for more information. ### `opts.strict` option diff --git a/docs/router/framework/react/decisions-on-dx.md b/docs/router/framework/react/decisions-on-dx.md index a38716f624..efb2862056 100644 --- a/docs/router/framework/react/decisions-on-dx.md +++ b/docs/router/framework/react/decisions-on-dx.md @@ -90,7 +90,7 @@ This only gets worse as you begin to use more features of the router, such as ne What we found to be the best way to define your routes is to abstract the definition of the route configuration outside of the route-tree. Then stitch together your route configurations into a single cohesive route-tree that is then passed into the `createRouter` function. -You can read more about [code-based routing](./routing/code-based-routing.md) to see how to define your routes in this way. +You can read more about [code-based routing](../routing/code-based-routing.md) to see how to define your routes in this way. > [!TIP] > Finding Code-based routing to be a bit too cumbersome? See why [file-based routing](#3-why-is-file-based-routing-the-preferred-way-to-define-routes) is the preferred way to define your routes. @@ -160,7 +160,7 @@ We went with **module declaration**, as it is what we found to be the most scala Something you'll notice (quite soon) in the TanStack Router documentation is that we push for **file-based routing** as the preferred method for defining your routes. This is because we've found that file-based routing is the most scalable and maintainable way to define your routes. > [!TIP] -> Before you continue, it's important you have a good understanding of [code-based routing](./routing/code-based-routing.md) and [file-based routing](./routing/file-based-routing.md). +> Before you continue, it's important you have a good understanding of [code-based routing](../routing/code-based-routing.md) and [file-based routing](../routing/file-based-routing.md). As mentioned in the beginning, TanStack Router was designed for complex applications that require a high degree of type-safety and maintainability. And to achieve this, the configuration of the router has been done in a precise way that allows TypeScript to infer the types of your routes as much as possible. @@ -234,4 +234,4 @@ That's it! No need to worry about defining the `getParentRoute` function, stitch At no point does the TanStack Router Bundler Plugin take away your control over your route configurations. It's designed to be as flexible as possible, allowing you to define your routes in a way that suits your application whilst reducing the boilerplate and complexity of the route configuration. -Check out the guides for [file-based routing](./routing/file-based-routing.md) and [code-splitting](./routing/code-splitting.md) for a more in-depth explanation of how they work in TanStack Router. +Check out the guides for [file-based routing](../routing/file-based-routing.md) and [code-splitting](../guide/code-splitting.md) for a more in-depth explanation of how they work in TanStack Router. diff --git a/docs/router/framework/react/faq.md b/docs/router/framework/react/faq.md index 01169d3b13..09fccf1dd7 100644 --- a/docs/router/framework/react/faq.md +++ b/docs/router/framework/react/faq.md @@ -14,7 +14,7 @@ You should commit this file into git so that other developers can use it to buil No, the root route is always rendered as it is the entry point of your application. -If you need to conditionally render a route's component, this usually means that the page content needs to be different based on some condition (e.g. user authentication). For this use case, you should use a [Layout Route](./routing/routing-concepts.md#layout-routes) or a [Pathless Layout Route](./routing/routing-concepts.md#pathless-layout-routes) to conditionally render the content. +If you need to conditionally render a route's component, this usually means that the page content needs to be different based on some condition (e.g. user authentication). For this use case, you should use a [Layout Route](../routing/routing-concepts.md#layout-routes) or a [Pathless Layout Route](../routing/routing-concepts.md#pathless-layout-routes) to conditionally render the content. You can restrict access to these routes using a conditional check in the `beforeLoad` function of the route. diff --git a/docs/router/framework/react/guide/authenticated-routes.md b/docs/router/framework/react/guide/authenticated-routes.md index 007ec5cfe8..f80a18377f 100644 --- a/docs/router/framework/react/guide/authenticated-routes.md +++ b/docs/router/framework/react/guide/authenticated-routes.md @@ -83,9 +83,9 @@ If your authentication flow relies on interactions with React context and/or hoo > [!IMPORTANT] > React hooks are not meant to be consumed outside of React components. If you need to use a hook outside of a React component, you need to extract the returned state from the hook in a component that wraps your `` and then pass the returned value down to TanStack Router. -We'll cover the `router.context` options in-detail in the [Router Context](./router-context.md) section. +We'll cover the `router.context` options in-detail in the [Router Context](../router-context.md) section. -Here's an example that uses React context and hooks for protecting authenticated routes in TanStack Router. See the entire working setup in the [Authenticated Routes example](../examples/authenticated-routes). +Here's an example that uses React context and hooks for protecting authenticated routes in TanStack Router. See the entire working setup in the [Authenticated Routes example](https://github.com/TanStack/router/tree/main/examples/react/authenticated-routes). - `src/routes/__root.tsx` diff --git a/docs/router/framework/react/guide/code-splitting.md b/docs/router/framework/react/guide/code-splitting.md index e57c7d7fe0..c1e5f193c5 100644 --- a/docs/router/framework/react/guide/code-splitting.md +++ b/docs/router/framework/react/guide/code-splitting.md @@ -72,7 +72,7 @@ This is the easiest and most powerful way to code split your route files. When using the `autoCodeSplitting` feature, TanStack Router will automatically code split your route files based on the non-critical route configuration mentioned above. > [!IMPORTANT] -> The automatic code-splitting feature is **ONLY** available when you are using file-based routing with one of our [supported bundlers](../routing/file-based-routing.md#getting-started-with-file-based-routing). +> The automatic code-splitting feature is **ONLY** available when you are using file-based routing with one of our [supported bundlers](../../routing/file-based-routing.md#getting-started-with-file-based-routing). > This will **NOT** work if you are **only** using the CLI (`@tanstack/router-cli`). To enable automatic code-splitting, you just need to add the following to the configuration of your TanStack Router Bundler Plugin: @@ -96,7 +96,7 @@ export default defineConfig({ That's it! TanStack Router will automatically code-split all your route files by their critical and non-critical route configurations. -If you want more control over the code-splitting process, head over to the [Automatic Code Splitting](./automatic-code-splitting.md) guide to learn more about the options available. +If you want more control over the code-splitting process, head over to the [Automatic Code Splitting](../automatic-code-splitting.md) guide to learn more about the options available. ## Using the `.lazy.tsx` suffix diff --git a/docs/router/framework/react/guide/creating-a-router.md b/docs/router/framework/react/guide/creating-a-router.md index d84815bd7c..d18d6329ca 100644 --- a/docs/router/framework/react/guide/creating-a-router.md +++ b/docs/router/framework/react/guide/creating-a-router.md @@ -18,7 +18,7 @@ const router = createRouter({ You'll probably notice quickly that the `Router` constructor requires a `routeTree` option. This is the route tree that the router will use to match routes and render components. -Whether you used [file-based routing](../routing/file-based-routing.md) or [code-based routing](../routing/code-based-routing.md), you'll need to pass your route tree to the `createRouter` function: +Whether you used [file-based routing](../../routing/file-based-routing.md) or [code-based routing](../../routing/code-based-routing.md), you'll need to pass your route tree to the `createRouter` function: ### Filesystem Route Tree @@ -73,4 +73,4 @@ export const Route = createRootRoute({ ## Other Options -There are many other options that can be passed to the `Router` constructor. You can find a full list of them in the [API Reference](../api/router/RouterOptionsType.md). +There are many other options that can be passed to the `Router` constructor. You can find a full list of them in the [API Reference](../../api/router/RouterOptionsType.md). diff --git a/docs/router/framework/react/guide/custom-link.md b/docs/router/framework/react/guide/custom-link.md index 6131527d59..133a1b7e13 100644 --- a/docs/router/framework/react/guide/custom-link.md +++ b/docs/router/framework/react/guide/custom-link.md @@ -2,7 +2,7 @@ title: Custom Link --- -While repeating yourself can be acceptable in many situations, you might find that you do it too often. At times, you may want to create cross-cutting components with additional behavior or styles. You might also consider using third-party libraries in combination with TanStack Router’s type safety. +While repeating yourself can be acceptable in many situations, you might find that you do it too often. At times, you may want to create cross-cutting components with additional behavior or styles. You might also consider using third-party libraries in combination with TanStack Router's type safety. ## `createLink` for cross-cutting concerns @@ -53,9 +53,9 @@ Here are some examples of how you can use `createLink` with third-party librarie ### React Aria Components example -React Aria Components’ +React Aria Components' [Link](https://react-spectrum.adobe.com/react-aria/Link.html) component does not support the standard `onMouseEnter` and `onMouseLeave` events. -Therefore, you cannot use it directly with TanStack Router’s `preload (intent)` prop. +Therefore, you cannot use it directly with TanStack Router's `preload (intent)` prop. Explanation for this can be found here: @@ -146,7 +146,7 @@ export const CustomLink: LinkComponent = ( ### MUI example -There is an [example](../examples/start-material-ui) available which uses these patterns. +There is an [example](https://github.com/TanStack/router/tree/main/examples/react/start-material-ui) available which uses these patterns. #### `Link` diff --git a/docs/router/framework/react/guide/custom-search-param-serialization.md b/docs/router/framework/react/guide/custom-search-param-serialization.md index 33124513e8..11f3329edc 100644 --- a/docs/router/framework/react/guide/custom-search-param-serialization.md +++ b/docs/router/framework/react/guide/custom-search-param-serialization.md @@ -38,7 +38,7 @@ const router = createRouter({ However, this default behavior may not be suitable for all use cases. For example, you may want to use a different serialization format, such as base64 encoding, or you may want to use a purpose-built serialization/deserialization library, like [query-string](https://github.com/sindresorhus/query-string), [JSURL2](https://github.com/wmertens/jsurl2), or [Zipson](https://jgranstrom.github.io/zipson/). -This can be achieved by providing your own serialization and deserialization functions to the `parseSearch` and `stringifySearch` options in the [`Router`](../api/router/RouterOptionsType.md#stringifysearch-method) configuration. When doing this, you can utilize TanStack Router's built-in helper functions, `parseSearchWith` and `stringifySearchWith`, to simplify the process. +This can be achieved by providing your own serialization and deserialization functions to the `parseSearch` and `stringifySearch` options in the [`Router`](../../api/router/RouterOptionsType.md#stringifysearch-method) configuration. When doing this, you can utilize TanStack Router's built-in helper functions, `parseSearchWith` and `stringifySearchWith`, to simplify the process. > [!TIP] > An important aspect of serialization and deserialization, is that you are able to get the same object back after deserialization. This is important because if the serialization and deserialization process is not done correctly, you may lose some information. For example, if you are using a library that does not support nested objects, you may lose the nested object when deserializing the search string. diff --git a/docs/router/framework/react/guide/data-loading.md b/docs/router/framework/react/guide/data-loading.md index 02fc39d670..cd02b10a20 100644 --- a/docs/router/framework/react/guide/data-loading.md +++ b/docs/router/framework/react/guide/data-loading.md @@ -49,7 +49,7 @@ TanStack Router Cache Cons: - No built-in cache-level optimistic update APIs (you can still use ephemeral state from something like a `useMutation` hook to achieve this at the component level) > [!TIP] -> If you know right away that you'd like to or need to use something more robust like TanStack Query, skip to the [External Data Loading](./external-data-loading.md) guide. +> If you know right away that you'd like to or need to use something more robust like TanStack Query, skip to the [External Data Loading](../external-data-loading.md) guide. ## Using the Router Cache @@ -219,7 +219,7 @@ To opt out of preloading, don't turn it on via the `routerOptions.defaultPreload ## Passing all loader events to an external cache -We break down this use case in the [External Data Loading](./external-data-loading.md) page, but if you'd like to use an external cache like TanStack Query, you can do so by passing all loader events to your external cache. As long as you are using the defaults, the only change you'll need to make is to set the `defaultPreloadStaleTime` option on the router to `0`: +We break down this use case in the [External Data Loading](../external-data-loading.md) page, but if you'd like to use an external cache like TanStack Query, you can do so by passing all loader events to your external cache. As long as you are using the defaults, the only change you'll need to make is to set the `defaultPreloadStaleTime` option on the router to `0`: ```tsx const router = createRouter({ @@ -401,7 +401,7 @@ export const Route = createFileRoute('/posts')({ Ideally most route loaders can resolve their data within a short moment, removing the need to render a placeholder spinner and simply rely on suspense to render the next route when it's completely ready. When critical data that is required to render a route's component is slow though, you have 2 options: -- Split up your fast and slow data into separate promises and `defer` the slow data until after the fast data is loaded (see the [Deferred Data Loading](./deferred-data-loading.md) guide). +- Split up your fast and slow data into separate promises and `defer` the slow data until after the fast data is loaded (see the [Deferred Data Loading](../deferred-data-loading.md) guide). - Show a pending component after an optimistic suspense threshold until all of the data is ready (See below). ## Showing a pending component diff --git a/docs/router/framework/react/guide/deferred-data-loading.md b/docs/router/framework/react/guide/deferred-data-loading.md index cfff886fb4..151be5537c 100644 --- a/docs/router/framework/react/guide/deferred-data-loading.md +++ b/docs/router/framework/react/guide/deferred-data-loading.md @@ -62,7 +62,7 @@ function PostIdComponent() { ``` > [!TIP] -> If your component is code-split, you can use the [getRouteApi function](./code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useLoaderData()` hook. +> If your component is code-split, you can use the [getRouteApi function](../code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useLoaderData()` hook. The `Await` component resolves the promise by triggering the nearest suspense boundary until it is resolved, after which it renders the component's `children` as a function with the resolved data. @@ -77,7 +77,7 @@ If the promise is rejected, the `Await` component will throw the serialized erro ## Deferred Data Loading with External libraries -When your strategy for fetching information for the route relies on [External Data Loading](./external-data-loading.md) with an external library like [TanStack Query](https://tanstack.com/query), deferred data loading works a bit differently, as the library handles the data fetching and caching for you outside of TanStack Router. +When your strategy for fetching information for the route relies on [External Data Loading](../external-data-loading.md) with an external library like [TanStack Query](https://tanstack.com/query), deferred data loading works a bit differently, as the library handles the data fetching and caching for you outside of TanStack Router. So, instead of using `defer` and `Await`, you'll instead want to use the Route's `loader` to kick off the data fetching and then use the library's hooks to access the data in your components. @@ -139,7 +139,7 @@ Streamed promises follow the same lifecycle as the loader data they are associat **Streaming requires a server that supports it and for TanStack Router to be configured to use it properly.** -Please read the entire [Streaming SSR Guide](./ssr.md#streaming-ssr) for step by step instructions on how to set up your server for streaming. +Please read the entire [Streaming SSR Guide](../ssr.md#streaming-ssr) for step by step instructions on how to set up your server for streaming. ## SSR Streaming Lifecycle diff --git a/docs/router/framework/react/guide/external-data-loading.md b/docs/router/framework/react/guide/external-data-loading.md index 2b1ebf78f1..3c99ba7a03 100644 --- a/docs/router/framework/react/guide/external-data-loading.md +++ b/docs/router/framework/react/guide/external-data-loading.md @@ -4,7 +4,7 @@ title: External Data Loading --- > [!IMPORTANT] -> This guide is geared towards external state management libraries and their integration with TanStack Router for data fetching, ssr, hydration/dehydration and streaming. If you haven't read the standard [Data Loading](./data-loading.md) guide, please do so first. +> This guide is geared towards external state management libraries and their integration with TanStack Router for data fetching, ssr, hydration/dehydration and streaming. If you haven't read the standard [Data Loading](../data-loading.md) guide, please do so first. ## To **Store** or to **Coordinate**? diff --git a/docs/router/framework/react/guide/history-types.md b/docs/router/framework/react/guide/history-types.md index c65afccd27..5559788d80 100644 --- a/docs/router/framework/react/guide/history-types.md +++ b/docs/router/framework/react/guide/history-types.md @@ -52,4 +52,4 @@ const memoryHistory = createMemoryHistory({ const router = createRouter({ routeTree, history: memoryHistory }) ``` -Refer to the [SSR Guide](./ssr.md#server-history) for usage on the server for server-side rendering. +Refer to the [SSR Guide](../ssr.md#server-history) for usage on the server for server-side rendering. diff --git a/docs/router/framework/react/guide/navigation-blocking.md b/docs/router/framework/react/guide/navigation-blocking.md index 575c4d1442..f95b5f5f94 100644 --- a/docs/router/framework/react/guide/navigation-blocking.md +++ b/docs/router/framework/react/guide/navigation-blocking.md @@ -79,7 +79,7 @@ function MyComponent() { } ``` -You can find more information about the `useBlocker` hook in the [API reference](../api/router/useBlockerHook.md). +You can find more information about the `useBlocker` hook in the [API reference](../../api/router/useBlockerHook.md). ## Component-based blocking diff --git a/docs/router/framework/react/guide/not-found-errors.md b/docs/router/framework/react/guide/not-found-errors.md index 739e2b20cb..acf45085b6 100644 --- a/docs/router/framework/react/guide/not-found-errors.md +++ b/docs/router/framework/react/guide/not-found-errors.md @@ -256,7 +256,7 @@ export const Route = createFileRoute('/posts/$postId')({ ## Usage With SSR -See [SSR guide](./ssr.md) for more information. +See [SSR guide](../ssr.md) for more information. ## Migrating from `NotFoundRoute` diff --git a/docs/router/framework/react/guide/path-params.md b/docs/router/framework/react/guide/path-params.md index ba2d77df03..1b1399af65 100644 --- a/docs/router/framework/react/guide/path-params.md +++ b/docs/router/framework/react/guide/path-params.md @@ -68,7 +68,7 @@ function PostComponent() { } ``` -> 🧠 Quick tip: If your component is code-split, you can use the [getRouteApi function](./code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useParams()` hook. +> 🧠 Quick tip: If your component is code-split, you can use the [getRouteApi function](../code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useParams()` hook. ## Path Params outside of Routes @@ -113,7 +113,7 @@ Notice that the function style is useful when you need to persist params that ar ## Allowed Characters -By default, path params are escaped with `encodeURIComponent`. If you want to allow other valid URI characters (e.g. `@` or `+`), you can specify that in your [RouterOptions](../api/router/RouterOptionsType.md#pathparamsallowedcharacters-property) +By default, path params are escaped with `encodeURIComponent`. If you want to allow other valid URI characters (e.g. `@` or `+`), you can specify that in your [RouterOptions](../../api/router/RouterOptionsType.md#pathparamsallowedcharacters-property) Example usage: diff --git a/docs/router/framework/react/guide/route-masking.md b/docs/router/framework/react/guide/route-masking.md index b31647db81..d46dbc7f33 100644 --- a/docs/router/framework/react/guide/route-masking.md +++ b/docs/router/framework/react/guide/route-masking.md @@ -9,7 +9,7 @@ Route masking is a way to mask the actual URL of a route that gets persisted to - Navigating to a route with the search param `?showLogin=true`, but masking the URL to _not_ contain the search param - Navigating to a route with the search param `?modal=settings`, but masking the URL as `/settings' -Each of these scenarios can be achieved with route masking and even extended to support more advanced patterns like [parallel routes](./parallel-routes.md). +Each of these scenarios can be achieved with route masking and even extended to support more advanced patterns like [parallel routes](../parallel-routes.md). ## How does route masking work? diff --git a/docs/router/framework/react/guide/search-params.md b/docs/router/framework/react/guide/search-params.md index 786ea2cd67..832ce03e29 100644 --- a/docs/router/framework/react/guide/search-params.md +++ b/docs/router/framework/react/guide/search-params.md @@ -363,7 +363,7 @@ Once your search params have been validated and typed, you're finally ready to s ### Using Search Params in Loaders -Please read the [Search Params in Loaders](./data-loading.md#using-loaderdeps-to-access-search-params) section for more information about how to read search params in loaders with the `loaderDeps` option. +Please read the [Search Params in Loaders](../data-loading.md#using-loaderdeps-to-access-search-params) section for more information about how to read search params in loaders with the `loaderDeps` option. ### Search Params are inherited from Parent Routes @@ -415,7 +415,7 @@ const ProductList = () => { ``` > [!TIP] -> If your component is code-split, you can use the [getRouteApi function](./code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useSearch()` hook. +> If your component is code-split, you can use the [getRouteApi function](../code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `Route` configuration to get access to the typed `useSearch()` hook. ### Search Params outside of Route Components diff --git a/docs/router/framework/react/guide/ssr.md b/docs/router/framework/react/guide/ssr.md index 9197f03a07..d4f4f6c5da 100644 --- a/docs/router/framework/react/guide/ssr.md +++ b/docs/router/framework/react/guide/ssr.md @@ -112,7 +112,7 @@ Resolved loader data fetched by routes is automatically dehydrated and rehydrate ⚠️ If you are using deferred data streaming, you will also need to ensure that you have implemented the [SSR Streaming & Stream Transform](#streaming-ssr) pattern near the end of this guide. -For more information on how to utilize data loading and data streaming, see the [Data Loading](./data-loading.md) and [Data Streaming](../data-streaming) guides. +For more information on how to utilize data loading, see the [Data Loading](../data-loading.md) guide. ### Rendering the Application on the Server @@ -220,7 +220,7 @@ If you are using more complex data types like `Map`, `Set`, `BigInt`, etc, you m The Data Serialization API allows the usage of a custom serializer that can allow us to transparently use these data types when communicating across the network. - + ```tsx import { SuperJSON } from 'superjson' diff --git a/docs/router/framework/react/guide/tanstack-start.md b/docs/router/framework/react/guide/tanstack-start.md index a56a204e28..a44ebd195a 100644 --- a/docs/router/framework/react/guide/tanstack-start.md +++ b/docs/router/framework/react/guide/tanstack-start.md @@ -117,7 +117,7 @@ Once configuration is done, we'll have a file tree that looks like the following ## The Router Configuration This is the file that will dictate the behavior of TanStack Router used within Start for both the server and the client. Here, you can configure everything -from the default [preloading functionality](./preloading.md) to [caching staleness](./data-loading.md). +from the default [preloading functionality](../preloading.md) to [caching staleness](../data-loading.md). ```tsx // app/router.tsx diff --git a/docs/router/framework/react/guide/type-safety.md b/docs/router/framework/react/guide/type-safety.md index f6aee18a5f..f194d8779a 100644 --- a/docs/router/framework/react/guide/type-safety.md +++ b/docs/router/framework/react/guide/type-safety.md @@ -65,7 +65,7 @@ function PostsComponent() { Every hook and component that requires a context hint will have a `from` param where you can pass the ID or path of the route you are rendering within. -> 🧠 Quick tip: If your component is code-split, you can use the [getRouteApi function](./code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to pass in the `Route.fullPath` to get access to the typed `useParams()` and `useSearch()` hooks. +> 🧠 Quick tip: If your component is code-split, you can use the [getRouteApi function](../code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to pass in the `Route.fullPath` to get access to the typed `useParams()` and `useSearch()` hooks. ### What if I don't know the route? What if it's a shared component? diff --git a/docs/router/framework/react/migrate-from-react-location.md b/docs/router/framework/react/migrate-from-react-location.md index ed5914b41f..f61329b969 100644 --- a/docs/router/framework/react/migrate-from-react-location.md +++ b/docs/router/framework/react/migrate-from-react-location.md @@ -2,23 +2,23 @@ title: Migration from React Location --- -Before you begin your journey in migrating from React Location, it's important that you have a good understanding of the [Routing Concepts](./routing/routing-concepts.md) and [Design Decisions](./decisions-on-dx.md) used by TanStack Router. +Before you begin your journey in migrating from React Location, it's important that you have a good understanding of the [Routing Concepts](../routing/routing-concepts.md) and [Design Decisions](../decisions-on-dx.md) used by TanStack Router. ## Differences between React Location and TanStack Router React Location and TanStack Router share much of same design decisions concepts, but there are some key differences that you should be aware of. - React Location uses _generics_ to infer types for routes, while TanStack Router uses _module declaration merging_ to infer types. -- Route configuration in React Location is done using a single array of route definitions, while in TanStack Router, route configuration is done using a tree of route definitions starting with the [root route](./routing/routing-concepts.md#the-root-route). -- [File-based routing](./routing/file-based-routing.md) is the recommended way to define routes in TanStack Router, while React Location only allows you to define routes in a single file using a code-based approach. - - TanStack Router does support a [code-based approach](./routing/code-based-routing.md) to defining routes, but it is not recommended for most use cases. You can read more about why, over here: [why is file-based routing the preferred way to define routes?](./decisions-on-dx.md#3-why-is-file-based-routing-the-preferred-way-to-define-routes) +- Route configuration in React Location is done using a single array of route definitions, while in TanStack Router, route configuration is done using a tree of route definitions starting with the [root route](../routing/routing-concepts.md#the-root-route). +- [File-based routing](../routing/file-based-routing.md) is the recommended way to define routes in TanStack Router, while React Location only allows you to define routes in a single file using a code-based approach. + - TanStack Router does support a [code-based approach](../routing/code-based-routing.md) to defining routes, but it is not recommended for most use cases. You can read more about why, over here: [why is file-based routing the preferred way to define routes?](../decisions-on-dx.md#3-why-is-file-based-routing-the-preferred-way-to-define-routes) ## Migration guide In this guide we'll go over the process of migrating the [React Location Basic example](https://github.com/TanStack/router/tree/react-location/examples/basic) over to TanStack Router using file-based routing, with the end goal of having the same functionality as the original example (styling and other non-routing related code will be omitted). > [!TIP] -> To use a code-based approach for defining your routes, you can read the [code-based Routing](./routing/code-based-routing.md) guide. +> To use a code-based approach for defining your routes, you can read the [code-based Routing](../routing/code-based-routing.md) guide. ### Step 1: Swap over to TanStack Router's dependencies @@ -57,7 +57,7 @@ export default defineConfig({ }) ``` -However, if your application does not use Vite, you use one of our other [supported bundlers](./routing/file-based-routing.md#getting-started-with-file-based-routing), or you can use the `@tanstack/router-cli` package to watch for changes in your routes files and automatically update the routes configuration. +However, if your application does not use Vite, you use one of our other [supported bundlers](../routing/file-based-routing.md#getting-started-with-file-based-routing), or you can use the `@tanstack/router-cli` package to watch for changes in your routes files and automatically update the routes configuration. ### Step 3: Add the file-based configuration file to your project @@ -70,7 +70,7 @@ Create a `tsr.config.json` file in the root of your project with the following c } ``` -You can find the full list of options for the `tsr.config.json` file [here](./routing/file-based-routing.md#options). +You can find the full list of options for the `tsr.config.json` file [here](../routing/file-based-routing.md#options). ### Step 4: Create the routes directory @@ -249,19 +249,19 @@ You should now have successfully migrated your application from React Location t React Location also has a few more features that you might be using in your application. Here are some guides to help you migrate those features: -- [Search params](./guide/search-params.md) -- [Data loading](./guide/data-loading.md) -- [History types](./guide/history-types.md) -- [Wildcard / Splat / Catch-all routes](./routing/routing-concepts.md#splat--catch-all-routes) -- [Authenticated routes](./guide/authenticated-routes.md) +- [Search params](../guide/search-params.md) +- [Data loading](../guide/data-loading.md) +- [History types](../guide/history-types.md) +- [Wildcard / Splat / Catch-all routes](../routing/routing-concepts.md#splat--catch-all-routes) +- [Authenticated routes](../guide/authenticated-routes.md) TanStack Router also has a few more features that you might want to explore: -- [Router Context](./guide/router-context.md) -- [Preloading](./guide/preloading.md) -- [Pathless Layout Routes](./routing/routing-concepts.md#pathless-layout-routes) -- [Route masking](./guide/route-masking.md) -- [SSR](./guide/ssr.md) +- [Router Context](../guide/router-context.md) +- [Preloading](../guide/preloading.md) +- [Pathless Layout Routes](../routing/routing-concepts.md#pathless-layout-routes) +- [Route masking](../guide/route-masking.md) +- [SSR](../guide/ssr.md) - ... and more! If you are facing any issues or have any questions, feel free to ask for help in the TanStack Discord. diff --git a/docs/router/framework/react/overview.md b/docs/router/framework/react/overview.md index 9e064cf0a1..bed2f51360 100644 --- a/docs/router/framework/react/overview.md +++ b/docs/router/framework/react/overview.md @@ -44,7 +44,7 @@ It's probably no surprise at this point that picking a router is so important th TanStack Router itself is not a "framework" in the traditional sense, since it doesn't address a few other common full-stack concerns. However TanStack Router has been designed to be upgradable to a full-stack framework when used in conjunction with other tools that address bundling, deployments, and server-side-specific functionality. This is why we are currently developing [TanStack Start](https://tanstack.com/start), a full-stack framework that is built on top of TanStack Router and Vite. -For a deeper dive on the history of TanStack Router, feel free to read [TanStack Router's History](./decisions-on-dx.md#tanstack-routers-origin-story). +For a deeper dive on the history of TanStack Router, feel free to read [TanStack Router's History](../decisions-on-dx.md#tanstack-routers-origin-story). ## Why TanStack Router? diff --git a/docs/router/framework/react/quick-start.md b/docs/router/framework/react/quick-start.md index 83a36555e2..321078e999 100644 --- a/docs/router/framework/react/quick-start.md +++ b/docs/router/framework/react/quick-start.md @@ -62,7 +62,7 @@ export default defineConfig({ ``` > [!TIP] -> If you are not using Vite, or any of the supported bundlers, you can check out the [TanStack Router CLI](./routing/installation-with-router-cli.md) guide for more info. +> If you are not using Vite, or any of the supported bundlers, you can check out the [TanStack Router CLI](../routing/installation-with-router-cli.md) guide for more info. Create the following files: diff --git a/docs/router/framework/react/routing/code-based-routing.md b/docs/router/framework/react/routing/code-based-routing.md index 3adbf14ca2..41b7ee565e 100644 --- a/docs/router/framework/react/routing/code-based-routing.md +++ b/docs/router/framework/react/routing/code-based-routing.md @@ -3,18 +3,18 @@ title: Code-Based Routing --- > [!TIP] -> Code-based routing is not recommended for most applications. It is recommended to use [File-Based Routing](./file-based-routing.md) instead. +> Code-based routing is not recommended for most applications. It is recommended to use [File-Based Routing](../file-based-routing.md) instead. ## ⚠️ Before You Start -- If you're using [File-Based Routing](./file-based-routing.md), **skip this guide**. -- If you still insist on using code-based routing, you must read the [Routing Concepts](./routing-concepts.md) guide first, as it also covers core concepts of the router. +- If you're using [File-Based Routing](../file-based-routing.md), **skip this guide**. +- If you still insist on using code-based routing, you must read the [Routing Concepts](../routing-concepts.md) guide first, as it also covers core concepts of the router. ## Route Trees Code-based routing is no different from file-based routing in that it uses the same route tree concept to organize, match and compose matching routes into a component tree. The only difference is that instead of using the filesystem to organize your routes, you use code. -Let's consider the same route tree from the [Route Trees & Nesting](./route-trees.md#route-trees) guide, and convert it to code-based routing: +Let's consider the same route tree from the [Route Trees & Nesting](../route-trees.md#route-trees) guide, and convert it to code-based routing: Here is the file-based version: @@ -179,7 +179,7 @@ But before you can go ahead and build the route tree, you need to understand how Believe it or not, file-based routing is really a superset of code-based routing and uses the filesystem and a bit of code-generation abstraction on top of it to generate this structure you see above automatically. -We're going to assume you've read the [Routing Concepts](./routing-concepts.md) guide and are familiar with each of these main concepts: +We're going to assume you've read the [Routing Concepts](../routing-concepts.md) guide and are familiar with each of these main concepts: - The Root Route - Basic Routes @@ -214,7 +214,7 @@ export interface MyRouterContext { const rootRoute = createRootRouteWithContext() ``` -To learn more about Context in TanStack Router, see the [Router Context](../guide/router-context.md) guide. +To learn more about Context in TanStack Router, see the ../../guide/router-context.md guide. ## Basic Routes @@ -269,7 +269,7 @@ function PostComponent() { ``` > [!TIP] -> If your component is code-split, you can use the [getRouteApi function](./code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `postIdRoute` configuration to get access to the typed `useParams()` hook. +> If your component is code-split, you can use the [getRouteApi function](../../guide/code-splitting.md#manually-accessing-route-apis-in-other-files-with-the-getrouteapi-helper) to avoid having to import the `postIdRoute` configuration to get access to the typed `useParams()` hook. ## Splat / Catch-All Routes diff --git a/docs/router/framework/react/routing/file-based-routing.md b/docs/router/framework/react/routing/file-based-routing.md index 03e9942d7e..e4095e2b00 100644 --- a/docs/router/framework/react/routing/file-based-routing.md +++ b/docs/router/framework/react/routing/file-based-routing.md @@ -2,7 +2,7 @@ title: File-Based Routing --- -Most of the TanStack Router documentation is written for file-based routing and is intended to help you understand in more detail how to configure file-based routing and the technical details behind how it works. While file-based routing is the preferred and recommended way to configure TanStack Router, you can also use [code-based routing](./code-based-routing.md) if you prefer. +Most of the TanStack Router documentation is written for file-based routing and is intended to help you understand in more detail how to configure file-based routing and the technical details behind how it works. While file-based routing is the preferred and recommended way to configure TanStack Router, you can also use [code-based routing](../code-based-routing.md) if you prefer. ## What is File-Based Routing? @@ -96,7 +96,7 @@ See the example below: Both flat and directory routes can be mixed together to create a route tree that uses the best of both worlds where it makes sense. > [!TIP] -> If you find that the default file-based routing structure doesn't fit your needs, you can always use [Virtual File Routes](./virtual-file-routes.md) to control the source of your routes whilst still getting the awesome performance benefits of file-based routing. +> If you find that the default file-based routing structure doesn't fit your needs, you can always use [Virtual File Routes](../virtual-file-routes.md) to control the source of your routes whilst still getting the awesome performance benefits of file-based routing. ## Getting started with File-Based Routing @@ -106,13 +106,13 @@ To enable file-based routing, you'll need to be using React with a supported bun [//]: # 'SupportedBundlersList' -- [Installation with Vite](./installation-with-vite.md) -- [Installation with Rspack/Rsbuild](./installation-with-rspack.md) -- [Installation with Webpack](./installation-with-webpack.md) -- [Installation with Esbuild](./installation-with-esbuild.md) +- [Installation with Vite](../installation-with-vite.md) +- [Installation with Rspack/Rsbuild](../installation-with-rspack.md) +- [Installation with Webpack](../installation-with-webpack.md) +- [Installation with Esbuild](../installation-with-esbuild.md) [//]: # 'SupportedBundlersList' When using TanStack Router's file-based routing through one of the supported bundlers, our plugin will **automatically generate your route configuration through your bundler's dev and build processes**. It is the easiest way to use TanStack Router's route generation features. -If your bundler is not yet supported, you can reach out to us on Discord or GitHub to let us know. Till then, fear not! You can still use the [`@tanstack/router-cli`](./installation-with-router-cli.md) package to generate your route tree file. +If your bundler is not yet supported, you can reach out to us on Discord or GitHub to let us know. Till then, fear not! You can still use the [`@tanstack/router-cli`](../installation-with-router-cli.md) package to generate your route tree file. diff --git a/docs/router/framework/react/routing/file-naming-conventions.md b/docs/router/framework/react/routing/file-naming-conventions.md index 300895addc..859b05019c 100644 --- a/docs/router/framework/react/routing/file-naming-conventions.md +++ b/docs/router/framework/react/routing/file-naming-conventions.md @@ -2,21 +2,21 @@ title: File Naming Conventions --- -File-based routing requires that you follow a few simple file naming conventions to ensure that your routes are generated correctly. The concepts these conventions enable are covered in detail in the [Route Trees & Nesting](./route-trees.md) guide. - -| Feature | Description | -| ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **`__root.tsx`** | The root route file must be named `__root.tsx` and must be placed in the root of the configured `routesDirectory`. | -| **`.` Separator** | Routes can use the `.` character to denote a nested route. For example, `blog.post` will be generated as a child of `blog`. | -| **`$` Token** | Route segments with the `$` token are parameterized and will extract the value from the URL pathname as a route `param`. | -| **`_` Prefix** | Route segments with the `_` prefix are considered to be pathless layout routes and will not be used when matching its child routes against the URL pathname. | -| **`_` Suffix** | Route segments with the `_` suffix exclude the route from being nested under any parent routes. | -| **`-` Prefix** | Files and folders with the `-` prefix are excluded from the route tree. They will not be added to the `routeTree.gen.ts` file and can be used to colocate logic in route folders. | -| **`(folder)` folder name pattern** | A folder that matches this pattern is treated as a **route group**, preventing the folder from being included in the route's URL path. | -| **`index` Token** | Route segments ending with the `index` token (before any file extensions) will match the parent route when the URL pathname matches the parent route exactly. This can be configured via the `indexToken` configuration option, see [options](../../../api/file-based-routing.md#indextoken). | -| **`.route.tsx` File Type** | When using directories to organise routes, the `route` suffix can be used to create a route file at the directory's path. For example, `blog.post.route.tsx` or `blog/post/route.tsx` can be used as the route file for the `/blog/post` route. This can be configured via the `routeToken` configuration option, see [options](../../../api/file-based-routing.md#routetoken). | - -> **💡 Remember:** The file-naming conventions for your project could be affected by what [options](../../../api/file-based-routing.md) are configured. +File-based routing requires that you follow a few simple file naming conventions to ensure that your routes are generated correctly. The concepts these conventions enable are covered in detail in the [Route Trees & Nesting](../route-trees.md) guide. + +| Feature | Description | +| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **`__root.tsx`** | The root route file must be named `__root.tsx` and must be placed in the root of the configured `routesDirectory`. | +| **`.` Separator** | Routes can use the `.` character to denote a nested route. For example, `blog.post` will be generated as a child of `blog`. | +| **`$` Token** | Route segments with the `$` token are parameterized and will extract the value from the URL pathname as a route `param`. | +| **`_` Prefix** | Route segments with the `_` prefix are considered to be pathless layout routes and will not be used when matching its child routes against the URL pathname. | +| **`_` Suffix** | Route segments with the `_` suffix exclude the route from being nested under any parent routes. | +| **`-` Prefix** | Files and folders with the `-` prefix are excluded from the route tree. They will not be added to the `routeTree.gen.ts` file and can be used to colocate logic in route folders. | +| **`(folder)` folder name pattern** | A folder that matches this pattern is treated as a **route group**, preventing the folder from being included in the route's URL path. | +| **`index` Token** | Route segments ending with the `index` token (before any file extensions) will match the parent route when the URL pathname matches the parent route exactly. This can be configured via the `indexToken` configuration option, see [options](../../../../api/file-based-routing.md#indextoken). | +| **`.route.tsx` File Type** | When using directories to organise routes, the `route` suffix can be used to create a route file at the directory's path. For example, `blog.post.route.tsx` or `blog/post/route.tsx` can be used as the route file for the `/blog/post` route. This can be configured via the `routeToken` configuration option, see [options](../../../../api/file-based-routing.md#routetoken). | + +> **💡 Remember:** The file-naming conventions for your project could be affected by what [options](../../../../api/file-based-routing.md) are configured. ## Dynamic Path Params @@ -27,7 +27,7 @@ Dynamic path params can be used in both flat and directory routes to create rout | ... | ... | ... | | ʦ `posts.$postId.tsx` | `/posts/$postId` | `` | -We'll learn more about dynamic path params in the [Path Params](../guide/path-params.md) guide. +We'll learn more about dynamic path params in the [Path Params](../../guide/path-params.md) guide. ## Pathless Routes @@ -39,4 +39,4 @@ Pathless routes wrap child routes with either logic or a component without requi | ʦ `_app.a.tsx` | /a | `` | | ʦ `_app.b.tsx` | /b | `` | -To learn more about pathless routes, see the [Routing Concepts - Pathless Routes](./routing-concepts.md#pathless-layout-routes) guide. +To learn more about pathless routes, see the [Routing Concepts - Pathless Routes](../routing-concepts.md#pathless-layout-routes) guide. diff --git a/docs/router/framework/react/routing/installation-with-esbuild.md b/docs/router/framework/react/routing/installation-with-esbuild.md index da3cd9f857..0e2d275090 100644 --- a/docs/router/framework/react/routing/installation-with-esbuild.md +++ b/docs/router/framework/react/routing/installation-with-esbuild.md @@ -80,4 +80,4 @@ When using the TanStack Router Plugin with Esbuild for File-based routing, it co If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. -You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). +You can find all the available configuration options in the [File-based Routing API Reference](../../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-router-cli.md b/docs/router/framework/react/routing/installation-with-router-cli.md index c67d7c1f9c..53b94fcd6f 100644 --- a/docs/router/framework/react/routing/installation-with-router-cli.md +++ b/docs/router/framework/react/routing/installation-with-router-cli.md @@ -100,4 +100,4 @@ If these defaults work for your project, you don't need to configure anything at [//]: # 'TargetConfiguration' [//]: # 'TargetConfiguration' -You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). +You can find all the available configuration options in the [File-based Routing API Reference](../../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-rspack.md b/docs/router/framework/react/routing/installation-with-rspack.md index 741978192e..9be1cbf1b9 100644 --- a/docs/router/framework/react/routing/installation-with-rspack.md +++ b/docs/router/framework/react/routing/installation-with-rspack.md @@ -86,4 +86,4 @@ When using the TanStack Router Plugin with Rspack (or Rsbuild) for File-based ro If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. -You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). +You can find all the available configuration options in the [File-based Routing API Reference](../../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-vite.md b/docs/router/framework/react/routing/installation-with-vite.md index a860279372..5d67a12ce9 100644 --- a/docs/router/framework/react/routing/installation-with-vite.md +++ b/docs/router/framework/react/routing/installation-with-vite.md @@ -88,4 +88,4 @@ When using the TanStack Router Plugin with Vite for File-based routing, it comes If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. -You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). +You can find all the available configuration options in the [File-based Routing API Reference](../../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/installation-with-webpack.md b/docs/router/framework/react/routing/installation-with-webpack.md index e89288e2e0..d173fbecb6 100644 --- a/docs/router/framework/react/routing/installation-with-webpack.md +++ b/docs/router/framework/react/routing/installation-with-webpack.md @@ -79,4 +79,4 @@ When using the TanStack Router Plugin with Webpack for File-based routing, it co If these defaults work for your project, you don't need to configure anything at all! However, if you need to customize the configuration, you can do so by editing the configuration object passed into the `tanstackRouter` function. -You can find all the available configuration options in the [File-based Routing API Reference](../../../api/file-based-routing.md). +You can find all the available configuration options in the [File-based Routing API Reference](../../../../api/file-based-routing.md). diff --git a/docs/router/framework/react/routing/route-trees.md b/docs/router/framework/react/routing/route-trees.md index c2d9729666..6065034b73 100644 --- a/docs/router/framework/react/routing/route-trees.md +++ b/docs/router/framework/react/routing/route-trees.md @@ -6,8 +6,8 @@ TanStack Router uses a nested route tree to match up the URL with the correct co To build a route tree, TanStack Router supports: -- [File-Based Routing](./file-based-routing.md) -- [Code-Based Routing](./code-based-routing.md) +- [File-Based Routing](../file-based-routing.md) +- [Code-Based Routing](../code-based-routing.md) Both methods support the exact same core features and functionality, but **file-based routing requires less code for the same or better results**. For this reason, **file-based routing is the preferred and recommended way** to configure TanStack Router. Most of the documentation is written from the perspective of file-based routing. @@ -58,10 +58,10 @@ The above is a valid route tree configuration that can be used with TanStack Rou Route trees can be configured using a few different ways: -- [Flat Routes](./file-based-routing.md#flat-routes) -- [Directories](./file-based-routing.md#directory-routes) -- [Mixed Flat Routes and Directories](./file-based-routing.md#mixed-flat-and-directory-routes) -- [Virtual File Routes](./virtual-file-routes.md) -- [Code-Based Routes](./code-based-routing.md) +- [Flat Routes](../file-based-routing.md#flat-routes) +- [Directories](../file-based-routing.md#directory-routes) +- [Mixed Flat Routes and Directories](../file-based-routing.md#mixed-flat-and-directory-routes) +- [Virtual File Routes](../virtual-file-routes.md) +- [Code-Based Routes](../code-based-routing.md) Please be sure to check out the full documentation links above for each type of route tree, or just proceed to the next section to get started with file-based routing. diff --git a/docs/router/framework/react/routing/routing-concepts.md b/docs/router/framework/react/routing/routing-concepts.md index 8ba6969379..d28c30ec85 100644 --- a/docs/router/framework/react/routing/routing-concepts.md +++ b/docs/router/framework/react/routing/routing-concepts.md @@ -59,7 +59,7 @@ export interface MyRouterContext { export const Route = createRootRouteWithContext() ``` -To learn more about Context in TanStack Router, see the [Router Context](../guide/router-context.md) guide. +To learn more about Context in TanStack Router, see the [Router Context](../../guide/router-context.md) guide. ## Basic Routes diff --git a/docs/router/framework/solid/quick-start.md b/docs/router/framework/solid/quick-start.md index 4dd822540d..6f00501190 100644 --- a/docs/router/framework/solid/quick-start.md +++ b/docs/router/framework/solid/quick-start.md @@ -61,7 +61,7 @@ export default defineConfig({ ``` > [!TIP] -> If you are not using Vite, or any of the supported bundlers, you can check out the [TanStack Router CLI](./routing/installation-with-router-cli.md) guide for more info. +> If you are not using Vite, or any of the supported bundlers, you can check out the [TanStack Router CLI](../routing/installation-with-router-cli.md) guide for more info. Create the following files: diff --git a/docs/start/framework/react/authentication.md b/docs/start/framework/react/authentication.md index 8d4ed86236..5846ef5b72 100644 --- a/docs/start/framework/react/authentication.md +++ b/docs/start/framework/react/authentication.md @@ -27,8 +27,8 @@ Clerk is a modern authentication platform that provides a full suite of authenti - To learn more about Clerk, visit the [Clerk website](https://go.clerk.com/wOwHtuJ) - To sign up, visit the [Clerk dashboard](https://go.clerk.com/PrSDXti) -- To get started with Clerk, check out our [official Start + Clerk examples!](../examples/start-clerk-basic/) +- To get started with Clerk, check out our [official Start + Clerk examples!](https://github.com/TanStack/router/tree/main/examples/react/start-clerk-basic) ## Documentation & APIs -Documentation for implementing your own authentication logic with TanStack Start is coming soon! In the meantime, you can check out any of the `-auth` prefixed [examples](../examples) for a starting point. +Documentation for implementing your own authentication logic with TanStack Start is coming soon! In the meantime, you can check out any of the `-auth` prefixed [examples](https://github.com/TanStack/router/tree/main/examples/react) for a starting point. diff --git a/docs/start/framework/react/build-from-scratch.md b/docs/start/framework/react/build-from-scratch.md index 6143199b6c..046b928f5b 100644 --- a/docs/start/framework/react/build-from-scratch.md +++ b/docs/start/framework/react/build-from-scratch.md @@ -4,7 +4,7 @@ title: Build a Project from Scratch --- > [!NOTE] -> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](./learn-the-basics.md) guide. +> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](../learn-the-basics.md) guide. _So you want to build a TanStack Start project from scratch?_ @@ -263,4 +263,4 @@ That's it! 🤯 You've now set up a TanStack Start project and written your firs You can now run `npm run dev` to start your server and navigate to `http://localhost:3000` to see your route in action. -You want to deploy your application? Check out the [hosting guide](./hosting.md). +You want to deploy your application? Check out the [hosting guide](../hosting.md). diff --git a/docs/start/framework/react/middleware.md b/docs/start/framework/react/middleware.md index 9877da95fd..307ed6eb42 100644 --- a/docs/start/framework/react/middleware.md +++ b/docs/start/framework/react/middleware.md @@ -273,7 +273,7 @@ const requestLogger = createMiddleware({ type: 'function' }) ## Reading/Modifying the Server Response -Middleware that uses the `server` method executes in the same context as server functions, so you can follow the exact same [Server Function Context Utilities](../server-functions#server-function-context) to read and modify anything about the request headers, status codes, etc. +Middleware that uses the `server` method executes in the same context as server functions, so you can follow the exact same [Server Function Context Utilities](../server-functions.md#server-function-context) to read and modify anything about the request headers, status codes, etc. ## Modifying the Client Request diff --git a/docs/start/framework/react/quick-start.md b/docs/start/framework/react/quick-start.md index dab0590691..75913e24e2 100644 --- a/docs/start/framework/react/quick-start.md +++ b/docs/start/framework/react/quick-start.md @@ -5,7 +5,7 @@ title: Quick Start ## Impatient? -If you're impatient, you can clone and run the [Basic](../examples/start-basic) example right away with the following commands: +If you're impatient, you can clone and run the [Basic](https://github.com/TanStack/router/tree/main/examples/react/start-basic) example right away with the following commands: ```bash npx gitpick TanStack/router/tree/main/examples/react/start-basic start-basic @@ -22,16 +22,16 @@ Once you've cloned the example you want, head back to the [Learn the Basics](../ TanStack Start has load of examples to get you started. Pick one of the examples below to get started! -- [Basic](../examples/start-basic) (start-basic) -- [Basic + Auth](../examples/start-basic-auth) (start-basic-auth) -- [Counter](../examples/start-counter) (start-counter) -- [Basic + React Query](../examples/start-basic-react-query) (start-basic-react-query) -- [Clerk Auth](../examples/start-clerk-basic) (start-clerk-basic) -- [Convex + Trellaux](../examples/start-convex-trellaux) (start-convex-trellaux) -- [Supabase](../examples/start-supabase-basic) (start-supabase-basic) -- [Trellaux](../examples/start-trellaux) (start-trellaux) -- [WorkOS](../examples/start-workos) (start-workos) -- [Material UI](../examples/start-material-ui) (start-material-ui) +- [Basic](https://github.com/TanStack/router/tree/main/examples/react/start-basic) (start-basic) +- [Basic + Auth](https://github.com/TanStack/router/tree/main/examples/react/start-basic-auth) (start-basic-auth) +- [Counter](https://github.com/TanStack/router/tree/main/examples/react/start-counter) (start-counter) +- [Basic + React Query](https://github.com/TanStack/router/tree/main/examples/react/start-basic-react-query) (start-basic-react-query) +- [Clerk Auth](https://github.com/TanStack/router/tree/main/examples/react/start-clerk-basic) (start-clerk-basic) +- [Convex + Trellaux](https://github.com/TanStack/router/tree/main/examples/react/start-convex-trellaux) (start-convex-trellaux) +- [Supabase](https://github.com/TanStack/router/tree/main/examples/react/start-supabase-basic) (start-supabase-basic) +- [Trellaux](https://github.com/TanStack/router/tree/main/examples/react/start-trellaux) (start-trellaux) +- [WorkOS](https://github.com/TanStack/router/tree/main/examples/react/start-workos) (start-workos) +- [Material UI](https://github.com/TanStack/router/tree/main/examples/react/start-material-ui) (start-material-ui) ### Stackblitz @@ -58,15 +58,15 @@ Once you've clone or deployed an example, head back to the [Learn the Basics](.. While not Start-specific examples, these may help you understand more about how TanStack Router works: -- [Quickstart (file-based)](../examples/quickstart-file-based) -- [Basic (file-based)](../examples/basic-file-based) -- [Kitchen Sink (file-based)](../examples/kitchen-sink-file-based) -- [Kitchen Sink + React Query (file-based)](../examples/kitchen-sink-react-query-file-based) -- [Location Masking](../examples/location-masking) -- [Authenticated Routes](../examples/authenticated-routes) -- [Scroll Restoration](../examples/scroll-restoration) -- [Deferred Data](../examples/deferred-data) -- [Navigation Blocking](../examples/navigation-blocking) -- [View Transitions](../examples/view-transitions) -- [With tRPC](../examples/with-trpc) -- [With tRPC + React Query](../examples/with-trpc-react-query) +- [Quickstart (file-based)](https://github.com/TanStack/router/tree/main/examples/react/quickstart-file-based) +- [Basic (file-based)](https://github.com/TanStack/router/tree/main/examples/react/basic-file-based) +- [Kitchen Sink (file-based)](https://github.com/TanStack/router/tree/main/examples/react/kitchen-sink-file-based) +- [Kitchen Sink + React Query (file-based)](https://github.com/TanStack/router/tree/main/examples/react/kitchen-sink-react-query-file-based) +- [Location Masking](https://github.com/TanStack/router/tree/main/examples/react/location-masking) +- [Authenticated Routes](https://github.com/TanStack/router/tree/main/examples/react/authenticated-routes) +- [Scroll Restoration](https://github.com/TanStack/router/tree/main/examples/react/scroll-restoration) +- [Deferred Data](https://github.com/TanStack/router/tree/main/examples/react/deferred-data) +- [Navigation Blocking](https://github.com/TanStack/router/tree/main/examples/react/navigation-blocking) +- [View Transitions](https://github.com/TanStack/router/tree/main/examples/react/view-transitions) +- [With tRPC](https://github.com/TanStack/router/tree/main/examples/react/with-trpc) +- [With tRPC + React Query](https://github.com/TanStack/router/tree/main/examples/react/with-trpc-react-query) diff --git a/docs/start/framework/react/server-functions.md b/docs/start/framework/react/server-functions.md index e4d8e43a9f..2c6a075b35 100644 --- a/docs/start/framework/react/server-functions.md +++ b/docs/start/framework/react/server-functions.md @@ -32,7 +32,7 @@ Server functions can be defined anywhere in your application, but must be define ## Server Function Middleware -Server functions can use middleware to share logic, context, common operations, prerequisites, and much more. To learn more about server function middleware, be sure to read about them in the [Middleware guide](./middleware.md). +Server functions can use middleware to share logic, context, common operations, prerequisites, and much more. To learn more about server function middleware, be sure to read about them in the [Middleware guide](../middleware.md). ## Defining Server Functions diff --git a/docs/start/framework/solid/build-from-scratch.md b/docs/start/framework/solid/build-from-scratch.md index 4549c6f0ba..1e3642e9f5 100644 --- a/docs/start/framework/solid/build-from-scratch.md +++ b/docs/start/framework/solid/build-from-scratch.md @@ -4,7 +4,7 @@ title: Build a Project from Scratch --- > [!NOTE] -> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](./learn-the-basics.md) guide. +> If you chose to quick start with an example or cloned project, you can skip this guide and move on to the [Learn the Basics](../learn-the-basics.md) guide. _So you want to build a TanStack Start project from scratch?_ @@ -248,4 +248,4 @@ That's it! 🤯 You've now set up a TanStack Start project and written your firs You can now run `npm run dev` to start your server and navigate to `http://localhost:3000` to see your route in action. -You want to deploy your application? Check out the [hosting guide](./hosting.md). +You want to deploy your application? Check out the [hosting guide](../hosting.md). diff --git a/docs/start/framework/solid/quick-start.md b/docs/start/framework/solid/quick-start.md index 8d296d362c..4006381156 100644 --- a/docs/start/framework/solid/quick-start.md +++ b/docs/start/framework/solid/quick-start.md @@ -5,7 +5,7 @@ title: Quick Start ## Impatient? -If you're impatient, you can clone and run the [Basic](../examples/start-basic) example right away with the following commands: +If you're impatient, you can clone and run the [Basic](https://github.com/TanStack/router/tree/main/examples/solid/start-basic) example right away with the following commands: ```bash npx degit https://github.com/tanstack/router/examples/solid/start-basic start-basic @@ -22,8 +22,8 @@ Once you've cloned the example you want, head back to the [Learn the Basics](../ TanStack Start has load of examples to get you started. Pick one of the examples below to get started! -- [Basic](../examples/start-basic) (start-basic) -- [Bare](../examples/start-bare) (start-bare) +- [Basic](https://github.com/TanStack/router/tree/main/examples/solid/start-basic) (start-basic) +- [Bare](https://github.com/TanStack/router/tree/main/examples/solid/start-bare) (start-bare) ### Stackblitz diff --git a/package.json b/package.json index 9798cfeaba..ae737ee1cf 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "gpt-generate": "node gpt/generate.js", "set-ts-version": "node scripts/set-ts-version.js", "labeler-generate": "node scripts/generateLabelerConfig.mjs", - "cleanup-empty-packages": "node scripts/cleanup-empty-packages.mjs" + "cleanup-empty-packages": "node scripts/cleanup-empty-packages.mjs", + "verify-links": "node scripts/verify-links.ts" }, "devDependencies": { "@arethetypeswrong/cli": "^0.17.3", @@ -47,7 +48,9 @@ "eslint": "^9.22.0", "eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-unused-imports": "^4.1.4", + "fast-glob": "^3.3.3", "jsdom": "^25.0.1", + "markdown-link-extractor": "^4.0.2", "nx": "20.8.1", "prettier": "^3.5.0", "publint": "^0.3.4", @@ -57,13 +60,13 @@ "rimraf": "^6.0.1", "tinyglobby": "^0.2.12", "typescript": "^5.8.2", - "vite": "6.3.5", - "vitest": "^3.0.6", "typescript53": "npm:typescript@5.3", "typescript54": "npm:typescript@5.4", "typescript55": "npm:typescript@5.5", "typescript56": "npm:typescript@5.6", - "typescript57": "npm:typescript@5.7" + "typescript57": "npm:typescript@5.7", + "vite": "6.3.5", + "vitest": "^3.0.6" }, "resolutions": { "use-sync-external-store": "1.2.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01d24505d9..0a4ea67521 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,9 +96,15 @@ importers: eslint-plugin-unused-imports: specifier: ^4.1.4 version: 4.1.4(@typescript-eslint/eslint-plugin@8.22.0(@typescript-eslint/parser@8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2))(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2))(eslint@9.22.0(jiti@2.4.2)) + fast-glob: + specifier: ^3.3.3 + version: 3.3.3 jsdom: specifier: ^25.0.1 version: 25.0.1 + markdown-link-extractor: + specifier: ^4.0.2 + version: 4.0.2 nx: specifier: 20.8.1 version: 20.8.1(@swc/core@1.10.15(@swc/helpers@0.5.15)) @@ -11732,6 +11738,9 @@ packages: html-entities@2.5.2: resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==} + html-link-extractor@1.0.5: + resolution: {integrity: sha512-ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw==} + html-minifier-terser@6.1.0: resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==} engines: {node: '>=12'} @@ -12395,12 +12404,20 @@ packages: resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} hasBin: true + markdown-link-extractor@4.0.2: + resolution: {integrity: sha512-5cUOu4Vwx1wenJgxaudsJ8xwLUMN7747yDJX3V/L7+gi3e4MsCm7w5nbrDQQy8nEfnl4r5NV3pDXMAjhGXYXAw==} + marked-terminal@7.3.0: resolution: {integrity: sha512-t4rBvPsHc57uE/2nJOLmMbZCQ4tgAccAED3ngXQqW6g+TxA488JzJ+FK3lQkzBQOI1mRV/r/Kq+1ZlJ4D0owQw==} engines: {node: '>=16.0.0'} peerDependencies: marked: '>=1 <16' + marked@12.0.2: + resolution: {integrity: sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==} + engines: {node: '>= 18'} + hasBin: true + marked@9.1.6: resolution: {integrity: sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==} engines: {node: '>= 16'} @@ -20225,6 +20242,10 @@ snapshots: html-entities@2.5.2: {} + html-link-extractor@1.0.5: + dependencies: + cheerio: 1.0.0 + html-minifier-terser@6.1.0: dependencies: camel-case: 4.1.2 @@ -20852,6 +20873,11 @@ snapshots: punycode.js: 2.3.1 uc.micro: 2.1.0 + markdown-link-extractor@4.0.2: + dependencies: + html-link-extractor: 1.0.5 + marked: 12.0.2 + marked-terminal@7.3.0(marked@9.1.6): dependencies: ansi-escapes: 7.0.0 @@ -20863,6 +20889,8 @@ snapshots: node-emoji: 2.2.0 supports-hyperlinks: 3.1.0 + marked@12.0.2: {} + marked@9.1.6: {} math-intrinsics@1.1.0: {} diff --git a/scripts/verify-links.ts b/scripts/verify-links.ts new file mode 100644 index 0000000000..2297d9814f --- /dev/null +++ b/scripts/verify-links.ts @@ -0,0 +1,133 @@ +import { existsSync, readFileSync, statSync } from 'node:fs' +import path, { resolve } from 'node:path' +import fg from 'fast-glob' +// @ts-ignore +import markdownLinkExtractor from 'markdown-link-extractor' + +function isRelativeLink(link: string) { + return ( + link && + !link.startsWith('/') && + !link.startsWith('http://') && + !link.startsWith('https://') && + !link.startsWith('//') && + !link.startsWith('#') && + !link.startsWith('mailto:') + ) +} + +function normalizePath(p: string): string { + // Remove any trailing .md + p = p.replace(`${path.extname(p)}`, '') + return p +} + +function fileExistsForLink( + link: string, + markdownFile: string, + errors: Array, +): boolean { + // Remove hash if present + const filePart = link.split('#')[0] + // If the link is empty after removing hash, it's not a file + if (!filePart) return false + + // Normalize the markdown file path + markdownFile = normalizePath(markdownFile) + + // Normalize the path + const normalizedPath = normalizePath(filePart) + + // Resolve the path relative to the markdown file's directory + let absPath = resolve(markdownFile, normalizedPath) + + // Ensure the resolved path is within /docs + const docsRoot = resolve('docs') + if (!absPath.startsWith(docsRoot)) { + errors.push({ + link, + markdownFile, + resolvedPath: absPath, + reason: 'navigates above /docs, invalid', + }) + return false + } + + // Check if this is an example path + const isExample = absPath.includes('/examples/') + + let exists = false + + if (isExample) { + // Transform /docs/framework/{framework}/examples/ to /examples/{framework}/ + absPath = absPath.replace( + /\/docs\/framework\/([^/]+)\/examples\//, + '/examples/$1/', + ) + // For examples, we want to check if the directory exists + exists = existsSync(absPath) && statSync(absPath).isDirectory() + } else { + // For non-examples, we want to check if the .md file exists + if (!absPath.endsWith('.md')) { + absPath = `${absPath}.md` + } + exists = existsSync(absPath) + } + + if (!exists) { + errors.push({ + link, + markdownFile, + resolvedPath: absPath, + reason: 'not found', + }) + } + return exists +} + +async function findMarkdownLinks() { + // Find all markdown files in docs directory + const markdownFiles = await fg('docs/**/*.md', { + ignore: ['**/node_modules/**'], + }) + + console.log(`Found ${markdownFiles.length} markdown files\n`) + + const errors: Array = [] + + // Process each file + for (const file of markdownFiles) { + const content = readFileSync(file, 'utf-8') + const links: Array = markdownLinkExtractor(content) + + const filteredLinks = links.filter((link: any) => { + if (typeof link === 'string') { + return isRelativeLink(link) + } else if (link && typeof link.href === 'string') { + return isRelativeLink(link.href) + } + return false + }) + + if (filteredLinks.length > 0) { + filteredLinks.forEach((link: any) => { + const href = typeof link === 'string' ? link : link.href + fileExistsForLink(href, file, errors) + }) + } + } + + if (errors.length > 0) { + console.log(`\n❌ Found ${errors.length} broken links:`) + errors.forEach((err) => { + console.log( + `${err.link}\n in: ${err.markdownFile}\n path: ${err.resolvedPath}\n why: ${err.reason}\n`, + ) + }) + process.exit(1) + } else { + console.log('\n✅ No broken links found!') + } +} + +findMarkdownLinks().catch(console.error) From aa94daaa19766ab0b41bb73855d1ca041ab08a21 Mon Sep 17 00:00:00 2001 From: Yeoh Joer Date: Sat, 24 May 2025 18:20:17 +0800 Subject: [PATCH 106/126] fix: normalize router filepath (#4247) Fixes #4243 --- packages/start-plugin-core/src/plugin.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index f81cffa513..5f3a0f33da 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -237,10 +237,8 @@ function resolveVirtualEntriesPlugin( return undefined }, load(id) { - const routerFilepath = path.resolve( - startConfig.root, - startConfig.tsr.srcDirectory, - 'router', + const routerFilepath = vite.normalizePath( + path.resolve(startConfig.root, startConfig.tsr.srcDirectory, 'router'), ) if (id === '/~start/server-entry.tsx') { From 618b91fdd57e3e7309f6e07a801afd5a9130ee79 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 24 May 2025 10:26:13 +0000 Subject: [PATCH 107/126] release: v1.121.0-alpha.13 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 5890270ec2..15ac16a89a 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 66ef0112ef..a528900378 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 332d7814fd..f38aee1695 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 2515445846..bcf873254f 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 9b576131bb..d00b406bab 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 5f441c962e..496b75c7c1 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 1a0fd9771b..5941731479 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 32f8e22b8d..eb973a2eb9 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 24ff1a34ea..099da52bcc 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 978c0d29e0..fab10c0c6d 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 943a9bf2f5..d3ddd26416 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index d77e035e83..6973c14f41 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index a7b118e796..2b49577271 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 268ec51969..18e8d5bf27 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-with-query": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index db39fd2ad0..5b2201f0db 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 33cb6b1af5..eb463543bf 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 39cae89d4e..4f976508b6 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.11", "@tanstack/react-router-devtools": "^1.121.0-alpha.11", "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.12", + "@tanstack/react-start": "^1.121.0-alpha.13", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index c29098b6e8..69c4fd70b6 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.12", + "@tanstack/solid-start": "^1.121.0-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 566b40cae6..9a2ba29334 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.12", + "@tanstack/solid-start": "^1.121.0-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 5b15bcc7b1..8193a0e1e0 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.11", "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.12", + "@tanstack/solid-start": "^1.121.0-alpha.13", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index e467feebab..11a68c8e4b 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.12", + "version": "1.121.0-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d819923147..43907e9590 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.12", + "version": "1.121.0-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index b145fcb97d..e57ed5dafe 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.12", + "version": "1.121.0-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 3dadc6212d..0dbf5911cf 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.12", + "version": "1.121.0-alpha.13", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 587bcf1b47..2ac5c22195 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.12", + "version": "1.121.0-alpha.13", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 35d9c60b5599194c35743dbf6c29cdab4703eb67 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sat, 24 May 2025 20:11:43 +0200 Subject: [PATCH 108/126] merge main into alpha (#4251) Co-authored-by: Dane Grant Co-authored-by: Birk Skyum <74932975+birkskyum@users.noreply.github.com> Co-authored-by: Tanner Linsley Co-authored-by: Luis Merino Co-authored-by: ThaumRystra <9525416+ThaumRystra@users.noreply.github.com> Co-authored-by: Tanner Linsley Co-authored-by: Adam Hunter Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Leonardo Montini Co-authored-by: Joel Tannas Co-authored-by: scarf Co-authored-by: Christopher Horobin Co-authored-by: Lenz Weber-Tronic --- .../react/api/router/RouteOptionsType.md | 4 +- .../framework/react/guide/search-params.md | 12 +- .../react/routing/code-based-routing.md | 2 +- docs/start/framework/react/databases.md | 5 +- packages/react-router/src/route.tsx | 140 +++++++++++------- packages/router-core/src/RouterProvider.ts | 8 +- packages/router-core/src/index.ts | 1 + packages/router-core/src/route.ts | 45 +++--- packages/router-core/src/utils.ts | 27 +++- packages/router-core/tests/utils.test.ts | 38 +++++ .../src/TanStackRouterDevtoolsCore.tsx | 8 + packages/solid-router/src/route.tsx | 140 +++++++++++------- 12 files changed, 286 insertions(+), 144 deletions(-) diff --git a/docs/router/framework/react/api/router/RouteOptionsType.md b/docs/router/framework/react/api/router/RouteOptionsType.md index 5058dc864c..33fd10fe00 100644 --- a/docs/router/framework/react/api/router/RouteOptionsType.md +++ b/docs/router/framework/react/api/router/RouteOptionsType.md @@ -65,13 +65,13 @@ The `RouteOptions` type accepts an object with the following properties: - Search middlewares are functions that transform the search parameters when generating new links for a route or its descendants. - A search middleware is passed in the current search (if it is the first middleware to run) or is invoked by the previous middleware calling `next`. -### `parseParams` method (⚠️ deprecated) +### `parseParams` method (⚠️ deprecated, use `params.parse` instead) - Type: `(rawParams: Record) => TParams` - Optional - A function that will be called when this route is matched and passed the raw params from the current location and return valid parsed params. If this function throws, the route will be put into an error state and the error will be thrown during render. If this function does not throw, its return value will be used as the route's params and the return type will be inferred into the rest of the router. -### `stringifyParams` method (⚠️ deprecated) +### `stringifyParams` method (⚠️ deprecated, use `params.stringify` instead) - Type: `(params: TParams) => Record` - Required if `parseParams` is provided diff --git a/docs/router/framework/react/guide/search-params.md b/docs/router/framework/react/guide/search-params.md index 832ce03e29..dec1850671 100644 --- a/docs/router/framework/react/guide/search-params.md +++ b/docs/router/framework/react/guide/search-params.md @@ -587,15 +587,15 @@ export const Route = createRootRoute({ validateSearch: zodValidator(searchSchema), search: { middlewares: [ - ({search, next}) => { + ({ search, next }) => { const result = next(search) return { - rootValue: search.rootValue - ...result + rootValue: search.rootValue, + ...result, } - } - ] - } + }, + ], + }, }) ``` diff --git a/docs/router/framework/react/routing/code-based-routing.md b/docs/router/framework/react/routing/code-based-routing.md index 41b7ee565e..c4562541fd 100644 --- a/docs/router/framework/react/routing/code-based-routing.md +++ b/docs/router/framework/react/routing/code-based-routing.md @@ -214,7 +214,7 @@ export interface MyRouterContext { const rootRoute = createRootRouteWithContext() ``` -To learn more about Context in TanStack Router, see the ../../guide/router-context.md guide. +To learn more about Context in TanStack Router, see the [Router Context](../../guide/router-context.md) guide. ## Basic Routes diff --git a/docs/start/framework/react/databases.md b/docs/start/framework/react/databases.md index e2a0bc42de..39d4cd09dc 100644 --- a/docs/start/framework/react/databases.md +++ b/docs/start/framework/react/databases.md @@ -57,9 +57,10 @@ Key features that make Neon stand out: - Point-in-time restore - Web-based SQL editor - Bottomless storage - +
+
- To learn more about Neon, visit the [Neon website](https://neon.tech?utm_source=tanstack) -- To sign up, visit the [Neon dashboard](https://console.neon.tech/sign_up?utm_source=tanstack) +- To sign up, visit the [Neon dashboard](https://console.neon.tech/signup?utm_source=tanstack) ## What is Convex? diff --git a/packages/react-router/src/route.tsx b/packages/react-router/src/route.tsx index 8ec238a5b3..d3730e819e 100644 --- a/packages/react-router/src/route.tsx +++ b/packages/react-router/src/route.tsx @@ -25,9 +25,11 @@ import type { ResolveFullPath, ResolveId, ResolveParams, + RootRoute as RootRouteCore, RootRouteId, RootRouteOptions, RouteConstraints, + Route as RouteCore, RouteIds, RouteMask, RouteOptions, @@ -148,43 +150,62 @@ export class RouteApi< } export class Route< - in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, - in out TPath extends RouteConstraints['TPath'] = '/', - in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< - TParentRoute, - TPath - >, - in out TCustomId extends RouteConstraints['TCustomId'] = string, - in out TId extends RouteConstraints['TId'] = ResolveId< + in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, + in out TPath extends RouteConstraints['TPath'] = '/', + in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< + TParentRoute, + TPath + >, + in out TCustomId extends RouteConstraints['TCustomId'] = string, + in out TId extends RouteConstraints['TId'] = ResolveId< + TParentRoute, + TCustomId, + TPath + >, + in out TSearchValidator = undefined, + in out TParams = ResolveParams, + in out TRouterContext = AnyContext, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TChildren = unknown, + in out TFileRouteTypes = unknown, + > + extends BaseRoute< TParentRoute, + TPath, + TFullPath, TCustomId, - TPath - >, - in out TSearchValidator = undefined, - in out TParams = ResolveParams, - in out TRouterContext = AnyContext, - in out TRouteContextFn = AnyContext, - in out TBeforeLoadFn = AnyContext, - in out TLoaderDeps extends Record = {}, - in out TLoaderFn = undefined, - in out TChildren = unknown, - in out TFileRouteTypes = unknown, -> extends BaseRoute< - TParentRoute, - TPath, - TFullPath, - TCustomId, - TId, - TSearchValidator, - TParams, - TRouterContext, - TRouteContextFn, - TBeforeLoadFn, - TLoaderDeps, - TLoaderFn, - TChildren, - TFileRouteTypes -> { + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + implements + RouteCore< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > +{ /** * @deprecated Use the `createRoute` function instead. */ @@ -364,24 +385,37 @@ export function createRootRouteWithContext() { export const rootRouteWithContext = createRootRouteWithContext export class RootRoute< - in out TSearchValidator = undefined, - in out TRouterContext = {}, - in out TRouteContextFn = AnyContext, - in out TBeforeLoadFn = AnyContext, - in out TLoaderDeps extends Record = {}, - in out TLoaderFn = undefined, - in out TChildren = unknown, - in out TFileRouteTypes = unknown, -> extends BaseRootRoute< - TSearchValidator, - TRouterContext, - TRouteContextFn, - TBeforeLoadFn, - TLoaderDeps, - TLoaderFn, - TChildren, - TFileRouteTypes -> { + in out TSearchValidator = undefined, + in out TRouterContext = {}, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TChildren = unknown, + in out TFileRouteTypes = unknown, + > + extends BaseRootRoute< + TSearchValidator, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + implements + RootRouteCore< + TSearchValidator, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > +{ /** * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead. */ diff --git a/packages/router-core/src/RouterProvider.ts b/packages/router-core/src/RouterProvider.ts index 1c2b42ef21..972596bb12 100644 --- a/packages/router-core/src/RouterProvider.ts +++ b/packages/router-core/src/RouterProvider.ts @@ -1,11 +1,7 @@ import type { NavigateOptions, ToOptions } from './link' import type { ParsedLocation } from './location' import type { RoutePaths } from './routeInfo' -import type { - AnyRouter, - RegisteredRouter, - ViewTransitionOptions, -} from './router' +import type { RegisteredRouter, ViewTransitionOptions } from './router' export interface MatchLocation { to?: string | number | null @@ -37,7 +33,7 @@ export type NavigateFn = < ) => Promise | void export type BuildLocationFn = < - TRouter extends AnyRouter, + TRouter extends RegisteredRouter, TTo extends string | undefined, TFrom extends RoutePaths | string = string, TMaskFrom extends RoutePaths | string = TFrom, diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 9f47c3ac3a..c0dc5cb2f0 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -197,6 +197,7 @@ export type { RouteAddFileTypesFn, ResolveOptionalParams, ResolveRequiredParams, + RootRoute, } from './route' export { diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index c87b77fe9e..4d55371437 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -1304,24 +1304,7 @@ export class BaseRoute< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, -> implements - Route< - TParentRoute, - TPath, - TFullPath, - TCustomId, - TId, - TSearchValidator, - TParams, - TRouterContext, - TRouteContextFn, - TBeforeLoadFn, - TLoaderDeps, - TLoaderFn, - TChildren, - TFileRouteTypes - > -{ +> { isRoot: TParentRoute extends AnyRoute ? true : false options: RouteOptions< TParentRoute, @@ -1661,6 +1644,32 @@ export class BaseRouteApi { } } +export interface RootRoute< + in out TSearchValidator = undefined, + in out TRouterContext = {}, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TChildren = unknown, + in out TFileRouteTypes = unknown, +> extends Route< + any, // TParentRoute + '/', // TPath + '/', // TFullPath + string, // TCustomId + RootRouteId, // TId + TSearchValidator, // TSearchValidator + {}, // TParams + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, // TChildren + TFileRouteTypes + > {} + export class BaseRootRoute< in out TSearchValidator = undefined, in out TRouterContext = {}, diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 5a9c1ba71a..c100c73eeb 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -228,10 +228,18 @@ export function replaceEqualDeep(prev: any, _next: T): T { const array = isPlainArray(prev) && isPlainArray(next) - if (array || (isPlainObject(prev) && isPlainObject(next))) { - const prevItems = array ? prev : Object.keys(prev) + if (array || (isSimplePlainObject(prev) && isSimplePlainObject(next))) { + const prevItems = array + ? prev + : (Object.keys(prev) as Array).concat( + Object.getOwnPropertySymbols(prev), + ) const prevSize = prevItems.length - const nextItems = array ? next : Object.keys(next) + const nextItems = array + ? next + : (Object.keys(next) as Array).concat( + Object.getOwnPropertySymbols(next), + ) const nextSize = nextItems.length const copy: any = array ? [] : {} @@ -260,6 +268,19 @@ export function replaceEqualDeep(prev: any, _next: T): T { return next } +/** + * A wrapper around `isPlainObject` with additional checks to ensure that it is not + * only a plain object, but also one that is "clone-friendly" (doesn't have any + * non-enumerable properties). + */ +function isSimplePlainObject(o: any) { + return ( + // all the checks from isPlainObject are more likely to hit so we perform them first + isPlainObject(o) && + Object.getOwnPropertyNames(o).length === Object.keys(o).length + ) +} + // Copied from: https://github.com/jonschlinkert/is-plain-object export function isPlainObject(o: any) { if (!hasObjectPrototype(o)) { diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index 486ccf0410..562716b231 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -29,6 +29,44 @@ describe('replaceEqualDeep', () => { expect(result).toStrictEqual(obj2) }) + describe('symbol properties', () => { + it('should look at symbol properties in the object comparison', () => { + const propertyKey = Symbol('property') + const obj1 = { a: 1, [propertyKey]: 2 } + const obj2 = { a: 1, [propertyKey]: 3 } + const result = replaceEqualDeep(obj1, obj2) + expect(result).toStrictEqual(obj2) + }) + + it('should copy over symbol properties when creating a new object', () => { + const propertyKey = Symbol('property') + const obj1 = { a: 1, [propertyKey]: 2 } + const obj2 = { a: 3, [propertyKey]: 2 } + const result = replaceEqualDeep(obj1, obj2) + expect(result).toStrictEqual(obj2) + }) + }) + + describe('non-enumerable properties', () => { + it('should treat objects with non-enumerable properties as non-plain (no need for property comparisons)', () => { + const obj1: { a: number; b?: number } = { a: 1 } + Object.defineProperty(obj1, 'b', { enumerable: false, value: 2 }) + const obj2: { a: number; b?: number } = { a: 1 } + Object.defineProperty(obj2, 'b', { enumerable: false, value: 3 }) + const result = replaceEqualDeep(obj1, obj2) + expect(result).toBe(obj2) + }) + + it("should treat objects with non-enumerable properties as non-plain (copying doesn't happen)", () => { + const obj1: { a: number; b?: number } = { a: 1 } + Object.defineProperty(obj1, 'b', { enumerable: false, value: 2 }) + const obj2: { a: number; b?: number } = { a: 3 } + Object.defineProperty(obj2, 'b', { enumerable: false, value: 2 }) + const result = replaceEqualDeep(obj1, obj2) + expect(result).toBe(obj2) + }) + }) + it('should properly handle non-existent keys', () => { const obj1 = { a: 2, c: 123 } const obj2 = { a: 2, c: 123, b: undefined } diff --git a/packages/router-devtools-core/src/TanStackRouterDevtoolsCore.tsx b/packages/router-devtools-core/src/TanStackRouterDevtoolsCore.tsx index 38a99c583e..a342d01e4d 100644 --- a/packages/router-devtools-core/src/TanStackRouterDevtoolsCore.tsx +++ b/packages/router-devtools-core/src/TanStackRouterDevtoolsCore.tsx @@ -58,6 +58,7 @@ class TanStackRouterDevtoolsCore { #panelProps: any #closeButtonProps: any #toggleButtonProps: any + #containerElement?: string | any #isMounted = false #Component: any @@ -73,6 +74,7 @@ class TanStackRouterDevtoolsCore { this.#panelProps = config.panelProps this.#closeButtonProps = config.closeButtonProps this.#toggleButtonProps = config.toggleButtonProps + this.#containerElement = config.containerElement } mount(el: T) { @@ -90,6 +92,7 @@ class TanStackRouterDevtoolsCore { const panelProps = this.#panelProps const closeButtonProps = this.#closeButtonProps const toggleButtonProps = this.#toggleButtonProps + const containerElement = this.#containerElement let Devtools @@ -110,6 +113,7 @@ class TanStackRouterDevtoolsCore { panelProps={panelProps} closeButtonProps={closeButtonProps} toggleButtonProps={toggleButtonProps} + containerElement={containerElement} /> ) }, el) @@ -146,6 +150,10 @@ class TanStackRouterDevtoolsCore { if (options.shadowDOMTarget !== undefined) { this.#shadowDOMTarget = options.shadowDOMTarget } + + if (options.containerElement !== undefined) { + this.#containerElement = options.containerElement + } } } diff --git a/packages/solid-router/src/route.tsx b/packages/solid-router/src/route.tsx index a1c2762f69..5e61e3926b 100644 --- a/packages/solid-router/src/route.tsx +++ b/packages/solid-router/src/route.tsx @@ -24,9 +24,11 @@ import type { ResolveFullPath, ResolveId, ResolveParams, + RootRoute as RootRouteCore, RootRouteId, RootRouteOptions, RouteConstraints, + Route as RouteCore, RouteIds, RouteMask, RouteOptions, @@ -142,43 +144,62 @@ export class RouteApi< } export class Route< - in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, - in out TPath extends RouteConstraints['TPath'] = '/', - in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< - TParentRoute, - TPath - >, - in out TCustomId extends RouteConstraints['TCustomId'] = string, - in out TId extends RouteConstraints['TId'] = ResolveId< + in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, + in out TPath extends RouteConstraints['TPath'] = '/', + in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< + TParentRoute, + TPath + >, + in out TCustomId extends RouteConstraints['TCustomId'] = string, + in out TId extends RouteConstraints['TId'] = ResolveId< + TParentRoute, + TCustomId, + TPath + >, + in out TSearchValidator = undefined, + in out TParams = ResolveParams, + in out TRouterContext = AnyContext, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TChildren = unknown, + in out TFileRouteTypes = unknown, + > + extends BaseRoute< TParentRoute, + TPath, + TFullPath, TCustomId, - TPath - >, - in out TSearchValidator = undefined, - in out TParams = ResolveParams, - in out TRouterContext = AnyContext, - in out TRouteContextFn = AnyContext, - in out TBeforeLoadFn = AnyContext, - in out TLoaderDeps extends Record = {}, - in out TLoaderFn = undefined, - in out TChildren = unknown, - in out TFileRouteTypes = unknown, -> extends BaseRoute< - TParentRoute, - TPath, - TFullPath, - TCustomId, - TId, - TSearchValidator, - TParams, - TRouterContext, - TRouteContextFn, - TBeforeLoadFn, - TLoaderDeps, - TLoaderFn, - TChildren, - TFileRouteTypes -> { + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + implements + RouteCore< + TParentRoute, + TPath, + TFullPath, + TCustomId, + TId, + TSearchValidator, + TParams, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > +{ /** * @deprecated Use the `createRoute` function instead. */ @@ -352,24 +373,37 @@ export function createRootRouteWithContext() { export const rootRouteWithContext = createRootRouteWithContext export class RootRoute< - in out TSearchValidator = undefined, - in out TRouterContext = {}, - in out TRouteContextFn = AnyContext, - in out TBeforeLoadFn = AnyContext, - in out TLoaderDeps extends Record = {}, - in out TLoaderFn = undefined, - in out TChildren = unknown, - in out TFileRouteTypes = unknown, -> extends BaseRootRoute< - TSearchValidator, - TRouterContext, - TRouteContextFn, - TBeforeLoadFn, - TLoaderDeps, - TLoaderFn, - TChildren, - TFileRouteTypes -> { + in out TSearchValidator = undefined, + in out TRouterContext = {}, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TChildren = unknown, + in out TFileRouteTypes = unknown, + > + extends BaseRootRoute< + TSearchValidator, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > + implements + RootRouteCore< + TSearchValidator, + TRouterContext, + TRouteContextFn, + TBeforeLoadFn, + TLoaderDeps, + TLoaderFn, + TChildren, + TFileRouteTypes + > +{ /** * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead. */ From 91ef1b025209d07ed2f5215c1b677fc13be604f6 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Sun, 25 May 2025 01:13:42 +0200 Subject: [PATCH 109/126] fix: dynamically import virtual modules (#4252) --- .../src/createStartHandler.ts | 2 +- .../start-server-core/src/router-manifest.ts | 4 ++-- .../src/server-functions-handler.ts | 24 ++++++++++--------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 0765fb4cfa..ad44b6c2a7 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -106,7 +106,7 @@ export function createStartHandler({ const router = createRouter() // Attach the server-side SSR utils to the client-side router - attachRouterServerSsrUtils(router, getStartManifest()) + attachRouterServerSsrUtils(router, await getStartManifest()) // Update the client-side router with the history and context router.update({ diff --git a/packages/start-server-core/src/router-manifest.ts b/packages/start-server-core/src/router-manifest.ts index ca08026e62..393691c3e5 100644 --- a/packages/start-server-core/src/router-manifest.ts +++ b/packages/start-server-core/src/router-manifest.ts @@ -1,4 +1,3 @@ -import { tsrStartManifest } from 'tanstack-start-router-manifest:v' import { rootRouteId } from '@tanstack/router-core' declare global { @@ -12,7 +11,8 @@ declare global { * special assets that are needed for the client. It does not include relationships * between routes or any other data that is not needed for the client. */ -export function getStartManifest() { +export async function getStartManifest() { + const { tsrStartManifest } = await import('tanstack-start-router-manifest:v') const startManifest = tsrStartManifest() const rootRoute = (startManifest.routes[rootRouteId] = diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 460711e54c..836f9ac61c 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -1,19 +1,8 @@ import { isNotFound } from '@tanstack/router-core' import invariant from 'tiny-invariant' import { startSerializer } from '@tanstack/start-client-core' -// @ts-expect-error -import _serverFnManifest from 'tanstack-start-server-fn-manifest:v' import { getEvent, getResponseStatus } from './h3' -const serverFnManifest = _serverFnManifest as Record< - string, - { - functionName: string - extractedFilename: string - importer: () => Promise - } -> - function sanitizeBase(base: string | undefined) { if (!base) { throw new Error( @@ -53,6 +42,19 @@ export const handleServerAction = async ({ request }: { request: Request }) => { throw new Error('Invalid server action param for serverFnId: ' + serverFnId) } + const { default: _serverFnManifest } = await import( + // @ts-expect-error + 'tanstack-start-server-fn-manifest:v' + ) + + const serverFnManifest = _serverFnManifest as Record< + string, + { + functionName: string + extractedFilename: string + importer: () => Promise + } + > const serverFnInfo = serverFnManifest[serverFnId] if (!serverFnInfo) { From b3dae311cc84344fadc22ec22d7061ce7ecb0d3a Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sat, 24 May 2025 23:16:07 +0000 Subject: [PATCH 110/126] release: v1.121.0-alpha.14 --- .../package.json | 6 ++--- .../react/authenticated-routes/package.json | 6 ++--- .../basic-default-search-params/package.json | 4 ++-- .../react/basic-devtools-panel/package.json | 4 ++-- examples/react/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-react-query-file-based/package.json | 6 ++--- examples/react/basic-react-query/package.json | 4 ++-- .../basic-virtual-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/basic/package.json | 4 ++-- examples/react/deferred-data/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../package.json | 6 ++--- .../kitchen-sink-react-query/package.json | 4 ++-- examples/react/kitchen-sink/package.json | 4 ++-- examples/react/large-file-based/package.json | 6 ++--- examples/react/location-masking/package.json | 4 ++-- .../react/navigation-blocking/package.json | 4 ++-- .../package.json | 6 ++--- .../react/quickstart-file-based/package.json | 6 ++--- .../quickstart-rspack-file-based/package.json | 6 ++--- .../package.json | 6 ++--- examples/react/quickstart/package.json | 4 ++-- .../router-monorepo-react-query/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../router-monorepo-simple-lazy/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/router-monorepo-simple/package.json | 6 ++--- .../packages/app/package.json | 2 +- .../packages/router/package.json | 4 ++-- .../react/scroll-restoration/package.json | 4 ++-- .../search-validator-adapters/package.json | 12 +++++----- examples/react/start-bare/package.json | 6 ++--- examples/react/start-basic-auth/package.json | 6 ++--- .../start-basic-react-query/package.json | 8 +++---- examples/react/start-basic-rsc/package.json | 6 ++--- .../react/start-basic-static/package.json | 6 ++--- examples/react/start-basic/package.json | 6 ++--- examples/react/start-clerk-basic/package.json | 6 ++--- .../react/start-convex-trellaux/package.json | 8 +++---- examples/react/start-counter/package.json | 6 ++--- examples/react/start-large/package.json | 6 ++--- examples/react/start-material-ui/package.json | 6 ++--- .../react/start-supabase-basic/package.json | 6 ++--- examples/react/start-tailwind-v4/package.json | 6 ++--- examples/react/start-trellaux/package.json | 8 +++---- examples/react/start-workos/package.json | 6 ++--- examples/react/view-transitions/package.json | 6 ++--- .../react/with-framer-motion/package.json | 4 ++-- .../react/with-trpc-react-query/package.json | 8 +++---- examples/react/with-trpc/package.json | 8 +++---- .../solid/basic-devtools-panel/package.json | 4 ++-- examples/solid/basic-file-based/package.json | 6 ++--- .../basic-non-nested-devtools/package.json | 4 ++-- .../basic-solid-query-file-based/package.json | 6 ++--- examples/solid/basic-solid-query/package.json | 6 ++--- examples/solid/basic/package.json | 4 ++-- .../kitchen-sink-file-based/package.json | 6 ++--- .../solid/quickstart-file-based/package.json | 6 ++--- examples/solid/start-bare/package.json | 6 ++--- .../solid/start-basic-static/package.json | 6 ++--- examples/solid/start-basic/package.json | 6 ++--- packages/arktype-adapter/package.json | 2 +- packages/react-router-devtools/package.json | 2 +- packages/react-router-with-query/package.json | 2 +- packages/react-router/package.json | 2 +- packages/react-start-client/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/router-cli/package.json | 2 +- packages/router-core/package.json | 2 +- packages/router-devtools-core/package.json | 2 +- packages/router-devtools/package.json | 2 +- packages/router-generator/package.json | 2 +- packages/router-plugin/package.json | 2 +- packages/router-vite-plugin/package.json | 2 +- packages/solid-router-devtools/package.json | 2 +- packages/solid-router/package.json | 2 +- packages/solid-start-client/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-client-core/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/valibot-adapter/package.json | 2 +- packages/zod-adapter/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 94 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 37761f7ba5..340ac49348 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "autoprefixer": "^10.4.20", "firebase": "^11.4.0", "postcss": "^8.5.1", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index ae8d80c341..108b66b1b8 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index c4d9cd5f00..b8f63cb95f 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 6a2aa47b6d..b16a1d1e2d 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/react-query-devtools": "^5.67.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index cca2d77598..a4a61164e3 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index b59b7bddca..5aab2b314d 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index 21bb9abc0f..8c3af77f92 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 9e4b8b2864..89c83442f3 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 9a1057e796..01fd73a681 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index dbf01cdbbb..4074901dd9 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "@tanstack/virtual-file-routes": "^1.121.0-alpha.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index e73765ad27..9b8c4fac19 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index 7210b7dbdc..eb82806d3f 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index fbae548a37..f0055fe7f5 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index a7e356dc9a..7de2aa3851 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -11,9 +11,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 34a718e4cc..24053124c5 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index 11852f182b..8a0f66c093 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index 05c6f9eecd..71dda9a65f 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 49505885d8..88925991c8 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@radix-ui/react-dialog": "^1.1.6", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index eda61f2fb0..b92699fa0c 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index e8c111dc57..368440f617 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index b73ee47307..bfb0aea091 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 12d6553320..356c27b9da 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -8,8 +8,8 @@ "preview": "rsbuild preview" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", @@ -19,7 +19,7 @@ "devDependencies": { "@rsbuild/core": "1.2.4", "@rsbuild/plugin-react": "1.1.0", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "typescript": "^5.6.2" diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index f78e449fab..63b9cd2f34 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.10.15", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index fe145d93c0..9323c679ff 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index ce390184f4..dda29897f8 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 9ad56dbae2..e718ca7cd0 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -20,7 +20,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 411d7d396b..ed235257f8 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "@router-mono-react-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^3.24.2", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index b7668b2185..85c7ea1ffe 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index cf58cd6adf..362b359e22 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", "tailwindcss": "^3.4.17", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 66eeae2383..4c4ab475fa 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 1d8fc320e1..813b52718e 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index dfc0cc4081..a1c651f291 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5.7.2", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "vite": "^6.3.5", "postcss": "^8.5.1", "autoprefixer": "^10.4.20", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index f7f253a0a6..f0355e9509 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.121.0-alpha.1", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "redaxios": "^0.5.1", "zod": "^3.24.2", "react": "^19.0.0", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index f10caa054d..3a00b4f82e 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-virtual": "^3.13.0", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "postcss": "^8.5.1", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index ebdfc391cb..313ccc9e19 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -10,13 +10,13 @@ "test:unit": "vitest" }, "dependencies": { - "@tanstack/arktype-adapter": "^1.121.0-alpha.11", + "@tanstack/arktype-adapter": "^1.121.0-alpha.14", "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/valibot-adapter": "^1.121.0-alpha.11", - "@tanstack/zod-adapter": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", + "@tanstack/valibot-adapter": "^1.121.0-alpha.14", + "@tanstack/zod-adapter": "^1.121.0-alpha.14", "arktype": "^2.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 15ac16a89a..b294c33a21 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index a528900378..f6ce2211cf 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@prisma/client": "5.22.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index f38aee1695..96f6ee465c 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-with-query": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-with-query": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index bcf873254f..de521d11cc 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@babel/plugin-syntax-typescript": "^7.25.9", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index d00b406bab..9fd5cd3481 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 496b75c7c1..1039b719d9 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 5941731479..9688d87230 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@clerk/tanstack-react-start": "0.12.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index eb973a2eb9..cbbb0630a3 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -14,10 +14,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-with-query": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-with-query": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 099da52bcc..9feab93eaf 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index fab10c0c6d..c68d108d5b 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index d3ddd26416..a09670a85c 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -14,9 +14,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 6973c14f41..cc1b51dc9e 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 2b49577271..1394e9687d 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -9,9 +9,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 18e8d5bf27..5744dabd73 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -11,10 +11,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-with-query": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-with-query": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 5b2201f0db..8d5733da0a 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.2.1", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index b1afc49790..6acf05fd4c 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -9,9 +9,9 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 1d4c3f179c..a4815d1258 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index eb463543bf..6a9e27c875 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -10,10 +10,10 @@ "dependencies": { "@tanstack/react-query": "^5.66.0", "@tanstack/react-query-devtools": "^5.66.0", - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 4f976508b6..15fbe715fc 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -8,10 +8,10 @@ "start": "vite start" }, "dependencies": { - "@tanstack/react-router": "^1.121.0-alpha.11", - "@tanstack/react-router-devtools": "^1.121.0-alpha.11", - "@tanstack/router-plugin": "^1.121.0-alpha.11", - "@tanstack/react-start": "^1.121.0-alpha.13", + "@tanstack/react-router": "^1.121.0-alpha.14", + "@tanstack/react-router-devtools": "^1.121.0-alpha.14", + "@tanstack/router-plugin": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.14", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 64117109b7..6ad684931c 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index 8e8fdb676a..a09b50256e 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index d4437db5db..c5e93ebf5d 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 0c88c30965..386056cd57 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -12,8 +12,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -22,7 +22,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 850740c6cd..63e2026a78 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tanstack/solid-query": "^5.71.9", "@tanstack/solid-query-devtools": "^5.71.9", - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "postcss": "^8.5.1", @@ -20,7 +20,7 @@ "tailwindcss": "^3.4.17" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 9ea2c27c89..9d02c9732c 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "redaxios": "^0.5.1", "postcss": "^8.5.1", "solid-js": "^1.9.5", diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 6463e257dc..b2686584e0 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "immer": "^10.1.1", "solid-js": "^1.9.5", "redaxios": "^0.5.1", @@ -20,7 +20,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index ca737eafb4..0177c4e814 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", "redaxios": "^0.5.1", @@ -19,7 +19,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.121.0-alpha.11", + "@tanstack/router-plugin": "^1.121.0-alpha.14", "typescript": "^5.7.2", "vite": "^6.3.5", "vite-plugin-solid": "^2.11.2" diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 69c4fd70b6..57d78e58fb 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.13", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 9a2ba29334..fd88204f0e 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.13", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 8193a0e1e0..5b63c954db 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -9,9 +9,9 @@ "start": "vite start" }, "dependencies": { - "@tanstack/solid-router": "^1.121.0-alpha.11", - "@tanstack/solid-router-devtools": "^1.121.0-alpha.11", - "@tanstack/solid-start": "^1.121.0-alpha.13", + "@tanstack/solid-router": "^1.121.0-alpha.14", + "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.14", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/arktype-adapter/package.json b/packages/arktype-adapter/package.json index 56c99f6f71..16c143b440 100644 --- a/packages/arktype-adapter/package.json +++ b/packages/arktype-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/arktype-adapter", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 8f70f10dd8..b0c82b2f0d 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-with-query/package.json b/packages/react-router-with-query/package.json index d841497993..6f8e28de63 100644 --- a/packages/react-router-with-query/package.json +++ b/packages/react-router-with-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-with-query", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index d824933002..03d7d3b770 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 5680a185b4..245e7c8abc 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 11a68c8e4b..320fa79f22 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.13", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index a845a9d8e1..4fa57d90da 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 43907e9590..d012d53564 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.13", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index fd4a56148c..47dbcb1ba4 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/package.json b/packages/router-core/package.json index c691a964c0..5a3ea10fd7 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 642c67fa8a..3e8a58b4a3 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 549286718d..e54fa6227b 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index 00328a6322..da6df479c5 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index fdecca8cbc..d41bce2185 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index a488997804..21e4f15c88 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 3bd71ac5e1..eefaa42146 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 029d21e039..5846b7df98 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 56892f83ac..f71ce8695a 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index e57ed5dafe..ae8c58d1d6 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.13", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 78c3f1e528..83dd5279dc 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 0dbf5911cf..65681d1575 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.13", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index 195dc61f68..1780dc0ebc 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 2ac5c22195..3b1c5f87d9 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.13", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index e0cc77ac12..b1697bc08b 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index d5967dbb63..01580d8dae 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json index 95036205f3..2bf31447f0 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/start-server-functions-fetcher/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-fetcher", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/valibot-adapter/package.json b/packages/valibot-adapter/package.json index a4a1f39051..cae3cf4dd4 100644 --- a/packages/valibot-adapter/package.json +++ b/packages/valibot-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/valibot-adapter", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/zod-adapter/package.json b/packages/zod-adapter/package.json index 6cb58750f5..9786ba28d8 100644 --- a/packages/zod-adapter/package.json +++ b/packages/zod-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/zod-adapter", - "version": "1.121.0-alpha.11", + "version": "1.121.0-alpha.14", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a4ea67521..2b2b0a9245 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5124,7 +5124,7 @@ importers: examples/solid/basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5164,7 +5164,7 @@ importers: examples/solid/basic-devtools-panel: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5198,7 +5198,7 @@ importers: examples/solid/basic-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5238,7 +5238,7 @@ importers: examples/solid/basic-non-nested-devtools: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5284,7 +5284,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5327,7 +5327,7 @@ importers: specifier: ^5.71.9 version: 5.72.2(@tanstack/solid-query@5.72.2(solid-js@1.9.5))(solid-js@1.9.5) '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5367,7 +5367,7 @@ importers: examples/solid/kitchen-sink-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5410,7 +5410,7 @@ importers: examples/solid/quickstart-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5450,7 +5450,7 @@ importers: examples/solid/start-bare: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5499,7 +5499,7 @@ importers: examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -5542,7 +5542,7 @@ importers: examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.121.0-alpha.11 + specifier: ^1.121.0-alpha.14 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ From e165d602b077632dcf9a2bbbb114808ad2c9a23a Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Sun, 25 May 2025 13:13:56 +1200 Subject: [PATCH 111/126] refactor: rename internal functions and limit deploy bundler defaults (#4253) --- packages/react-start-plugin/src/index.ts | 6 +++--- packages/solid-start-plugin/src/index.ts | 6 +++--- .../src/nitro/nitro-plugin.ts | 10 ++++++++- packages/start-plugin-core/src/plugin.ts | 12 +++++------ .../src/server-functions-handler.ts | 21 ++++++++++--------- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/packages/react-start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts index 6170d72698..af5a1bad72 100644 --- a/packages/react-start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -21,10 +21,10 @@ export function TanStackStartVitePlugin( TanStackStartVitePluginCore( { framework: 'react', - getVirtualServerHandlerEntry(ctx) { + getVirtualServerRootHandler(ctx) { return ` import { toWebRequest, defineEventHandler } from '@tanstack/react-start/server'; -import serverEntry from '${ctx.ssrEntryFilepath}'; +import serverEntry from '${ctx.serverEntryFilepath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); @@ -49,7 +49,7 @@ startTransition(() => { ); });` }, - getVirtualSsrEntry(ctx) { + getVirtualServerEntry(ctx) { return ` import { createStartHandler, defaultStreamHandler } from '@tanstack/react-start/server'; import { createRouter } from '${ctx.routerFilepath}'; diff --git a/packages/solid-start-plugin/src/index.ts b/packages/solid-start-plugin/src/index.ts index 586b5ee425..4b64f632a5 100644 --- a/packages/solid-start-plugin/src/index.ts +++ b/packages/solid-start-plugin/src/index.ts @@ -21,10 +21,10 @@ export function TanStackStartVitePlugin( TanStackStartVitePluginCore( { framework: 'solid', - getVirtualServerHandlerEntry(ctx) { + getVirtualServerRootHandler(ctx) { return ` import { toWebRequest, defineEventHandler } from '@tanstack/solid-start/server'; -import serverEntry from '${ctx.ssrEntryFilepath}'; +import serverEntry from '${ctx.serverEntryFilepath}'; export default defineEventHandler(function(event) { const request = toWebRequest(event); @@ -41,7 +41,7 @@ const router = createRouter(); hydrate(() => , document.body);` }, - getVirtualSsrEntry(ctx) { + getVirtualServerEntry(ctx) { return ` import { createStartHandler, defaultStreamHandler } from '@tanstack/solid-start/server'; import { createRouter } from '${ctx.routerFilepath}'; diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 2e8df9fad3..d1606b4c3c 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -72,7 +72,7 @@ export function nitroPlugin( const nitroConfig: NitroConfig = { dev: false, - // TODO do we need this? should this be made configurable? + // TODO: do we need this? should this be made configurable? compatibilityDate: '2024-11-19', logLevel: 3, preset: buildPreset, @@ -86,9 +86,17 @@ export function nitroPlugin( }, prerender: undefined, renderer: ssrEntryFile, + plugins: [], // Nitro's plugins + appConfigFiles: [], + scanDirs: [], + imports: false, // unjs/unimport for global/magic imports rollupConfig: { plugins: [virtualBundlePlugin(getSsrBundle())], }, + virtual: { + // This is Nitro's way of defining virtual modules + // Should we define the ones for TanStack Start's here as well? + }, } const nitro = await createNitro(nitroConfig) diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 5f3a0f33da..3049fbe74c 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -35,11 +35,11 @@ export const ssrEntryFile = 'ssr.mjs' export interface TanStackStartVitePluginCoreOptions { framework: CompileStartFrameworkOptions - getVirtualServerHandlerEntry: (ctx: { + getVirtualServerRootHandler: (ctx: { routerFilepath: string - ssrEntryFilepath: string + serverEntryFilepath: string }) => string - getVirtualSsrEntry: (ctx: { routerFilepath: string }) => string + getVirtualServerEntry: (ctx: { routerFilepath: string }) => string getVirtualClientEntry: (ctx: { routerFilepath: string }) => string } // this needs to live outside of the TanStackStartVitePluginCore since it will be invoked multiple times by vite @@ -250,9 +250,9 @@ function resolveVirtualEntriesPlugin( path.resolve(resolvedConfig.root, startConfig.serverEntryPath), ) - return opts.getVirtualServerHandlerEntry({ + return opts.getVirtualServerRootHandler({ routerFilepath, - ssrEntryFilepath, + serverEntryFilepath: ssrEntryFilepath, }) } @@ -261,7 +261,7 @@ function resolveVirtualEntriesPlugin( } if (id === '/~start/default-server-entry.tsx') { - return opts.getVirtualSsrEntry({ routerFilepath }) + return opts.getVirtualServerEntry({ routerFilepath }) } return undefined diff --git a/packages/start-server-core/src/server-functions-handler.ts b/packages/start-server-core/src/server-functions-handler.ts index 836f9ac61c..82d502ba16 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -42,19 +42,20 @@ export const handleServerAction = async ({ request }: { request: Request }) => { throw new Error('Invalid server action param for serverFnId: ' + serverFnId) } - const { default: _serverFnManifest } = await import( + const { default: serverFnManifest } = (await import( // @ts-expect-error 'tanstack-start-server-fn-manifest:v' - ) + )) as { + default: Record< + string, + { + functionName: string + extractedFilename: string + importer: () => Promise + } + > + } - const serverFnManifest = _serverFnManifest as Record< - string, - { - functionName: string - extractedFilename: string - importer: () => Promise - } - > const serverFnInfo = serverFnManifest[serverFnId] if (!serverFnInfo) { From 7e7b4366b4ea87bb052e1326eef9acb344cc623f Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Sun, 25 May 2025 01:15:12 +0000 Subject: [PATCH 112/126] release: v1.121.0-alpha.15 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index b294c33a21..48d118c928 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index f6ce2211cf..ea10e10ff4 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 96f6ee465c..621ed9fc40 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index de521d11cc..958b66ff96 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 9fd5cd3481..77e92a1fda 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 1039b719d9..02fa341b01 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 9688d87230..d7cb1752c3 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index cbbb0630a3..cfaf3da4b2 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 9feab93eaf..e6d8dbe696 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index c68d108d5b..32e2d8917c 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index a09670a85c..34bc98655c 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index cc1b51dc9e..9571f94f18 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 1394e9687d..4377eb4e82 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 5744dabd73..b4826876d4 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 8d5733da0a..06f535a342 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 6a9e27c875..9e633c6d27 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 15fbe715fc..deb4f6c30e 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.14", + "@tanstack/react-start": "^1.121.0-alpha.15", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 57d78e58fb..67ffa8e3f1 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index fd88204f0e..7bb1d85af7 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 5b63c954db..592682faad 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.14", + "@tanstack/solid-start": "^1.121.0-alpha.15", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 320fa79f22..b7fe7c1b6f 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 4fa57d90da..35fcd83154 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index d012d53564..bf20542a73 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index ae8c58d1d6..81fd692118 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 83dd5279dc..497843dcb6 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 65681d1575..17121fe910 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 3b1c5f87d9..69c770a1a5 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index b1697bc08b..f4a7318785 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.15", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 5aa342437389cd9c5e484ecb0129d4a890cce380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Larramendi?= <30437204+ilarramendi@users.noreply.github.com> Date: Sun, 25 May 2025 23:20:07 -0300 Subject: [PATCH 113/126] fix(start-plugin-core): recursively import CSS assets (#4254) Co-authored-by: SeanCassiere <33615041+SeanCassiere@users.noreply.github.com> --- .../react/start-bare/src/routes/__root.tsx | 4 +- .../react/start-bare/src/routes/about.tsx | 3 ++ .../react/start-bare/src/routes/index.tsx | 2 - .../src/routesManifestPlugin.ts | 54 +++++++++++-------- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/src/routes/__root.tsx b/examples/react/start-bare/src/routes/__root.tsx index bf930f435a..c9872be2c7 100644 --- a/examples/react/start-bare/src/routes/__root.tsx +++ b/examples/react/start-bare/src/routes/__root.tsx @@ -1,13 +1,13 @@ +import * as React from 'react' import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import { - createRootRoute, HeadContent, Link, Outlet, Scripts, + createRootRoute, } from '@tanstack/react-router' import appCss from '~/styles/app.css?url' -import * as React from 'react' export const Route = createRootRoute({ head: () => ({ diff --git a/examples/react/start-bare/src/routes/about.tsx b/examples/react/start-bare/src/routes/about.tsx index f0d5d234a0..25cb18b1ea 100644 --- a/examples/react/start-bare/src/routes/about.tsx +++ b/examples/react/start-bare/src/routes/about.tsx @@ -1,3 +1,5 @@ +import Counter from '~/components/Counter' + export const Route = createFileRoute({ component: RouteComponent, }) @@ -6,6 +8,7 @@ function RouteComponent() { return (

About

+
) } diff --git a/examples/react/start-bare/src/routes/index.tsx b/examples/react/start-bare/src/routes/index.tsx index bd87c0bf42..a415539bdb 100644 --- a/examples/react/start-bare/src/routes/index.tsx +++ b/examples/react/start-bare/src/routes/index.tsx @@ -1,4 +1,3 @@ -import Counter from '~/components/Counter' export const Route = createFileRoute({ component: RouteComponent, }) @@ -7,7 +6,6 @@ function RouteComponent() { return (

Hello world!

-
) } diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/routesManifestPlugin.ts index c46dbb4577..1abdd288e0 100644 --- a/packages/start-plugin-core/src/routesManifestPlugin.ts +++ b/packages/start-plugin-core/src/routesManifestPlugin.ts @@ -12,6 +12,35 @@ import type { import type { Manifest, RouterManagedTag } from '@tanstack/router-core' import type { TanStackStartOutputConfig } from './plugin' +const getCSSRecursively = ( + file: ViteManifestChunk, + filesByRouteFilePath: ViteManifest, +) => { + const result: Array = [] + + // Get all css imports from the file + for (const cssFile of file.css ?? []) { + result.push({ + tag: 'link', + attrs: { + rel: 'stylesheet', + href: joinURL('/', cssFile), + type: 'text/css', + }, + }) + } + + // Recursively get CSS from imports + for (const imp of file.imports ?? []) { + const importInfo = filesByRouteFilePath[imp] + if (importInfo) { + result.push(...getCSSRecursively(importInfo, filesByRouteFilePath)) + } + } + + return result +} + export function startManifestPlugin( opts: TanStackStartOutputConfig, ): PluginOption { @@ -127,17 +156,7 @@ export function startManifestPlugin( preloads.unshift(path.join('/', file.file)) } - const cssFiles = file.css ?? [] - const cssAssetsList: Array = cssFiles.map( - (cssFile) => ({ - tag: 'link', - attrs: { - rel: 'stylesheet', - href: joinURL('/', cssFile), - type: 'text/css', - }, - }), - ) + const cssAssetsList = getCSSRecursively(file, filesByRouteFilePath) routes[k] = { ...v, @@ -157,16 +176,9 @@ export function startManifestPlugin( // Gather all the CSS files from the entry file in // the `css` key and add them to the root route - const entryCssFiles = entryFile.css ?? [] - const entryCssAssetsList: Array = entryCssFiles.map( - (cssFile) => ({ - tag: 'link', - attrs: { - rel: 'stylesheet', - href: joinURL('/', cssFile), - type: 'text/css', - }, - }), + const entryCssAssetsList = getCSSRecursively( + entryFile, + filesByRouteFilePath, ) routes[rootRouteId]!.assets = [ From e95834e5aad46ceff1aa4b427f75ba4fe6f8c785 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Mon, 26 May 2025 02:26:44 +0000 Subject: [PATCH 114/126] release: v1.121.0-alpha.16 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 48d118c928..386fdc77c4 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index ea10e10ff4..2eeecad873 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 621ed9fc40..68e4982f8b 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 958b66ff96..babf39ae6f 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 77e92a1fda..4cbdfda6a0 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 02fa341b01..b5c2f595f5 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index d7cb1752c3..a668964a50 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index cfaf3da4b2..1e51dad3a6 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index e6d8dbe696..7f0076eb05 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 32e2d8917c..ea16be9208 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 34bc98655c..6d24f368f2 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 9571f94f18..59396dcd2e 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 4377eb4e82..95c1584b96 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index b4826876d4..56ef209e7d 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 06f535a342..77446a9a1c 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 9e633c6d27..a05ddbb7f8 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index deb4f6c30e..4bdd0065b7 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.15", + "@tanstack/react-start": "^1.121.0-alpha.16", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 67ffa8e3f1..a7e3ac8df3 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.15", + "@tanstack/solid-start": "^1.121.0-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 7bb1d85af7..1480f3ce83 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.15", + "@tanstack/solid-start": "^1.121.0-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 592682faad..6a47e5b7b4 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.15", + "@tanstack/solid-start": "^1.121.0-alpha.16", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index b7fe7c1b6f..25a5203bd1 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index bf20542a73..5de8d55bdd 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index 81fd692118..cff0de969c 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.16", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 17121fe910..f1f6f68cd8 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.16", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 69c770a1a5..fdbdb23ccc 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.16", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 481582ea9265954081a1453e067c197747a16fe1 Mon Sep 17 00:00:00 2001 From: chorobin Date: Tue, 27 May 2025 00:26:39 +0200 Subject: [PATCH 115/126] refactor: use createStart --- examples/react/start-basic/src/router.tsx | 15 +- packages/react-start-client/src/index.tsx | 2 + packages/router-core/src/index.ts | 11 +- packages/router-core/src/router.ts | 5 - packages/router-core/src/start.ts | 26 +++ .../start-client-core/src/createMiddleware.ts | 120 ++++++-------- .../start-client-core/src/createServerFn.ts | 151 ++++++++---------- packages/start-client-core/src/createStart.ts | 17 ++ packages/start-client-core/src/index.tsx | 6 + 9 files changed, 196 insertions(+), 157 deletions(-) create mode 100644 packages/router-core/src/start.ts create mode 100644 packages/start-client-core/src/createStart.ts diff --git a/examples/react/start-basic/src/router.tsx b/examples/react/start-basic/src/router.tsx index 4e94c73aa4..e0b6ee8792 100644 --- a/examples/react/start-basic/src/router.tsx +++ b/examples/react/start-basic/src/router.tsx @@ -4,7 +4,7 @@ import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' import { NotFound } from './components/NotFound' import { serovalSerializer } from '@tanstack/react-router' import { FormDataPlugin, HeadersPlugin } from 'seroval-plugins/web' -import { createServerFn } from '@tanstack/react-start' +import { createServerFn, createStart } from '@tanstack/react-start' const fn = createServerFn().handler(() => { return { @@ -20,14 +20,21 @@ export function createRouter() { defaultErrorComponent: DefaultCatchBoundary, defaultNotFoundComponent: () => , scrollRestoration: true, - serializer: serovalSerializer({ - plugins: [FormDataPlugin, HeadersPlugin], - }), }) return router } +const start = createStart({ + serializer: serovalSerializer({ plugins: [FormDataPlugin, HeadersPlugin] }), +}) + +declare module '@tanstack/react-start' { + interface Register { + start: typeof start + } +} + declare module '@tanstack/react-router' { interface Register { router: ReturnType diff --git a/packages/react-start-client/src/index.tsx b/packages/react-start-client/src/index.tsx index 3aebc26282..a8e54ab40f 100644 --- a/packages/react-start-client/src/index.tsx +++ b/packages/react-start-client/src/index.tsx @@ -9,6 +9,7 @@ export { serverOnly, clientOnly, json, + createStart, } from '@tanstack/start-client-core' export { type DehydratedRouter, @@ -60,6 +61,7 @@ export { type FunctionMiddlewareServerFnOptions, type FunctionMiddlewareServerNextFn, type FunctionServerResultWithContext, + type Register, } from '@tanstack/start-client-core' export { Meta } from './Meta' export { Scripts } from './Scripts' diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 24a183182e..bc5698c179 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -261,7 +261,6 @@ export type { ServerSrr, ClearCacheFn, CreateRouterFn, - InferSerializer, } from './router' export type { @@ -423,3 +422,13 @@ export type { ValidateUseSearchResult, ValidateUseParamsResult, } from './typePrimitives' + +export type { + CreateStartConfig, + StartConfig, + StartConfigTypes, + DefaultStartRegister, + StartRegister, + AnyStartConfig, + InferSerializer, +} from './start' diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index b0efe62ca4..f9de28cc3c 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -505,11 +505,6 @@ export type RouterContextOptions = context: InferRouterContext } -export type InferSerializer = - unknown extends NonNullable - ? SerovalSerializer - : NonNullable - export type RouterConstructorOptions< TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, diff --git a/packages/router-core/src/start.ts b/packages/router-core/src/start.ts new file mode 100644 index 0000000000..e024eb2756 --- /dev/null +++ b/packages/router-core/src/start.ts @@ -0,0 +1,26 @@ +import type { Serializer, SerovalTypeSerializer } from './serializer' + +export interface StartConfigTypes { + serializer: TSerializer +} + +export interface StartConfig { + _types: StartConfigTypes +} + +export type AnyStartConfig = StartConfig + +export interface CreateStartConfig { + serializer: TSerializer +} + +export interface DefaultStartRegister { + start: AnyStartConfig +} + +export interface StartRegister extends DefaultStartRegister {} + +export type InferSerializer = + unknown extends TStart['start']['_types']['serializer'] + ? SerovalTypeSerializer + : TStart['start']['_types']['serializer']['~types']['serializer'] diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index 7ff876b7d4..1ac65896fe 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -5,41 +5,41 @@ import type { ServerFnTypeOrTypeFn, } from './createServerFn' import type { - AnyRouter, Assign, Constrain, + DefaultStartRegister, Expand, InferSerializer, IntersectAssign, - RegisteredRouter, ResolveValidatorInput, ResolveValidatorOutput, + StartRegister, TypeSerializerStringify, } from '@tanstack/router-core' export function createMiddleware< TType extends MiddlewareType, - TRouter extends AnyRouter = RegisteredRouter, + TStart extends DefaultStartRegister = StartRegister, >( options: { type: TType validateClient?: boolean }, __opts?: FunctionMiddlewareOptions< - TRouter, + TStart, unknown, undefined, undefined, undefined, ServerFnResponseType >, -): CreateMiddlewareResult { +): CreateMiddlewareResult { // const resolvedOptions = (__opts || options) as MiddlewareOptions< const resolvedOptions = { type: 'function', ...(__opts || (options as FunctionMiddlewareOptions< - TRouter, + TStart, unknown, undefined, undefined, @@ -74,23 +74,23 @@ export function createMiddleware< Object.assign(resolvedOptions, { server }), ) as any }, - } as unknown as CreateMiddlewareResult + } as unknown as CreateMiddlewareResult } export type MiddlewareType = 'request' | 'function' export type CreateMiddlewareResult< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TType extends MiddlewareType, > = 'function' extends TType - ? FunctionMiddleware + ? FunctionMiddleware : RequestMiddleware export interface FunctionMiddleware< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareAfterMiddleware< - TRouter, + TStart, unknown, TServerFnResponseType > { @@ -100,18 +100,18 @@ export interface FunctionMiddleware< ReadonlyArray >, ) => FunctionMiddlewareAfterMiddleware< - TRouter, + TStart, TNewMiddlewares, TServerFnResponseType > } export interface FunctionMiddlewareAfterMiddleware< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< - TRouter, + TStart, TMiddlewares, undefined, undefined, @@ -121,7 +121,7 @@ export interface FunctionMiddlewareAfterMiddleware< TServerFnResponseType >, FunctionMiddlewareServer< - TRouter, + TStart, TMiddlewares, undefined, undefined, @@ -129,15 +129,15 @@ export interface FunctionMiddlewareAfterMiddleware< TServerFnResponseType >, FunctionMiddlewareClient< - TRouter, + TStart, TMiddlewares, undefined, TServerFnResponseType >, - FunctionMiddlewareValidator {} + FunctionMiddlewareValidator {} export interface FunctionMiddlewareWithTypes< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerContext, @@ -155,7 +155,7 @@ export interface FunctionMiddlewareWithTypes< TClientSendContext > options: FunctionMiddlewareOptions< - TRouter, + TStart, TMiddlewares, TValidator, TServerContext, @@ -338,7 +338,7 @@ export type AssignAllClientSendContext< > export interface FunctionMiddlewareOptions< - in out TRouter extends AnyRouter, + in out TStart extends DefaultStartRegister, in out TMiddlewares, in out TValidator, in out TServerContext, @@ -349,7 +349,7 @@ export interface FunctionMiddlewareOptions< middleware?: TMiddlewares validator?: ConstrainValidator client?: FunctionMiddlewareClientFn< - TRouter, + TStart, TMiddlewares, TValidator, TServerContext, @@ -357,7 +357,7 @@ export interface FunctionMiddlewareOptions< TServerFnResponseType > server?: FunctionMiddlewareServerFn< - TRouter, + TStart, TMiddlewares, TValidator, TServerContext, @@ -368,21 +368,18 @@ export interface FunctionMiddlewareOptions< } export type FunctionMiddlewareClientNextFn< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, > = (ctx?: { context?: TNewClientContext - sendContext?: TypeSerializerStringify< - InferSerializer['~types']['serializer'], - TSendContext - > + sendContext?: TypeSerializerStringify, TSendContext> headers?: HeadersInit }) => Promise< FunctionClientResultWithContext > export interface FunctionMiddlewareServer< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerSendContext, @@ -391,7 +388,7 @@ export interface FunctionMiddlewareServer< > { server: ( server: FunctionMiddlewareServerFn< - TRouter, + TStart, TMiddlewares, TValidator, TServerSendContext, @@ -400,7 +397,7 @@ export interface FunctionMiddlewareServer< TServerFnResponseType >, ) => FunctionMiddlewareAfterServer< - TRouter, + TStart, TMiddlewares, TValidator, TNewServerContext, @@ -412,7 +409,7 @@ export interface FunctionMiddlewareServer< } export type FunctionMiddlewareServerFn< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerSendContext, @@ -421,7 +418,7 @@ export type FunctionMiddlewareServerFn< TServerFnResponseType extends ServerFnResponseType, > = ( options: FunctionMiddlewareServerFnOptions< - TRouter, + TStart, TMiddlewares, TValidator, TServerSendContext, @@ -435,32 +432,25 @@ export type FunctionMiddlewareServerFn< > export interface RequestMiddlewareServerFnOptions< - in out TRouter extends AnyRouter, + in out TStart extends DefaultStartRegister, in out TMiddlewares, in out TServerSendContext, > { request: Request context: Expand> - next: FunctionMiddlewareServerNextFn< - TRouter, - TMiddlewares, - TServerSendContext - > + next: FunctionMiddlewareServerNextFn response: Response method: Method signal: AbortSignal } export type FunctionMiddlewareServerNextFn< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TServerSendContext, > = (ctx?: { context?: TNewServerContext - sendContext?: TypeSerializerStringify< - InferSerializer['~types']['serializer'], - TSendContext - > + sendContext?: TypeSerializerStringify, TSendContext> }) => Promise< FunctionServerResultWithContext< TMiddlewares, @@ -488,7 +478,7 @@ export type FunctionServerResultWithContext< } export interface FunctionMiddlewareServerFnOptions< - in out TRouter extends AnyRouter, + in out TStart extends DefaultStartRegister, in out TMiddlewares, in out TValidator, in out TServerSendContext, @@ -496,11 +486,7 @@ export interface FunctionMiddlewareServerFnOptions< > { data: Expand> context: Expand> - next: FunctionMiddlewareServerNextFn< - TRouter, - TMiddlewares, - TServerSendContext - > + next: FunctionMiddlewareServerNextFn response: TServerFnResponseType method: Method filename: string @@ -530,7 +516,7 @@ export type FunctionMiddlewareServerFnResult< > export interface FunctionMiddlewareAfterServer< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerContext, @@ -539,7 +525,7 @@ export interface FunctionMiddlewareAfterServer< TClientSendContext, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< - TRouter, + TStart, TMiddlewares, TValidator, TServerContext, @@ -550,14 +536,14 @@ export interface FunctionMiddlewareAfterServer< > {} export interface FunctionMiddlewareClient< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerFnResponseType extends ServerFnResponseType, > { client: ( client: FunctionMiddlewareClientFn< - TRouter, + TStart, TMiddlewares, TValidator, TSendServerContext, @@ -565,7 +551,7 @@ export interface FunctionMiddlewareClient< TServerFnResponseType >, ) => FunctionMiddlewareAfterClient< - TRouter, + TStart, TMiddlewares, TValidator, TSendServerContext, @@ -575,7 +561,7 @@ export interface FunctionMiddlewareClient< } export type FunctionMiddlewareClientFn< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TSendContext, @@ -583,7 +569,7 @@ export type FunctionMiddlewareClientFn< TServerFnResponseType extends ServerFnResponseType, > = ( options: FunctionMiddlewareClientFnOptions< - TRouter, + TStart, TMiddlewares, TValidator, TServerFnResponseType @@ -595,7 +581,7 @@ export type FunctionMiddlewareClientFn< > export interface FunctionMiddlewareClientFnOptions< - in out TRouter extends AnyRouter, + in out TStart extends DefaultStartRegister, in out TMiddlewares, in out TValidator, in out TServerFnResponseType extends ServerFnResponseType, @@ -606,7 +592,7 @@ export interface FunctionMiddlewareClientFnOptions< method: Method response: TServerFnResponseType signal: AbortSignal - next: FunctionMiddlewareClientNextFn + next: FunctionMiddlewareClientNextFn filename: string functionId: string type: ServerFnTypeOrTypeFn< @@ -643,14 +629,14 @@ export type FunctionClientResultWithContext< } export interface FunctionMiddlewareAfterClient< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerSendContext, TClientContext, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< - TRouter, + TStart, TMiddlewares, TValidator, undefined, @@ -660,7 +646,7 @@ export interface FunctionMiddlewareAfterClient< TServerFnResponseType >, FunctionMiddlewareServer< - TRouter, + TStart, TMiddlewares, TValidator, TServerSendContext, @@ -669,14 +655,14 @@ export interface FunctionMiddlewareAfterClient< > {} export interface FunctionMiddlewareValidator< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TServerFnResponseType extends ServerFnResponseType, > { validator: ( input: ConstrainValidator, ) => FunctionMiddlewareAfterValidator< - TRouter, + TStart, TMiddlewares, TNewValidator, TServerFnResponseType @@ -684,12 +670,12 @@ export interface FunctionMiddlewareValidator< } export interface FunctionMiddlewareAfterValidator< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TServerFnResponseType extends ServerFnResponseType, > extends FunctionMiddlewareWithTypes< - TRouter, + TStart, TMiddlewares, TValidator, undefined, @@ -699,7 +685,7 @@ export interface FunctionMiddlewareAfterValidator< ServerFnResponseType >, FunctionMiddlewareServer< - TRouter, + TStart, TMiddlewares, TValidator, undefined, @@ -707,7 +693,7 @@ export interface FunctionMiddlewareAfterValidator< TServerFnResponseType >, FunctionMiddlewareClient< - TRouter, + TStart, TMiddlewares, TValidator, ServerFnResponseType diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index b31a98177d..3b32ffdde6 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -5,13 +5,13 @@ import { startSerializer } from './serializer' import { mergeHeaders } from './headers' import { globalMiddleware } from './registerGlobalMiddleware' import type { - AnyRouter, AnyValidator, Constrain, + DefaultStartRegister, Expand, InferSerializer, - RegisteredRouter, ResolveValidatorInput, + StartRegister, TypeSerializerParse, TypeSerializerStringify, TypeSerializerStringifyBy, @@ -36,7 +36,7 @@ export function createServerFn< TResponse = unknown, TMiddlewares = undefined, TValidator = undefined, - TRouter extends AnyRouter = RegisteredRouter, + TStart extends DefaultStartRegister = StartRegister, >( options?: { method?: TMethod @@ -44,14 +44,16 @@ export function createServerFn< type?: ServerFnType }, __opts?: ServerFnBaseOptions< + TStart, TMethod, TServerFnResponseType, TResponse, TMiddlewares, TValidator >, -): ServerFnBuilder { +): ServerFnBuilder { const resolvedOptions = (__opts || options || {}) as ServerFnBaseOptions< + TStart, TMethod, ServerFnResponseType, TResponse, @@ -71,7 +73,8 @@ export function createServerFn< ServerFnResponseType, TResponse, TMiddlewares, - TValidator + TValidator, + TStart >(undefined, Object.assign(resolvedOptions, { middleware })) as any }, validator: (validator) => { @@ -80,7 +83,8 @@ export function createServerFn< ServerFnResponseType, TResponse, TMiddlewares, - TValidator + TValidator, + TStart >(undefined, Object.assign(resolvedOptions, { validator })) as any }, type: (type) => { @@ -89,7 +93,8 @@ export function createServerFn< ServerFnResponseType, TResponse, TMiddlewares, - TValidator + TValidator, + TStart >(undefined, Object.assign(resolvedOptions, { type })) as any }, handler: (...args) => { @@ -97,8 +102,9 @@ export function createServerFn< // in the babel plugin. We need to cast it to the correct // function signature post-transformation const [extractedFn, serverFn] = args as unknown as [ - CompiledFetcherFn, + CompiledFetcherFn, ServerFn< + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -117,7 +123,7 @@ export function createServerFn< const resolvedMiddleware = [ ...(resolvedOptions.middleware || []), - serverFnBaseToMiddleware(resolvedOptions), + serverFnBaseToMiddleware(resolvedOptions as never), ] // We want to make sure the new function has the same @@ -296,7 +302,7 @@ export type CompiledFetcherFnOptions = { } export type Fetcher< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TResponse, @@ -304,14 +310,14 @@ export type Fetcher< > = undefined extends IntersectAllValidatorInputs ? OptionalFetcher< - TRouter, + TStart, TMiddlewares, TValidator, TResponse, TServerFnResponseType > : RequiredFetcher< - TRouter, + TStart, TMiddlewares, TValidator, TResponse, @@ -331,18 +337,18 @@ export interface FetcherBase { } export type FetchResult< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TResponse, TServerFnResponseType extends ServerFnResponseType, > = TServerFnResponseType extends 'raw' ? Promise : TServerFnResponseType extends 'full' - ? Promise> - : Promise> + ? Promise> + : Promise> export interface OptionalFetcher< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TResponse, @@ -350,11 +356,11 @@ export interface OptionalFetcher< > extends FetcherBase { ( options?: OptionalFetcherDataOptions, - ): FetchResult + ): FetchResult } export interface RequiredFetcher< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TValidator, TResponse, @@ -362,7 +368,7 @@ export interface RequiredFetcher< > extends FetcherBase { ( opts: RequiredFetcherDataOptions, - ): FetchResult + ): FetchResult } export type FetcherBaseOptions = { @@ -384,25 +390,22 @@ export interface RequiredFetcherDataOptions } export interface FullFetcherData< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMiddlewares, TResponse, > { error: unknown - result: FetcherData + result: FetcherData context: AssignAllClientSendContext } -export type FetcherData = +export type FetcherData = TResponse extends JsonResponse ? TypeSerializerParse< - InferSerializer['~types']['serializer'], + InferSerializer, ReturnType > - : TypeSerializerParse< - InferSerializer['~types']['serializer'], - TResponse - > + : TypeSerializerParse, TResponse> export type RscStream = { __cacheState: T @@ -415,23 +418,17 @@ export type ServerFnResponseType = 'data' | 'full' | 'raw' export type RawResponse = Response | ReadableStream | Readable | null | string export type ServerFnReturnType< + TStart extends DefaultStartRegister, TServerFnResponseType extends ServerFnResponseType, TResponse, > = TServerFnResponseType extends 'raw' ? RawResponse | Promise : - | Promise< - TypeSerializerStringify< - InferSerializer['~types']['serializer'], - TResponse - > - > - | TypeSerializerStringify< - InferSerializer['~types']['serializer'], - TResponse - > + | Promise, TResponse>> + | TypeSerializerStringify, TResponse> export type ServerFn< + TStart extends DefaultStartRegister, TMethod, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, @@ -439,13 +436,13 @@ export type ServerFn< TResponse, > = ( ctx: ServerFnCtx, -) => ServerFnReturnType +) => ServerFnReturnType export interface ServerFnCtx< - TMethod, - TServerFnResponseType extends ServerFnResponseType, - TMiddlewares, - TValidator, + in out TMethod, + in out TServerFnResponseType extends ServerFnResponseType, + in out TMiddlewares, + in out TValidator, > { method: TMethod response: TServerFnResponseType @@ -455,17 +452,19 @@ export interface ServerFnCtx< } export type CompiledFetcherFn< + TStart extends DefaultStartRegister, TResponse, TServerFnResponseType extends ServerFnResponseType, > = { ( opts: CompiledFetcherFnOptions & - ServerFnBaseOptions, + ServerFnBaseOptions, ): Promise url: string } export type ServerFnBaseOptions< + TStart extends DefaultStartRegister, TMethod extends Method = 'GET', TServerFnResponseType extends ServerFnResponseType = 'data', TResponse = unknown, @@ -477,8 +476,9 @@ export type ServerFnBaseOptions< validateClient?: boolean middleware?: Constrain> validator?: ConstrainValidator - extractedFn?: CompiledFetcherFn + extractedFn?: CompiledFetcherFn serverFn?: ServerFn< + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -513,7 +513,7 @@ export type ConstrainValidator = | ValidatorSerializerStringify export interface ServerFnMiddleware< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TValidator, @@ -524,7 +524,7 @@ export interface ServerFnMiddleware< ReadonlyArray >, ) => ServerFnAfterMiddleware< - TRouter, + TStart, TMethod, TServerFnResponseType, TNewMiddlewares, @@ -533,26 +533,26 @@ export interface ServerFnMiddleware< } export interface ServerFnAfterMiddleware< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, > extends ServerFnValidator< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares >, ServerFnTyper< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, TValidator >, ServerFnHandler< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -560,14 +560,14 @@ export interface ServerFnAfterMiddleware< > {} export type ValidatorFn< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, > = ( validator: ConstrainValidator, ) => ServerFnAfterValidator< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -575,35 +575,35 @@ export type ValidatorFn< > export interface ServerFnValidator< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, > { - validator: ValidatorFn + validator: ValidatorFn } export interface ServerFnAfterValidator< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, > extends ServerFnMiddleware< - TRouter, + TStart, TMethod, TServerFnResponseType, TValidator >, ServerFnTyper< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, TValidator >, ServerFnHandler< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -612,7 +612,7 @@ export interface ServerFnAfterValidator< // Typer export interface ServerFnTyper< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, @@ -626,7 +626,7 @@ export interface ServerFnTyper< TValidator >, ) => ServerFnAfterTyper< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -651,13 +651,13 @@ export type ServerFnTypeOrTypeFn< ) => ServerFnType) export interface ServerFnAfterTyper< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, TValidator, > extends ServerFnHandler< - TRouter, + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -666,7 +666,7 @@ export interface ServerFnAfterTyper< // Handler export interface ServerFnHandler< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method, TServerFnResponseType extends ServerFnResponseType, TMiddlewares, @@ -674,6 +674,7 @@ export interface ServerFnHandler< > { handler: ( fn?: ServerFn< + TStart, TMethod, TServerFnResponseType, TMiddlewares, @@ -681,7 +682,7 @@ export interface ServerFnHandler< TNewResponse >, ) => Fetcher< - TRouter, + TStart, TMiddlewares, TValidator, TNewResponse, @@ -690,31 +691,21 @@ export interface ServerFnHandler< } export interface ServerFnBuilder< - TRouter extends AnyRouter, + TStart extends DefaultStartRegister, TMethod extends Method = 'GET', TServerFnResponseType extends ServerFnResponseType = 'data', -> extends ServerFnMiddleware< - TRouter, - TMethod, - TServerFnResponseType, - undefined - >, - ServerFnValidator, - ServerFnTyper< - TRouter, - TMethod, - TServerFnResponseType, - undefined, - undefined - >, +> extends ServerFnMiddleware, + ServerFnValidator, + ServerFnTyper, ServerFnHandler< - TRouter, + TStart, TMethod, TServerFnResponseType, undefined, undefined > { options: ServerFnBaseOptions< + TStart, TMethod, TServerFnResponseType, unknown, diff --git a/packages/start-client-core/src/createStart.ts b/packages/start-client-core/src/createStart.ts new file mode 100644 index 0000000000..19844de8a8 --- /dev/null +++ b/packages/start-client-core/src/createStart.ts @@ -0,0 +1,17 @@ +import type { + CreateStartConfig as CreateStartConfigCore, + Serializer, + StartConfig as StartConfigCore, +} from '@tanstack/router-core' + +export interface CreateStartConfig + extends CreateStartConfigCore {} + +export interface StartConfig + extends StartConfigCore {} + +export const createStart = ( + config: CreateStartConfig, +): StartConfig => { + return undefined as unknown as StartConfig +} diff --git a/packages/start-client-core/src/index.tsx b/packages/start-client-core/src/index.tsx index 5c409dab00..84fec1f42a 100644 --- a/packages/start-client-core/src/index.tsx +++ b/packages/start-client-core/src/index.tsx @@ -86,3 +86,9 @@ export { serverFnStaticCache, executeMiddleware, } from './createServerFn' + +export type { StartRegister as Register } from '@tanstack/router-core' + +export type { CreateStartConfig, StartConfig } from './createStart' + +export { createStart } from './createStart' From dea9a58e8619daac906d626cc27a4bbce7704506 Mon Sep 17 00:00:00 2001 From: chorobin Date: Tue, 27 May 2025 00:51:33 +0200 Subject: [PATCH 116/126] chore: remove serializer from router --- packages/react-router/src/router.ts | 9 ++----- packages/router-core/src/router.ts | 37 +++++++---------------------- packages/solid-router/src/router.ts | 9 ++----- 3 files changed, 13 insertions(+), 42 deletions(-) diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts index 4ec7f995f6..3680337ba6 100644 --- a/packages/react-router/src/router.ts +++ b/packages/react-router/src/router.ts @@ -5,8 +5,6 @@ import type { AnyRoute, CreateRouterFn, RouterConstructorOptions, - Serializer, - SerovalSerializer, TrailingSlashOption, } from '@tanstack/router-core' @@ -89,14 +87,12 @@ export class Router< in out TDefaultStructuralSharingOption extends boolean = false, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, - in out TSerializer extends Serializer = SerovalSerializer, > extends RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated > { constructor( options: RouterConstructorOptions< @@ -104,8 +100,7 @@ export class Router< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, ) { super(options) diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index f9de28cc3c..bc4ea7bfca 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -76,11 +76,7 @@ import type { NavigateFn, } from './RouterProvider' import type { Manifest } from './manifest' -import type { - Serializer, - SerovalSerializer, - StartSerializer, -} from './serializer' +import type { StartSerializer } from './serializer' import type { AnySchema, AnyValidator } from './validators' import type { NavigateOptions, ResolveRelativePath, ToOptions } from './link' import type { NotFoundError } from './not-found' @@ -123,7 +119,6 @@ export interface RouterOptions< TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record = Record, - TSerializer extends Serializer = SerovalSerializer, > extends RouterOptionsExtensions { /** * The history object that will be used to manage the browser history. @@ -404,8 +399,6 @@ export interface RouterOptions< * @default ['window'] */ scrollToTopSelectors?: Array - - serializer?: TSerializer } export interface RouterState< @@ -511,15 +504,13 @@ export type RouterConstructorOptions< TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record, - TSerializer extends Serializer, > = Omit< RouterOptions< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, 'context' > & @@ -584,15 +575,13 @@ export type UpdateFn< TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record, - TSerializer extends Serializer, > = ( newOptions: RouterConstructorOptions< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, ) => void @@ -678,11 +667,10 @@ export type AnyRouterWithContext = RouterCore< any, any, any, - any, any > -export type AnyRouter = RouterCore +export type AnyRouter = RouterCore export interface ViewTransitionOptions { types: @@ -758,7 +746,6 @@ export type CreateRouterFn = < TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record = Record, - TSerializer extends Serializer = SerovalSerializer, >( options: undefined extends number ? 'strictNullChecks must be enabled in tsconfig.json' @@ -767,16 +754,14 @@ export type CreateRouterFn = < TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, ) => RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated > export class RouterCore< @@ -785,7 +770,6 @@ export class RouterCore< in out TDefaultStructuralSharingOption extends boolean, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, - in out TSerializer extends Serializer = SerovalSerializer, > { // Option-independent properties tempLocationKey: string | undefined = `${Math.round( @@ -807,8 +791,7 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, 'stringifySearch' | 'parseSearch' | 'context' > @@ -831,8 +814,7 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, ) { this.update({ @@ -864,8 +846,7 @@ export class RouterCore< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated > = (newOptions) => { if (newOptions.notFoundRoute) { console.warn( diff --git a/packages/solid-router/src/router.ts b/packages/solid-router/src/router.ts index 69a6da9d27..bc5af4f758 100644 --- a/packages/solid-router/src/router.ts +++ b/packages/solid-router/src/router.ts @@ -5,8 +5,6 @@ import type { AnyRoute, CreateRouterFn, RouterConstructorOptions, - Serializer, - SerovalSerializer, TrailingSlashOption, } from '@tanstack/router-core' import type { @@ -85,14 +83,12 @@ export class Router< in out TDefaultStructuralSharingOption extends boolean = false, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record = Record, - in out TSerializer extends Serializer = SerovalSerializer, > extends RouterCore< TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated > { constructor( options: RouterConstructorOptions< @@ -100,8 +96,7 @@ export class Router< TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, - TDehydrated, - TSerializer + TDehydrated >, ) { super(options) From 5ce936ff468c5cb12f25ed0f3f426842a8c0d00a Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Tue, 27 May 2025 20:07:24 +1200 Subject: [PATCH 117/126] fix: support usage of a prefixed a base path (#4258) Fixes #4221 --- e2e/react-start/custom-basepath/.gitignore | 20 + .../custom-basepath/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 155 ++ e2e/react-start/custom-basepath/package.json | 38 + .../custom-basepath/playwright.config.ts | 35 + .../custom-basepath/postcss.config.mjs | 6 + .../public/android-chrome-192x192.png | Bin 0 -> 29964 bytes .../public/android-chrome-512x512.png | Bin 0 -> 109271 bytes .../public/apple-touch-icon.png | Bin 0 -> 27246 bytes .../custom-basepath/public/favicon-16x16.png | Bin 0 -> 832 bytes .../custom-basepath/public/favicon-32x32.png | Bin 0 -> 2115 bytes .../custom-basepath/public/favicon.ico | Bin 0 -> 15406 bytes .../custom-basepath/public/favicon.png | Bin 0 -> 1507 bytes .../custom-basepath/public/script.js | 2 + .../custom-basepath/public/script2.js | 2 + .../custom-basepath/public/site.webmanifest | 19 + .../src/components/CustomMessage.tsx | 10 + .../src/components/DefaultCatchBoundary.tsx | 53 + .../src/components/NotFound.tsx | 25 + .../custom-basepath/src/routeTree.gen.ts | 406 +++ .../custom-basepath/src/router.tsx | 24 + .../custom-basepath/src/routes/__root.tsx | 141 + .../custom-basepath/src/routes/api.users.ts | 17 + .../src/routes/api/users.$id.ts | 23 + .../custom-basepath/src/routes/deferred.tsx | 62 + .../custom-basepath/src/routes/index.tsx | 14 + .../src/routes/posts.$postId.tsx | 39 + .../src/routes/posts.index.tsx | 7 + .../custom-basepath/src/routes/posts.tsx | 46 + .../src/routes/posts_.$postId.deep.tsx | 27 + .../src/routes/users.$userId.tsx | 38 + .../src/routes/users.index.tsx | 7 + .../custom-basepath/src/routes/users.tsx | 48 + .../custom-basepath/src/styles/app.css | 22 + .../custom-basepath/src/tanstack-start.d.ts | 2 + .../custom-basepath/src/utils/basepath.ts | 1 + .../custom-basepath/src/utils/posts.tsx | 36 + .../custom-basepath/src/utils/seo.ts | 33 + .../custom-basepath/src/utils/users.tsx | 9 + .../custom-basepath/tailwind.config.mjs | 4 + .../custom-basepath/tests/navigation.spec.ts | 34 + e2e/react-start/custom-basepath/tsconfig.json | 22 + .../custom-basepath/vite.config.ts | 16 + e2e/solid-start/custom-basepath/.gitignore | 20 + .../custom-basepath/.prettierignore | 4 + .../server-routes/routeTree.gen.ts | 155 ++ e2e/solid-start/custom-basepath/package.json | 35 + .../custom-basepath/playwright.config.ts | 35 + .../custom-basepath/postcss.config.mjs | 6 + .../public/android-chrome-192x192.png | Bin 0 -> 29964 bytes .../public/android-chrome-512x512.png | Bin 0 -> 109271 bytes .../public/apple-touch-icon.png | Bin 0 -> 27246 bytes .../custom-basepath/public/favicon-16x16.png | Bin 0 -> 832 bytes .../custom-basepath/public/favicon-32x32.png | Bin 0 -> 2115 bytes .../custom-basepath/public/favicon.ico | Bin 0 -> 15406 bytes .../custom-basepath/public/favicon.png | Bin 0 -> 1507 bytes .../custom-basepath/public/script.js | 2 + .../custom-basepath/public/script2.js | 2 + .../custom-basepath/public/site.webmanifest | 19 + .../src/components/CustomMessage.tsx | 8 + .../src/components/DefaultCatchBoundary.tsx | 53 + .../src/components/NotFound.tsx | 25 + .../src/components/PostErrorComponent.tsx | 5 + .../src/components/UserErrorComponent.tsx | 6 + .../custom-basepath/src/routeTree.gen.ts | 406 +++ .../custom-basepath/src/router.tsx | 24 + .../custom-basepath/src/routes/__root.tsx | 100 + .../src/routes/api/users.$userId.ts | 27 + .../custom-basepath/src/routes/api/users.ts | 58 + .../custom-basepath/src/routes/deferred.tsx | 65 + .../custom-basepath/src/routes/index.tsx | 14 + .../src/routes/posts.$postId.tsx | 36 + .../src/routes/posts.index.tsx | 7 + .../custom-basepath/src/routes/posts.tsx | 47 + .../src/routes/posts_.$postId.deep.tsx | 24 + .../src/routes/users.$userId.tsx | 33 + .../src/routes/users.index.tsx | 7 + .../custom-basepath/src/routes/users.tsx | 48 + .../custom-basepath/src/styles/app.css | 22 + .../custom-basepath/src/tanstack-start.d.ts | 2 + .../custom-basepath/src/utils/basepath.ts | 1 + .../custom-basepath/src/utils/posts.tsx | 36 + .../custom-basepath/src/utils/seo.ts | 33 + .../custom-basepath/src/utils/users.tsx | 9 + .../custom-basepath/src/vite-env.d.ts | 4 + .../custom-basepath/tailwind.config.mjs | 4 + .../custom-basepath/tests/navigation.spec.ts | 34 + e2e/solid-start/custom-basepath/tsconfig.json | 23 + .../custom-basepath/vite.config.ts | 16 + packages/start-plugin-core/package.json | 2 +- .../src/nitro/nitro-plugin.ts | 19 +- packages/start-plugin-core/src/plugin.ts | 19 +- packages/start-plugin-core/src/prerender.ts | 2 +- .../src/routesManifestPlugin.ts | 96 +- .../src/createStartHandler.ts | 12 +- .../start-server-core/src/router-manifest.ts | 8 +- .../src/index.ts | 5 +- pnpm-lock.yaml | 2262 +++++++++++++---- 98 files changed, 4783 insertions(+), 544 deletions(-) create mode 100644 e2e/react-start/custom-basepath/.gitignore create mode 100644 e2e/react-start/custom-basepath/.prettierignore create mode 100644 e2e/react-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts create mode 100644 e2e/react-start/custom-basepath/package.json create mode 100644 e2e/react-start/custom-basepath/playwright.config.ts create mode 100644 e2e/react-start/custom-basepath/postcss.config.mjs create mode 100644 e2e/react-start/custom-basepath/public/android-chrome-192x192.png create mode 100644 e2e/react-start/custom-basepath/public/android-chrome-512x512.png create mode 100644 e2e/react-start/custom-basepath/public/apple-touch-icon.png create mode 100644 e2e/react-start/custom-basepath/public/favicon-16x16.png create mode 100644 e2e/react-start/custom-basepath/public/favicon-32x32.png create mode 100644 e2e/react-start/custom-basepath/public/favicon.ico create mode 100644 e2e/react-start/custom-basepath/public/favicon.png create mode 100644 e2e/react-start/custom-basepath/public/script.js create mode 100644 e2e/react-start/custom-basepath/public/script2.js create mode 100644 e2e/react-start/custom-basepath/public/site.webmanifest create mode 100644 e2e/react-start/custom-basepath/src/components/CustomMessage.tsx create mode 100644 e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx create mode 100644 e2e/react-start/custom-basepath/src/components/NotFound.tsx create mode 100644 e2e/react-start/custom-basepath/src/routeTree.gen.ts create mode 100644 e2e/react-start/custom-basepath/src/router.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/__root.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/api.users.ts create mode 100644 e2e/react-start/custom-basepath/src/routes/api/users.$id.ts create mode 100644 e2e/react-start/custom-basepath/src/routes/deferred.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/index.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/posts.$postId.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/posts.index.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/posts.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/posts_.$postId.deep.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/users.$userId.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/users.index.tsx create mode 100644 e2e/react-start/custom-basepath/src/routes/users.tsx create mode 100644 e2e/react-start/custom-basepath/src/styles/app.css create mode 100644 e2e/react-start/custom-basepath/src/tanstack-start.d.ts create mode 100644 e2e/react-start/custom-basepath/src/utils/basepath.ts create mode 100644 e2e/react-start/custom-basepath/src/utils/posts.tsx create mode 100644 e2e/react-start/custom-basepath/src/utils/seo.ts create mode 100644 e2e/react-start/custom-basepath/src/utils/users.tsx create mode 100644 e2e/react-start/custom-basepath/tailwind.config.mjs create mode 100644 e2e/react-start/custom-basepath/tests/navigation.spec.ts create mode 100644 e2e/react-start/custom-basepath/tsconfig.json create mode 100644 e2e/react-start/custom-basepath/vite.config.ts create mode 100644 e2e/solid-start/custom-basepath/.gitignore create mode 100644 e2e/solid-start/custom-basepath/.prettierignore create mode 100644 e2e/solid-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts create mode 100644 e2e/solid-start/custom-basepath/package.json create mode 100644 e2e/solid-start/custom-basepath/playwright.config.ts create mode 100644 e2e/solid-start/custom-basepath/postcss.config.mjs create mode 100644 e2e/solid-start/custom-basepath/public/android-chrome-192x192.png create mode 100644 e2e/solid-start/custom-basepath/public/android-chrome-512x512.png create mode 100644 e2e/solid-start/custom-basepath/public/apple-touch-icon.png create mode 100644 e2e/solid-start/custom-basepath/public/favicon-16x16.png create mode 100644 e2e/solid-start/custom-basepath/public/favicon-32x32.png create mode 100644 e2e/solid-start/custom-basepath/public/favicon.ico create mode 100644 e2e/solid-start/custom-basepath/public/favicon.png create mode 100644 e2e/solid-start/custom-basepath/public/script.js create mode 100644 e2e/solid-start/custom-basepath/public/script2.js create mode 100644 e2e/solid-start/custom-basepath/public/site.webmanifest create mode 100644 e2e/solid-start/custom-basepath/src/components/CustomMessage.tsx create mode 100644 e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx create mode 100644 e2e/solid-start/custom-basepath/src/components/NotFound.tsx create mode 100644 e2e/solid-start/custom-basepath/src/components/PostErrorComponent.tsx create mode 100644 e2e/solid-start/custom-basepath/src/components/UserErrorComponent.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routeTree.gen.ts create mode 100644 e2e/solid-start/custom-basepath/src/router.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/__root.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts create mode 100644 e2e/solid-start/custom-basepath/src/routes/api/users.ts create mode 100644 e2e/solid-start/custom-basepath/src/routes/deferred.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/index.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/posts.$postId.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/posts.index.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/posts.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/posts_.$postId.deep.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/users.$userId.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/users.index.tsx create mode 100644 e2e/solid-start/custom-basepath/src/routes/users.tsx create mode 100644 e2e/solid-start/custom-basepath/src/styles/app.css create mode 100644 e2e/solid-start/custom-basepath/src/tanstack-start.d.ts create mode 100644 e2e/solid-start/custom-basepath/src/utils/basepath.ts create mode 100644 e2e/solid-start/custom-basepath/src/utils/posts.tsx create mode 100644 e2e/solid-start/custom-basepath/src/utils/seo.ts create mode 100644 e2e/solid-start/custom-basepath/src/utils/users.tsx create mode 100644 e2e/solid-start/custom-basepath/src/vite-env.d.ts create mode 100644 e2e/solid-start/custom-basepath/tailwind.config.mjs create mode 100644 e2e/solid-start/custom-basepath/tests/navigation.spec.ts create mode 100644 e2e/solid-start/custom-basepath/tsconfig.json create mode 100644 e2e/solid-start/custom-basepath/vite.config.ts diff --git a/e2e/react-start/custom-basepath/.gitignore b/e2e/react-start/custom-basepath/.gitignore new file mode 100644 index 0000000000..a79d5cf129 --- /dev/null +++ b/e2e/react-start/custom-basepath/.gitignore @@ -0,0 +1,20 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output + +/build/ +/api/ +/server/build +/public/build +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/e2e/react-start/custom-basepath/.prettierignore b/e2e/react-start/custom-basepath/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/e2e/react-start/custom-basepath/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/e2e/react-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/react-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..87c0856e21 --- /dev/null +++ b/e2e/react-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/react-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/react-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api.users' +import { ServerRoute as ApiUsersIdRouteImport } from './../../src/routes/api/users.$id' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersIdRoute = ApiUsersIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$id': { + id: '/api/users/$id' + path: '/$id' + fullPath: '/api/users/$id' + preLoaderRoute: typeof ApiUsersIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api.users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$id' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$id']['parentRoute'], + FileRoutesByPath['/api/users/$id']['id'], + FileRoutesByPath['/api/users/$id']['path'], + FileRoutesByPath['/api/users/$id']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersIdRoute: typeof ApiUsersIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersIdRoute: ApiUsersIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$id': typeof ApiUsersIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$id' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$id' + id: '__root__' | '/api/users' | '/api/users/$id' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api.users.ts", + "children": [ + "/api/users/$id" + ] + }, + "/api/users/$id": { + "filePath": "api/users.$id.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json new file mode 100644 index 0000000000..a287277f7d --- /dev/null +++ b/e2e/react-start/custom-basepath/package.json @@ -0,0 +1,38 @@ +{ + "name": "tanstack-react-start-e2e-custom-basepath", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", + "test:e2e": "playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/react-router-devtools": "workspace:^", + "@tanstack/react-start": "workspace:^", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "redaxios": "^0.5.1", + "tailwind-merge": "^2.6.0", + "vite": "6.3.5", + "zod": "^3.24.2" + }, + "devDependencies": { + "@playwright/test": "^1.50.1", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "@vitejs/plugin-react": "^4.3.4", + "autoprefixer": "^10.4.20", + "combinate": "^1.1.11", + "postcss": "^8.5.1", + "tailwindcss": "^3.4.17", + "typescript": "^5.7.2", + "vite-tsconfig-paths": "^5.1.4" + } +} diff --git a/e2e/react-start/custom-basepath/playwright.config.ts b/e2e/react-start/custom-basepath/playwright.config.ts new file mode 100644 index 0000000000..8b913adada --- /dev/null +++ b/e2e/react-start/custom-basepath/playwright.config.ts @@ -0,0 +1,35 @@ +import { defineConfig, devices } from '@playwright/test' +import { derivePort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const PORT = derivePort(packageJson.name) +const baseURL = `http://localhost:${PORT}/custom/basepath` + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + workers: 1, + + reporter: [['line']], + + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL, + }, + + webServer: { + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/custom-basepath/postcss.config.mjs b/e2e/react-start/custom-basepath/postcss.config.mjs new file mode 100644 index 0000000000..2e7af2b7f1 --- /dev/null +++ b/e2e/react-start/custom-basepath/postcss.config.mjs @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +} diff --git a/e2e/react-start/custom-basepath/public/android-chrome-192x192.png b/e2e/react-start/custom-basepath/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..09c8324f8c6781bc90fcf5dd38e0702bd5f171f3 GIT binary patch literal 29964 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 b=FG literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/android-chrome-512x512.png b/e2e/react-start/custom-basepath/public/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..11d626ea3d00fddd52861bf0af5554a92fc30d69 GIT binary patch literal 109271 zcmXt9Ra6{Jw;kLqxDzxG++BhN2@b&_xDF89U4sOd!GgO58Qk6785rDxyIsD2t@~8{ z)LnJz$lm*$j#N>S#Xu!N1pojTa$lv?007wcM_2$d;`?&#G57esz&NYPegRZXkR1X5 zQ~)_C2@Ma!lXfJqxpX}L#(p6RJNwvgXFLrR)jW7Q6ly9HTE@MIgQ}K;Bi5(cmsVTM z&s8`$DyldtE~@b#X~sTL$xm>hbB$q#4YRGkEf%-7l$VuH9y&wX@7C`&njwROZQf6F zhhAb`3Mt6O=L$imWgWgsDKSd?)C;&(jO_i4DtU}W{H`|Fwx}+@VJX4R z<8JM<#r_J6u5GooLn^(U7jHKJ`+{1$)%|*0V{})m6LNjnPI!X0Z~;tJ?fZ4ViB4jj zrhmcv|9G5#APwtwmKBMA3q(e+LCUp=$$%x#>q@`lYdlqrK}%Arw%eI*;Jq9W{4$sA zpEKMD5kPS3*hweD!?$zuhB- z-5&YeM+sc5b@WscW4`6aX0FlDk>f+XgXI>sPu;5=V=MOG!l#RKubQ3FH8I0-Vd<3> zf4P}x{qziUcYr52eu)NpBje$v^q>q46#=N3iT`OJ=QF$(|4ZFnCI{x38>v27Xi|0l ztS_diZfv8P>jo%V@LF7=SKG`vqkL=|nOlzR{fx2wPrNXEc~h&0WK?)_S!<%$yoThc zv!hM#jX^Ka2qV9!%PjA|%@xg8I9X@FQu-U8J75&vj^y8jmFF;==MGKaHz&7YQ2S?g z3@*c6F=e|Ki}Rop!7;j9+6_DS>D%cNH977Bwhe$@=4)f1E2eO#uF43dnxaP7?FqJj zg6DZf>4knZMP0Oi{`*WqXvK7iOrWwb_>~VMnLHIFXcpoeTrRPE&G||m&A~ImD}ptd zJL?TkP*u^Cd_j+KHv1&ld8SyMmFR70h-~R^IoZFL7^No)cdVGSC6kF2&D8@pJB%*j zQD=Dx`QR8Vuop%)Es=>;qz(&Ax6!`{H7FuCiU~fN=0TtrefL~rX!Va630Q;)KjU?d ze4ShWQgpVaE;)~Qc3Q;p5up%V_nmK*A({xIT2PBRq^;s)aADU7NzC`R#j4rriZ9__ zcHaUczXodf^5Zy_?+f=cp0i<9kxnEXxta|*A9y0$D8`ig_U>ukW9)CpQEUtxtE9`$ zJe=_1J&GkKDo9B?(!q`S70}&hdazTu>X8moieO8DW~j)M(z?uj)G( zS><^i6O&*Y;MnB|-I(%RC)#8nkK_wj610aCC6WrOL9p%{o@`>c4j3WIqg?xcK0WuN z1r&@G?@pWDpWW+hodaZg?Tm6KB&0vOz*Ka3Vmop<6AI$3Jj9~#iNLt@1$LFy03S4% zG1g2y&w@<^>9&fJGHws*U!5^W!;15K=J}OHQRgtbcJyW$L#N#dxF0D&e}U{;^83V@ zjm_OkuubzHm^Iw= z%$j?3{NJ;i)PFCP(r;iC-B)JQZ_+chx)!B4Oe8nc3ss6*kutSaRL3UUK84kwvJ^br z0{U!3v@WzElW6p{?gI!o8&w_&1>pyXNIw=@!+xr8PCmm~^AR$Jz)ZQEPqTlUJB_+N zIYc^2>LMF^;wXfIA8I+7&#daP_$2FMw-z8*ZIkwVFRzTO89a};(f=8@o4}4q`Hl;# zx_11?Gj>r8p}5$32#B~@&&#>9)`4gmc<`kZ5Iv5;L!`y3dD7lZCx$6XGBmrP=@>lX zoryLWO=E9RPs*p@AFs3>qxaXvgd1T^v~_k&w_3?unkUe)n%EVVWkDnJsM9(>j_<(P zG(KB}ejIu~@2aYuHX|BO8NM5b@fhpR2!fUN*xaYn{#THf#T-1(xfbwjekIYFTBS-{ zVd0dxRdfZIU>p`U*5;@K{*&GSJ^D9rvE$D#gmgE%0qDonzGX$eKJ}LSRVR5Rcc*>U ztG}}MzqCFayD7%%c>$ypTVhV%HiUy74lu>A;vU*QF>|fZUz6)I#stiM;ATc5oh4p# zY@x;Hn}wzkKurZ*G5K0pf*sU$N>i1f1m|6pucpNqvDt!Z`lf<7pHzeZxIdDMy2!+w zChK&#ipM=zzfVVezNl>GPoPQNUb?ssBB4rmnfbMz@vExqCSxV&I)&klWe6U_buYK1uN3d|l$V&0oq;GvkSc;bGE34-B0wUk_7ICD+D{Pa0s zAB6nbKf^BW2^ao;F5okj9Rd)+*?}%gHx?w$pcq@%oci+5xce{wmSPj!jE(|@@i6)* zw$-C@9F8bln)Emp``5-mxRl4xo%%bMfqT_xLFW8Eh3CIt@}+U{Odb^6m&T*E8|MUu zBum~I{jfmHQ4a#{2NhmQiVZ@|`_%3-r+gnn^L6%9c03LzQ#1~fU0O}gfC|!}tRCg1 zk9{kPlUoWo8&3Ig%JK**H1n?i)z&J#gkiovZ)el{h@>$xovrr+*@^C!eFmp#i&GN> zxe8918{>S2p19;Lq=pmoh(W*Vh{=i_aG3Ku?dOGfH$EA4v0;wnd`w*@G8@3Fh|gF zV9-cy(+iC|oRr7TARN^Hmx!-ZJ`=b{s9^h)A0CR%0wo=h)!xL$0;3{M!ktrKiVZ;g zyu&Arpbps~d6`e8KXbic>@-i|GEFR)cx?|3fo4lS#bRF?030wU|-a$KILQU z0l8!Xr>g?Xj-;_RZ46t_m&qrpS<1t`!TWSeSalbS*AV-tFKaG})(Hd)7JvQ*&N&SE zSBH`Q^*K=X`58!NARGTPhScDLGQ)AK>vYSF=wD!OT&KtAe4?iNoQG@nd(N8j%upWT z^V_Q3$Fwe)K2G@UyzpD^GucCuc+Wmme}s}*z>hbue^`f=8_A|2QROPduMQd}oYLhD zIAaRb2tm?q0J;IcRqF{k{^C)S-*JGtk_ejXoc+mJ^2&M%>>C}Id#L;Rc>^<|TZve`p7UbASI^{EBT|pMBJb4|{wT4wOwv z!Dv1+Kek}SZRm!~#c!dYyyV{PUyd}})PO4vGQLlRe;+*cH9iG0g5p}yOAx@CVf~K5 z5ANG7-)z>B9_I&}R(EdH^=Rgo_$1%aoK={O`h7YZo6n*69O>%WXnyX< zvadbcgpm~_#26t~NjfGV-1P=1mIFS8Kv@($3T)f-~&SO{D zcvKgaL|Fj9UE_8^fh1es-XWmIQWqXwI$Ub<=tnh@0UAsQPL)A6=2;Q@5qn z2epG*@aT^dmt6e+Q`Q~KjvA+5!s^~ z;gh64Q*|_KVwRyR>7f87Vh7>A7pj^b7iMI`EYLW==SO+x?97JK%_sL zBtC%g6GPL{dGP_ZlvY=ndaeFAj7`c>*u+y78mLr3x>xMONPQLfpm59^3%)UHm(6ZC zJrVmR*RM&FCG~zOU#Vy3NL?n{JbnMVui6foUphZoju-4^Q2F(IGu0n5Pi{r~u>?UT z;HU+2Que}{qFp&zuKTRum)h8-PPfs4$@oqt16C+$fPMOdj)}k%oF4Bw-@rw9Z;l-Z zk$<2PP=Pv7$xieG7I-z2mI8YLqgY4Y$yE3NDA&_bjQ_n2-^>Q^J3s6`jK9upEL`+& z@)0??ntV>zndZY=c=5Q3nD7;5gWDcieQ)vrgj)GhK%*by!UDbNZ}yT#>3o@(kRpb% z2#c1fzRde!KIKp0J-;0PN@->%|LlPm*Ww~XkM-|jPjD;r!jDlJLp_5pvHc{Ws-2Ae z+YKzYn2oR_SK5!YF}g2H;wl+4EGVy}1wWn}x-Fzyof0<*x9C~C&=JRSntYj{ofi8v zB6nNLKnugd7_n!|EWkeYQYUG9`s0T8ndWhk!xxnkT3`({6UmD-_$XM}ZhJ5JltJH5 zg(>DHU|8`#GBZ}LhtuR>(~DJVx27_vndUu|^I#_1 z>wT;mZq8-W{WWS$NtD%Xz#e)o&w9(vYU9{_R%0VX@1G68YD{@WFSFRzb;zDn!OSFMBfeg%7Qg^<)r+z#IX9f^*imL5(?|M>)w_%6* ze9LmvA0HYxeUv;&a>kIt2TAA$#(NVsck&tNfMJ;9(3I-v%C7x(^q%0fQsJpG*UvpH zDH)u0Si`ODAwT;e*E!8~Sx|id} z0Qd%h!?1UBUZ6K)64LQNZXVf)qtA1DS$n zKzBfrd$D8r2xN)a7qYB3gAOQo#YKe;J`s=K?jj44aj1U$#}W6Gw>Z>N2)*qH)#EK( zwvo+ctoybU{?6cfSPdE?-_CHA+eB zZsH#eo;Bg|!8%}4JJIhHr50@ncakwqUlGLvvtX7r-}|m6{H3*AsgJejjpezKK^v{1!k{p7iT@oF7%) z78M#)TQ*;6Kd!BuO_q8X>R*N#;luqzX%v?x{-4cI>a|PNvlgwcMeh5cA7|&#`7*kj z_B`o;1NY<3?jTaBpSN}i3P{Ii529?MKQKuTZeI|&JM;$#KJ=_*;(lp|`)hgf3p0yV z_UhuBi*C4{5>^OYNU(>fz|Dz;N7EMl^stX5_2Va?m4PWZQn+ivji8zo7;N^ymD`ZT z0F~R^b=$OPLHWXf+$u+VzH{8+nw0VPgt9;=SDQ*(X`^vXz|;AchSDTV>cCdWg1VPJf&SKDHYWm9+m z?lbj;6f;iPcdXvUw+R{9xyXI;KNe!XoeuCCbNnTJ9Qy<$z0%sbpn>RjwxjQ7 z5JZaS&^)Y!vo^NEUp?`ZR(ec7jbaHpuL>SYJk@Jr0%u)Ro@y-2Qmw;`aw0UfZ*CvO zu1|bnhO7HU zq5V~J{Go^U*mPYoYGWN$8$jdHnPrshDZK~B0LK(xix2KbTMYui7;X<}xdv6Nru=fy zkbQd{cR2>&;~F}5xzFe8QI1A)>T@Qswt}jSat+(>rJx?k1IOCVeKYp4O{%goBJHWE zU#e-tZZ;>>-z7Fd<*StT+G#5@F~gQ2Pbiq}QQK(7zNW=qRMaWxb`C`A6{AP8)e@s* zny&md#l$n$`A5=+xdt$#N4ddz;<`)3GviI2@|v0gpL!6m?U;KseEjQpGUR{y;E=ic zQBWaTIB85+EX~?3zjO&Uf@DkN)V?~N>NJs>uonBrpMT;|9Qvn|_h&8E9B0!w7dYlu zIf0soNu9Q+TVd9E=}1dG1;UhV)iK8ltZPdC9#5Pp=>85dhZMtxRo8z89=W>z$KCC^ zuU**mAGNg)2FrGxUl8P(w^@A63Y?+lAgyN5%% zWAy94%j7+~`;GiyK1MuEdSS#A3XM7rTO4`wwgbnD|BZZbTpRepkoyGQ-eVgZE5zTM zWd;_Dv`K!LjF%|Y19*4?zAI82-=v7UUdG+wGJ1Km?Q3^J)Hd@9;|xoa1T%1H*IKq+ zCtf2XPFi3%nFW-IRymV8_j%?Fukgl8$riMooHt@h2xs9748RXIy?YCl0&AbfZP!M2 zzr|VMXJw?Wt5cL601iT9?O}{vXfc>Gv1@w$a>xr}OOtQ=a>XRi@ z_?8}VtWGyd=Rg!2k~h2y84X=B?O%KO)CY~=Nj+niCFJBfN3n(@;F}Qe_v|`n1?D&PL%;(9oz7-z%QUFOdKqor zIJJCkVh!u#n7UnbcvFPrRu*f*MI2D(FgzD^LdDa1WO{Qyq4HmVN$!t0G~W-0{}hS( zoc5=Zt=fin{JW#Ko4U#laI{z2#Z#T&O$Za_az?nw_d?sSIa`ntl7rOQ^a6HTX@KV= zoB5MeEM@zB6R8Prg$KsM%4Qv2yHd9)6T**``wG`qgFB$^$GPN+$2U4VHTFG285KBw z$(M?wwuExIu+tJ*Lquu4ws9TM-jo|v#P}1i10}^0aRqgY#*^ziplIl1D8*Eg2Pmlu zUWjyh0jJmEZ-PgIU)Pq{ZMEAx!mA7FMY?jfJ>{NTU)*0wUV&ZGY9D3@{BfA&;uQ(r z<*pb)phu-{EpR&qbd?ukcq?5Ou#4^95q&N3cDWNhEiuz4O3&NAqaFRIRaR1 zQ*uE$^v^S#ed(to9q6vhzx{ogSC1^Kp;&+JTV*;h-bkY~ z1FYPEi8d{FoMk6wrf+5QIU2QzE1qOAb$fjJI((kw`!|VW%a*`0e69&iORwTKM(IQR zZF@%;Iv&_;IT(06cjtZ4T1uZ46Qe)fDPkb0O?<@A+xw-$uBRc8>qS(!+th=f#@4Bt ztA&_PDSSA9^jrZ4SbL4J@#$#5H6JV|Oer{@@b8ct*niZd?>4TR?efOjpZxaW>C0p1 z&@!~MFgm6bk2n0}x0gaLX@${y9q4A#Z+Y$xYgQx3D*I9#l}T;PusGEI8T-1+fO$;F z{q8ImvW~6g6bE52z(4x2%nMHW_0vOZs-NR4O4pJN_|KhYsJXoqgJW=_lR6CFUk4zY zIijcy9afDi&2jiiN1p>L5OdG;A*r}TVUJ~0@7SYGXU)(ZQZ=+qSY@;0aWvg~i__M= z|3X=YKRSSCpZIkGsqJxU1%=4rO8s3S0>h??I^D&Vb)NnBu4uX2y}p_afy9~;GDp7p zxr@VO=Q|0kRRWE7`QTT)wq^eVoqjGY5B)d z{G9dTwywf|iU^BH;va*K=T|y;ooJZ3n|*?y;`eoTBE7Nk$B`Z2`;l6@woTjZKQ zHye=tu=rItF{h^>?DI$h3hI^<=KlbEu*b+pGII}36i`p+a>KnDrdczVRh&0PrR z1euw%eXo|H@y1a@JPHwh?b%u|*ffTeM!y~S#T3MQL7S2s&^f(9a$ZUbf$@~|qM~;g zggmv`kbEtE8=ZMvVvB!vWZj?P4Zg5yhkUyZoszo5f3HXlp=3`7D=W@=^Ne{>k;Lt;`JXi)^kZ~F zl+=PWxpUrIM?bn#WR>7Af%QqA{fpw&?9$BBOS3S1qrx*v_ zIV<$g`Lt)m-9W$jq!?tmpA5&~!eYdMrETqd+4N)q^19{D!GBj!4#;YMIZu*j4JLUk z<14SPb_M>7zuS#=qy0K~OWF#T_Iqh-LNlykBjF0u@GCKMP5P2=7mVs}B5W-;rtN{n zkBt`+uw_~mAna(KzrZecX}M1(Z_AHOp$wthmzaD{SQI`#8~fbAI%@#>J%?;=$0E{7 z>kn8|!u-I&jdpKGwW)_J{+V#3KY%F#PK2Y>ev%!jygSL?z2R9_Td}lq619tqO5*!t zKeAvB0F~9+evo(_-bdN|XZvu`8uu7J_lwvY-v#PgYr`#|wDCDkCx1W7zg@ z=n|o>G@~pR1)VcQ_d@)rLBbf2<=6{VU^J03!Ip*RJpJ_7fsg47Xii)U7<;P(%MJXd z&2Y;IWLCJWEkN-F)3c4<=fr}2)W>IAqySkM%^NE1SUi3o!gCSKXU? z8$2Q=^4$NQ1$g&Xo9i;+M|b7*_D||Ir2e(29cBnGt6`{1o0qA(rxx8Rrn_5+8O7`T z1s+>DQ+2#=ApLt2I^v|N@vQ`R=*1LuiV&u@wW&7kXRT7*qUE z8IM2s$GobJ&caDt%)1Ugjq@Kqjlc!A5rxfR8(lQ#&yN*TsF%r3zj;kV9w8a?_wMKD z&sA?>95Y-Z^5a5Vf(?F;7O!=5G|}I--Np&u>kO>ue0 z8OkqmfZaiD{Jv=yW59*95^V6*Q{q3jGhm7msH(-V{iOD;fCDL-#AF$!4nkW`>@Fo) z&A39cd9Hum-3VWxbH##2PD8Fmh@_>rc|F|#_gkr4p62a*Y`v&C?!~y{meDz4VS4#l zc+`@0yqnU$Hu{10>s9{M%kQuKgs=j{X3ntMk8gh7U$U{X2?tpG7dmor!CMM?>{;u#eiUYFUljA3CKY~bllSK(RJpLTgfnxI9{RW_$MJ$?tXrz z6cyNhtX0-Kxe@ozfY2OZq6CP&f9NdiB+eAe^dQ_CE<0}A&xGmNZuE20KDf(G0Og$`xqA7rhy@{1>D*y3RlRqo}F;&+(#aRH{&4pK-9N zvp2M8yqfEFAc4Qjqc+%t8UB~Z9vLRaC>cXRamH#GDLhk3#(D^d&!VRVe+ng&PSziW z&k}5kUI|!hNMz6k_S~>t9DI>6lLb14l*dI;Gf#7$6I`SvWw3%;6;- zOjoY9V`dyfeC5U>P}h5W8u0UTl4zbAV8&Wg@KSm5dA*L)W@j=78fwN$=a5Qm>2gxl z%AWRxdaGt`jB+0}wVMNTW z0`+lN&M4Y?S=DvdOQqHqv-zkbdH?jKk=JN8^NfY&nu zKYsJHZqFC~UE2Hh=fe0d;%f%#6Rr;$)%fD4d4FgCZ&y`Tz+MXV06}FiZ|FyZmkOTO zgwsYBn0BR|^!rR|j`tJBQbt(@22RqX5N+z zF&2IBwDhhEs6Q`GNNdGXL^cI`<|7baTy$g1M!J2Ja{tt|?rjc+$y%$7&gvi6g>^?Q zm<0!dD#wb6qyc*j* z?BU2=>^il(gELgS)4!8l3DA^P&Z&cbS=5-}??8fhd$mn|WPf0e1-blDLIvt`De|m= z!xZ)Tv>l++7p@f5u8H?TMbi)3cpI7n-va17L!}lFh%wBn6x~|knu6bMsWXC7mteN5 zngHO4pCZURj6tD;Uk{(s1e1&vj;I>x0_F?CU3J|GT1rq{MGGlQ$pfNB{a>PlL{k}W zsxJnkdU~SRXzuPceNz*_^p`$kqW6&54&qF zk1yj6J5hlmk8dx94As7&z0cx}y*1XUXLQ6p%n0WxN6Kap_xeI8ZrV?fHEa2P@?3r^ z`mff4Gx)08wp(Kc4q6Q^vU&Q!L90#a{lo$pgPfPpVIWhnH4{!paG4F;uhJS}H8AID z8-7Di!vwr_oGsXJ@MC70LM~7)vmQ) zJ+9Q_uPbs;9!vNN%GY|EpPn+8z3S$h~`V0B5$#$J4>)|MY@I6E5L>}A`kg|~& zRzg@kWZE8RQ(23>!jmE5XoJSCv)iOjk@%#5rE%1ji~)}q_G&s8xHT|bKE+R!;^4aF z&rSc{LM@Dr!z7%eKWzLBYybFHQukWDHXwKh0Vi|_Ikt*!Ic93*m{7tE&2jauvAw+1 zWEiFd@dtHuRTJC?teM*(L92G1+MIC(>$Uu_D>EG0cXOEwB8)ksNUr6 zt00loaPxj)57B^BP2MTCEEkN#y|Zjv7@!?yNSMGrO2+S5@eJk9PQ5jG$1=st{rn*fW+XVYCsgeVF=Xue67Y-u8-|Fs7<`3Jf`V-|NK>eky& zlYUK|+!FKoA6xLxkuMBKTyfF&=?Fd0s9c3|OYCS6u`H^SIFy5x81zOyU6??8RU5TSDj?YPaJzjVLZyDn1ZI<%1| z^X)AFw{7m=c5?-gK;yjwPvp=IMd13YW5Y8km@ba3XLjvS6k?qD-Q_;pMTmHgXUgR& zm|U^+)5zf4wWufRs1a>ntMg17arGg`NVOpFJhQWjd>rZghaRq9>cT#(`T@6-Bb-IP zKti4?m-p$OBzen)PE)`l&6T`P(?yrPVx4WJvyc-P6cGWzZFil{I2tMQc}Sosb)zw^ zV!gmcBzn#jP8<6+`Y)v(tEbN|D7dOF+*EzjV|jvPmzC zpR$mXMEMU>>m}l53&+Hb_eR~l&ewqBg)yTIQ@_hq{Ou@G^)JvCo=ClqSjL9*`#16) zfGd?Gq#d-vA)j+0(`R#Gw1nH9)9Ngms6|1GPo|dyiE$S9LNcUsZUZPy24_zJ84Z_O ze;>^e2|Nm{(5Mh4AG05eolMgO+0X-f_a-Fb;ouynxR$4HG<$pkZIA*~cN#UXnjxg- zM;0D}tRL5JMhgZoy!c%RhxIr~GtI3~x>#Xntmk#awku?D4G z>W`$^{AHyyxSUu)$)&9z2S~*UX_0Q9%`RsP|KlXbvxY__N^$Ibp>iB!VRnxXcc7;= zpxxobcJuR5x=*0MEl6WQJQR2)@9LIa8*zmD;N;VuXt0gwLt})xTWU}b{2=yY#n~%v zutiQ--0KI`KI&{94LDu8CXhYZfR*O3?pKQ&_s3SljV}}t7typ1=3a-=XtykUu^u5w zFq?Xa9zM(s*|?1>C=-{Zhu;-C%`lGYnejzqff)wwm5lHt%)8$KS^= zVXEOdG|pAv>|F-ExjCMm29(r@GGJFVDh~(kn%Zr^_69wO@4oi+kE>LWI_0MuLl!W~ z<^;wA2g@!4xKN?(=Z>T~uDsIG zYjai2^|EcZ-+Z#|v~&w2V?q)~8e^2j5_3h8J<1P7H^o_?f~%nW1#SaeZqnoGkse7B z_KZd1Tr;!&@|0>(jn%%`l~4R%?2hho%r(Z}q!CLHmqe8?{L#DyLcT~PyeF-h$k_&b zaQ|-GU*Rcc;E(-byz%*UaG=XK__dJ-p{mqd-5UP~6DJ3FA;1DkWaI1ZwCahyG~<08 z^Oxzr=1a*UpPvndV8$67Mp8_Bo?q|g{SgL*hA_LunlXz|4bY4QL1zmb&xJ`vFIdbvM7pg&Lz~q# zuG?JIgQ2vKcU(v~A&VK1>-N=&>K@076d;742!AEUQNc9LtK?)1R&2+X#8FTk@rxr9 zfDuO_cn({#E)#-L7ldYvgrLj zzp|DAp9BY@aAc!S1cuz^aF+#Y2M6okzGyv72-jCbg>4gmR)?Js>-aW0sMZ9Wp={DH z=xQIlCDCV(4QO~sE8kJey?)1e7hPk6me~WE2{W!;~+xD!bT2W zNWop9|12Igxh0v|5pX-`(~*jI)1Q;{C7(8bDBJax0pdeu5j}8YW$Txrv9C}A(DLo1 z@+f}yj;9jc|M3q9F54~z3Cd3@2^vZK;7>}&>6T6Q8JM|PdlFWcM&B9$f>$UCtx(A5 zuZ%MEdaXp#+U9A$uH6nWXS}g-$jkp_oZ8-Wa+l}XpKV_<_}6s4(Nw}ZPgIDGJm6_z zT$2(w#dKPZeulEs^J00}3yxcj676HAli&74Qeu=p_1Jgh{d}&hq9=V#wVOJ(~ zZLSo2IV))9sUvzE%8i6g>khu2t{b0iVrU9C)FCRjcB_TA z$>jM}^3o1<(Vzs(u6A4CrTtC9)K5ib;hGTL#DNvwn~BDC!DacHo-G;5O4#>}av+ zrM?pNl+bd+YD?B5_ZwKX;Jnq;md|P7Jw4g`?C;uKdA^-ui1I!@Lqz1)-w4|G%v(aj zI|DQ&#|`c~Z6=^-d9j?3k97TI?7@ouLYj8M`pQ zaU$>3tqfh)GgnFCOK-0V`0|!6`^^xH#`<YrbR?3sCx1*rOx{Q) zR9N0GcnDyK&B9~YIf2g(L3&jROAZ2w2m~a-j^UFcy}mMm5%fL_^mIJtp;q{KIu^Ew zGoY_#F~L>m@TftLZyz1V*5uO_f?S8w`LJahB9Qoj-AiiO*T<)+YgZ_H`4@&wz+U@S zXGjrZirClL$Bc+CA)IN8^}_cZcuoP$%mBtMfH3%9 z*#BA*LtgGvXMs;2IC@cBt`hLnK5mcyAm08|XlD&F{O%Nkj!h(d#qV%Dx)-eb`q(@V zZtz++yo-@ch;}VU^4&c5SCu{W6t>0I>`MFxuP_8>x+{nL(zaDS0Fj}HrlYx(S<&JP z2PNVseCDY6I;eDRoYuw@ygKHuU)^|r!O)8=YH@BlA#V2E>(HD%BiHp!c-`1(^iOr}o^VJQBuA;hxDi!_c#P?aic4@29^% zMr6yL3MaD>yBS`GzYUywC3{H;0d99>|JJpdaw!4KV8F(M(H3I?@`$=K`Ad;qijg^k zn8<{L6@TL~F>Hv{vJ(dm&b;26OXc%4>lXET0y%PL0O7hk__%FcaYMd&V%au!x&o}a152^c2Z92VInYAc0$O!_!%OCd?VV3zUC zyF$0!Pjhs~b^viUH2SxitrkAdkMBp9SVn`lW5^aVo=a})04oLp30;nzt z9;2Qlb&FhgL2RWM)t$l>3vtAkOfsEa#6(#fdMrLK)fhMG*B|15r!A+BSAXU`!C;1D zbSxpHdB{=+gD!vd33%85i~U_QkXUPC-qB<2;?j*0`^64Avpc}fY;r}!?Dv5A z?{mPUi-Ozm`eX4i-tPzx%O%^ePt4JiM2=ihLlE{MHpZYsm@L64kgM6|Ojg-(m=h@( zg+}$8R{yaE!cFpxnN6?`SEYm8>VCIwEP7mtt1Xlm5Hq=JX=v&r*$2l>lqU?h4N_#R z1AfS2sw5Q@TESCpbX-UG&U3D<|KSLf{=CJ@nb+tK`H>yX-x7DSjMVQVJ>Bv84YzXg zHAet5F3ZnAV zA9LC@@Y(QHzuT?X%ng>l67F0Z`20;uxq7D{17ry{(P7|-Fq5G|NP#!fg^#4XAk&Q@ zeQ$?ebvv{5(6opcA0|hE+(b>R_waOu+JnkRmov!kZoWq|ewaqd*CBN{;FL`O_OfX| z*g1u5Mg6U!^L~>)_kiXvyTS=-8t}y<*&$Yrv~1m(kh9UHv9pw)i=zTp+d&twL@#wg z9c9FT?pke^frdGM(+NfV_BpOLHGAJtC#Q~Bb7>C(D&DHECIyydev4z?g#u2YI`o+c z9_E9}6N+60E&zh6&f5!Sb-iGiVYGOUMN+e9GMwL+P{aj+saj|4XDzWR_msI;%P!o^+v!#7o z;L+hRhHd^ywg8#H#o{ChZawrcIrQxLRA+JOgGM88q6T^f+8o|n99QZbcBKilB;0Bo zZ#A+m3KKz?D`7CQ`V*+EGR!s)-$xc=SV-Z&KQDiC5I&`v1Z$8`mfG0-2W7BvgjZb0 z1*^V~fc_T!M-;tu-KUm)=dG(xpw#pk=!wUypdY6%eHL8JeX}Qsx2V+o6+PJ_GlPVo zF%KM+CWx7m=us%9AZg-QG=;oKfZTL108_KVz%K`Qgy~LzXNH*w>5G}=`*NnS7W2$l`Og}OhF zyYL@oAzyD|WZNEDgWLBfRt|IA zMVQj(%2eND(rc}-Bt6C-UXHMN*2M6Q%ybb(^NJd0d93gy%)V(?!XQ(8&OSAeOe5cD z?DtWS3aP=<(2g?zai5Nb@2-HcnuI2%2{THoCZg#AfzDiib7EeBKFr=cX*}G)_x>XN z+b7!i$e|DZmYQph@;Otj!Ql2sTdTMxJBg_?XFdq6-58O#;gG+rq1WTEB^u;DtLgRY zDZBe1G9+fQ#mQGti{iJr&9l?$QC9fy@#yT$P@3%Iqiv{h4(W!8Wy3SMSVe(?Nu8eb z#W-3)v?iqL!_bvvXbi zsnoz}ROgGX@0GGqWeG;|OqkelKhlPHte!ww}CkFZJ46<3{(ox`3xqlb7;7_2V1 zImbu#P#}kg(*TV3{sM+uIlDj2;;a%Is{@r{Sc0ZgJ|_L72;t~z%9)@d@DHiN;o!>S zt%c2Dr_t$e;Cu`I`)H(`X=kV#AVbdm*q{t=^mmG&a$+-{wz;(*1M`Uo6b z3d!xfk%HD9aaSct<`nykMeTmWQ#sk1F=P9dEEY)4Pjuw1@dOCkGKlmlFF8E;TY^?zD~=#URCbv#xbRQE8K!} zzgvUEgy}Yz#OVHQxxa@{ibi3Ce>X9O%8f!el{4HO>9Cz?B~*Sg5Ih^knE_uCe|&s! z;Y1$o-J=~x>PtEEJ6Ero0cJVdojzT2aRKkMRt{v1@>T(lcXbh+vZa~~ZAO&>_b~$8 z<*=9jO(yH-j~e~<1JKd=3ZxDSPLVjT2Z$h=3Z9N>#0Ft<=;!NRv!$^iLD-hi#!XKR z%3qrgZ6mJ(Xj-vPQ6~*HZY{ir8}W%fFjm~J95r?xks^IT-$_`{3eZ&k;hAFQ-esyE zZ1sf2R-mJuO(stwSG{6yiI-dl1^H0~!mo!BNI(XLYd^qRCl(v;ufC1rlNYV$Nc z+*m(3rh>X@7t6s!k7jBSILJGf5ITywe-R${8d+gZT)A2cOv^D5W}N(WW%l=&Aa%X= z(hL;{YQKt@f|*i>$^xFe=IW~Vnj#tCmzGQ#wA?N1Moa0TLSw%`*v4(Ws~w*%B&o6Z-p3-56G+&ZQiS(EIe$aPG*}c%w?U zM*qh#YtIpgRKY|7Xoz>8-7d`Whh^>cVR5#Hi}hA+xoBB6H5(KrP&5QXZ#WU1Al(z; zl~s=q2Lk^(P)u>zd|{tX?fH4Y{?<|~_mQG`5pL?>2-@!4Q7zNBJnVCZ%Gr$8`5PY9I(>Nmqr=WB{HuN)gq;^;#+Io3q8v_NL7Y-TX|YqHIN|7uoKRC#g)>_^Sz z5~bk!FfDl&ulq;f+2R zaOOt`+YLqWf}oFsIr8~%LoWG%v3K&hGT7OP6T2Q@LOTFY4gc{6O`0HoqNp^XE1|H20s7tUwiKk0OG8g9VD#^#wVpyqiJG;)kz zaU&+b6$bD2y3nW*oRY?RvU%L%G{NuY^5n7d^P)DuP%X42@$uu08+Tl=UgFHfb=;h5 z)8&D{DsEYkEMt>=;P0~&)iDzl#|iBKJTv@9rvY=-OTpIKX<-73WRgqf1CFF{DNuWGBZn6p|B{;zAro&kWjby+nT_x!mnR{bws75! z{Ms>UWOO7+9=F_nb2WYXG!o`uqsoJw!T^Vq+IwDH^w458GNP|qi+`^9r#~9wnZ%R6 z#vpVmU3(={h$^j{-7EtWNMXd+&BJPP-B6$um$&xghWXnHF`|>j%`QBy=is#FjySAt zGq@30NjxB2(1ctXNiWU51~~yGyEu+6`XAZ}h-Cph(y}r!USaWx0_wfSg(M}lkDumI zzJxOt=+rF$j+4$8-W0Vb>i@a)JRO-u$UvfLtDwPv?(%~}5NcwNYp{y7K6KJ54c zx0B_TfUvDUcIcu-r-;o!e%voMAN{?5f0yEB1;WWER-PiA?3bu&1Fnp9C+C`6w|Vzn ztN!DP|4cIeJMXc5u9)yU4ZRJ;Y1%iIcf|2Gb{9Mm9=>;B;e38@`nT1to9`kh$_P(d zp3mRV3{TqU@=1|3@P9k!LDCLwST`dNGJhknju@HnIUo$-Nsy%?*%ffZ#&1lzBxT(K zW0|IxoSrDaZR2^bDlP`}OF;QmHwG%YDi{o6lGH^8VKKr(V&BK+%6Pl!DRIXjVNMg( z37C)$z>1OI>#CMs=UO_+EZeZcmW3;I%vD^mbNACqDn9FNOncxin{=GuHlp!zgAd7) z@;PGZo2s~ZIvx6zqmyKQ*B9>S3~s(Qs4s*2Gha%HM~Z_Q%qe>BfBo9xLgDNF`48sI zJFhEo{DBHX#LZ6Tc(jNoWozM`HYjj%!Q#=E^d3Gpv4FV7Ehp0`~{I>5JQ(uuM`FLV3D#C*I(`;I6 z`5PRopn#th#`7o}yS&ZNsS~&r$u5`w@m#lA%{l;@h|s~BN5|YJiKX=U_fm=;I|s1v zlF=?o*Yhk0cQ_;`A+}vmWvrg(iK>TP;@b7jz=U%ER*qgN)%=7;7oRj?iGiY)yQ0yx zOo)}2gHe>GV!#3=Z=bCK3$_TI+_eBV4y($10L7RAs{*T8+>ZU$8`X2`%EOf1U%X4Y zK#Ey^C{dS+=4dhA{dYcG+Wz&1f4X6-Du6ixey#X@YPgVIFj58)q<#l6QZN{sCs(yMSXVD@w%L6e-zGJv0 z=z(_ORz)vuIIqciwW2F55^#^MdD*kgYy+fAd3N8TnCIc<|W06VL4@LQ?D2nZokO|Fg73e3<>{zF`;>%(VYB<8J`z9jtH5F zW^fbe)H2*`a~z|D+lSjhUw(C|$UlGY-GZul!~FczhXLgR2m24dBjB9?_fkPw+;jT_ zrE_Z6fTLe*|6IMF`MJfDP#0<{hSQtK*-j}ig(oP9~ zHx8Uq=Otw*1bR#)Ct$)j0F6eYXKmxk5s?oPyfyb6N%5kpU&Ii>_8^L8uyGLEWin<; z*_MJw#*7bpeyBV7fOk8{yP>mg=vg=MH3 zPbqcRU++&AGYV+Ivx(uxdo%#cf&IIJ+? z-x#*EnB3Cwc@;4-rU#!7f0usG>+5F?SL;HTPjL>?z_7gBdtXQmm=pztP8R1Fgh~Yl@0(V(zLz-b?rwk^It*PKOo)g zy4gt9WfPptG$(Jac(6=%rQ<%%Fj(Oha5F<%A-e^-L@HKFl-+3;y+vgsYt`UkpH!pU zA84nGED$-afsZ*b3u$o&eb;~QxvF>36{T_`1`NfwSr^uh3N_Mn4xoptIBZ4Fa7P96 z0Dg0o_hE;lz!}J1KQXofCWHg9uJJocYLpg~9ZavjqiZXk>9KZ#IJHHl00x@0aQ-e5 zIbx%3X5vo;MC7lPxM53WUq>C~hFbdEGIia9x2T^jxLhrImNu-}W6RytoA*9J9kA2O z)Z7hbM{x7Xrqj6X|E1TIDzO(G@O<7W$81Mn`IL^+xuu0OrFJ`sp3QWXa?6)KQ`+vg zbh6_#;F_~8Q8NZ+#NUp$iBQ$K=OwRMo8bY@lW@AHS=seEAyM8)w?Q+TR^cYYDmalh zv{p^~-s{aJL~s+K{r})8mnzja&7CSrqBVB3QP48&s&dCU$`EBvKvh0YP_b1(wq*Pm z=QRt=(tHA8FFE5H7R zLVTY8(%saw=>z!~cLj534)qO{^Qvu2>IZzl7+2?}PWu5y3H?>-1M;8mv>( zV-GG?Pc3=6I*}&O6EECyclD#wzk*sJa4ni3Z^F8H>s6*%t?VHg@uwU3yCqm4yRy8& z&5d+ESPux#J8lZ)%`dHFd5ZK(Lk)cCIDhRhMEy7ez_I~@r)VdDy(gd(%qYHY16QA* zRAUTV)!GS=KGD<-s~>2!JQTgR)$dA#m%X98w*tD_0a!nJ#p6n;t$F2XzRod!fZOsS zj}31N$8<`O9N9U*e4Gpx>8BD8Qp64GBCP8etgG+6QJwvp&nL2G`-a{6&sWf{ZH!KV zNJ!p$$-3?L<>Kh&Wryw+-EJX)h0~+BN3I=_ucO}|xb3EYD80u&)jsn-c7^SzX;0KN z$=|r+BjJIV-;4>(qrnu}1sx$dd!3Tqf|y|7zh0}98u6+An9=7Bz^Q2eevG&cTrJ3v zlueMBUUvy>ReUSyb8ekd=am8r>-8clI2KrDZ5C&5RB+iy*Qt)~b^u1Mz|A?`9(ryM z*bUo?q$eo{Q0a9&!7Jjn-yoy`u+Pa zRGZA4J%)AT-j|`!z9q(AKeg{GUu++yVSytp5p34J8U3cmFSz!Oj?lNSzfbk`_oA+V zp1Y*x7bC-?YG}~!jMI+V8l*^l!l~&8Hn@^LtL2Zwumk8c=f%?CA zs>;@_2=@40s-HUo@Hf-~UGU) z&;Ez+?QW)vVNGNhH_t&)|6gyoQwzP~>aKR12kQq`AfZC6ZhzHa1bW|pZk2jIXXUz)F{tM+$w zAJBBkSXX|XE<{Za-Se1Qx@cL;NW9@jGga2pW9JisCAQw~Bhh#cJp+A+fQNYsSnrnw zE$5V4y>fNzYJ;Znyyc^pv(pqPV*yT8&fcg^ApDJaKsYKF$S#a;Qg$7Ug_ALaFjZtX z1vforWJC>o`a~1)Yc-=g#%rUF|6>*Z?l=8Cb`WOFQiE^2$jMNUSt*jO0^A1XozOHN zq^Y+@w*+6Fx#Ra1pq%qo1H(&La zmf*VaoQ+u61Kk}dR)VkT>?O8Uf{mnJ0oPE%UWajrRK9JncFp>h;HiPYdcqo(Zw z-BNi&PN2Wnfu0I2(q@miyNxFJu8`dR8W zWMEpq8kjy{Zm=M>(Eiad>Q5VvwX4>t(b3iwz-_KP$qrFeaaIg{17Upxc~)?sEXvUvAv& z+z$F25V?7cU3lU;(7`I$XW>48-0-958#0=woqxS`Sfp$(D zRvB*R-THHN?oAh_@>S_LZR}^xni+3KR1$9TE$N}bVYRvihU3<=E+?lX$-b^#H^?pO zb=&W2x^g=HIrKIA=RXE@l-{Q?>fW-})61S!f1iJEDg9yt^nB-Rt_vOIkLy3+JVulI z!Tbnuf!hwkJcDzQ*s;JyPr{ct8@}-oE+*vH^gjF4b4q7H#`5{U_nfch&X^s@u9Lxv zvTGC+Y}eQpdN3v;`o^CC$;LHfS6PTds zSFDS7a0*4r5@12#VuA6%bAb87vnA^uz1 zD5Bdw{-hU*+Cw%x*YyLZ_`>hzy{H2RXw zwwj|}xQ}W3%N>?LM>HDh+AIFt+=P`>Ai%Hcrwdu;|i!s>&{qci=rI8k$Lkd_2O}&VViggslJ}Gcfd_pQ}dyfb(Kw zdWmou(kHFJZQ#1G>mpUf31~_hC+I^B_4@2B>Q~(``>t^S)~~yan8YGSj%JZ)q==oc z{NFhJg(%Kp_!K>j$KZ@`S;ogJ(fE9v@^OmSjQ#3$KU6=xJuHl?!XR7kppRvNB^Eqt z6Zq5Y2@kTtg9)-!7H$}ndn3*4%aVmpR++vVd+UcUv-KOsIRXDn|9`)46f318Uw3d& zyvrx?r%P{WYF>H^W$u=9EQz_vl=7Mdp*nh;uZd02s4UMY#Cq9_3n$`*{9(8CfxiRO ziRml>YW7sb?wjqbE;#usE|DS0F8R*x-Bgx0;W_WJf@FmBOw}d8=$t2W!b5)7V8l z`IolJo>h~<7#Dr9(<{O6_*fQ(#pWZdv8@Gz<7hH&`+igJxi$Cc?dw%r@3=+0tl26K zz!lR6-<}xMM+i)x8zZQ!!V1qCDkD!|u>I|5k3X`cGIF<`c`2%LHjnGM?^i;rquy{R zO&Or5SmS%uCD&J;i+*66o#Zp`PP1Wq99kVWOxH~4|8xT%Lw~bR>&U5(n`-6I)1x-r zcmuV;hUS7EQdd#|1Fo;>G|^wUP|}9M;5<8-v}2xltVzdCuc>g7Dp}q@PLbSk9W26v zAOO=XqD%PFxub}Tk3iOYuD(L`Ui<^PBK&Ay*&e_CeS=wQ@T?z;JRj46aLmPTCxP?t z^-TdQ((F)7=Z>yZ{WqLkeuOHBx)_r}CIF9PI>cuh*|X9!k_;4$lMFO|KV~FpUIo5< zp*R-3SE-@wEy`R}GLE0_Z~)d`N=O{UH}33nc#jJ%_6iEWm~qe7nH@>S-^E~Y=N8sW z8V}z|?*Ts3M1RvoXR3#vUewgm>ol}Z^}7$52zcBSQND+t8y0EnO)_R^mb{1zjx+kX z@K8e62n?&L8G(yW{f63k&UOUF{r)HJENN%x$deBCTL#WxDD}`?kE#3r{%~blZ@;VQ z;EA0j3CNn&>pFTjz_b|yYO}58qV>1g0#f=OF0fR57{@K-4$s>SwfK>xmFYSE%u6jj z{mC7Cn#QND4d|F2z%Ndfw<1^^Mw#rw`}^N3@S`SM%;@u4fZiT8^qETtP0DZ+MV;40 zvF%TOvWC;Sh}OLioTqvgk1acyf; z)p)NNe`hA`8@a&Qqrihl5h=U_C&5VpRGx12iU%0Q6Uaxm1{Td3;q$^ahaD8B!o2q_ zFl0px+S}W!cHCoI-zv7qGsT$;hL@Xp;C98{ZgID{le%fbp-c+Kbu$SoqF)bb7ra8n{FILtUCH#zizNH zyiPo@<#wB?foVRVApB@dj58B{TP)1!LPtU<2PxW9dHmrem5+wb|B&ALY>n)CIrNN- zSsLUGq}pT4GF28y=ph2xLs>6*7kJ>kCmGOOi^k6QqwRsA&t7UffxzP)NKx+rs+Z(v z%xe3SCXP-ftrOKt@SI1{^gGfFhd zv%s3oL{KvkoM^~S9$zP5+#P_y)y4sEOzYB7{#%!N#>HvCkwll(MZg%Yhp5lK>LcnqxBN`~V8JhTBG%o%YyX4G#~ig%2#Q{A@Qpu)}WK+MWbv0l0n(O}~}FvhX*5 zkV1R({%V=58{c=a>hJAC#j1#Mf$W-had`_IZm%vxU1CI)!g8G=k-?Or04&#j%ci0F zzIKl4x%W;`UfvPlSpeh^4E~pn_{~<2+gT9xlEE7Ej$1^g_i$DQ)2R|}2|9P+#y2a~ zXwl6-RWH&kGrncNw@WZv@ZKry01U3a#2rfY(KxrPoXS>|$$4B@VJznKJDCSCEO`WV zOa;qsw-xeP=YkZ*ARM=K!|T-{-#NJwTfX3>ySee)S>`I440MHowm}WnB=ROeaCFvy zh?xv1wB+be+Ty)#4eQ=J9!kdlh+Pg;w?A>Wda9rW@^Pmf>ESh$y5gd%lHpJGf!pr9 zmC{9wQ2b|3dBm{B+!b;^7*P)Fk^2^vZk6CSYA0ZzSC_+=$u8zSYiphCOT6c0(3^Ya zg`#)TJ`LrvOXZ-U`rprv>;lQyiGZQcp064+H$>r{Y(0!Y_Zc@SUGL=`U`ToiUvQPC zmpE>GZTfF~xu;*9>wP1xj(uuyAzD=0oO%=Ckj))z16xwcj4}R0BHUkn<=n=At$K z0o#%j61-UmQ_McRVV1)pN1~bB8?xI3v4~PN)LnnMKSh+1#+>lhqjHbccw-sLwX zJ=3W{J-t0jcL|)k`6lF*I2r3*S8L=(8~J?%t5>eAWLV2^+T{g1bLH}=LY+3QF z2p9E_07dfPU5}Pc!To;IdoNb~eSK~_DNsgleb`Et!HO zhtE7mjqawere>e2xK-703Ai;wr~Vt>pzIM9gAn&UWM3pK=+MvVnt+ro0q&P^qrrVv zAT{@o;Cm^S5e<=j0RP5e$GDv@c<5VNL03xMr~0#VT6VE=vi#xYtMpJS1`n?MrQW2a zo5>ikTRcliXGmDb6L?J-betg2D%2`&Bs|Ufp1BaFIalVAZfT&bpkfudal}f zhb>5fR5X}F`n+h(Xk!}l5b0dV1*ZU5;8e%f%_es5zWsisy9$o=bK)6Ct80JzXZ6go z7VK44oXi&6Zk8K(@q?5HWP%_v#RZjKuY{Krak%; z1~U24eGgV6Z~sUlZi3Y$1_N8NNXMy|UgE`+Ezr6BH=SJl_P`>JsJbPP%v}>_V0Oy* z)B=o424LN)OOEVmH2&!93X5dRmJJ&$4g*KEsYZ{FONHU>qHnd@46J>>O_fI({`&Wq z9EuLH7_X~dnE|&8~GneGQmAa%Vtl)G7o-1m7jBhxMEmpVT7SnP0c0g&@ zjS4KOvjNaTI2O5k<>LXjDsq?J$$Z6VwgaOn=}svt0?&APJ1RR>b$s7)TpWPG=YCax44t^dBS ze2KTTr3Yz=Nil{TUo9)UR^2fG03ZNKL_t(Kpq!g=#sl>?U}a&HPB;XHPDE(s>?EFh zW~I9S&gw_?DyW#`q5T7W>Ul3hMlr~@V2P%5H31>COGZ-eHsC4UeeVS6SSEz0tb>zK z(eH}BvW8lDexqI z6)&(KtL&1>JE)1lPOYUxitGmUGogI(1(*!DVI2DI{-VmBxwSH%6+WQjfS3`D1tu&( zk~E?6qd|UP;1sl3FZKW8jixVw#>3Vn3>}9~(=hz1;+Cyl zs`_sKP%Ffc!f3vucl=87Yu9;@sng@uLjG7qqpK6+JZ<%-qn@3(f|38+SGI(oCM=c+BX*;MI1 z4fzKtRo-#Y{f;^)`lG1U5kN;7-J4=j5jQeuYTg|&TT}}ldO|(3EbYEleXa4H`|eIp z{0T&g`O4tPXb14_+wNDxL*-7u*0VNOm!I-2=6p0EyZJn&c$?{xXy*^&@g>X$U*XNY z{&wmmj3>n{TYjJF`_rfC zOsOHQG!M?-DPttXQ8X{i&ca+fodrlG*I4wUdv@^Ii@&9^>;plHM@o^z(koaaI>toP z!#(L!QZL{HU|8rmmkq1}3tNCDaohL1rU6csk5;ya9=pFQ>$hq$8&5D z?a@}iIk`~1Dn3~eBd@V_v{fcK+J=5}dMV4)?Kk}+iDrB4zlX1T;P!?&I=*$T0gdY& z?!5J$q^pK+e)msRU)D?aLt;*7%Vn351nVH~)5jb##ODNB2lZ0VJ-=1Ge?8wDf5-s9 z(L{^a(D6SH8$`ewi`;=7olxiY-GrO~B>PcDE7Pg)`;hGi14N04PT)Sa`3YEPnX%4#BMgOJ&s!Aqx2oYcBS0v^Ogn%zT=j zOxAQdV@2NyZ4Fw3+g-~ZRByZNQEqRPyA>- zVTD^dq<^4az4*WvkS+5#3xf5w{|9Rh!o+PF1BBg&Sm3(gy1$j;_p(D@WIYHE1!om- z4Fu&XUq|xS>uu+}lDFkfK+&g6p2~iY$y=GODWg)A_X>5;Irxe&U`lh96*-zJN^#&e_~B1o*@?;4hR2U zG%v~GhAQ~d>@;QjOgB%alqWmp01Q6;GfyIY>zT_U`{E*Zw|eeu+Tm!diH`jDkot7r zyG20-XTHKMk1E`IaWsqat{7G@9|;zZiraykQtE*3pR7h2x|w$M&(Uvsg?&hfF04ln zryW9DVz^V^>i3WN_f~&-{X{7RbeF!Dy!?gnam4c?k`oOT@HPO6*zxU+mY)p^n{}Rl z&FzKr-S?F*b`}bYV*ZfxQ_MfGxZvEwf@{m2jX%HRBGn6>0@OQFaVplr4EtyX0rT!nBX3pkggC8^gHZw4E{KeGnwOHr2H5&lywj3>Bii46e z2AnY9=^}|pfhUdO-?5;tQ(1tHH~{OPzW9roYJ9AWR%O2vSrtliiq|QA*1F1jWAA7M z4DPrBAA(UHZH%h@e{f2vL5U4G_T-j}WA2N0=r) zlMoosT=JpdfYx+8@Q+8-Q%mLTnhj>nG{u3gc+~c*=SM-2(T1@&`*-WSVn;(iGyh#b zixR(G@+Q5o%Db2zFFh#_M@D11Ert8~zkP~QJ)?5LpPmp;|HEm36Mj}H+0YDbeYcEZ zO8}>?I3f6NIyP!mE0Lo2rYuNn#(XI|U46VYpyE(E;s6Xj^;5e!?vLWp2n8mH@+e~E zsW*}Q=vuDM^46rtZHq)s28xdx%rKh63BF5!6**lw4tmHtoMx((n(qN9{X?alV+8Myd2uX^Fu{8dT!;V=;X*)nLVd4R@6kP0kv(wvO z3($54VCb2P4sDF~T$_>wAt!ghW>#1r@(%9BC3us`9xj6=y*I!&_I~Mm;XCOaV|4_& z!O(Th9Bk2}5joVJ$L>(^dWcTVTNe$!;APKa6?I%V@S!)uDZCgR1ReXw{mJ6w4apO24aiedQ~RmKfnhss-GVOW6M z;TOJ3tsGpFzT)-BoB{*W21xWnqtvjWPhdb%b3V=2+CgaNmWl2)@cg~?jgUgvgL?E} zeU5n)Upxfzgyq8<1Ax!(t95Pf{ZO1yV5th4PZMTsmB9^H&M)N1>3!4G4R8IC#X2Ut zDe~qiV_hWU=8>LO33|zTO^8aY;{eaEn783nztL@D(_}Fjw zZk3(ZxkD>e-(TM|zFJ7{Zk4yC2%V!=&KlT6pAxp+#YJD{*!E@t+Ufu-S@Poz=JfWh zB8UlLwigK6i4nwc^_OP?DCf002^kd*%xi5!MUM$||`1Dq-}+yC&r)r<|MJ0r{!?8E`! zMP1PwA4Szedqp4;0l9KVB4`R3nnv1Ff)eYx-`-M+{`|N9#QEpZoj412OuB?k-F30V z*K0^)fL^r8=ssD?5&);|Ub4UJ43IH2hzCaBh{%Nnjv?3cP-1`6W zE~Q4gC~#S)lv<541yaP%+3!NvS*&aQH>k^DYbs>VClYh+H93N{Iv%;hK*k!Vl9Al5-NYDj}cP6Xl;2~}}JNc+Af827aKSd!#u?sML$ zWjxiA-+TLdRd27!Ux8g5T(8@9jsHhCLW0klRcn(cq@!z}8fK|m!I;JXLqb9NU8jH7 zty!Nur=o$n*Mqc?>wI#mY!~F(MaA+#PwQ&XxKpKS~EhUVCkowDYe^V=- zURg+w`Da|@jump*b^QmBPKfCeEGH>?iEll2S}$ST`aWlkzn&B{`jIjL?Dyg0|5K?= zcQWMX*$RA|ejIgf->s*}=lU^M;EW2-{uYgkIql9Uup=xyD8tNzg-6OjOIZRwH-Hy& zwy{FhV_u_rcn`0ZC=b?3p;a(*ID=1Kl%wb9AzX_|GGvG`ok6xrC&M@CYrY+A}xj&YSvj18#bph&Qfdi|kJc}fW-qO-IEz*Cn1 zG#@BwIIfYn<_vuhC(d*?B}$sBesz5z**tP-K=x7;nk||w)ZsG z2uVySW97|}7k;ZMxGCey<|T-d1U7q3dujpNmH`-CdZBXwuv!T`YKtvZJ3ehGIeJBo zQ>emx5|^(AUwWe& z9xm=XvEXeNI`<@1c1iIa&W13(GoE@0mWt~&FxGwlcADJaM>78CyPl$nr|^Er*ISN*rWvx1}-Z%^fbcw~;D7yVXk7UAd?!JbeKz|hhQ2USD$ zJHk6pUY0LAo zX7kD$kKoE@X?<#J0(v_EwmN(s+NV>EF$$eS5^XWyL12KQQ|$;ed+ZRJJ%w$YZFHQo zxxJ=2aS?H10Ph4?P^1trEclbm4SYvkf-5hcSI7g}0mwfQ*@fQL)o#)Ml-E@Sz9syLrX4nJMXNyCfTlZ@?!-jmq+WCLca}ip$Wnpl#(B3 zbpv{yC@2>Y!7)KJ-cAHZW_XXEoM+C{jOHb*Nhmpc+)mscT(MBS<=53O3F2%6MxWO} z7`lb&ZC%7RI+~v9*U@v8LcG?oHHEa%CbJl5FwI6SuXv_-{}~?MXp^vv*VyeKwzY=} zX!MNt#JL0DY!P}S)j{EOJK%`D)!Z%TkS08?5D-qVV6PZ^Dj_NkJm2yttd)>X9AG4c z%K6{@AKbgZVpdG8*n6~ zN^PzU^K}0OZ!J}lWdqFKIJyql9)>1aUPOPbjMlDBE2PtrvOZd;9ff8J-KI?+$hiSG zpDDv9<@b%}%tF}|AKgK}35{-QCqxa4<`j7f$E+&fPdAYm{mmW+cS9k9##_eEB|0da z4#%H4?pHlFc3wp`*4)DJf$!?j`1Z={`_5X{Nb8Y0UVGnNigYS_eF#Hiu zAB>wsC(u1WkD!xjOgd;b)afqwC{lC$8%x*2j?Mn+TR6o1t4^1<3e}A7z@mo#noh~|Ip50iLxG$}v z{T_QFV9m<4l~dS#{k^KMUxzlTDaWCVFtawbbz0~(Fr&D&ud;NmZhn@h#AJeoczzv|bP%n`t7#-HRy?1|3Woyv|WijEA zltaqclrbr=1-nL#4gwPT+f-Y$xEQeY4#46c8`(!Gz#`@B3a5l3$5a>qzg4i{oU*G$ zUiTsBgGIFb5g3F<_6)bQ|i~o*yJF+o^MVZ~PaPty^N=3I741lv2Zonfc&e6r2w2)VbNJ2UPFTjVF&{_xJ@$(x{=mZTjNJT#coq2(oO*0B)Bc7wRTJ$?wCxG&K z0W>@x7zYJzpr@qwVL+r;fSos=4}sMJ+}`xte^n2!c)T)G&D?ON(&==mS{qMGDgf8d zlr?10d-QlK!Awx6r_(Cx0U_L|Cx_5zC&zx@yb`1?;dXl_vj5@dP_ir=K2skC+1Xxe1vBiFBUO*F<;=MJw^ z{dc~%MO@xKFr%9tr$)DZBMaI>TiKNkz~G|u@6VLlwJevCH?J=A6Y%j;mu~WD;WBg}tx^dt#d6I=9 zPR+Mc&n{n4$VeN{*~n)U+!~rx_cJBWV!+d945(gP=$C(wmOs`6$9MBgQIM&P6}B`PTYw&#(-iC&OLT>H0_TtxO}P za7>J-RSRs{;&R8NoGRlxLOX^Bzj|LaXR}Sz&(6KPa54){`4Nq<%XA4u>5T8fOQ5)3 zLV5!90M0UCYX%WNKg;Zyi0UQL=9>5QebO3QOa)*Zebn#&o!3#lr0LZA*YBxp@lEt- zB4h!;8L;ymex-I!CWg+XJfJTGTAOci^gMK~%0`w`JW@m?o32K-dZTL0ewk7Ov)f`% z`nNlyCAPaIKpOY_VAk*kJ(21pt5$B2P+b>zR_VRycnvu3Iu+jl`zuk1vEb^!DzB@3X(>7utV#y}2}UCLO$oTZDF zmGX&p&ZbT8x6Tgb4SJG=6>2gzH7t*g)*=TOIPJ;Dt+Fbe)x;mL;ACw8xy~rl34k|R zhgRyP!ugcZJk(2l|0?K%o?bQl+3yzsYZGn_rTQ*^yEp#a@Z-OAcH$MVK4^^sT93cZ z^-f9|@5J;sQWDOZmcfcGU%IXATRpl_w#Pfu8ki(-OBr_-{yy~Bc|xv-C3=eJ=bq+? zI5Ad22A26R8wauXR+!H|KYK@|HJH2kCL}AttJuA&v)K#YdmzhH z(H^pH1+4dU`NtHmDfRS|`cmz*Pj39t$IFQ^dMhKXdEq&5Tvo0qt}_4!po$Z)<@TEk z=T8c^Z&^QjrIsvwvXl^8ZnwD`L(lqi9tVY~{|~=G&j#k*30q}L7M43DrIVci0~Wjm z42&SVUaLniLC;J8y_7wCk5U_MtQwnb71wE7^J}R7?cc!+V0FPAGXVX{p+|pc$VAfeu?=<>RzV~m z1kA`AlC6jN7KdjX7D`tW`M^3BD^cRJ@bkf}td;pUW->y^Ci3OzDbq z+EfNe;fd%Q&d}fB`=X+@SfxCmQl&D^BZ1FnTHDx@kqWq=(34L2nd zppU$5wv|oQ3-TkG7ie^Wg=g84r`1r&O^CX00CtAJX#=?_zCcD`B%BdIb6>h>d1*aI zbyd+_Pb_%L599L2j#MV=r6OGd=tuRH8$k6^&Lm8i#q^}4m&ly#06tG#Zl9u;n$Wp@ zzjy~N{KG|n>_)=j!}Zz-K@^FQbLCCbV18Ai|Pm!($2>!-sOyjJLuc8HxGFim!Bvl@$~ z?lDkQsCdAy=nl-%o&SIKz5~pz+GtyM@7fsCA@pW2)iir;dJEOmKni>*UlQ_>KoSVH z=}AaJ5=cTI7>Cf)d!vQkdv~LE(@YH=+qmrR{eK;4q?yr3N9XR{_1gG8Pr~}%b0m#4 z^G?xdq||f6%b9JpwO6)B8WTnyvIN58l)jIbpMR~i!_|hYg3L}_C5;x&#>WX=1}88S zwmy8I!1b-m8|PjwwCWNos4MpUd11i6HtQ{Q(WC!SmrqOI&R0rgFF$b7mWQYV*Y%el zRhHdsVOh@r03ZNKL_t&*;lqN8OF7E}w6*`uDt~_UFpma+_rHfV0HBi$oD|2?OPDL! zCZzu=6?xZEO)vh0~_E$#dtYz$(9!CHQ@84RW;uV+DZ+tW~CTi3JyV{f2t9Ra0 zqAjBctr>=_ZeH>-n4H*nP+PcdLU#q)swjV*PzL+J?nsYSq@esky%vgtY%u#lrIN*p zJ}_gt{3oMfax&ndCt5Do8Y|>fl=)6NL15lBA3U57XUtY}=gy1rdtm@r=?3t+_mg?z zq0hL(2bZhnWnM{QGf0nRF)+vU^~h!U0eTB(&=TgxMVy-vu#Ytr@KH7T4Dv1jgg|@0 znKbKcB(fom+elDcf4pW6AehDbzq$J{YN-Tmsr{6u0!LdaX^}chE&)n|&m^ z66T3Gz{gXgbBm)B{RNjWZEd%nt!gh%@!mhabV!H-bnX4yevP@=>*m0~myqm_`eeY6 zLwlsdd-SrNqj}H&#>btB@`#^-HOLMjqR4ZsEoTs5kuPgQ(jqa7t*kAQ02e=ZoJ-sF zFFl~Xb8oz&875O_tm9}BcKCRNk$WWg->D?Aq7U9M@_MTzm@T{f($-j^_*^uH?ofF5 zZ8>jrnH83134>-Jx-wy^7!Z#DKmg&MOe0{e^;UOhsvBw7E^*+~)BMu2uaqjiHHWTd zWr1xr*ni^l)A&q#X~WjA=<4oLuRQ;H&g1H9n|wkYzR3aU1PE-E39>Y=yHkyy`VaNb zXUZ@3$r@DRp@|3o#{8NqyLjxec3aU_SsT59OT9pw#@zZJ50#Jo3Ch2F!vj?J`ub=a zv)ua$=K7M?w(die2g-C8`n`{7<9cwu8UXX2`*oq0q>Fl-0VP~0VSdBcZTgjv+cIb@ zUI{`J)?{99$s73mF$C|81Psp0K3`vU|4^eZWkbmcYl zkvQ{`-&g=(trdIpWoPh#7=6Z`79+r6b(&WpUA|MiANh23c105g^()(6N>f5`GxvTf zYr56i>#t693d{?Rs9@Uwwp&mw7^0NAyBccxw6r0hjewx+G%-LV^Uv_S!5@6XrGF9I ztU1PrZt>Ow&sMtJZd$G>e^-(J*mfAP zR+_c}>wL9oN51J7HKFsS83O<|G#&IHyutv9&;7fIJb8dQR=k};2C(&I7n0w01_NOs z+G42am_LlieaAxHNF$QFQQ-S#Y0FpsE4c_Eq)}im-S2A9v&xQ6YZ#?6!%cQN_CAq? zVKsSfW_eK;KSWwmI@PKz^}#zcR99DcwQzCl5Dfue)uitUNL`4dBLH}waIRIOO{x1b ziUjHM#%r&)I!S2tv%{{EjvN+op+Y+t{qN_WnqI2#*4|(ZVmyH52U|a`0bl}qe*)gJ zfCgwV$7~6`_)K19$@@QZk*eb@I3le4c0qDSuBS03yUy^B%kH0^xK{o7>Fd>7v(xt; zO#IBRsa!^|#C;8;!??iS!8}9c0wZMtmvCRSEyOIX!X?aqEymnh*F07K{WnbLpBn%| zE#7A`pUgi4;Mt2%8M9DA;K&&9DysGFdi|Y0DG>%9=ag4Bo&YLif`4!OIVDzwm25 z^sl>-5&)55(D`Y|$LL+mZTs(is!QCktsn+J_vnjq*1=Biy^R(bVodeWFLy zzV3X80CY~f$mt-CXwJG4pf0eA+3CR;cp~Wa%a}N+=bpEN!B{S}g@;PKZAL>+X#22p zj@t3^BTF^V>O)pB;LYwfcgbSJI58kV!P0#9N+Kh@FfjOHu%j}sypXqdy!=W=s}|$4 zUTMe^Rw1c|(#d?%&3@2MFhO?l^p&`&s)b|=z%CSD%iOJibvIrsy7D+)g2mJrWb`#; zU%BYSw8vje@_;Uxt1oj38WSuMY2AI}7Vu06q4-*FqvS>cCVu*&=xz?kX~Cz=?r^!X z>@*gZ9dZ)R&KYjUwNH+alGz5Ei-LEgEiWVT)Qh6f0@^s9^+#OdW32z_L{*#lR(R}> zpZSOT2o9#nm>5PlUdHe~u_l935{3p#f;k8Vj>?wcug+9Tw z4jB5i&`T`UG$F!dykZ`i_soSp{O=qU9ptwt*I4Uc%2r0T z=8ay8j0X)a7&9ABRoci&g_=^MEIdhZ81%Z(0?Rv4~7^TDlM0)SP-mYDW$j5rzsax>2`j1j=ox=MtMfShB zM!?WbhL9)=*k={dxhF0*IP zRj-spB4DT!KXoD1x=7ZI@`o=Xa^0J<%jJ_;B6K`eW%r{@Tm4to`^TaGi1P2+?O4@V zX#>L}y@0u@>qAw)|EM@D3|>QZZT@}JJ=Zx+=o7sCNKdsP9n!2m;ku@xuH^az#;V8J z-j@cz?8h(Mpgur7Y1ceB_JK1ML;1%$s>rCbp>A?)j~?qL-iVpYu&9jr8fAGRMHB`D zO&b83e(S;Ub8Bc*N^O7n5o%6X{0JNH20o64xt<(@mR+&8{$4mI@5qt8ddP5+?#$B`g-*qsQlU%0Lu@7sGhfLEM+ znWGqQzWR3dB~IQ5XkKRj5_`7SK+Hlauhdq@9 z6XD0E!Upr6z5s88RqfL~pUQ~LZL}3_c%HHmjNHx>&+&1My0rW{%C&~-Ps8YdLylnyH>Q(7qVMAK_amB9+osSo}78A&H6yqFE}=R z*$)^2y59en^Num6##_b%?ROmRw<0u#!2eLA-9tXBx>w#Mc^WNu&Tu|SPy-~l5&K*j zZB?4fX=}jxhga6;m0!?Ce6z zt(3QxKHf&mHatU~6?LLrS)!VLTJKZCfZZHPi&9LuUl6I7kSWDWvvF~8BO6;R9!V7= z+WH2iY9IKM0FF;ko(ayUd`(vh+#*j5H{4>VQ_`uTRA&FvS1|Mrh+R+ZOub50sP4^w7^KF=bQ9q@d~VK#erfzWzC}=c<{NYs zFHt7gm!Z}+@0Vwwd!eLlSaxE$qV(HfJRa7N>*H$2w4@o_sLR2$=NA3y9?%ldGt_c}tO4h1f22 ziLQ|Z*p%#6#*z}*1^mJDU5&QZ;ZkqYR{!O(O3nTto%n|ggRZY$Kr-=r19R&)A@AQR z`@$f>k${>~-9rvija7Cx#(+gpAMkGuzp?k9O(>U>YKNEaGb4ts z90BNj>U^V0*d_o!sfKfdz_OAuqNO}3>C}_MFgs$lwPO}PF(#)+A@_~7Q!I|~9sVBX zO`;9=kJ}k_`PWO8|2iA4Nu6`@Mi>_$7NnJj=bn5?>_;0GKo}_@>=w*Vh)x`wmngNX zJ6K$Y>x(-5kv%sErdVOXV|`t?u6Cu>brGWYhp5;_BU#$EFaY$?ae=G3HDCPOj`8ly zN`XU%t)&JI(#Hc6)ho%&$Ob}qx&!Dp1A2VQGs!vGXvBKH7vw!M_6OwiZQ;-Z>*0y1 z=|17{i3gk?&xK?%M6$ur0&v+)VE~aU2-Y=;0lcmLf=gJIBn;{aF6Clw`%k`Z&inHU ze|oOj-hbDD$1Amp*%s?f%&p&Gv6Cx({O>lUI=8LHlPTRqJn(*|Pg3&@kkr1x*DLAt zN)PJ+bUt~Wjo{Is7!Fk%hBn@gnNaG*!#Q1Ur9pgCI{wDnf|CYd^QGEys}3HeyrIvb&*YysE%^HtDe z%!t6cV&yefME{H%CzKAQ-h2CfHG9^aK(U$js1HaVq83}Kq9Km}IOdiV9|~aT{&J0g zjXTyybs4a0ZI1vJUomroe^*E=y|9U#*H=o-d~c?DF;PlbM*`|~b1@YDcqb$@QWE;V zXyWn7PbUoz{o`lX-9;U{*}+zKhGvyy+(5{mpVba!SB~n@NDy$AKXK%OQOLvMSVE$c zEyE=r5Gkh(rq<9HMoZ9V1D?Qw}<>dCRRacIN7`W;RoJI9t_BQ**tR!q%+Nx$G41jA{xhtQztf(_ zAdI*NiW_|)RTI=@j=B0G*BoO-X-Azh0JgqfsX?=pnn(4BarDu?owZ4cjnbZZeXt(y zCZje)Ys7UX@&;4L0eU@1W!6M-HTCGX)9d*a>4|6 zp&87rpYjbqRy__l{s(`fs6f}Z&NJicW!maj*(!v(ANZfN4N$MEt{s0R&s7WcNqy2c zLY}wt(A9CaQZ>rCpxL7n z<9*>SChmW(=~IxmqGcw#hDRVO=yM_5b6DQ+k;x3%#rV=H*{wnwNSKIA97`(G=I?vx zE!yfoVaiPtFI@Jc+Uu(G$g>?!_a^4HUum(Eh5L)n(RZD@p6hsx;Jt+374!*itL?ep zs@mHRcO3)#`o#d~jk5Y33!XU9t%azaMgS#g@Pq^DSf-{<``J2yGF)Dzn3KaDsl zU1E5EqS0CWR&tphnIoyx`G@bR`t{!q!~fVYu~C7pJ^Yw*SS4qk_%roM z-}HDYLA4guWrnHl^=OsXoOR0?vzb%5B)r6L?HhkHTd!w7s5|O>>|9^_pIBIKlfrTb zo+baAv0`jKK#*;L@&uewgiS5GEY6#;V2Yo0%7gVmGF6bGaX2ftC61T3g=Y|Dy_XpP z#gVRz58hWQ9=H8H{qS?*+wQ0s{OYtbERFX{AvXH-BXV2Ngiic}OL~mQ&g!%BxMML+ zfAC&10C*{4A3d@F!oz7g+qbJ*j3mG~chr>tyOqKx+i|9>IEI; z&-iSy?J(l$OX&>2M|k}lkXo5AtjN*DpM=mqJ^$oO>iu_TL`SvxHpn1}MLo#L4BHgr zVa;O?-TQbc^^^8L*KJ(8z5kf(B6)Z7(JI;HSmL~FgiArD;ewA#^bB6}nA`p{ecUb* zzqU%Z>szO*#-PEj+_!n2UP4yzfS9pZ4RhNsIig(o+wFj^(dU|@(yi7fUO-iSq8$&$ zR4yGlH=;w!gOTIHlxO^%rB9^e&=vW+eb^D%dOiEW&d1Ktj#b_5tD`rA2tb(yh}|Pl zYQ(z?Z*_~J5#xK#$knV-yJkJ4?U+dys9RrqC<&k&Y#tVuDMeiSK8h$P0AmP%zwfDWWT~z zGri0+E*%SA7Pw-fhqy%c?U7^9cFkW^?ZLZ3RzZT?b>cbx_ZH5Rq)+Pq$}j-5!rj-7 z39q-HPY7=1=q7l<&UgL35(B_K*EI^w5v(_i2e7fMf4&OM&{k7j?HeCqk`hWj`3AtF zzj8O7IE%~fF+v|W0~k=qdq32hH+12!FCA%+O^mI2CSCqnRAI<^R6eL`NR`L#IlXz> zoVlk)UX{M^M<2}_GSBz zcfRb$mQhPCHJG0Hwcb5nBT!Uso>fgODx`A>^xm~sY=Gog@({mRl<1t-rBX?NU;yY= zv=P9a5w86GikW_~0ige#n-8F$9kKnUh8{>qDb^IPf&8~mdSpmp%^@86gN$JP)6}~k zjfyrHBqY~{Uzr_!+mAEV2fV)CQmd(d?DSpInk2h^E~wTgvWr~W081kB>`xM)s9zuB zQp;!~%mXr!!Y$-&BGG9EbL(e}RjPAdm_)B-sZjojb#u`^VLVM>ZvF2^&>RFk1^9p9 z{qGM77jm8Q^a<=u%JYP2F#4o^mmLp>Q~(e#0Jieuad{ySov6%{9-Ts6Ne4n@#f&*O z3XpFAJfaN%^ueKJ#~Untm+&z9jkZKHPzA4mxP}cM{tr3QyJ<-F{7EeqbREk z&4Fu+(l+wyv;nZu@bw~lN|608qqFwZW8wOu&EjJQWtc+vfJLd4nlo!o={@z*-2^#h zDWPZSPJ!5c2O`yIz2?oCr=(f}@E$e*x)YquS%|PTcD4 zGo$|njn*m%_-*o?k3`k@h#fX1d@V!~UH+*LRfh6C<*s-i@bsj8enqpwC3%zVALbp-=C%4{_neilF|kM?2$#YX6;*$Nw5E@!_w~v?WGKWGTRSxj3G4Cskuf#TU(nd z6t8Q@*AOGv$u8_Ex+F1Su+q?Af;~>d8fW?UpX9F_)pMQQjeQ1f{;g|5G^5{S833IRpY4$d z6g37)$rI{9wJ%|a_mDX z6*~_;tYdvQZpd?@N2_Sa-zjt5W=Y|fwbonRs50BI(Lw%bBpd+?NVU@_T`E*4f2+(= zHT9+G)3*rD`e0U+7jOhXm*bZ{e7oJxnSHuDeCv$!&Qe=mH?~Zc3~sg6)X1GSr}V{Gi6Gp(Ooj3P#7RZVD0&IEE33y*t|D7^2U{dbiYl5oVn<2?W zC1tVa^5*fs#cc&igIUY(A8G-XxW-!5)&hXJ^*?;ed)0~Zzg-8JNWn9h{G<3Ak%*qM*1mwB>8&$Vy*ty2A7`hX^|^PyiF1d=kSFoLEsTLPqIvyTN% zNQxp)r`qCz+v>I?ra|K=GXORjW$(^*AkVE0-2wH*x;nd+RH}7_m6lVhti_Az$Xtz= zM*pqb(^>VYkG`M?ZzqV6Eu@xahVQYycQ- zY=3}af)*oSP~tH3v#bm4*`IOV1XZ@S(5}8WVA#m@Da$hd7=Gl@6t`Po|DXpf;<3vI zZk-xk$}K;hdE=3Egv)mMz^xA^c}4#?X|G?h0t~_{t&m;L%)Nz6y^ST!;^jh$x%EGt zpwv8lohJ&db0fe;2D%RZrD3jER&NXSN&Uv7Y+sC@VVw5su3gV2^=Ja_m-wkfpNK-2 zNn877tu_GMXhP^rU!$0V_@31C9&>+d3&vAZyWRY4_3qsGF|8$+Swa=H`JD#Ji-5$= zWpA?OhS9UQUctyGD$34!lM95fpn2!jpG_4URGqIN?fNkG}7 z)a!*|(JNw6={2TA887fGz##66hl0k{Bid?eBrr+@hQnelao~a`9=`txu{GTmp7j!a z6eRN$g=G?-AseiTew94W$eP-fmP*RPjfWD`<@8WirdBcl5GRGk5|gXq*`nS+I5B6Q zXFU#W1Y9?!bh`Be`pV>@)HB9)Z_iMXh|73sUpNc+-kTtPEO{GF>bJ@i?c3;$qVKmfgnD@l*%m%aFc|jX~|J{j0)>6 zGy_rE;Nl>+7mh4SBo`yEPb&sjInMS;96A96G_XH>U#O_{ZG7eiL0VbPSc8T*xQ^FD zr5~u&CT5Z)mKt0rFQ)_Wc-es<-zqgnbkQ3A8M2`P16>(XrPMt)%0_@L554-@tJtBTqf-VfBoiI2mErk&BW(k{ZK|dwj-KG=DSE;H z+w2_6Q}R|-c6kyc6tar6BkIqd;8G54P6mS0c0^u+(@pc6HV-c5FKOK}X=}UV5>%)Cn|8Kd!ur0c9v9b9}cBH^;PiUL^ z?lg7i{fIFGPEx8U(h?sUc|(J3tQs4%gDXzqYI8D_`{v84ypdZ3iCW<7BA}b$L?zuU zsErmcxU4M<6li&i9_*vfJt1Ft43Fm+0A$M$d&9O5{U2=rNI76@uw=uW7Q*Cp@ zF~TZ`Uwv$q<<*8;tSh$3pGJo_vf4Hed8Pux;O^@uitlf?$4JNe#sKw3GJZiaQuKFs z-!Q3kT$A?Xav;U3V)3go*_FGmEW6HFZVs3HDEc97#hT)ILU`(IjK0R)^t#p0wn|nr znf{-22Y~*5(Bi7=3qM1R<>-o>XQ&+E(bg|#jvYW3jMYBewIAjC9G=8{l+=}Ow>WRz zz!~hZ0nnu*0JfL|(@^H07{|#4F!Z-*jz9#2NuCSpIJnj^6=lGcD%n`+ek+j{Uh~3X zEGQ3`sAb2c+v+Is{!6RHvE(S7p!d*yVL4XU4ulWDBN2Yp$epNnv{M!!R?RSF8Zt&W&BW*v*GPTVMca zk3<6rvr}-SkVGR8%XUfI0Oy=#Sl$ZbjIIyW&NqL%R3YjI78^8B>0~@NTkr?E>XR65 zIHE^hLY4|)L`x)Ew!5x-AQ;>Bqemfg0h!=Tc7178CZLUmx+`K_Kxg_i!2P?QNh7lE zY=bYf;^-AH0GCscx0l$laeaq%pWZq=z(&4!EDgyzUV~m) zH)J1Z+Uh-t0CZ2C@KB@C*v#mdu)qn-QK%~LF*ghHaGZ?q$0N{XIBiuBojsUypAh9S zj)OTyKl7V!%eB)Y+B$AX9}^qC{U$c=Khzh}x%yZE7GLGfx8r9RRr_=E>SsmwqwDg& z@$#Edr8RJ|0cy>ms|8r$=be=KcjXMg=+IwCR||ttLAU9sw@0>p$Ow&*@a$vhD~p31 z0PRTV;)qC@#zJ1)^Ntw+o{vmRFU|U|I`A%fM|jF2*m3Wzik}@P7R`jWP6l>9((g|B zS($VIM@maH)STIK70=$^VK3c(*chqL&x}gw59UrEJDfdhPSWt1yvJFhyg5EWp%^TS zaV%+#?9y}9_PC`prai_nzlL!m#S*L+`Wr5}@nqsR$H~5+t@iGls_l2Dm^qH^|J$fQ z*Wu%xx#jKRJl)hRZS{XyY-b9eFh!eE-JjGv-y&V5=i~CBeTw_|To>-)Wz%#eII)E>VOq z7z=2av|3HwarJ$r#7^2he@>iKNLQ-LDa2y`F)ZN`snWqq`|A)@i{wj`wJBZ~yO7Yv z*N?Gsa%$=qeov{HGiY*<=41RnhyZ-EoTpl?PwM|**bczT41%uD$YX0ppTs7t8QR)A z#zpmf(g5h1Jl+JR-G-9!#OQYxx5(zIFCGK&UFW3$1l5rB9RRZ#ma7s6W3YXgwv0vt zr6Xm%;v1rPTmC(-Ql;;p4?IK%CTKhz2?Ida(;uqC>MYjn_wD@{^k0+jcsN*pU0`PT z_M4LG0e)MBRdkDKjz&YJ%E#(X*V}Z6D-44b5>_zMc0CMu?womwpa0kMY77ALiQOR( zc)cV#)KJepT0H^)1^@}Sp}Yb+Aj`x)S};#A00s;gpiVpUG`eqY8-D1$=haspNaujy zMcsM7ZOZgT*6(cRD0s*4sx=dxallP6Ziz^+Kuyo*pPU}7Gw*!z?&BR+fNaUK8=B@^ zcCqXPatc^Nu!`amuQ*9@3H9G{T|`VWn71%5(mOG1qBM$#h&+jSss6X4y|GRlA-c`o_1W&+Sfos-VYb(#a+l4>()QvKisb z8MD>nlaVmkmPhSm+5p*z>Ug%L!UtAX)ouMv^R6k55iH$RfZN35r)^Nm%xqBhd*+ca zvH)$YJZM?9(ciY(M+Roj0r9d*c{tT$yhqx&ef^;e8*h9-EY zH|9ELp6V0Q7^=tDHRjBokVa1*RcNXHCp$Lg@fS^?@47zU-1u_lr);>Xb!#7aboB_p zyouv~R#V+4VDEt>=6U19jSWW-i@CAg+Asq3MC8aKY0EJs8a}jzGbZ`|Z7ivbj){6k zJ)v#n&1vS{a_22r=Cuz!8z%BBAXQvjPDcfLM&pzW7%N!C>6a3Nk8(1wRTqT z{eH6g;QbFs|9YO<>!=0}%Ui_{lTe*fYOW9kIP;fY$T@#&o}4jnw%Y0T@07`_`(0NV z+8PmdyhvvBM@h|8n+ECH_-GyWYIHTp)b-4| zoyohI`SOtndf`MJYg%&&vh|9<-6 z`2F;gcRf?hojXUJaBP^BU*=>JAwY{R831RDKV8-BzCw(@=X7_f?QT6mlDFu0yB)ZL zQ@`9Jz?sUVfwDCMLFBy&^9_T(wN8Z3# zwf9$4(I*aLF%MWHKyYR-PqzK$7;gY@jfwu};YJMerazHiT_ig^SX{%{N#Pi;49=PQ}m*Y?v4|Wd-gD_mf}3u8!!3rA z;Q1ciw!Dyw+B4Q)UamuC4_*?0L>5g+%QRfIMZAo8~aS!Z!#N5%HLvBv|m>Z=%n&_mpla2%Q}^X7dw#p}a!z}{&1dIkWYq8AP^+wlWW zNXchUObt&iXrqEFdFVIz9@dv@T^;^^_&L=rmFTmLP2S~9(G%Q< zqYd$}mE$?{LbZ10S!Z~K=6F)(?~W4VP*R$Ee0oRpHI@;CHpLU(K^O&>G>bMi zPCcHHw;h)RzwP!MY4)_y8Dao+Uscb@{S*Wx+TdM@ZnE!p8V>RbJgVc!u*Ib%{ls@okb(SYhXK%+;S-< z(^6=oI`%(iIinrt8Rs}6rFrA}f8U-YW%AB;&e&5DW)N9Gd?(2>=fe4cOR*Zy3j=NQ z9dj|i%qM-)b~cLuaDV~>;F}?jCv~NuPqOqI3%}wuO6bZD>RTUYE;B(NF)Yw^-{}q? zprv5u)dr@YcHx1ns7>zWcAXv@H1uL3BTh^Py9}mwqjYE9VG_9_M^8nF%RTC zVPJ6hrae>G%!lW#p;cDIgxfQ*I`FCa8rHFXP?v^#ja*^ke&2lcZS~(*-y&V;ON-WA zch#uEiFvE$1$vX%<5Ql_QZO@S&Q#w!>Ez(q#q2f!k2VF;fY+&^l#T#M%JR%JwZTEV ziSZdc)!pb;qi(O390>33^*Agw;6t>gA|1Yn1~ zv;jatnHU2I$K8&AnKbi%R?E6#7KlUeks~-FaMyM6B`{^6G;HJs_7U#^`cZ=>@EQPT zD(e>?ofOtC&_)G4yJ+XyMLSSF2C-`Wq=47@*yM5p0QlwTqmK{B9W;P>%1lr4NIP!e zLm>)q=9xbav*U}GJWpc&#ynYOG{)AdtzK7q9lUdR&w~(+BW-XCk^P%QzmTcG!661T z`u*H&+Fr+{k0$2k ztQ(-Z;ezVx#$~tdoa0OPaS8*Vhx(+av>9qCf15dIsCvEu@N=A8Pb0knDxeK6izMW1 zF$P*VcO3BoT!<3AV=~2U`9XYc8G9-cVzQXI^SXK4a40m0*98%7uE&dicibK-8$6sH z_u0x-*5g3ybh)%gh&)kHD{ko6I6&rwzWk-p9S`oNjDSr>fdPOGA_Qn8Y=I978{2Qeju(R8m=^Q7=hG2&~wx}`=~?K^d9oKhyfriHH)UXDZ*?k835ydVKbGRy&WCTq#b{zYVPuIrN$j2M*yURKM9x3p#8DCSyCRrFHW(gbM$UGf48*{7+TwM97#k941lhCPW!KF zsE;{GPIv^80avDIa@u7PbK0ad9;7Tp6DQ^rSEWsOzT?g~fNM`}<<&n%(tvqIG=6*| zoWIyCdr-Xd+WVEhKDZ|zopCOzEuI7dTl4lDzt-+E-RKOh*-pVa66f z0%9y2rn5)xeEXo+)Rv`#OOik;=6U$8KRCl;v4aCRp7~s zUb;!0_rmo}FW(m14pVEbw>sHU3y*8kBVkf!#avkHOoUI##%2?E<)3fNUaR843iFgZ zL9M_gv5f>?h?vzZZB=n8cVeoJpNS&rrmtvAjk&kzUXW-@%>kdgntHRo?FlR5S3(2e z?$eCy$5MtNP1;Ea%7k`?3UY06T6JIqqnT#l<6a9kXKf=+|GBCtM$x!%Gs~48&3chDN+HVAVvXB{~0Oc9EQ_9e-|_(^h# z<A^ig>5)MqbM7rz$27Il|T zY)4CAb|r7Zf0d|>V{{R0VVj9bGIwDB;bC88^{#s z_~taU$1|lJS`PHl>zmx2W;=Cq30dU*DhO=?CG=LxO-xUtCixLufLPUz>~K7 zsTz5ASR)@^)_e8!b||;W_uwr%u*_0i#`VE_9}C8@#Wur&+x*H0i%Od!Mf}jcp@9Ky zEjM5Zb<>t71&IdZjt}WwLK^^)k8=?0@7TcCOE4p50F?1tll*=DOE;+tUrLA5%jZ+6 z0}jzg??CCJdJYA_zABQBbg{$~sgMoZCUDJL-n{Jh*CmHGdApzb-??0;^Npblg zqR47oV7!38Q_;D8h)eVct>Di!$&+MJdvo1lJODbRif)SSC+DtPj0YrrBI&pa`h*{S z4z^B%b&KqeBxtMe@a;?k0Ijyzjq_$Bvd;I8?PEb(sdgf5I2pwed=f4Z#*{lAXBY^n z`Is4MHPw+&s`}Ag58U1#3vq-?ra(Ae^muUmM3>xs<@wig@Ly@Lz3uJC)wn1A7=3>D zwwqXwJiS|AG=LN{R407!9>D>7L@BN;d+bvv6n6>);p(U0c ztoHoO&V0|y{~M2!TR(2y>0S+sZo2ip^mo^m8UO?b`a*VrZ*y^=hwJ7@>I>Q!F7e4< zm@qe+HvJ%XZ>#8&GCfeGtyb&G6m2E^oiqSC@BGP^YYp{#Gs$@Na&`p>WU_U_2%m#o zz0nr#w<>L-$)P&#NniWA+b4I3<}*fYx6;XZ_R;6n^G{7LeNI1c&(=Rui?y|@(+^KmGiQ8A-XA(_ZKaCslRA3JfKPpE@e*(PJi(!i?9Zf{_TXhK?ga_4J7pbg_5)`(?G z*9zKX%4z?Q&!tIR6K z-Y#iN;<;EKwjVcKXYt#~PVpprHkY=Jd(#GhzSITgh>DEQv?_*Wz1=X2>Vsr#`ghm{zhEh}R3L^_6b}$Bow|)ql3CV^S75%gCzcWKU``GhoMY7GQQ4f6FiQ)PzY4ZRu zy`%$LftbX>q6R>z^kL-)n#W8~v;1AQrpZYYek_cEukGu`#2+ynPqmk1Q^On)X$Ej5pTh`6Brfo!t zq0+I#W^}SN{5?$#*^+yldLSV1(TaFJPtzYNonq!~f4@pK@n>+d{W8Y3oy5 zBBiv3Cxml|LkebO0oLdB|o8f_MnVqxJRcQ7Jr}{q9yI zR0ZfjzX1vxq6U2d=a<9r;I@#*Vl6ly`t`K{nx$<-i2*SBV4ZY@y%iLFKu6xZ^=^L$ zYqQZ%Gv1%2bcx@b&p$T(mfB#6RZQJ;+pVUpY@8!^)C$`l?UG^pIe2Q>id z^){uq0I07R-*)Fd3j{)R`@C&F2UE5_6~#!v1M+hmGXO|D0xby+#CSgO2Mjv9l$t43 z1^nqL1-phk2_tSLPs*$Fljkm1|9<2C95$)^%zB1|zJ826oUeU=^+dY$5S08uhl^cqUN zC*=YBL`NcI-s@}r?re0atseM67SA;E(Aw*-uD0F7TyYIx>^X-TyMI6T@?;lNwmOB! ziL!>&3fYzL19#rn>y{c%vt#KmJlR*YVeZRfq>_iK%zGJ6wz93B(pLZYNzMmye>846 zZH;aY|B_Dum|o*^Ech`Jq!c+J~ZNg=WSIR52!U0 zmo(lWYuo+XEN909-%GB=-k;l*U27}RA~!L6)@*gl0M|e$zklw@TI*k|_j$F;avP&( z&G=y5MwA#TqjuihzH79;n@888)rKf)p`V+0`$NI_M($+VD%J;`GY7r`&#|!MdDt9j zbE$3I*_B%yqgG#RIirM-0fE=;nD6}{Fi-}zE48@28kh`T3TO#uVcw$$9*QQ$pZep< zJSp=xz=XixE;8q3rHsFKntY0y(N%tpX%>@39{S|}?X3ps3QNK^*5A%a8vv8H)bobq z4dFl;Z3_%8HL-3B3~hkgUh>!_+L+tk1{ zYrC9K93^uGK-5xH*l`0mh57X0T4d7d^PUx{2%S-eq zg+5XSfL@fnKf8-C*wSfHvp)Dx-Fju7@*lhAX!WI4c1Si_W~k^(Wy;napZ_n|rqNIj z+(xtPbsJmmY}$fd46bBd$RAy{Be9&+Hg3x)58+fFF!l>CO;_X3zaW^KWfr%3CrE3f zm3`fdmLarJ^Ukbrs*gYFNVV$9E7KqPf+tz@BesURj=(mPept?UEqG%8FYaNEfGVZ_ zdiJHs7N>0ae*-jfDc4VMy;pDH}i1KM1oZpQk}7upizlJtoi zV=wBH*pTL@KA{*Zs}8OQE9*D2JA7N)uHP%JPjv=B*UdjhL0a!Uf)T^d2f{$G_2I2{ zyEnqF?*#`kw=LM}0gKpOd5PMU+roti`JRbP8=lx)+D0TI0PXE{HTr)(P7|lyYzvyl z?rqJR)2VK_`1TA@R_b#rZKIA`YhM(8mTBvl`2A#iTkSI3{SKEE84up#;>9)syH;mFOYYhMi zbEV`_JP@4&FjuI{bJnRpw)aM$oAvCAm{vTeoWHRG2VTb&7d^c)e;d0jExUhy{cd&U zOX)&AS8P;cpj_!&{22!(6;>RdrK;*C%~R zTYcB>7uv`h05|6U#{0nVC;9+8~<4X&aGHtcwjAsET8NI9h}a03*NTM97@kbJY$1&Qt!MUU5rx z(%SpG(}TovWv)=iq!I&Q*Ae709q*R01H%q!&BW=8i1-H^6V2)fsa@RGUKjuo(!_iKMu-#z82{rR86$+CM{f%XQ(TXvW=UJw?9RsJuXGG#H8tZx3LGkerFAUMvF)5yG zwbHxURRR(d^%kG@psjf|AP2>66ahVO&g!R4=s|M)e%%dNDGT7T1Z+}U;-@UV9bKvcjbk(outNs{;992yqH0O|vY>DQ#jZ7K&BeD%(l)5qWTSc3T5+Z|}x7`z5>dke-K0*v9#d$(F z)f3uq+x-D^39Z&Kg?ge~O|>eS-KlXv^hSp@=2dl|HOtbTRWtT0xs` zw{15b0ni43{XqEFZuRYv{FBt%5{rHD)>c)+YB#{cKHC#^Y)CTWI z`J3^i6)R^%_}obA?a=_5<3QV?+lo2+NU9a$9YkJ1NO(D(2J1h3djT#*q<;LbP|cQA=c|%b_tImg+=5op(|thBu<+hr}tT-vMcd`-}>;0`t{v^K>Qxn zjSK)T)Zo?N;vWXAd>S{mRARtDymmWdeha{7p{IaFvVvedxGf%Wm)gvs4ZJq~e#!t? zeDENp3jw(gj#t8$wVKkN|5bmzDGNtCmRwu?di}4sQwn7-0d1*q>NbjFU9jIzG797# zG%5E8#}l{Ny@N(2@asg|3GLcNEj#u&#VY^Yb^Gy|jWsPzyaUNGcz$LzJy@5+*d<65iFkx=1`MZz>w_S~L6|8>ijdklQ*(LDHB9m=_ z0dT{~*sv+yO*n0?Z49FL`Cy>{Oe2R3sO28sH(phjI2{`~poa;tzL&k{i zxnWZ9lyAo-5BgY}f7VHx=P*b#eBr6->XjE>Pxd}}#L0we$;ji3JnjeKIxRmqxIwt+ zmq)*_ne3LYq10Q_Hoy=4*!Z||_?t`(^UNHWv)Rezfz&*?#JR}KV;TR}vwu-{zW;Ov zhvYqS>X1*XeU>woDEYdzhPLFPCSn9i_?5G6d~ITm2X9L{KTrji*k)od;bqv|pJ|I> zE}m;_t2ZNW^K0E&shg_EE@qInJx=z}HtV|Yt~sbS;6=y)q`B2b)xbV2ps$pj?0*9w z^+_h48PR^bOX(HJ_{v>4PH(CWy8a$m(EUDm@uGBTSsD?dH~z) zIm(X1&!%yrB(X9f&X@s^3a>gIuwhodts=FFC+J6O9jNwO-X2*LdD1*>1K!3!(kB5V z17Hb~e;FDmsACSanhq%nF#hBpko*S|>O-d~98cn`Xf)@pPf6b7wx|Y+$(zl;h{zk~ zeJpR-W_8)#Fv&`(gP%B0J^f+YXiG79z1F54*y8)*Jk4*~T&BItiK6uxLR|9eHa~GG zG$bX=H71uwj0Kst=J^}*Cg$&??79r%D*D883zjzzSbZnEnzlKOd20i3fn=333bGpIeBV~^6C0k|!a{Y;J$ zfgyw9T1&e79>nw2t zL_a-e@6H7*USw?)vEI>fKHuJd)t{$y@v&I6cAn8&XIm*~LwBOaR)XdBV(^ zLt8jc{S%jX$-f`sH^^=dPo`xzm$up!ZF`>liDEXo zuKPhz0{}sf^P@Z{PzmM`0r3Q!d}_%wi81K^ITqlyq*35;;aqa;!%;uVhyYn=7JiTH z0K0dv=@JVyjd(B~0njz^5B$nr0qp6p|7E|+JBPi_VjokNY;=TcgU^#^;?#^b)QAVo z5w+N7`_Wq_e2c^;WQJfgvkOD!39XI(x#OX<0kFefTiWSHDh`KZ zU=;Q{ZN%_!{Zh*;p*G)km>VxuuGlN}ePGDD>)P~%M^iTcesCP5lqc;xjr~zbzfJ7<)4fZt#R49rD#K74fBMKS0H@q8_YHQjhGo_+lxHeG;LV;C~cx{Vwjs;x29#6 z(v7^_0<7|NrJ>Cm0M~xM7?N~`Ij*gAEqA|fMD6OZGNvm}RT4i?t_-8#W%7d{(9{a($mts%)G)?z45#pEH(=4h;3qU&rQUqoMA& zhAQnH_t}al^`b#{w2&rcc+cI8nYYD>pS0Qc6s<0hHI?R}no_gp%vC3zc3SY#il$_} zxJ!Wz0RCbTEl^6m@j*C_v%VLLsDZ3tQX_Tg~X=`%^z||)~=`FN{h_d`# zXiKQG%h3cIU=g#;gpyF*-+&8*$}FrcVu8s$%f-x^D|S=@Q!ZdUAq#W1gU`Y)d=ss|^5lJCEzdf6qgxw_kl< z@sxg_|K^3yFM|uS>#yvX@40c3nkN<4M>95M)9=~mg>`coF_Cj~g@SLWv8RMO8#c+`w3B!L~hya{^;)!ZNyS;8OwQhXet>kaUZRPSNrEbucQlen5>KS8_A zuUoP3JRCzJp=DT-Ph0ssEf}~&LgaRh7SRUEwl{dPB7bvdG~sQublq5Rgc$%J&3Mx! zOK;hSoUe#pO0^|CpR}l?_VJiw0c%V{YiS$tNIC*=(Bb=KEB_S-ETyjBaEvhFv3Zre zG?~70U%ypd^xr$9i@EcD+Z4Y6b~_9w#~%GMbGyzNW5^H##-#}`;pHQ@U3qVk$<7<{ z1+~qR>(H~5;v4CCiWvad&VhYq7s$f&<325&?|!J%9Ck5~KH50`yZY3|g23NZWhxi$i>Z63#3IEOY)KB2?V^T@21)fcDzE^YwqyA4W7 z_KW9^l<9N(Ft(zI0ETYX_!efPO5$3WSq2_oJ@taj>Ez>6%m@DE^j;@q2&S7t>bfuB`wtbxe z@ZF3}KM0{fxFh40z-!|08Hii*}PdtMo9*jTO z+>AXnTr0f=fD?*i9U-v`9*G(NMgN???duiRE!?DFr)7c>CAxb#NbBI}SfyDrl_5ZnrFwSu-0kM+y|D2n`Sd;*y? zGp^WN!=veWl4whfb=eh`Q6skBL_A6&R(y1)@gYsnlVHx1n(vKCW6wc5kIw+^Gmku{ zrcZk{3HMWmnF2@z5=rDMf1XbJ^+oE{H{Kv^>3fS-uqAQ+paRhZ3(NIMU(!~%Xdgb+UTa+O9bIbfSBTAu zeQ2^@!ZD6*mHVIRYC8s&;;bl>ObW*M%E+emWDqTSNEF{QZ%0{5Ta5OQw&6`007bU{ z2L7mDGLTX_Pgo(x*R9N0+4aEfBL))8TO!LIhJdFiwk8dwUVP?d^~|Hb5R9aPr*8Zm zn#R> z^+_!3*CNaX*_Cyv%mcFQ_8M(RY6IZLMx(Kt(XzO%B&#S*5;J@v7*75oiD33hPgpR* znCzS}ycf0w3=aL_WN?-!g%dqc0S9M6Bih`xp-yq(Fhd?~TJAcY_=%WnD=9SiZn^qk zb;|~0ZQ#Q6>%yXJ&U|#kur!`0qZh2%Rz_Q`rpgR}-9EX43tn zY3(%nQvueDvsx9#d-G*?rKU&~-v34?TFcM#q_}R3cIX@W!aOzhXFm=4)dm3dvgK@y z)PSWZz**V=upi3bY~Jh|_LMeJb{$(2^PcdLG*56{X?58}3dvcu<+2;fKaz=lgGKi8Tjo?zoTEhNl9&@}nO1Qx8p3FFpH8a?Yk~1ScZA zP!#h7CT%#=U8wEQJG5CTZ$h6q&f}*`@VZGd(I>R!=@X{%!iX%=V>s|b^)8AO zmC~l3uXSI3B6SapPin7R;W%we|60$`fqeA&cw0~ii0p9{4N8y;--W-KD`i1Z8B*fo zFZs>2<)7xjkS0c!u4(4FjXf=#gH@N3PXdHP%WgAm6l1Ehq=A4Ph=j5uPIJz?kVQBn!mZOtj^#5k}OAC_hlzG0PXB;GFZ=84a)G?No=%Y*M z=SsBk{&V@84=3UYi9E^eII#DCcQa+zEF_B@q`a71+Jev&BUZqrfTvg+t-~d>dER4O z67p^qVJ>kxTDNYrbc|!&3Owm`WxhTkyWtr;N%XO#Pmt{5XZbwAZ?(o{CIY}MXZX$) zgJH+Iir?*#FR(g646)^ezr$_0K5f>y)Rxo^9~bluA$^y*X(IvowE5@(r!8g`>gR?( zmG-QQB0uXL>+~boVAW_dAr6@~P`7@R;BDjo>Ze9L71qOt_1S6PZPcK}2L=%stP8ke zhX_+bM>=HI&)#tH?V*-r-%Q!y1bZ&S{J`faMw^>g#FLmW^?MIK`K0>Y<(H8jwIHmf z^8m0@U%tXlpmjq87WgN$47ZqW1#-;hg>u=vSpC{m1I60;DNv-?R6N+^d@Gk&7 z;zT4W5n@9o4B7+e(B`qB#oq^5Dl`10Q%b!}+wiC3N_EJ<<<(_FzDDj=X_~f-lUp9X z>DieqiM9mE=u-k+6JqEpuQp??x7v2RI^ zX~MB3eZjnsJw05nHI@+~0LhX1AEE!31Os5gah@K+-@+a4Ikc7WH|BLd{8q@Wi}JC? zKQgolF|t;y8;+y(#=1e9DOqV6mm+##zUmV;rlx6Y0p=ES-%4FsLR%zw7oIS*Oi^oG zdO}0Y1jd|*W-!P;L}x(bnTe<|)>fflaFG~GflDA{Ck8mG7oGq~3WEmhe!sN@-E)$J zp+3o6pmU@6eN5+wXTr1Px{DR-OR5{zJ))ep#AY+}8O#L~+L7p%*3CYjG63{zqYv7d z-g@H@14ERY3Fx8#_EDFAV(0d{f8CZ;sqM8k^}tXQDT&f8wSeaWGM5wUHYQ>K;Wx z^q?qR?dwCdgtlgJ31~wY7sHa&T#LBG+9s#468POGn9J#|s!t@jmUKZg`XmE$$w?Ti z#G|?b%2-B>hC?o?H4c@7&Id4L_LB11JJ#iJ%2y z+bLm|xwE+Z8A-`{GZ2>gppY3lD_sD%P^SV~lF`=k`TzhR07*naR3Z%YG8>wrsOM?; z)1d*d?tm54C2Jo_GwAyPZNnqR3eZ3L;E%iYFaBV+mBReN^EldGth=2+9%{S(-?ypm z?(~XHS?_q$w{0BrWYu*uO<*4I>o)d`aJ_T{!1Wz5U`VkYJ4TliqLg|`FaY-6ZhJL) zyX_sLdj6vP4g8Efw3sEIq77shGhUBm7l~N2vYVn!mS9MZmLm2-yRfL}t}*1;4c1efU1F&O)Gwjam;Ts)J+l1FS8ij!9wO&)fPH>&EYN+AQ zo=&EBgMlllf39_iQ9&paj-6>9adDp_vKnwmWHShN?-ZVlw7Wt0bC{hd1Zbqwr!jQs^&Fa4x80Ep3x zF2sR60F#3eugRlt1(dD_KI@p{tZ`vD01PE6KRNvERWRoP&XYEbf~;}R-yjPTe?!K3 zRoTV+>}HOCRcxg$(y6CA}%eW4fB9k6ER%MTQ}fnmcxJ}P5n@x5dQ9E z%%#{J$0g!E7tk33POs>b#>K~(prCL88L=QNMqw`{hU(<_A*-MU{D5?KQaRvboy6X( zFdmE*#S$PQY(zA`m0a3JO!Eq5$bjY5rE4CVb-@hGIgE$Tnboh!xe4Z@gf?!h@W%K4 z+^+2S1@rr2;U&AMZW{nKe9hl)DWzfRP@^PMbKa_T8zUJ2%PQ4|Wxx)E@H!%nSkNe< z^n$bvU=4sOv^n1JXQIVEv_A6#_4diMi*gU`}~l+womQwoWP=gD@6H4a{Q zCnR;k(Z}`~ZCG}_y&}vLG32}~#bwvz+(RUY8hYjO#-ER4iL`DIIq|rZq>XGW=FkS~ zF5nW`_sNspByAQOWBg6Irv!76XT5M?ExZ|2y<~40 zgXK$i>;0(Wsa8$U<}SF!9*%^X%~FOvEB;0DQq*3qd}-dtej%5Dm%{MnswSfBf>hs?RSoB8V#(U#~iCcsO7e zOFS@U{4W9$*Irhb5oX|o(JcCoz7%NIys(`K<8&0jOj<5&SXSuC-X{3Fcm;d$evICK z;PH>DvO9liOW{%&+o?)hbF$mxbu;elBFqgka8W&cQYRt=s*t}iG8nm_@o4aoTZg&1 zxCFTExy|!wYjvfkt=9PGF`=J|ybcEoWaAU1;p6W)_94V1(@Axxf2&GcvGG7_v9>ic=R^wJr=8U=jyyw#{CNeZsBcq^qN!4t`-Fi@M5pTvomR{5FWeF4$%i3 z@5`pm#ztMAcsxKGl2in-y+<3qM23#XYm0E*K%>C8+!4HvZQHj5dg#0-v51=prD1Uo-gC0Zv#_N_#o0naBt0h@fuoBRj*nD|o zMr`8)B(7izTh0&19L!ammTiM;>!g=54@73lHX2lil9b zm7zYVHU4q5OYlu1w*4^{4VG1Py2Vsvxh&io!lq<)@Wip^#={*b9xRnwZ3S&*?czS9 z{_y+o`(-m8Q76B3eRLvpHNcftU7^q;c+ZLCjj^}sZw+lc;W)x`YUX{h!KD>M-z{{nRS!a68bK5O@{Eck|$#{ENrx;<~=p% zIXs!OW|+TXV~IUeh93(8ZCrL!Y~D)#&Y7EB%&VoY7XZKbH(!32n(^MuWcyRsvdTZ;nT&Ny z(gum@NHhgr8uQDLejNdjlzl4k6o`b-y&jr20Pw8oXBJ;aMZY*q4{U3@-@<7Hva65-u}>5 zN_KN+rj_#6%CwvmaYr?I75h^4} zkTB#~$pH8kG5`qgAS>UEUEqP3yh*alt3pcAuONcP&^+L8?wX)zK&5r-A#K4tNLYes z3FcaoH*UtYkhWkg@Om@LL8NUF=2G^Rtl6sir0+4;S5`!pdei!(Dt}`%NAss|18n?l zoXM(jkk2O=Np~R^{)RWA)J5>ZZ820W_!?A+{VycNNZ}0kIv)=^VT}#(6u|A1b zYnC>q5-Zat%##}?S34+KQJkk#TV~F;n*K{Qw;^0$Z|7p4&+V!P4jLGq1}I)f372}k z(6+#3zrQwV01T?Nt9w^J(m%r!F5&QP<#hv_f{rIBZ)tg>tGinreeN%Vv97zkJp5#U zLRcQj02qJd7}ZvUimUQuHQEB1!u-wU4Ie)sq(@{V)mBsT)Zl(~oACDnK^tB>K2L0Jtn%qr4b?GyLQ+|O z@+*4{-ij&0 zEzD+o!br{lG6bf*t5kP4eY&kyQ{#^q;a2fCH&qZ%J9%T^QVbJi2NQQom}|G! zDao$we}2&xGpR}adP_uXancH@e*nba9s2PyH42FuwFO`L?A?V8CTGcp!9GGdp2!6 zl7QNG<&}C!8_}S6{Fc}(+F-5FJURS8#0EhfI^V;mpOrQM{%>!i8qnn~z5uitFZ?!p z<{Wj+Khib-KfmM%b^NkBn?4=SFlKjh)ic^$`+VKdJjDzEq7MZf=afFvwVchKek+{b z2}juN4}Ii~U>aLDyi_C+L5TjO_#5eOaYLsm*_Gt20#BxBgUL^<8`-N2umk~fZ_-A* zsVcH7U!^VPYyhviqkegVGk-BR2ba?PjQ}ai-_>-bH2`S6dYTYGB$jJH zp(2o=*u_0bG*G7%ENBu-o_j1D@rb2>EeZ2CwxWrpgRO3<4Q}N*v|-gHBs%&(ZNpzq zp9J{Sq5B{MKv2{G)~cZ{`OP&+V?zHpb#=W59#|!epAdt$WZf`7;q_E%%sHU}w4UAq zh}e@cu6ENvn^$oIAQl3KDa@6(IBkA0GTVyot2-?Oov}lY!mKnUyAl3s2@fP>aS<*d zR>50Si!fKtS!=OAA^eTypX-|5(o)rJU#r)~2JHeAZ z)+Zt6)*62vYf%VU8O5JM{Iie&p2UQ$6KD#Dx}>Bha42GJA@EFk0T_WZt=5k`ZGOFm zzmkpueEMtq(r5>(&ZrH5i+_D})QEr|rmlv)f2^pae3FQk&006ki`-!H{3#g#>mvgI z+u+V7VItwSjI~%W`}vu-lB4;na7o%YplviXvXRL=iALWTb=SRs{VSL%txq1RAt#k+59ouQape?QYVx0y2-qRjFl)Z^^i6-oZ2G!C{=0WiMRq!F2Y=zS?oNEX81cHyG~bD(IwFR_DS(q@07Sra&)I-{csx6_7 z%qM=4(l-3nbOhj_!}g1^hW7sdePP-F7+9;T`&T)N83|E~$v&4s8<|tIZlXCN@lit^ zeZkqPtD7E$Ty1HkmK-PygSE@0MeJ57*#P(k)B}*bcyuyWI=K=!nlf#2R=>pGz0H%j z{r*fFw@%o&#X`=_(uOTFVg5zlwiqV`8b~2(Y>~v~n_C4vgL(c#PpY1W8GENwtI}U7s>j|ob(I-y5P#_d+@{5RqV09sPO{I7JD$rNW*mj zlFB{S4sMI`_m%hErEZvfKWTMfT`9N}DCXR8)qwL#NiJO@W&l7Tq^kUl6o(sJ6a0-0 z`rw3tbQumzkzj0y7+~kTcsxV?F;BLbzy0FsxlYl>X~fYsPD8Wn)>_#mw2?fDj5%-F zx-G(783cPmF%p_KckM=0SP*Yw2x(|M})8&<>Dc zihrExTEXv9*=V)W!x=f;RCaLNoH# z$GAkC9%~4-43{`h_AzY>G3J)xQcyL}v0@HSR?{c7#vjH$r)sq!#-L_aMQ~0rbMG8H z73>lbi;Y=+JjZ}%TRD#iCIBf$H%8;x`48#?XbW67_KtWi(+U>%RC zduo!l;jgC?0S`E2v|4=dV$SjW`?(p)e`TxSf_3X#+Q?qGz>{MxkPQH`%YqzCuJ&9W z6S4Wv*ampLb*IKsib6+2-m+VH&h1eeHB z4V;ZGVGsvch9~`vHYqw(hD%=iP|LKpFc(KX`>j4fxD?eVNQM?3ee!&*@%wQ%s#;?= z@kVhRZj|<(Ndk)C#b6eTwgr;z%vtkR;AUZzMJ^Zi26#dYv4$zXlTd0YZQQELZL7b~ z#-k*Du64!QjuIo_vqv0Ih;es!BhUL^Idb!z$OCS%5d$TnIzbz8+WaXHL5nM;Bm-ch z75Unt>krsZ&LD`Kdev<8*c;(X2getU^c_DpH8$UkADmXSt+wj-Z+W?`&qwzV9uqsbpP)r-KajqDTBb_wZBRntgA~g(2PA0FYE1 z>5I*R%LBl=(2n()x0RYJ+`Ba4Ff>m>V5_IJkuYMmydlcTJII@t+DduZeMuYUfhaCv ze89#h|K9$_6B%*RGUq{&ClRxh@g(s6BFwdhWPi{ny@R=4$s-ryDjSx^w{l5}Nd~~iJOaRWS_+KkN{u_!OqWPefC-23zgX!vjgpqMVeXsm~@W55ryFsyh~*aj#J0L)*Kyp^n5 zoHog0M~WsU&wM=C6UDX!ObFgLj_&o^3Cxi3Y~hJ} zUu=&MM`rZ9QgjU;>2uGs8OHA+<1!czx710-rhQu2hs~l5w-p-?XAG&h5Q#Vlt|815 z_NZX*Qq06f>(Yy~_1FOTm^AqcfWSKgAe;nNRI(3Zj_ zjwK5dZLko%h)dzlv#`~a%LDxkbLTg0wg1Bg0F^2sLz$pcg#s&Zzrg(Zha2If3yJ* z`{3OGZXY|+nSlrIJR(E^CVaIl4}c?9&hk{5|Grp@vhkGt-s~8geXndhMB6uslRcI5 zW@#(qpEBB;?YFGm>atr#N%(u&7(RNmQ3IgxyzL~BeNXmXu;namh9WmU*h7^pILT9l z@u0ma@RZ&8*VINVr==O%VwvU^<%4;`8Df^9fbV!Dge%K_K-=&)t8W90U1CRd$e@uv zGY*y>8v-fXxQ+|v$u=0A&t+Auur;{^(ku^PyqER^6Fe~HH`M6S%e=|TzEpqqWY`CZQGlXlugy^EjhSI<6Al#& zC@F$b@Khi1WDb8zvP0IPWS3BqH=Y-eE4x+XEr&Kdwq|*f;03$)p$e9Kq%fDsN0oW1 z!UJ3kvAp%#y3HrqP0&{RDi{F2ZqX@#s%W|B`F=M8!{5$}0@PKTnzX#W)Mml{jQMRy z?`GNnkgy0<{Bydl45U!B_QBT#1K|I1BPa{@JTDskq8V5;1O00TYF~vUKx_bDi&q*i z-_s`>r0fN$E&e`!<^QqwC2)2XRr=?4r?ZD7Y_bTV2s#eRrsMv1XBF91+{RIKTm}L` zWYmBWA_yoDTtEeNM#ptT+(2<<2Sq^K71;?OA_>{kN#Fn6`)<|y>eM+^b>Dma`gQl~ z-!H#(zgM@a&Z$%9`_8H5N_FvQD5OJ(xbRrA_q!(JM3zlLG$9&FB>=b1FMzA6pzgRy zHo)t^zSXe-gUq2w4|K8M^D+UzF7l|}dH)Ps2MF;2kpTQ#^~&Vfyfb~SJKv=F6{;(w z>)5zS(Q0VEC)#9LET*57xjR;}Nqz}s9}C%9wE>YCv(=_Lb2nw&Oq=5kPdaJewyw_k z-0W>l0`MKmsrla5I+NC!oq~62tFB6FtTr}TY=4wl*HV8vS(l9+UGqrpmo&SWo|1{C zU)KobwAZ8I7Xs&9+fQa9KEBZ#r z8b}0SuO~i*{`DmX!~xE!ywiH>ZJU(FEow@hUt&+xo^PDpunk>F9U8516Vl5`ev%_A z%-z1vg%R!axb*;@Wc1za=yP9H_9Xx0!X0R8eh()Z;=2{lX0(VK{RwB?0zQaN7VG99 zk`i%htXt|2j~2D@jzu^rvPo=~hnunJb+lxw>fPhf@G?Ln`iH2D%Z<*5kJT8<=J3Ou zXu%hJSqlPy2HEz6qk(O&Y#I{|(#y&m|@EDO*L`<5_Y8#e*_9A6>LckU;c zF2oluX!EO;x{Q5tKZ3r5&pQs{q5g1rc)g)M^Sz}r|FS=jVRTv^I*+-9LmOpk_f==h5#tz>fo~mB8)_uY{4xL_?0d#2!Q!%W8A!& zJ5g7!&bPj7Dc)5s(*M z09te=^+sct7-35cCdRVy`%d(SGx3=57h1s(Ayi1p3_Wl`KJ&0BH8qf^1?{LOmPr zzn|7#dmT;Rb1xd&W#^O`(pekmv~1EmspCt=*e2Bh==rZKqu=;Xf9f$ll|#rUD1vw6oCHhvBD<+x6ZAxW4)uY)uFwb zoN^rt{>zuM$N+eA8^V5DQw1tmR=OP;dn6Hn`LpKG;vsS7Ayw@xfJ ze_@TWR=dTHO~g7h+TVB5COcVIC*z!LU$(FYI;ra#b!Gp~GXNJ>?*q^xcyDcr zg+Zm~W07I%dM|&_)P+$SuZyKvn;x6xx1=>SsV);Wl;25$jAPkQC5f_qXXEeblr=xJ z##@5F$3PVuNEtV=E(pD(@r~L*{c)2Bz#hfjJj`zJk~j(EwUq!q`-_W*ZckZV664ZIeWiyqJ zf?w+UT*vfW41fuoVgsGVlNNk#+M0i7e6CCYtV`%b#AVjBYt$8DFrjLs=hX5w0FXd$ zzxoq$k!3YC>guR$T4YtDKQU&WWwghN21pE0MmKK;VBkF)Xt(ybbs=hmu~_imeg{e`<_tLKLv}sw-*TuWpXCH&EL5{DsFvq_4hC zXjg8qv$Dm^+Hw|5@j4F){b_aXI)RPRlX9f7W&JUU$J8%r$2Dt=@g(=Tjmy4Le%kZ7 z**l~R05@0@4NFWD`zU4&B&K2(QLBeT(SjF=1Cx$1-)Mi#xmD;-t@X8T`BxB`sW7se;{F0Tj6|9W=+@ELfJohCA=^FvV`Nuq-hNj%>J`1h$wKvWTV_1oX z=F}ByLyWoH$VSqZ*k1)1C$nrV>j^*rnQG7uSVTJ7HoaJvDaRw6RFU z%HfSWWXFE|K8FC5zUfoiT>#ar@YW|-RGJc`rn2d1UHGat6IlqCwHpttvf2qO8@@K# z;XWDHOEbp zO`PVf*rXO2$LcEOVDqG-vh{tgGseA!C*#29X76gG|8)W&t#P2%z3(MYSXHk@ho0BO zNh2|wz|7O?3a!;>Ko*pZrI%{U2F}GT_JMh*nQ|B(sg;wUSb!nq$lVc@Y-{)2t zsp_;DpCzg<>HAzqRfYQAtrCERx!r|my;n7vI6m18Mi6l!8^g$>90Os)9fnf&RlZe2 zJaTb1G)Z+;P6qo`I%TL2f43o>5X5vtHX9{Cw5RH+P1zjY!Zw+hDACbVg=VdeTP@iP z6~$Y2YK&W(vMuBu)|JG2|u;4%DfmB zB=xOu0pLqQt&85I-pm$FR&zvTH$Gj0<=wpxB^;`&^j0DPjl3jh~8 zEaMfTC@+TqWh`R_r{KLjK98I&hu}gY6#THZ!vX~-XaLQ)uCB{w84o)*t+7-d5h1E@ zU9-W^WW(VA_wTMbap=Q{iV;E;CE=unaVlnEoVVMNaSLRjoV7W(!wddL-UBdD6mvp; z(7g#lJlXvS+>DYnJpkihNc#X@XYK=V5VBEmR8RHBZDjRoAOS4xUo8QY>;EPjKm#=A zC%4eR6Q1bOn}Pt8Kax#?U5Yl@+PF1OH?TH6pCt8*4=gey=#Nv^Xv&s2cUfXX)_I$< zS>MQ(k30iT9k;QTt?zT)W!sFhcb{V&h2t^uf&i4`rS0&95C``I;EpH86V$rAwMk%H z#@X4i6QWl9&VZV6^gJ4J=67KCs<2+_^uJ}*>KnCg!8!pJhA>R(Z@;t&DdWnc!IVx27bvg z*E+H#_}l;iIN@K3@-GOXhH^;T@lpMkLz&#u(D2F zUM{!lB-bbRb_h*U9TQbHWd9C4TLmrnvY!Fibqk`o(02U^}IM(qvQv)HXdn65k^!tK~GXd*K4wQXXd1F8%^1SNQ~L! z`@VSrty%BhhrjcDqRnTr^Zhud07J^DESWowDZ?C7)#_oQ-#p|4_R^z@Wq^nsqb*xo z6)r8{^G%t%`GyU&;=)f?>;Dk_+w_0Y>p_}(`y*wCH{Eg*tv>vf)e*q~%7&)WoMR6I ze#@1@92r+y`8NQilp(ZZ0Cwao4Jz3ZpJObDHBh?ktO{^|0SKSM;q5kWP8|oxHhG+fYOLYIE4?8Hl<2<5m zX2D05c_G+4T++vI=MzRb9h|#C$O4oEp#0%;#8k_`(mApwMVnGxe2(Na^4Lmx>>+2s^pg0i6>(CiykT*sG4ec}3%=3}qS zU4PtMTjBj2PqM{qWxUIl?w9=e-x-^X6M*w0Zw2(2ENk++ z?>w%I1vegf_ZYAW$3!;GVZ&YwNl$jiaa}!`sJI*B7LX0ss>*p`7&nevo3fRUhi&pR zSACm)x9kqb5Vo5`w8LDsoNRng)m02e90~=0a5~A&x2WTKcJ)?KX6b9;y#U-MB|VjW z3+!#NcnW9K`TBVIJW;-W9j*9uu^iCI0u(^sI2BNVy>vf-LlOpPvlGoLqYB4EUv5;}()lh*tYPm%W@0$1TC<^7H)YOSCn4X@WbMuCe#I z*|E(HfZ)=aJxzVK%6-|?&pGvAa8 zgsgOF^KE3+N_y;bU$*xEn416_k$!bFu(}(-5CcmRDuOWQJqIiM0r=dOB3dQu*pgpT z+8cHI#;k-EwS&R5B%6}G>&vFh9h|j1i#9p%Bs(^?1h91B!<5mM9)ZNQM28)l1g9Yl zc&;73GtU^~46gC<{Q=-hOvk+b7?Qw`ukffxpvJ0fU@+QRD({c9$APcQ@VyI6O^qW? zg6>Sj;OMfFo0nJh#3F61i~k;!4M-VwwIj0Oa&X{AoeqrK6~DiczJJ@bj#12?LG+X@ z+^w*syO4Z3_+ajLP0--arRK5uk(@}{47l_))jj|m1B(|B%}8tD_8Fr`&|x|J7)@4% z%^G|KL?f%$(8`OyLPa!CoB(iA{pM!Ca)Ds5d2c{juK6ONIVZkKm~27{Mce-~O0tP_ zE9RFhUI@BFDK(pv=B_s1qI0+Jb4wN3y=iFQ5X^MkFIDZBIW*pUZccyC7M!ycnk$E% z;yU0b(J=kh-2%lUL`SpXoxk4UVw+L!c_Y$2c9il6L+Y?IXI z4$;opyUumiJ0(p}eqMDFK#F=XQb4=qCk6P9-lVz=!(vQJ+8u0t1!H{3)HPNwea`n1 zXtI^(oQ1HDM=PG5dPFvlH-N73HnXyva66xeNBGxH@+%{{?jFB_j~x1LnlW`6EXBbc`c;(P z=p6EIh)z2+-$quhqLrV&q}of-d^=#{-hjqNz{V|tuwk(Jt~^ed4btp;e%BQ6{1f1< zf?b}w&ikg#;4=Lgog%jLNYiFffE{WXJG++5vN2MoFnPZ5x*TUE8!pPgci3aQj%-S{ z!)9zWn-n7Qc4X`OT)1Zg{8-I#%NDrn{}O#|F#q$4lK@iGmKa?c2i0()%)4<$h>^T0 z$|jaK;W%UGkpruTJ4{hFXU4NWgABbUTVurht60tFRuUnU<>NE1WRq+lU`vW@x7_<@ z`oi_!bH=;41Zekdni)p?(wPC(6bVK59{3AW;@1xnt=iy|fTgc4vH;q+K}DWyot?YI z5y8hU_^NX?FkTbP_XyY*3Qd_xbME|&E7;N#0;dE7OrNNa+ejdDNA z);68DqdAMV5IRbn1)XfyWrKYUC|@UJv)m~bJ(_U~>4`CaO;5&N?7R{ZQMF}LbcAgQ z{kd(~U+Lm&%?oWB9hxzPXpe21iq_1*fh*zIe)&E6f0m@c=dTsA085WFuLq9FCS^z1 ze8eM#o8L|Mnj5x{RUcj;WvQ< zG~XC#mIE69XEf*DKY6gXdiy5L9iDu=$4)kz@laQd@+LR4#Ka72vJBLErZq&AA zV{2^ar^_}Ay^eR;*ba5$=rq~5&6PS)PEAW`Gnfq70M00-{&Jlf}}&z4VwB*>;_;XL~`_gBT|+sI?9Y1QYy-@GS)T@+;A zA24O_y=cazU$!l++I|mvsnD$VzPR#Pt&iJi$mV4S+t5?_sI*6;qvOW1tlaO8nqNwg zZQS~$i78ulydV85Ua{g7=a?G-!JCyt1H7LTm9ey*dW)I$;Ei8!(@psSXEPS5-TeeX zrmlHt{2XSBB*$3F=1gSHjAODf89ON(*465`1!Z$QZsc?c1d?boHOK8w58X|ly4ocG zQwNEjxn0E>5fcT~a-SRe+gWik)2gcf(X~Xs{hR;v(j(wjz?!nz+QjE@9!f$gbA^aL zcjg!A$mug0SpjoNQ1!k5`yK(a5peE2${$?`uNQ7CAvv1?3YRp|LIDba* zC7w-6eu?=$XG0pw3qF&?dSUX~2osEwN03^7EI$!sv;LGtH8I(Y@j7}^ z&c2I`z87U_dv@cLmobJ2w~XK;|-vd!b*ErRTXfFT4XLjYF>n|%bc zj(;xE(4c!Nz{@yt`)2!!J27`PUJ#qRDZYgJ1t;U!g}K}Jxy?ys@MIGD-0TE@1E8Uw zzSk)*`C}{tATnMp+7zmk*dvejC1+}?!tcboI71i3Qa+SCK#FXkb*q%;n}8u+m(GtZ z1rL{L@^(SCkgB8O#xp)09yi&#?Rw*Hm)$|1z0TbOFnvlR1K|A#_UY`ALR(cHXVl0U z(W@i^a5z5+AVgD6TT-Olstx$|x#Ybcx2XHcI1r|4UxHP;e<18aKRA!>DS#*Fo9^QaU3k=k|U^JvM&&h)10 z$wnu_-UpQnL^2C8d9^Xtp3|a_R9(mRXSCX1sQ0#Ix6{Sfvr_;=Y!jgIITgMHO&4r5 z2GyJ|TqzKMSyN}w>92f;d@pe;^R3PtV)Y~Vo4(H&7^Jsv^Y{h_Z}jg0*sItBkP^6o*xqDP zmIp9k!PSxCT3~S*;IL{LU<_5f!fuwJahcGR zy|$sLFW+GdCG0od*TBToK=vLv`Y)u76MzsKDr*p`DA!uxJ1JU4hLl=QQ7#mI@pgF| zyq%87=ALSD**m1SxtdI0rCYfqJ5*&WmE!6-ifx< zDcP#N-hA&L>A!w?nWORICcr(n5l$tsaY>2rgPXotwxIa)%Deo*Us@1=I^%}p;GINK z?8ScU&)utkdJ|oF#SN-=Ty*9!l&>GA)ffEOzDl@}5hxr? zbEj1|0al-CK##lnOMip+XYyrfG;cNqu<@S@1mL_wkFR#oLx-#lvw5M-1##R&zV>%@?k2rvB|ELGA@X&HVt4=-=EO;DEpL!l41mw%?kj{knKf zapPzG5WR#-0k~Z3nAR+OFlp>GckQ` zc4Dg;fU_3fMj1U_#bynUG{1tAG9`Qp;hm|gP9Fpe>X>XeN&B+NqXGd>tHb8q;@qaL zfAFUp=<+{Y=X7VwneZ|ogSoK&@0ebo{nGzOmI$%oqI|IrpjZlUKhLNj0kwXdb;?+- zPp>%*{F~3`Yu3~1PhV9w=%xPIodM;01ggCOCOd%H0we@OpM5V49%haX60P6-2%A-C zY(T8q%LZuh<#TB8*~KwM<>#0W6Mg&xjW5wAYcBbCwfCTXmwlATXf0!s@0zJwMW^Sk zbD?CLe!%Lfwougr9hz?*9<^_izscTv&NDQzqH4>FEPxkn;7voU3S_d-S$L=}J7FSqbxJlqK~+6w_*e3xYm>H z8^8VuU32HJo%ylN9HLz}XRrTNW{?5-au}ntsZoi^7I==i((BKpWq?D?GC*Ly8Cy!S z?}(?%h(h3h@M~T{Pv7Gy{yiQU(a7?(wD$AYxyu1%L|-il!0UzWtA^q9Km+)z>_GMT z^hdtyba?&zBiw6=@wj36Vj`%cT4os7ZHNYM_++!5k5(@x673tWN3IIAVw2^V*0V`3 zo8`=}F8L)M(2S;E>igWvF#wt9kk1W8|L87MZ;+pruo19Mn3GaArHpa*;#yCQo$(Pr zSSy4}>31rlQ`gESuxvOMDY^`eUE=c>-}qg+?Sa2IHSI8$=t=VeQF9=LZ+$gHU3STp z&p04bh%G<6(-&;%A+Qk;WsBKUi{GDl$^|q$yiwKgqBBhDpB1V4HnL(Zt@+#y_B{a} zsF#s{V{d@X0u-kP%-(^LBs5<)>=S?^tM7~U2dfQ;g%;sm1#Is@(bmxF3vGut&N-fF zV@}yt84bKXqipjCgG;n2b)~@>w;HJ-X%tfX67rL+%s0)RoCvtrWJ}C|O+cTUy;o2F zrxAcN12+POqBbewxUXo4HQz(NX=?k+Yy)GL@Jhf~f z61537aNgBlr91zz%+c7B<`eBWSA7$Pr(J0;fD^?jDOj65VEd$gDiDCz?D2AX-cHZ( zJEdh~+OUCT_dP_P`_$KU@IU<+cGHoNl_=ugRqJW(XKyTz0hUJs&CP)oxEruw`MH45&X2i3Kw;KvSq4_yc=B_~y%(_h!*(Qk3%}#2c02H~m zS0>%l5sRjK_4`f(o>!ONaMi!n5w4^%eL@4=h3DdB0M76Z7ZU!X2a60+1)RUAtqBWqA%CGrP&4K z!OIBSh>GYZ(lWrSfB>Y-w-&}N3jQtF_lA{gY51aB0PrhthP?pIBZ3C-n*_mLFl3Jm zLe$T$8ZKW^Y%U~%%tCQX;m~8BBpPTA%ElQD0?@dy2(uJGE}(vsrN}leYFgpoS&a-w zx$ofrHcm_-q7UES{2u2CjIXzWE#^zm2XH&I(W>HKC0j|IZ=tz6*0Qx=-_E|99`;Mt zfLfSuM#k(v!_mJn$0#|>Ka#KyAX-bmKwksBr-23EImheNGq)w0Gp+hq0C6Rw9~7>v zrh3rv^}PP-%bzovE*by;AOJ~3K~&t~SGN=iz$mCP1pdW_zk`q5r{z|!`}Vc8#~lSa zHlqG=*FL{C*hckLL=J2C&JuwIY>3=pxqxphw6_#)J(s53d4`o?(~K&UAT2+bn+)b9PMb27&f5P!MrFQz{Om8#iWMtWpR;I5weBxPeSE$t z<95ymFQj+O-@B3ax8PqiX*T~=?-VE__-2&PuNby#{N*cWo6&kB5@#s>8`2C2o%hMT&gcj*fyCpkWSF3%%=Q`P+PS!P%W$T2VoNob_ZgI*6>T=YmtJ1f zJgv|qBR0KXw7<(1l>OlyO>GQ(w0W74r=x1L&$zcG?bUmzJsarz+rl%E0j0U*OqiNY<@R5An@W;tuiP`O=~kFe-aU0zl|sY~jw(WF5DQ&-Ef z!O--oYlR|AnT}P-9I!6J9W6&iI??zufuX zJT8cr2bt7=^HL&~Rj}!O7wpYR0!tLk`o75~oVO3rF?&-p`Y-B5SIV5?>G$awG%<1> zOTRRceeO7rtwTOHdw)Fo=dL6@CGijgX->8ZI6Hx+Em-AIrYG2kw|kk z1ksUv&YCf2ERSQ3%H_M+i|=@UCY)@7o-|$K&b4tdZgp%RqXplCGu@S4yzEKt;8BR}nk64^~+Nd#bB;nHW-_QxJgr-7HGqFEx!# z^63(P$InpT0sBrmxyJoH4kh3J)z-Lm(dSaWDSQ99#g5zP55jGAMT~FiB8lNi$pb<`?953L;HGK@O^&?pv(Xmw;q@w{2qW369Xi*>@6dc zro1M}4}~ni(gW+>2f*_YIbCFXQ zPhSfs4Vw1?G){fW*9G(U6L>EuvhO&+ej86apFYv=LEq_-cv$EpI`BkqjrCle_3Sx;- z1p8ic^cZEC;-QEHWx?{Cy{4?2d;MYSxl(_m5tU?+`e{Cs#?3e{UYC}+QR~viEnov^ zom?lPYzca@^<=c*`+f%C#a?NzT=)<2#uWdWD9lKkV|mq>UYMAk3xS8kaj{(9h0rPhqhf^cT%=;xD=Koh0%6+ zd6XKLO(FoVKmwqVj>>tP2wu8IoW~_)H=&DmAE^|;R5D2f;5j?&Mn^q;->NQ-B9-0( z_MHU&xW*P-bLKjS&4h2h13l%J`m)K?GCto%j{q!QJcXt_ zHr(*dg4gmQvVb%G+h1urt;Jf~vkyUB)jt&bdcqlh(KR=7$tLwJcj~7r6j& zDg9BA5kbPdOSc+SV{_8|4(zeU6ICOUts1n>b6Rk@zXb4#og*)BtFgmh%>)293B5(| z(RD;O3irt@J;3Y(V9Es9q@#%;@IUOx{pe}C?NTYcyL0!FuU}5T|K07f&nq?se#o3g zsB4qv8b=1yp?g9w^HDgvWrLJ|WggM;=0!#g`%*`@(b#F#?tku=JexH3HU_fUxzeHe zX6ozvT;N!B@T9H{uyNbC*-*B4vHlh>Hp3zo?9a!1$q9L5AyZ<$()>l?*)t*&mdXpP z$C*^-kCZhotv`lwA|pWL91Gb@`w~m3)1SUy?d1mvo0HDscYnI0~X=fxj<=DgP+PG}|nVymj!^~=oYROiOz9_Ts zeuA!!TZ(M3E6{XGEt6d8c(2XVy%eC`*}XM(AVTNNTui&cvRV84aU9fyi+ zmZ(=Yxn!|^l^>2q1#$u_`ci(tcq^SMHHyo)|JJ7u&9z^C6nL=Vl` zPMKirb}iU!v-wtcyf0hl^CL}$OE0&Un~J~Ft8 z9@zd5^zfVqXvN$IY3=ltw03Zv_+ld4M)eDqclxI3G;`e?+HCnYwAIROX`B0=O4+6< z%?pM~q1bqP(K9GbjnZA|V_>`JgP{`&F`H$8dV)zO9r$&+h{z3QkrOTWp-%wzEiwQC zu34+Du?GO*###Esp%%6rpmvIj@g9CL(afFYRcDRMVi0OfMVj!=XFzQD1aeHW`ckTI zhvhrbZZ{o7gBzzdZ5#AYjrax@1{QRfa(=}KBGU!JJ z1~Pj8$;Hx%Hh0n9s`ryv`xXG-8cB!dZks;0(fjVnwt8?1o%pmD(giy`qo@3LN@qTI z>yPND`~O7K3m@OEO}5~3>qh_Rn^NSnW%3Uh0uYKYH5My4eqh2E@3Ch_sN(rbPR=}t5(o-9YXSV7agzFggg|lp@{KQ5&DbWl zpH}+Q?4w8kp4=3uE<-j!E?U24#*QYoC0hG(qT!i7$n!{Do4Ba}Z7{(Dc=G`W9V84X zCcU)rBFr!f7h2E{>+2ulI>uzbyAr_y0G(x*VChy z7cXkTwZuxlJftkEb(1sAV`umbjGI9Xr!E9+0fU_#_JR$Rk7x#t847TmHYvjU$?IbM z!G7C$Vs_F>dU9ox2*7@oPq!IdmJmRkAid=T%0t^PKgdx(Wq2X!tiYwmTs2*%`$!YqYfET{-S@fcpJO{LhJN{eq zOGRZ%P7UuvD9S841(#nK-E(Y`-=bJ^?%KK38QGlEF-F(UUaL;c-Hhh%{|;I{WZtWt z?(-&F$-|c2PT#!gd%lln?&5CD4X$T5#r{G3F7B@>BYQ znBj}+D2@{juWeX@*nIVt^z5I#i9#e`!EtY)Idf)J`x1=ZwPuqec}}M<(Jv)3f|TIj zj!oia5GnTEk@?03UCLTu+BsE^-Fd{13Ro;N%#ElVz#50pMgeqE2R0n zUD~X?m~lX-3%_GsxJK{oVbIcB;AF&I?jhNXN^M#J_Cny=D$#-~{8IpB27m#Xo1BJS z92nsb5k2~*#w+UaM*=xszgS+0^sQ!C#VTQ7GujRtg=7luhBui;w z?v~X^BdXOUz(Xb5j{Cfo?wv8GBYvx2NxBAJ{_s8YqwBs^J>ZU8wz%Hz|B(Ml?$O8x zPsryV_zqgpPxB<}teXXw{qQ2%cI_&c6gbf^0HwqJ8S>anJ?wsy>cMCR^XKSG3^Cwj z!#XIAyyn$=?DOJJhh$);fH~5DY#ITO*7DJPmTr6&(LauA^h*Rp0iZeE32xvE0XM3H z`E`{DbfQ1tIaCrLc$XCYNKVO)gCf*#Upa-=Kb+B`lZ&XlGz!U3Sf;G1tom=sY5HCR z)2BlZ-IxA(x2H5C|CoI{n9uvf=aItnoH0OpUZUcS{10(@DF%kj~m=a_!3RRlnR)zs8IJ^hrQVtlh8hrd*qNhEb=#c{| zpUZr55D?jy5&%liJD)-KgJlC?YP%fkj{)q2a_t@+H28%9vnpR3{n6&u3$8ng=KOs- zYlBNZ9FF|6ETa#+zdGOVRobpiVuf|)kTidE`wq>wsRtiJ!vmA+sCBRT-H!C94e<8} ze@h+eX8~GLTQ5J9U$QhYB8QL+BO(lA9sd-L$V-RiMCokF!L0GB(N9GrwC@=QIq~P` z(}qori?ar%5bb%YKPnELXaRJ!Nfu3;S8Zv8BRTURbU*}Nr6EpE)c&CA0(~#Pis(_x zf{3~dTwJ8hv3?7w9@zfGrg~Y;cuN!Q%Z18%>ZZ-4ReIaS5VZ6 zkR*NT{aNtSkI|k>*m`^*&1`WiB|>G~r4HyiK$p@VcpwPSEICrAPqAzUtJ*5H?fxhX ziq{+4EU3-2Up;5YIkCFv{pNgsXl}-AGBgKp9`N6>&GzTp#w??uLsR7GeLvLip{Ri? zXwMz@ZAUlS{H#}JKMPP#U*oWJaaZ=nGBW@sgAs;viw&;Hvt42(nGnJ@^EuyD#@9FP zj(%{SVg$yJ6EYNEe98H=X~2DBrUY?z@Mg3kpT_3Jii zGhf`kQ|24?>HjV=nsV3zs{5{!ap;ozU2Ze_SGaWxdhHW{7L+!AA9=!>m2}tTpA!U- z)+0mF5_jX;dS+~q5sG@*TC&R_yX;`YK6OJ zz`lSaaEGpmTD)D-4B0I93-${*e?=z^*KVkk;J*cME4HE#6 zNQq)SvQd3dJ}ZEiLnIX7_Q*yD0N&~*lF3Nj;HWLJNEs7R=jOwN%!;Vv8WZiMKYTk) zTf-x4q2VsrcXmX7GhdCNo0vsA5dF71CtStea!>Ih0=PtVV(PswRa^s)eCI;ieEmB8 z@)Vv`4K21y&3QKfHVR#~_t$9Iy!#r!FFa>~g?$$Um#VBr8iHiNw4+44wfe(^5{X5q z9h6xp2SK-}Jl-Dfdt3cM!lR81kS{eOpy>!mW2?&ordwM*@_2gYRl>dZ-mQHYu?N@} zw`Ga+}_nPli z(lOM>)PFNWFND0>`e!rz`|L{_xA`SUjsipQqH1M>oAYP{SfY_IjC)F1X)~My+%dv| z*^@vvqm(gLHkE9E!bB1Qeb$JZr*nyvRsBsRCgon!P=g6`a{o(CfKrNmd-ZtiSD>p+ zn?L9U2hsPoeNsYi`b8#<209e|w`u-@y88rR(%4`fK?m}jHvO-1@e0r4^YAXPe*4*% z`Y-aa;Ke$qG2JNerUG36P`z}#lA&-&43Yzs#Q+@>s7?efwWI2Xd5M-%+dKIzJK5d1rz0q7HeNoS9(3Ow@l zrT#j-yr<7L@#!k!cYJ>gP|ec`fDzqMuYiTYH6F!k6HH1yw-d!Ck(d}UVR};g6Wef? zvUCE9Ns07R$|%EJek>6pZ)^hkscYjZ5m4;A_;{cX{B_klIm?d&0&q4Fy=P2E=XbxO z?E348Ry;e*K*9Rxt8cRzad(=l4$MPR;oyQX7+5N zxtme`+~*Sg^FOCOGkT>yN_*~jVkfKDd}VuWjK(s+#*IXO_#&Lf&Tqq(Wg)WJ9M+0VfQP@m>^d|v8LQEtUrqB|ZTS~Kk2q${7k zP`r%yaZHzyD7{vFDSc|;JpzQPZ?(|8JZ?*=zd|fA-a{5&h{;b=5ci%fI+Vl)vajt;#V>d+s>3 z)rYm`MkfPMv=++(tXoIfnP+uco(Wf9{-!q(J#nWACzmA9C;zsi{Wx_!UVTk10{{UJ znr)fiG*XcgEe7h4B2y?{0{K5Zt`W^!zzqO1UT%bSOF(Ub4`h>~e%qf)QHEe3Kzq+s zeROoIwF3gLT2FM#{f*1-JYa^(Jc1MOVj{_79|mneD9fAc)TaCc2Je{^^O^3vi?aXz z@5v!+8&c*cy_abE^l%NM5dCYUxD8R@Q6vDv!;~#OpQuRj^ncpcK>o%z5>Ig>RtYPaN~ zs=p)>&{iRXsB0l};bb7B{%`^V-p1&v{J;9+v2_hnpk*~AOP7e17SUi^n&V5#FaSYn zXZGDNcmSPB7q(MHZ#{d*os@m?i@nvS@!FeNvnXG1EYT1o(Z?MDD16BwM~{rxF&J0< z-eV8S4}R6S>aywVCm!0d;q_tjmXj7nhuiKB^n|pq1&T;psT<*n`u2Q$Ls|!%GNOS3 zfZ3))3yy&lzXfv88ShUC=2fG--9pzz+x*882?69nOAcJNvMlPFk%3^_rm~#q%D+}U z41lgATX3I9$OcS13PW%Rg3*28o{E$SIbO2?*|)z#bnC4tBKFI)se$~`iv}tW*=9|` zobPyzP+@k+(aK5g(QLI}cYff3M90{Fqd`v}?Mb-qHhDz+2bEgk~_({~1> zLjy#+ZQE2m0y+)|0xDvXlxDZf8~}u^JcD`=mkWeQ9>r6a7@!a*9hM02y#(wTQ_jmk zRDCLj>)N}BhBxXrO!Ej{;5bdL$-d-ed0n0j0a3Aptc@Ah^F-jLUs3k`@3$dg|It=8 zkY9R{WXi2p=R7xR6_>5-^Tt`(%xR-|4zD9RnAnwM8Re&(+%qzs{kNyl^jtOx8+{{* z6nc(p;0~w?e`p|p>_Z3&n_owOq9|CT^rug008S@i58Xd2_Utx*{@-^#c(-mJFwYBrnB>)BM?`Hv0#<^={@;Co0 z(G#A~wf0OyTa4UCANXk5IP3svUIkv)f&hcKR8zH-Q95GD^2I3f!QyiFTdpTc%t`59ZanQ8#Dm-FH*= zh5zbii~Y7D8W_#!U$ozjkI2DCzc9<_s*cy&udsa$Joh=2@3T+)^+ak|`k;{RXV#bM zbT#KHZeBy@&H$8m8Npd{;zhefY9Av^3;GPaEFc1)V%7rF;@Fl{x2a2tz7cq_O->*} zvZbu;O91X2FEo)n0J;{<9HK=;KfT@G ze5rx92>3wa>~pwzlg$`u?4>vUrcSggro55P%Rii2JgwZXe@)q?-%cyrFEwTw813j^ z^UECr^`F<5rM#UuTS2BXnJ)5Cj?+T(k{CP5wMBw zv78lwt&!Vj1;BB#1RTr(1SQ}V+lCVYs8SB{V&q>u(88VsX(<8$mFp4-lj)}PhPi`{MG?t3V^{ukYCvxV0351vx%sU;8XMYBf!Zl95&D(^D|^ejLKJ&?ec7qeh2 zfF_nL$`uiJaT$;EIodCeP7^P|aUy1jbWLz$g4IU z$R5Nd+Nyyq>DAfIv0|sH<=kz^f zZhjCf8;H`J=RyDvVB&yG^~Y1UCK@PC*%m*-wYeUES4F*OS*W}yqY)Jj$e~SdwrU>j z3UYfu569@*?T;3LOCZnnCIO<;*U05Yk{;{y2c4ZE6C*j%&&}q+fDNVEnk~nK4UvIX zrg$_P@XKFPcG=~vR6TmnJo}lHPm&u=QK3BEn2Rph6B%8Sf9s;dQ|f8AjAond z)+;`rz2;qce$WA<^P+@N>2Z%$`m0+h`wQFd-0dz3#|q#1kJr;K>#DsfLWG806b&x% zUVj@63Nmx&8v>l-@dEfw8E+#T0Ij#qF73uQq(C4n7^NBzve7ns4#mZv(yxW}U0I0&|@EnD#=9wZjrEbH22 zovHkr!57j=^gqrcy>M(V-{r|fd+$+4lzv&GfsGp}`|f3wf9+FU!{x3uRLc0ZAAEvx zdUt=sJEwu{+8c=Oy{~f>)~G3e?}_xWN1tM!XbIc{k(UKA@0avTg0N5XXA(WmyjVwz zI01PqK|rtr{lubn1C0E-T?t&Yy#^9^BRCe%aYDhfFb)YxICo!)D~yXnJ`il17db|+ z5{~LDqF?WM(~n9ij?T4gl+yP?Z-4$9(fyA#I}vh_MjwKCx^qIPBt}qEr{Mt`{zTbX z#T(ei;Ae-&Q~vztj6uT_xXFw@Nw3-OKe{DhcL_it)mMMeza4NiM|agK%D(r5(QKit zd;2Z^LB}6PTvX$s(1t(Jza%rMD%@2hRCBX-bRHqHlKs~q%%KT=+(n1cUmo0i)aQKu%KeCD&mQ%5CUpa^ z-LI>d+||a)f&I!4PopefG^q!<%fe@0`({UP^g8?Ki$n=hom{kBU`e3#(Iy10yt`(^ zPuYq^vZkQ&irf%bNSoqpBo6(Fk^v+U(sRORWxtq^#h>2tL{TvG`d^8#NTfzt8t~ey z+VYMovN7_AR_OR3^wEk8<7SUXN_!isdd2<-1V>w{FrS-#|MV}7hc&x(Y*HXsI9Zai z1}%E!1D71#InPoo^}VJm%g~+c^LVc*&z8_p`*!u())q~zO-=W+0BtI;jmL{)idSCK zas_7r_-n?aMbA#7vA6d@DCkAE)pyqMGHG@#fFC|{K)J@oJlh2X8|L6m%Gq)9P{!Hq zA4|X2e9Iq#l9AT{jG7TJKq%-}O0UQ2v3&@di3 zvLBB@%l#&q2C}bTLNpS8Y2&_o-%Kyt<7VgjTfh)euQ4J}e6L-SA^{I?#3_>z73cRY zAWH;8%Pg4BD^!tE%Gx?R%HWX>2t_4ewxG?UdkMTS+KvF8NPcX(qM^l<{z$Uf2$sp_ zkq1LGxXuHzaiYNWqmmIAH-5a5J2@{K!HIxk18D1^jDXXgq;o$1SQ%|jNu)w^X5YMa zFZ$fi_KN$ufdR^2Eg#H^Kin_TQ4Qqz%ju~7f6~!96Dk{<3_#Jbeik5Mc)D98`{l2Q z{(7g^=ttgqksDFNrmv(+egrG?K8l?L5Ta_+(I;1xF#XoifKueFx@46rFsQ18?f^eDSuXPzbQ0Tz6n)s45EMT z1G}rw#Xp-uPhCIU-A4PZC2QdKf1>QR-%tVmAtz@YehW@cVxKAL)3QGq(axJ!5kFLf z5h{W;&o*$UD@L0p_0L|4qt(R$R*G0X;(>t0qE88w%~;@`grxo?>>04_Dd~LMcO|>R zWpl1G2H6Z5!tXVpv+MLocKCQF%4Ux`;`4&-7=nW!ZZcKePBx7YU0EFGX2b*MnPUgB za>AtG&zJfO++>Mu7bGBm#?y(O);z6~>;w7*yQ6_WP8*`dFWK0g#@tpUAKblu^s@ln z({;_3b{PCKy?ffR&dYCtM1XmJ5!{6eL<5Xu1Gbn&G;exUnFb63m>Pg{zy|tVI(~yr z%uzd$tpwB{8wUwgjkheK9aRf#lnX99G}Y4hjq8VlJ0G`zY@QBSH0$lP5P%v%Rn!yc zpOXTOP{oLg(+)pr!sIQ>wy>w*zU4%JE-t_foMhp)6`W5IA`n_W<5PX%{pZsk*X~-= z1N4h`O#@>T{j;gxHF4dB`XpeC6t6eCc*fy0J!`&#+Bn71xfy_A4$8qz;X7>2I>H!f zV2-$m;C7lXpHY|6wb&;K!0m=IQ;^AqfF@ntYc?Trpt5>m;4Ae<12rk?lfcO%H2`R# zapS3bGZYfYJ7W$PAxQvk%6g|J*beaefoQ9+e_2xIFJhMKaKz*&v0Lk_e(8j063OXN$kDN7I&Wb<^% zo)MQN7yMH(a7Yb|z7*}6y47bmP_yHn4nb+(?H)1x@Bsz+Iu?}h=8>ZLpJGFxqwp5kk z+FPoty@&c)fcEs);?r-KdKx`#@LKU{FItHa0Y)jsC5c0yX~ zb$}2Wb|T(N3sPihKC|ToS;cj2X)|A7BOdRMHU_*u2*zBmDI`XWlJRI_1T3*lo>__Y z#~2?jGo)mDL>*KL3lTA|KW5xHX^3ToV&60Ug)R~j!8|~$`FL9$Dt>^^m7>@$);ymU zFYD^Xb1izQ3HVqKME{!q9UEfWE^7b7)0-)O4ql=|QKD_pkQC?T02+{i z;@9ow5=|+?Lx{u~SbN|Oo6@k)xGaHDYzU~z?yw_&WqFq3=4-nu5V2_6*+?iXi+I2( zY`8Q1LC};ooQYAa5;^lR;bci7RO*$(W=tce7|cdVv2Fxpg)Di*O(++vTLOLQ*e4PS zLxKVX(%PCJfARRbjYQWKS8XH^VXP}Pb0!iA?2C|k>n{m((dm{=<%iR2_rIjutxD}l zLE6~$tDgnvn(miW;IBoPQDcc++{0LbWN7%=j`N!>YAIMwG^C7x2jG$O;|TD!2Pu(V zAkvg{YCnry0%T=4ED7{0MXws^ z;^f6U(x(wqKAy_jzog6HXNELjeHqcus`m>7H}z>~F6_7A_JCxV&t*xUeGHxZk50k~3<8_=Jfn#b0mb2(wu^QC!7A#v;Ac((DBx}TV7|x5 zRsz__J@pnOw6$CYlwR~Hq{_=j%!WP22sn6oYtur+R;q~W62Jv@f@5T#39Pjj<(-R# zByh({>+I0icKH|e1x_(Y%PAr$s_Nm{lMpC}mKPiXnLzT?DjO0XD6_*Hs zZbK27B}?ETQV6_Qr!a5(Bw*BCZ%={$=yp;8Z@tkQA;uAy6XBZ!5-nC;*X0ZU9auWgVm1k_eW)@PF) z(E7yXM%(tr&Dek;PX>Q+95}!#L?C37&ItpouR1X^V1&h!0(IsSQwEo_BryA#dbEai!=lriAX8%v2S5OkTJYW!)uOJL`*De|~EL_>qk z$Gpf6>NC%nK04sZoHr*1{PG^`rWQ?_bytUs2(mdk72Vn6gBb~UFu=LE82iSpd3dW|M1%iEg+%otX3e0U>A3=eI`$7%}WA60qVi%5M2J(ZdfnK)hFercWo@ zZd=Nqxo3k&r2O<4_=jvJMV!$q^VJ{x8xei30QKz0KOAh2ra^8`vMht<-f&-TGH~t}P%rjpM=aaJ+ctHX7Ys=t zt?3hQp46PWwbQ`-wxp1V-f-tv=pUP4W6o%KsgE| zkQUA(OU7iJ%B&%xc{2j9q2>X1P6$*YXvVV!sr=*Lh#q*X(SkFl1RE5~FdOjZx4;slx%0glwITwV4+hi$}8l?M4oW^&R>65oU{aZ5>Qy32p9Ko9bzPG z)545+U_{2pjknKrZtGWwgV&$RO0+Bt2W9g-_7OqR>rZH}g+#8j{s4I>+m2k4#K#W! zRpZhpA!~%PdEgnbNt_qb{L$>j_7gUa+Is^G5nxJ{bZq+zUrN(dn!8fD8`i#nPFuF9 zhS#A+M89%Xt!E~3;a&xQ&9C>&SY(GBeSdL0yk|PpV;#v~{6eB_9w+wdxT$ZUd9j0zny02Z#X1fW$ap({(Q!z(7VLJiH!J1}POU z^@nf#Gkp*MFBL4j{=j&vWQlDAEdkylc=LA)vH<|+AglE!N&lb+?2qYMvD(UQQX?l0 z7#rm0`!l2^9X2K$oSh64vq?u6@Q1a*>a$dvv{wmB^Ehx?2Qw0(cM@@lK0{mpd)oWP?^ z^55-~{6Z@P0#v*}fY#+R>F_%)A-eZ|%C5aW*(Xi*g1sF5t9H^;gZARZQ?hyY4fj-^ zdbl&Eyy4<14=zOh)g%w5|5((DqS^>KvOi#(IgO`6;ANsVX)T%qtmA|M=v0TQ$iVyK z0VvZCW(1r*RewnBOOc%f)b=yw%Hve9u>CUNZDintfH`;$I-1U7<0yV_Didy1^njO* zm6Rp0fD6RP(WxL?a<(CIQB=z|AVlY4w#&$mGN9hTCNUczI`7a?T+ZZTnL$>*>_(o^ zL8rg9hrM5KbuC~1_#yiF;*Gu4E4Md-S@d3aC-sKF8pE;Z^`E1G0sp9s6fH;&#Fm2x zguozphd^<}PXjls-vP?N-T0=TVio~N29M5heK-iF1}GV*OBn>GFR))hB{2YQsK-#< zs5|Lxb=vn55IbY60i6WEY%d14i{ft)U{g0c^7_%<7zs1xFOoMPIaa@@a}Huc-KtG8 zfYh=TI6Y0)O3OZV!X`NhKmsUT3C-O{ko+^!D7l`IkpVjRjJMSAN|U!}uSfqPiR{(k z>XU%*$ejF!i<$+b=)>_;)gQ{4{ZztW!Kg~ZZZ)gf2yU=KCnY*+=vycP#P-m5ML=bn z!_fIUP7?_LKPqTarYw^6z#v2(1lc4)qDGns(B?s*KcUTV4%y;PUb-bwxj7N_&m#vZ zy7g=TWGOg+xCu|`k4lCF(6Zyh>f-(J?1>S!vTBw#mq1?9ONvdJW0sEY82R?<&WNtN zi)j6@Pr_JY&ZYnzdz1Wtk`0jNiTUi6A3nNQp`s`HH6Fl!ToC|Tym%nH^}bDfbo2Rh zh-S|unmMf}2EOb>F*{eUqwJC8jr%@F`R4<#znHQt_cr@+P%+)$&Kn(_)K$s3W4SG6 z5>0`-Fud}yG^^nBjN>y7*Y-UY;UVBMaIkeL7xg%8@DmA8mzq%s+_Y!MLRyoD$W#Pt z03tp4@lTp;JJNA4%DThBTuLB42~O)k=UQeZI2-vK!@l7 zIF6fDiu=~exovaq3qF>p3BVlc>EwOUfe^s7U=+_*~TbCR*Ti2bn57% zX^UNJ>9NOFQ}*CL8fTeW{8@yNzX2&$7mt3?(P2?3J!s1sr^mo(tJ#e}1AU^FF2zl9 zUc{<6GD{}RkuU9xIIMwNM~Y+sNd|Pb?7Jcx5*dD6Oa(?ZqtL0Njx5133f4{$2w)M^ zFDDZL*(7qHk{f0;X3Ql3Dn7Ft^H_gW8-Q|Xlg>K|;MiZ;PmqmA(VlFA-2`pc%q3ww zJ)2ZEd0IdX=l}@~e>Z}35fZn_pWmKF0-Sj+_y@d9C8KsxiADkx%gr8MPV|rJHV~!E`(IZ@{=z6q18bco0wb@xdQftp zwrKUGN%`}%sC`zt-d0&BHvYUME832IbjpE!0|>g-!7}2K0^kTTJgXr^dt%yGkOfJV z1j6Fo_mTDWXnz2}9sLNI4k_bfGYvvLNCH&dn^PXj>z4UAA>WAhCm@@r7s0-{Yz_(1 z>X!BhC>uH@S9mB_T`51Z=(;hk7?Vu(`t*VSpI(1y6S30hNJg4l>_mibQZQ;`Q2LI*2ZpKxNhjQjYftM-916im7x+S#y$sgwxdJtoLheYD+Fo!bi0=K$|Lk8`2w&&stk=ym75zWgTN zbqD>1u#P*#9;@)oQ_M9LJ=QV3I}#D>{m!3sYH_rpdYw$~cem3$JZhIO(v#*kUMTKG zkix|zQaJJIRn8i z&aqLu0Y)X|?C2VuFasTDd?L5qc@Z)PFiCHf4y0(;10`bvf@}r^L-p__DCZeS_h=xh z_6L+H>A)FpX^9E+WcrAD7yA=ff-+{Ml32buS0N^`tc8~C`Ncg%Yc`m{cK0WUKpwhC z2Ok`i#pjpb@f`ZpEeCWCoyJp5<1FG?5pk&(R4wproWlk%XuzWh5iYkw29j zUZ{3jT`A?}SFWRL4oD7VnYVw@a;!c{A_Z`xF_tBjC-QpGFoW zP$@p!ym*VB5a~JKE;vh#WQ3whFO{oA?kH0b;Dx0DEsEvN+)*owZY7oT%tf%BO4*qC zaKJz~)xf{^HVZ~>pNkP8N2g#UBFG8fbDhLwt2=HSEMv<@o;=c?5QR{9BwE_^$AL0( z+!aBT&!_Oi=blE=~4-XW$V`d{IO<+d;?d2y1{L84tSPH+UG~yW5w7IaZZ2&|{ zAA9M3=D02RC`Ym^I13T81rm&0BVdZ)q5&t$gTqjCLDGu^Iyk;!Rw1CFR0|pa03ZNK zL_t(Xr;icYoa1&}x0QiN?OQU3b_Zlhx?4a34_7^-ap zD?;MS!P+Cf>;j^oY-j_Fs27_9Jtxof;SnqNAOsNHmrP0$Fpi^tFwNe<^Okxt!AZb> z7U0h}omGnRA_tB%S~^b{eO{N@>?b;($Yna_84c9b2rJ>Dm?TH90Jx~H&=EVfQOmBa zM~>x5grsE>!$2ffPf+LJ{8K>AVnK*FaZok3DFBVwX2h1HtdL}1QbxcVZ>dj6co^9+ zAje6vnB54-i}g5DG}a$UmrP&M1xyI)SKiTVQPYP+%B<57mUKKf!zwQRobZ`|aSr|y zhX5>IJeAfCtZ#`t^!P&t{6&_|oKBDWW^zsf#_SZV@{In*b7GhQC?@GCXx^i z`oKQyn4nH!;%l}VA_3YBfR3z6dyedIRMmX`s)@QBFk@sIEnaNST=Y1K=-tzBVf+bn z(y7adXzuvyxZdNF_N*d*VU(PYV#j#|_TV^mc64xF1^(RWHW-1MQuKh%RIFUo!`n6a zNfFE$2!J1K_M_+zJ4)ugagOy{0yG2wRF}Af5xZ`dlMEmgC_^Z+wfzZz8YdhYI3Zc# zvLg{F_Y??YZ2F?v9Jc`nOqqEj@sqAD4gxF#I+P!u6KzsE$Inj^#O#~dq%*Z(-$v+K zW{G^Mw$1eyS;F8`9c>IrfZ!71ON>T#KHqR$go-C130OgAo-!eBHkvpDpfJ1%v=m^# z-+(T6D2}5v-h)N#p-C=&M?~|gGyZj*b5Wmk49;c{AhL5JGXO^;lLxxeWh#M7Q8<7* zAXj{;t(jI2N`To?wgF@lPdl)2Q$b$?9Rw@$dnKFMx8V^k!A64VY@v_XPigHQZPwU@ z-A5u^7KB+Q)dm9N=72x*Xr4`CbT8>2K#q^OlL3oF_tpkke^Ll@ESqMk^lTDj6SFJS zI33_zwTU*5052S|bbO9tlb&Cy#_d&?OrVW{6Cm}k`G4SYh;P0L5 zR;5&No%FGkC9qC90NyymJYZ0OS{ic?z$+bvB7g48Lyd-lH~vTG|K7y+zSFm$k&S;Jud=*ihwsy#Ti$59Z=+Z4 zorKMO-UO~e1U9Q)rpTSQ7j3``S%OYcaK>KUOgIjLXrNlOV*wGOZ3GGjFcBC*pI&4K z4m_C%L{1;@K3Q-Mobg88OBeeD^#g>6wKv{2za1x*SLlO}XfkE*lD4R3a zaDG+4Uvby7=@T~}I9^>d(ZG}~>5TV3GJXZ{doGf`aWCLWr`}IQ+l@Cl2D6Q{aQ9}a zOamV)7mqZUbF^>xilp=AO!GIa@#xAp1u;Dt*%6Q6t!{*48?QvC3)u*}^VvlAl|wg9 zE#!zDGGR!FwmA$)10IJ&a5lf=2?6tVWHA-b0fcV=G@GeFHtlU~YML4yKFff3eFq|D zzY_pf(yh1OLLp*EC>)Sx`bSRa*%~8e<|UfJj05ivpp;`H40usi9CvB?$P(9_ZJ0GS zoj~%u6AZAS&KVON7ezKCwB9^{{XQNEa6)_7>w^Z~=F-3s-#&#lY#Mhr<`!CCMrWR~ z{dmKaSbrxb0Vt#%hf4t`?$Oxv=P_wEO46W3Q+f(nD8L^bGQa+o-ve$Oc`%BL91FAU zF_5t!5xHAH1RcJdAY1^%&t6NL1w)`?$3@VkM2z@n;ux{IG(dNBrfdWYrF{*cIku&2 zc++;LTQb8oCW>`SHlWC=$%drCBW)oYQGho_Ud1tl&V@*&cHaS?s}5O_0GuyzNn>5~ zDfaFQeohpU>MT(281QRafnOgW<;@V<}HdgJhGvX0tfS0dg;{FoCF9?h}X$UpGYDEn;4fQV1k0bhauw< zB9z4T#Hc+I zAz7!X$R_p&%VN~TA|lVxS2N9mxtVzZqQQY5fg$vgB0H%W$x6w7h&CX|rhy!`EoG84 za^lE}rx@_g1L?#Ad@p4`xP#-_6)|d8-n{56UGcpQv8Ww7Qp>)X{i97fr%D1F3Qf~7 zo8%-wn*WRkHfMmaKR_Z3d|7c^WCA8I_)iW3aNHR?(X`<^V?1H3zCZ5ir_$g+@pj|J znwzuUC~WjIPMYt&mj+WJ0Y$mlQ=Pfn_`|Gqv&~Vay)w!|C4qDD9DDUv>`-(i0hI+H z2&v2HUs#*;A~4n;=h&G6F;-V869YKxgQvfY$gJ&)FNWccP}vxWy7n?DmAKvx_1Kbz zLY6Gi!DDO6<~$87oCsXfvpKQAk5{I=Ka+&_Ko(3;A(Bs*el3j?GGN12owUiV*>%3EJy&K%XR#XG$%a21oLfpWC|T|sk`hs zR(@D)cm2>4>Ad&d)l+@yaA&0P?r;-5P~AzVK1f85qv1_Nn>G<`+(b0Ik!Zs((Z~p8 zn{uK}BjxYqVfOOhAmxJ@(a;p4sY66l2AlshWUVRcRx=)?H|_cdUS+$d;C6%Z5a%;8ywFi59Aa04aNrI&dD9Y{9d>6Xg^e+L26^pg<=1SThC zFA%Y)4M^mz(wjtlLbAm&R34x*(vzY$Gv3?=tbJn2T#-#92Zl^|nI0`WAT9k7(bad# zBmm`i=C0!NRKLWG?u4Jdi~hQNo0^_eDP9O)_;&NJ@bAML8~%M{6H)P+#Nyw;0MXz; z!@n257yiBQ^M#Ke93&bl-+BHJoq0-!I@THSMx&O=K>&(LaLCcHw|X>GDbzV_i1IDx z63w0|Hn^}#{fn%d0f3!=LQPQ;P&F`f3Pik;gNZm{Ck?8Aq6fAb=;G%QP%^3rMcpwl z;gP<@+*Zhnv;oaHZ&NYPE<}hD5-uaJ9am+|9QEP=kf2)}7fUkWA^w^D3ISY@EjZq6 z>`NKpBuDvmjm>NvWVJDrWEDS4luaT^F`MMF8A9TXlS0N(|K;z2jEGpbRZcbMF$2Um z%$jkkgfhzkqF*u}Y9|H+zrbCVV_QUYh_)$k)f&qFzJh4|aF-l*vzh$TizWp&P6{C{ zc#Z`LP)zsuBQI)xBRFCa@D+f@CbWpJi2Usug8)v}p&__woAsb`MVBmi1$KTL2P^@V zvB8nm_>n**8>p^E^lI7^SL0PspLyuqp!p#=+LJ4+I!(t=<3&jup?)L`X#lFr9UOHev84JWXeg4$RyFfb*hlg~S=% zc>NJ%6K##nC&^a4Il=%PzsLSaZyof=vanQBWCGZ9asOsE$!(CkyaNApL< z?C;3}{;@F|vjG^*hQ}lmzyvxD!QVJZ!3lVih>e)W-uPsjQ60PG4$AqPIdt0{Bps1+ z%}|B-&H(MGl;}WHfPs~fKntC`bbQb}qea^YsHILK%LR6bLU$u*vO)bez0TT{h>&y} zqc^riJ=(=L#s--|aou>j!Zbe+A$&U>nyi$*?u1R6I}-TPmib%TS5wN9uup?;0OWQc z)&qizdKBiHsmGZQCT}T_akMq=%q2T1`z>69ZQEr;!0rh^0w*|UDd=Dcg2q!qwgda! z3nXANfj_sI(Zt=Js(UO+z)>&1lpZ(Vzo^jhy^#rLLCrXB`Fij2+ZjdV&r*KcyU3+_ z&A@Tzs+BFvDYvYp)}KU70&AOUl#FBsbSF6`DGJvJhS5`WBIOx1z1=@5031n|P(uFZx~b4;zC^#2%37i&YjdW-{1!ho~MG#=c)+K13vAfg?157oq8DX zTD_PyrMi@*i{M#!6P;=x#{s^kY$D(*M93KOZ{ zq5&xlZ{;cX_SKE}tq8Qs}t$v{% z4@?r?DkrV`OKp1~QaM%$z>IE;NcI94e8xE0#Ckje6UaDdWj%7n+E!&@AmS~X2$8kf z(C0dXVhCJXg=L<_;e# zk4y+QiS{cVp-mw$u%G8z$@i# z7;O@8%;B9`_xA=&VDbk1ZCSH<2^fR@wfGKp8S`g&dpuQ+-^U^*r!KakN&{u5e%6`d z83~jm$LIlF!11K6jY`oEcZB@ZfqIWZfIN8VeLQj}rON|^qD*^3M9Gf{TEd|biqKAU zqf;169E%X~Df(p}V}wewF)(G<2H3bJ*(946NJ=#O3z0?XnV3yVM9BFprc>~$A^YX_ z>G%QWnN3+fhD9cT&sW=5=1Vky;d4jyYdO*3XO8aCz{w8&eFA_JXOxx$Eco*YCd?w| zBf&9Y6^_HKoO-e8k55=>(wFrJIrkLr*Gpyp-m+A_$-Ka*rj0!w8b-;2N{0B8MS=IGds1h6VFN_L6_PXi}r ze<83oO_-tgKrSE~+K*@7-2Q~MaPA}}fc5M}kPUTeRKois+64$8f_qh&mW3%Em+S+{ zAojXo>Pt$vL2?jA zeW{L7*+uX5N07~XJ0Az-z%wC7t)=OU_N2@S0u4{sN+9cGM~uP1F-&n2m|#ne-7uRp zK*6IqwLb})HznCb8^FB}X77rUxxjwnoWsv~R!DtDm?si349z#IFXgm}eU^=z`JCIN zHs8<&_#EY9B<)ABL_n|`DI-;E3UvGz`a4j(WBYI-N%V&bA|26z{Q!ON_ch)p0Fo6R zdE|_2co9iSpMi$wl$3@<&~R7aJI?K>JP@!(OU^^k3ELAMX=Jf~Wtu#k8a_Y??!A8ur6lg$A{MYhnm@wz3@bwFD=o#ADB*tqez6`I>l#!s+glt+`z%iKsd$z-wn3xGg+ zB)}*`$N;610LhNe`S#1`x<5X#u1lsoA9x0R`!m0({oo{cpiclogM7%*M`c7`u44!9 zJhY1b1@oY@NR_+p%io!loX;Mkrk{9K}U*W zLu5v)Ta3t%OejRmzG;pFSRzrV-5+J#q+9$9M`(!{@-#cj&rW+tHXzdH0J6>wg|ZRdz&^X^@lIHm_Ejq!dkUST$XT1Q=(0(#Edy6t81wD(X~W>c&OECjhb0KJ;y`&+`0Bv0}yd1^7G0 zEleJ^7tj_Dru(5%j7B^#HkWq9BC;CCv>azz?FLsb-C=-f!6>kqh=ZX7j+#R;5tI6c zGp09mu2wGdiz1su+Cl(s*0i1arK4DESpctu#Z722*(4i4vol~|0T+&Umd~;mNpVui z>yqqSvRzy%P(crYw?-7}fE9F*lOApC#3cq+80(UBgtjN1*Z|q0OLL|%TzhAV=KbO0 z5E?gcqo$xUBr$wmq5NJ(ruy=Rdx(m0W-hOpqKvKmOURGp5eQo<3COeT4fL(gRy(m% zJow}*(1f0$NH87ZaiIl@?mqv{WD7agLvF%Se&35=-!;^e^)pAZOZvL)H1U;`YeoG~l@ z5KfVVvRAggK-QwDmT%fD^$q}qdXmP(*i)%Pfp{Q!a$YZqZL^Gw?L){9v|*F>Jp+t9 zAUU}1Ze=sFLT0$Lw7OtX68B@@ylyZ0>NR@>J$Ihbhv{1vElP3kletWv0Hluo!AE~K z%SgSN>K%tP&-`oPZks|76xv5e#O6-=N>p>fkcFQwes(>fhyr)YAtogjl!nKa(TXT^(yxQ~LN^S;yoi2FcZ?#Q$BTLSZ(E~0N= z^tM#jKAFq)2|%6EKlp8*$+Fxttbad5*!9l<(*yDt2{7Ly8|LeII2qZ*6jOqAU!21n zB}Si)Je(W|vSI2FnLh8Q>V%C~5!N)zZU%NkOJL#jhdDZQSf0Zc#?{Fl7zZqD1d~V) zI%)OjR&0Z%w8WBdSxz(>W;#y+3l2I~_jn-?f{iks8ll9sbx?H~mGe^%9Eh~Yx~M0W zz<9OwgkJg`xh*%v+M2UTdc5QUYqjWyrE7ueK_JIc54}v>m1yWi2nc_<& z5|HQFXX)FYeS00ZKAFq*2|(S^XUhTGZ*@Pt^7)tBT0Dg+#_N;|kO6fPX+VTv7Kuo$ zgOmWAgARC8(aB3>gn3}=XiZrScq6j$_8nkly40e-*iCyOa6}M55gq3$$X0d@WJ3qX z$C=l~pB4KcIe%sUfd-DI-lYC;5Rvwl2vM>Y1xuvW(NQ4n{r}s$vRKQG>RR`8w^48) z5h4KvB9Ravj==#L{SZ|zlUSDpKMdiUP)kNcf_PMxYy75b=27WvQ|7`>NTNSC9Z2KI>q@M3DT81a&EHQ^0Ioe?Q>$!X zNCdJJxrJZm&s(CVc%Fc|K~V?CWG zF7joCQ6Tnj>pLlVt*&6$YwxHU*5FVq2=H=ZXZVQkM(zW*>3 z1*-poEz790k)3qcr_Q|okKf+6`t1>SI|10E;D*QU`e=IEBBkBKf`Ca!Va_HIz!{lV z#JO|3)!euM)v05)Ktcc@z{^0=I&en;tXjx5qljRD;amc1qiebj@wgN&S$YJ>pm=0DBaiJ$Bc<>EY>$^aEz5kzm{~VtG%yJ!f@H`Y2Nh5^hh+pmyU#9i`_LyjUIIaE z+W`dkhlmLmLGoN8U|_D_8LcQk3uALK4M45{TM@qHu{rP%GAqE63~&q7S(kIPAsCw^ zM<{cew*oXk=a(Iu1IHzbV+$QvLMLk^hwTNgxBPqHJ&)s=u}v_1584=9Z^QLQF(c|t z{`X|JKL78ffvt^25(8l;hWmc(JL$?-zB29k$oBIz{cG_!>%&?M>T(R?u8;0yqfxn~ zGEWy7Jk-6z*S6T`GB9R?1Pv%-IQNT&uT0Da9a4Mzok?Z5RQL2N5omzZ=6wy1;u zg#)cl04|&?$CfY>z@BJC1e}4K`g4Z8f6SS4PFNW(7*}nPBf-dvQ5k39SyMiTdKeT#bXS z<^Htt=Aurb3gD&-+=oVi8%I*|Tw6*@c+R*Er2Jd^>V?dU6jeZ=)EaR*i)}|lfzmKa zCmooAQY>cZWU+;m(*Z0~A~>z}Hg*TrejcW>2TInglORBh0w|C#fJme|hUO1HuY3L% z60$l0xRBDE+NwnY7#Q*OHW{bSwm-O&F$92#3;)mv+j@<{eabMkyn`qtoe9B`Kn*r! z#}>8n-^$a&cTWE$%$ownIpFOG8;wWRi?nngN7@9qhTx6hT+vCV1Jk-{ z_Gfwsk3LppvC!inHDDxw*9h<+Z;gp~bnw6MVATo0g_r5rB9Z{9;H2Dk&zZAyqFKcl zNPxE#c2HTb^21fo5orjSvz+>w4JUiHXdnrZBoGSuFzHcXq6{4aV>YHLEwM)d0Vn?0 z&$jlJH@CShb%1vKcIYC{bBIJc`J(5$g{11QA;Or&e-@UQp*I#+HXZ@ zP=>6NPQHQHUL$8Jz0e}dMSrFX&9=n)&wUfAIpY9P-9VuuxNd{giA<-cS_7ezHtwN6 z4?O6<8W`pM-I|yNbmaQ(`CkmE>IC3oNOfxS&QrrK6_G5gVTz2Ny_g^-f0j$2lPy`R`Off%XLwBQD;>bKIHu6J zMkR0%SeDLy;rBsi>Lic#3&U3fjr@QfVx10}GE$f)4^LE0P%w22V6h?zak<^4MJ4 zG&c2K?x%r{^Cm0XtJol+QIj&Lct>dSikvRYd431yh85@|F~bQmuwarv?>^Nr zFJ%$*5uXpYoL1647+uJ~EXKC94j@S;d%z?_fp?zM+S(ENeZG3^bSct-X>3dqnBbru z+rQnKhOrgvb{U;aDGekb0v>XD?mK#Ydi+H;(Hq@-CjggV`tLlIZb>P9hCO;Tyu+5i zqVSIa!5-jZC^9YuNOR#68igRdTPTJoFj8SpXPBXF8FB^zj2?tg$iev@g%0x+iA{X^xt`0yS9Ptsrz@&o#MtQtNzd^1pcZ{BREjLX@*m)bN&5`-Vs%r zH^5i|$TV-b4ho$li^ZXQoY$O|fO(4w_iFQ|QV)yaunJWlqjUuHfalY#K|wT!-=iWt zNrHj3Ndg6ZQK^GrOj}#K-yY!|GG>>GG~|*x`NeO-@rr0CQc8E+(DVJ53YIznxKxs! z-cyi(l+uHzcc^eS{$vPL;hx*)OO_nl2|XqncacYp>H*Ne(V}-%%+S6{BV;=T9Ymtz z`ZK3ci)Ds&78shP`ilrakjxZdMPtk2S9w*IBaTIQO-xJ*vP8x*%UrDFh_Kn%5I`Jx z6Ck3%q5v4oy(^uZks8VU5bHq^ObK$R+n^U&zgjvF=%kZ1);Y97;9@P{I3r!lUj0mh zDkF@wbk5XnK|+?;N~+|a^^3{c^n=aA7yiwkb29vVtb_k0MWjvuE~&V8UWO!Kup{RE zqs^3_k2=T$tOq_bwB_0$;2D1pNPvOPus3~_CJ{UrW?Op}IL;s?K zWNhA5(P<_oOadvjz&e?^g#uZ7HUdo4fnc9F$~C_m=d+PwaQzbncS;A?OLkGSC>1na zM^ds^ogDgvU#yg#y~#kNLa^vCw=>)?&Zrn=+R(||9{~KkD+T8LOW)c_dzx+@yRm!z zml}>b0l3r>pWb)psq`NyrN{g)d@Li%;{iq#)x1rw#ylYMSmqRAW#tIGG3yuhI|GC8 zvT9#6jDUfS84?O-Ji);6*lZjsr0=eotQde$c50g-0eH4(N(O9*vEKsB5xBFA=)RiF zaSpjH7nuQ&bYy{u7ru-8(*lMfl#W0Wfj)qUTL(A~jXBBVQQq(p-fq+m%U_W_*6(F? zGMW?BCnT+oyhr+7s|PSgf{0zAOK^e5h9JZJ`QlDN;C~*wF+KJ&nc|IpZ6^SiarzIR zOiwttNMBcZc4_!+0kiiMEZ``|XI@gZ5_k#2s6v%U4wMI(jRc|ydPM|`3_J{8GF(d9 zoyRST&}#j`TrV55(6BqS+TDhw_UGH!GS&uLv>ebV9RMOC`$b@m9@R}lIv_8Fqr^}X^{h|1FXl^9|qk9!O8EY z2vtodl@1`mXz8RRC@`J}f0Tai8CRumTt+jz(XZ|VU>{8Xv3t`tpRtdCrs@NbAQZ-1 zgr=p(-zpXZ!xw>tGXRm14hn>nab|@qyhhR1*iBI^s0?+!78rFVO@+ZG(2>>pR2XLl zv(_IBl@~@+0F>iRGdx>0Pbzesi4Xv~BXhVHT+KItodf+DMS)0!^0Exbkea7z1R|(E zD2RZF!Z@9r(;r37BDqklN)aVf^#wE5ZJ}!yNGEwcNRn640o1u)dSVaxUvBv61mJSd z!1Vq*?%CZTP%*4df84RM=S&fdX_QkJn^l52&3Dt?*^5 zZ3KOqiz>+w^M+OSD&^xqlOj9psYPBp_bDP(k`#z2OmtrX*j85nb5RtqM(K+hK~VCq z0II!S6{XGwuv$8X$YXwA0M@+T3LO9)&Ll<<4di6C^bPh$lB&wsBoS5iht``Tj?w*a z{pt?>`vQ470oWJQu+xd7_on+6+v#V*kUA7~4HGxZn3>fO#%V5qut9a(tIRlC-^BiO zBL^8sf~{i;OqDUi{>U%=H7cKZJWN2`JEx<2#|a`&9KpI3xsV=N#goHuEzgqz0#swx zjUp8UhFFD#^SB6Pk>o{b9R`r9tfOeoOu{Dn1Dy|LSOK(}4kBSwppSZv1$5)}be+s_1r8{!BcgVo5H>wEKdw)d;0pyEbJH zol8IU%%`Mp?=zFT(cS3;V4qI^kP@inG||&yu*g_9gFGkzDIx<%3dD9o6d@aG6=hHc zHjlw9NUI1jFq+CJy1Xh89v7bF?R$+X{s_#F&`408S+CG)XPjr+s)o9NbrA~mXA>c~ zQOY-v6N9cJ1reFSNL6sSQ7d&K0UTwH;{k#Z>2Y39ja?ctA{Tl7qCXLttC5Q0qd!E{ zqz9G*ur9-Qc;OF-H+0 zlK>rf+fF{T-ek%`tT!25LI5|NjM^9LTCKN;kf;biC35!Nr$0IUM`y<5~1a0hMDY(^j~KQ3?;8i3+Uj`iz|h zbAW*jnc6C8!)m1q_8Kb1=fc+9Iw(zYI_+S2vZu0JOMBlB(4&kcSVE2w+SNhD`j3Gri$dEoQHo$pBm<3 z$A_Is54-y6^w2&xu^ZjJP5@S9`j4DU+toZMdN8dpy#jpRCM1j%8-h#%(15ZrMfr*- zL}a++y9f-Mo{%*zLhk%sg_>up#_4cGg;Yi8*DW?BizrM@poZSCJX}d^)oWGbM`883 zK&3oLBuce2@1+jVTxWeydP-|}c(j_viXsq-WI!EF0j8i|S-wHezS$ppw@5<~XUQjX z4!0s0vrcCD3({lqtj$|KA<$&dB4HqpYk#qa{8s^5IssUPS(^HIEU$mcHjv1B={#CE9=B-n|O1o7dyG z43i!PCNR2eWF3GH{hsE{dG}H7*odCVQF)q32H}2HP#TTR$$uggj&Mzbn7)aV3swuV zL^`Psok5v99iR_5A&wQ^eFJ#+5^X@8cjS8sos5cju|J9^DPU$}o%^J8z&bx8y61FY zddVD}(f}Pwt)>fO+iy^=fPN%8lw)<|iN{998_9tK0UHD8 ztGids+h~w!BGfe`hWyULbH(?oLQLoN;ETu;U1!3a zb|F*q+~OGkl)~r&!i7ectBMK0TEM#$p&;)+BmyQ6F}D27 z9#5>}$U#8_h$!TFQymVV&=A`gMX0=aT4G@6)!1;^NFA6@Q! z&Gb-%7&#&Yf3TjY`*1BW87#;t>ZJWBK0*``G1(uMDUg@BHA4l_twp33>Fjk^rGqPK zN;kUOodB%%^e>K_Oyl>o7*M5W5rDcR5okoka3% z_+sE(owRwgHCWq4Ben$E+I2daQo8P{w6$13L~^z5>BjZG6M!|C^1~-~3Is#&4Dx`{ zk-$~&r%@pu^+AF-hDpINI{=vBkxTEWb&i0FP>5?PG#z>O==tR_z&{GPF5AZnShv2k zI6SIC!Q9VcyscxIGm>++!76|acB&}- zWzXKt6Ohwz&68zka%Sz%)k#HIpM7-?`L8;BbONyIGdT7C`0=#$)yJf>wop0bZyqUv zSN2lPSSiCI0E|Pzp+^H=W)43?cvJPURV2pVA$ombbiz^u7+QsSSI_Y^Whl+d%;1Z= zFO(NWzgypV5zgsPtKbv8a?^=%?!~tfa0#HESQU7oC&Ablg!%86egyWn&+^dex^i+e@!Qoeoiew+uaJVZ9A;68+2aQ`61ZpX$ed6fqOmssu^s37_Mxq6P{GtDfW>9Z@>jxTeO2 zo~=uh1hp2Cj^z1PQHww)YyE+#aXTh>=Lh#^&;d(Jt83x z=mcP$W^)?L@xM(6zw(uIdYD`{!NBIxP&B_5Hoc$uZ2K&aL!m~Ymp7R*CGWtwkYbB^+6D0rIW2% z1J{RX&1bO$d-zc&RiPs5AsYvuM3jbFd9Ug zeGE+lNx&263Qv#>zXUM|v#Q^-{hNLq>aXxWmuf&mZ+#R7ls#%$bU0&=y)(qnshmqi zIe~1A7@$#RKq=ZrVrJu{oehpKz`Pl7NwA3kX1Z=VkPG~RR1lBF0X36MBo|bKms1I~ zIua}_ zTzk*hUWJ%AAV*I|kre|m{J-#iT=Vp5yYyl@iS392zjhElA*{ejwRFqwRMnn4GFkw_cXi z$+?6=Mf{M!*ig1pdfW4#o=$CuY24^xb^@?r(?4t(9ES{EW8sMtfGSW^VMYZy**FDZ z-w;HJcwjpi&gC=xtAItG9DAhW&%AxD6@~_I4ao|0-T+bN-tj*3NQIYJeGh^?0w#=Y zE~%;l3+PB8N447lbPkD*npb>pzITRBs)$QS*ho&Tu`1&0`X-_B+l@X*juwrU9sz^!=>v4(_# zJbino`;uC4Phl9DtbhloLcSrO1@bk*H8v~2l4Xz&2r{w$sj-C-6{?$=t2d71kbJFXg!`$^C{W{Q zl0hy6Rm5kJ(k&hMHxdat0ocfC-x>7ncc)tyi}dG(!3Arbjp1a)B4a9zW?*cV`4S%+ zPY(OK{#5$yhy(ngJjCqnsV!h4T%DVt1+m`ospC!HphzCjc8g{X2s{d}91&_aQv^g%yKyy-|3RbG_LpazT_bxMnq@qBrn9 z6%hbi>-Im6-qrLhK9>u`q58e)QSlbE;iXa90F88IyiP_~MX!L1+Cgu-23Q555T3sy zK3u`y03w!amO03NY@$H~YH1l4SrGFOk-0)A?Zz28iD1pTq2|qzL9#78w()uE1NMo= z*3!vpDl0xmdDx7iZt1Yoo0-;JK@1G4c`Ib8uDc7JHF2!xffG@vfLq>3jP z8C~hgqsJ)vV{Og#qO7?nRZ$q{iFH&746RB8QywdybI|Hf4bXDiDg}atnv>S>7^28d zL>8H_6#$Mzkcq?0Is-LcH7AN76|$_PhK$^x3|W_)PDj98(MgW14DGpd2bg3A>+L1a z?0Nof_ID)E2|(9`LINWZn2d)5b-O0QuxKpD2FZAjf1?3a#wiGkI{*RHKo3lMSJV5{ zKKJ2!=e7c@o$(qHguvj-9T4o15@1Ficm@gkhd6Y|`cx1Bnj;37qF9nhRE?aVYzwbF z*xpv?0E!dlyV^F@kretzx>XDLn|SgOzzC3}e~K)+cN6I;$P#TsRo~fAgd)op&p*KP z7&uK*A!iZ!Grf6f2mWsDNdlb!bd``2xaoL0_}HILr!(Fnco2{{;0f~PY)mCs1pAdU zKtoTR!4Aj-7ueN|d`|naIFPSYWoxSi?=-@F;GMx8|Nh|)(a2O0EmF7YQ$?EJCY$j)F~*GQ$Xd$);cf0 zLi}(XDt%Ju#vB4Q19T&OShhcrPEt@Pe_|L35fhz)Xeok6gl!I?;6Cy*7V$8T|I8x2 z@HNj$pY0~DOCXX!CjebHW=Y`4-RbwwEz<9qaWUXP1DOqf;E`9q^he%*t_46ZG4k}y zJMw1=<)ehYtFUqCE8$?*$Vv7QVY+n_~yIF)eU3G#AVKBW`U77a17Ei zxr;Df*X^m1BD`LakMmxY_iytDTi4Y04O-C;MZTiw$6TEpbznHFn$tu$UMlD-NC+Pa zCDKI8=%mvD(2=c_-usH{(tBnt?0(ZmOP~{gjh_DH2Y>tB>F&iM{Th0XXmFJ$Bfaw0 zwy;J$KLEpM>pZL4rD9;YmUk@B`kio*U_QKCf&1n45^Qt~K38IE&y-a8c9wY=2Ux%)P@ z=KL`6P=un9_HlYfV*_#dVp9TR)|;@vQjiIh|M2hp)l0e;BTgzp*3?Oe3OPa)5S;Cl zK6&f2)2-*Zr2FF=D1lA@HgM7}SbJ!mwE4H(N(;5z>tUopRf(39JO$8ib78ukDX;83R4~FR690i=%hT;pr!*+)FOyT72oYB zqXh52^*QNX7jixKwl+%wod9gsd|$ND9{oVN;oMgGT=rNH)Fw0ty?;ApP5}A<3_16z zLZXTUM8I1EW9qMgI(p6s8nX6bN)cPVfFlM0Sy@G`1o#G4;b8ISkw2idqfoPe=>{4>^j`%pIFM9(z)VK_`pt zrMsCDzds*j6%w}A8bOk}oo;;HbJO2lw8h*T-WUmV0&s-gt zp_BMNoWm$;^x*f?kH7K7=?9l)CHJ>%f&@AN*o0ZWJY!rOK9SC$adtq@A@E=enlg-R zAwFDS=J^)^lF>)u_gA z4J^{3!L#9TDjUTjT+4up-Y5KK|I8pb8DsE%?ZWhP3GU$(~3hWQGr-~C1 ztgGNDh*CtV5acl@&qbOJSSkN4!{YII@>$RL9sE^EoR=}BL;tDD_dKV|>HrXrYLOq1 z0Y#o7;!_m88t7ZP3JBOBUfe3FQY=a*Q%a|gT;I>?-&clg4Lj2bz#2~KejSn(3`%bg ziv`Wg0z=w7VGaiED!s7{QFw=7>J|g{Cx{|sB4Bk46_1Y7BH8cb z50L;o?pP5IM-EJOz;+zL0_18&Iv|6 zr3;FF&Y2TIT2T*DO7FkphF;jWUv1dB^{W$rb(_%@8PAcEX&VoDk;a*c0OW1wc!z*1 z?kjW|^kFNR{E&^x?FZ)IgFTyc~am^K7BCRNC=XEq>TFL^9m>-J2FE_84QUHa!Y z+?1ZQ2Fth)VMQg-3BZa@+`4u9RUb)@xbmU&fb-HC#baEE6_N;{K!h>IdZTud3HC5r0$fK(yzK_V9tis^w| zhambRi4E%j6F(55ngiFLVBUtVoIR8t`L^e!@2%S!?&DcK33LLmdULk+JwAF*`tTvWS0VbH zIlx}W2B`oU5vYKrGdeTsAJo`forg+Gz&z$Ky{Ip6gu-Mohrk5nG}6hfl>X+;&rdI2 z`^DP_xKa}61Yo76Yx6og)C!DBS^V$N;EjRW3A-RZl$HePCpbtQUIV)hG$csrcYfaIQlkiy1ok zwioo={^nV&)fsUo0IM@s8{gBT_oVHjSkJt+j7oZ+yaOt9r(qv=L^3idU@*2u`JkSt zl3i7abMAS1HY7c*BWiIsLI9ufPLx!0jJMPd;!kebpImHvB=@ zTjlT>_<&37;0dgfFyznVAOa#g_y-TPsgRgzc)hYU5xw+GVE8@3*d+N-^0hGs2L~aM z;Qk<~%5@01(?I3ldHW!YC#ua*pAMc|7|DHPy>R5us^4`78y;${+qQ3;F! zz=$!#?cS{pM}j_KabgH+@c!{Vc4I5zzy*H6)=5mmMBC&XVGsmP6@7ByB@zv50*?T8 zWJn#cEYdzvI$`Tk>56weGo9|svP)o9CC~}Ls?J>RcOikBj;DiRb&^0;U!36FQ>M!LS24dmLdp_%uIibA#@m9t(`0j=nIDYo#)>G{aR`yiXb>I zANp_d$~!)wmI24+fIa|fB!D>H+SpVf=G6SzUw=tD*q2zBz&c8x6M%J`)jp;|0(YE9 zFWowj{xSooI8`tz_;R3ypfiE43PUST-r83o`Ah_${bfSsDzDv2Ulb$--;G~u#6n5( zs*QJKU`ClBz}G&-OtWP*0sLKv4Ca-smH8Q9N<)`q?MI*k=eE{4FT7jj zu~UV5;h9@hgZI8egdz*jhyaXD9{U@mV8nCEyGLSz-n^Wj>0>)%A6e#N-c&?jk>(x`%>u=*fa@r0Mp5Xq7G1xn+DV#<6$KQH+ zx~4CME`d##Kqmm3t^s}gQUY)MVEV&FO20FQ1mvpzT4;KD3m2<#Xc~72jG^m{vOE8< zaCWpmzgW^Yg&r?5V!H!uw#NfAgm3dJLta0fSm+zN647c7#%W1EP_AHC~U z>D^t`y9BxfyaYM{=o--_FjE3=`cQfxZKp?!+sZ_k8^PLuIybGz!EkMhPAa4=cwrtN zKpE2uOjzu1M;wIbi~yPs^2siIxvRo?*ec=xV=F*EAQX;-KuV$}Ypy*=DShwVuTGDg zIi>x!E`g1fKqmkjJ^g*~=Ocl)o=QKzeKvhQrSxbCavb6&KxI$bTzu#G6IiQ=KyH@O z3>8i!E?_0ExWM28=V zoej0xhLJFk<(anreJ-VR?D*@_w=T~N^|y8jY?cH%0obhh?xWqu5_rq0^s`qi(%mWT zZb@UJkOKt4sek$G`zX&2Zg<{-CkO=A6{z&a*e_~pfq#RX;rUOcv+14hJ(9k;kEfw` ztxI5IB+v=K#!Ph|=sHQ@^&d+I9{t1gtBXZ?ZA$5h|DSSr0+I!DvLnJU{vOl}@Ne$x ze!CHfZ=^-~m+kHJ$!{D;_k8@ebatKO+sD!+un7|QKjQ7a{t~vDDgXcg07*qoM6N<$ Ef@mE(_W%F@ literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/apple-touch-icon.png b/e2e/react-start/custom-basepath/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9423cc02c40ea066d2a061cdcdf621c0718cb1 GIT binary patch literal 27246 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⪼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 N002ovPDHLkV1k;v<;Va4 literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/favicon-16x16.png b/e2e/react-start/custom-basepath/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..e3389b00443d602a249b48ae0e21e333971c9c1e GIT binary patch literal 832 zcmV-G1Hb%Px%`bk7VR5(v%lW%BSRTRK~=OuZ4FYhI3vvy^4t8t~UDHGBS#44K%hSiDal!9Nj zeb^RZ;3&cb72F3w6s4;uUA7>Cf>1=Z56;a$8wZ=NKHtq z33GDV=_|V0E(QPTEB1=edhG{{=-+C??RQi7*e9J7YBnZR+PppIKjA8EV+}Yt`zH<7 zGR%O5D3|Ef)99hUXu19=Cxaki@6toZIe&u-X0(oDFRl|x6P7Bwc^mB(i9|gOY)Jh6DaPkmt z8Wr!@TP1|RPlYRlJe^eRB0K(gn91{(=zi{HrkpHIflw8&q%;+U!V&dFPYDQAWJh@< zwcklN9VEX?vG;}75GqCepKC25M^xV%BcR%A8c!)S5k4P0$g}HS#lA6zy`~K@9&EX4 zOrvr%_1U2dp~gg6G*;&`Jag*?jZTJv+$S`*#)zme_SFWOCm*F4U&hJihqxAu;8z}x zWv7!u>YKRa3PUJQs55wC)i4QvFOAV0jW$?1cnUJJ7Vl?z_ge{9q!zpfCJxd8vJ>-ql@0&`Bttn1~4;s>8tax%hr(^q#A_*wqAv( zh(T&>hJD?OhiP$sxAzkd1W1^EHV1WL3xM&6$*HhG@|8}OjPpG{+!;GC>w;ha0000< KMNUMnLSTZGXp5cz literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/favicon-32x32.png b/e2e/react-start/custom-basepath/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..900c77d444c9b31e6144b6ac0bb1ab7bb7ca767f GIT binary patch literal 2115 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 literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/favicon.ico b/e2e/react-start/custom-basepath/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a1751676f7e22811b1070572093996c93c87617 GIT binary patch literal 15406 zcmeHOd0bW1+Fl2T)asg*b?Ynb=5X`&-CNczGfPshnW^PmhMJl=CJLyC8iErjB7!1= z%=0WD0t$kNf(oc84uDKf;D7_*z&VHWeDAyW*>FJYTG{>QyXW_NS$nU&*84nb?X}k4 z`*{~as6-p_+;f7`H^iK_LVPHMc;gNE{H-oR_)y-v@9MAj79y*w5N}Z#szNp7d`ceg z=Qg#k@cO}B`2AEQLYAsU^lG)(?NlVveB4D=RNqHBi7@LZyk>X`-?=&wyaXc324dGH zh`sI*2ZA9E$3YxV(}}Zro+2xvqoE%&Gttr5;%^xu$Xs8~f$F(IWCTHE$5Opih%-kZ z&Yy-jl?h|pAsJjp@v(NPk*BSN3PZOKf=D3D{ee_(C&aN7h|`CuUIE0#a)`n_3=NqA zF3WYeew3H!8|bXk`EOAn+)ag*2_NI>WPgaGyY-kWm?m!BVg-cSkCwHgSkV7%d$ihpd+fwB2n%=`AHbdAe!S+2u%Eu2wg?hGhq zwxvNjHX7#*6PqjedU_4aH|QF#E9E%lx@LY*lYwoauNnjVw_<^p8Xd=Mg_*Aoi+ts4 zN|_d^dU>2qy*yrrap8M0DKs1JWdDHC?g#MKIbq=Z1<_TMHt0PiYimy5!@5g#XqNzpXtEec~usxTf6PbkDqAu50ezz_=_Pt%P-o2*Owy3VuMqO8Gt*$AvExLMsqx-eXE{~qS zii2O7@;dVd*=JmqJ_o=9-? z5_?=tM2bh}-;Jj@@SNIPxKH*Gp409N?^zK33m}3lAi}I5BCR2Iu7!x-2$8sj?%{Tb zeO|oI+!u!;eZ-O7wCeuGpU13DgzG3gzSl^&em@Z|t%ISGQ;FG zj@PMUDH>6b=_qn@JN+sazO#E#dkcj3kD&D)BG3?bjRCGJMCuM|uYwyx>th1p?uE$D zfGEg@IF|=elwTk+f_ps)XL|`ZeLtxMtK|OPZ5E)4U?wID2aEW|}8@+;m!x z4}?NwMa#H(jJuz3vmnmqO6#*IE0mrS9a6lnvF~5vU^-3onloN?ZJ2p)h+t}S*m9cF zt7Y5-#@$Bk^@K3QJ+ccTZx6(YbizHJ87#T90#y9nQl8gMTKBV9#Q+w0snR`&i zEn?iWgj+(m7a=OE_h_WL2e&@vCYu7I&AMA^LD*hRZ zF%=H6KEh|KjS3Ey)b1rJY+j*)FJY&Kt5BLFu;*YO^a+cCD#b&-2S@0gC7jN5 zoa`9APtcglO@fNXf1lk4uqXQ+sV@6qU+j~8GX`TZCga=Nmvqib9eBU!$n&^xTu4@y z*B<$qy|FibGCVv(VQG6G7OQ}1b~hn5_|W{PIi5y#D1zpC4B8*sjif>1xtnzOXnY;!ZKQWI_M!J9)z=>z`sL%sYx4Cxb1z&s^P>DmSkEnHn75-wx^C)0 z?~fxK(e5i}EcDdEYzJWKp?hTANBLCpCG246%z_BN6`SpU1ApE39r}4WN!Mq((fIq) z0dGtTZnb=CK7KKeu$RV=MeCs0lIRAE@=KJ?#|EV1gA?=c*ObZlF{}cUw$R)jz5xTR z(i+Pv^?p+tqtjU@>8@KR>OiSvOA~I>yW-~<7nX=GgTnC6;UDnsk(u}?z#b#k(K`FN zEvC8^HkP;8RgH0>$yk}F*5@@)%GTub7mly5%h2Vm%V>aN)@e29vF97~**68fJ?5d$ z{wa7PVH{oy9g7baN1)A+6|hOUkLmGQcrS7(-aha>dPYrctgrZayi}Lxn4|UDl%s_s zy*tyfWZfgjqfh!|={@(z)28TudLf2JyEN8i zACf=4FU9Bd@CGS=Y#`0ky^UC2uBWvo+X}R3G7b7it^niy581Oj2BM4KU_9?XgvQ=< zbTl6?^-quFiBi9G4<8TvW7iDo8~V~>N<@QntzUo+&Zo4Pn%)4LT)7Nmdz7HFSE=Sc z85CQ4vKTLV4WkRj()U8A?fvo8)_zdU8-^F?JK}|af1zveFg)iw2p@;9#OU4b7#>fH ziGdHtld``NJ83NBYp{;KQQS*3*hJqMPGpS9*!&C#u2lO3RjFZUcIVFEPuo62yDc9; zFcUBk*R}1h`$Pkm^R(`CTD99djA2QPbX~tE@OPQ2(l*#%z@L~-t4h3Qt9(w;`4u>C< z^vb?_=34gM(|D9cU)hKG2iDQ}iEXt^`mHl?I#Y(Eo9FQ6kq7kdM%aAcWxGb$t-gOU zKL1YK&FPze=fJi6+Zo8eeL!z~tehJj^Yy0u?5l?`JLV$h?Z1HIw+^5~W&^!16E@pE zToWnsceRZ4=)Wa*_Vy~i5nE7vJqEwdb|RxV2?xs)rFze2Q~NUr`vCQM#xJ+KC7UZ( zJUU&f^mV*)WrybSl^u9o+nkt*31P)JUK)&{Cn_`|o5osh>-W1QW^3oyFFE$EzTn_< zv%>EFtqMEbs<0>HwB@mUUS8;g>T>)0)fYDToW11PY>u_&|8etBV&D0G$qJMEC01Vb z=PmQp=a*hrmn_v$%67fJ#4?YsaTzZAxPJe?mt&oTBw8_z?1|_ku) zoLL*GBuyrszS%8BcG!C&J)KnX|G>{)hWhd9%iUkiJv1Vr0!CCz14$y>;SLhK0yK^pc=Y zswdVK&nd>jb80eaS8{**P=71DIrhMsoy41B5UkrVZ;nN)qOAH>NFSsP>Rgf)xeQ#w&}yhLOjUk!YK0%q%b#eR zETVV4#j;izu~LrRNcx=}^*63x>)y#!CJ#HHoO>HxC?nG7X z+(||lv5YlK3weGjdTA{6cf7v8lN8>h*QWW(F*MeS4SDA#lXjabYpAU4ojI)Nw{nb4 z;#~r9se;Fjq%DfQ_`DT<(;e72bKQT^JZPNl*SI#ZA<#uAm2%b+9;S4 zb7PK=YRBR!;-#gtRmscdt8`ZLRbaE6tAgpAr_gufFtlahb&{|Z z9?XfkF~>*o4{;S1n^&sT8%T?^Un*<8&Z|`L-bC?BpAHxkIb6Ta(D+Gm)@#4i-^`o! z?wlk!hRT}v$xPy%E$hIAq{k|}%N5?#->e5$U8V6v<#-*XwvS2q5rKYBOPGw!db7lZ zI59Wo*c$%`578|#MARu-u3@@6SRg(?Alh4CqQ?L{yK@y(2{itB4Dpy@?i~Ali1%?> zE9dp3C2#KY@*+v&SCO9m?4b}$4EkEaU@XQo)*V-lin-MQ64L-J@Y)2co$Q= zp-k5OS%c^Gh1VNi^Qq5`a&}=*?rONC{gZsRl`t5KF&UdVD14Y3b7Zc}S!qLgzIg9= zs<@aGq(ay>(&z0}@LW&&HjSG|cNNkiRXDLv;Os$x@;rfxV=C;~I|LKm_v3|FdY1BB zke;s`FQWUw>m}b0=E&opjo14;T8H>Of#(Que<3Xc6Mb{BCv_+)j;kc!jKNrp$=J++ zxiBZ@#vGX|b7uZFHZVGw+0(M zCf;6l0CQK|gT>FJuahtK$-Wtbu^5xF6>VPTVnlj<2QXLW%-omR-R`o^>2&-yk9hb6 zY)4q=TI`Hkiny3Xh>Bc}kdO`V^7Vn!_B7g0a0M2&v=5+#nbWx#O{nZS14b z(=CN;Ke}z%i~b?!FvzbIz2@z~NV8%rGNbtYCucEZz(p*!)HUvc3j2#uRT;jr< zn43RwWUkDaxi49R9_DtaG+$3Tx!xArX|dRz`qz&1bA$X}I#zv2YwBbgHDzF8 zv!n#`S3kgqgH!P1vOAbK?luO!UWOTc?!(qt1MAnd*z&0cOU;{bTl3Exm|76Th^%(M19n98H{~7FCc@oDG z_w7jH*okD@DOIdRo;l}J-cPP~vB32~Q+a(kF^t|TCip{)cEc#E6X5dSt(}TLun@DnuQ!(a zVQV#{{{Pw)-M;f~%x}%d6V9tKBklQd?OWdycx~rb`1_$57~~bySnnIhQknmVP55-_ z{>J>r_4|9uEs4@WHhPYeQ@&N4u13E%tl3_%W$_ve@NvQ0o>nl8 zxh7qE$72=VJvtKu&Y4Luj=r9&VHKxEfAcuvzaCx2IbnWKbu&MWd(V_TXiqS;ir3Yw zO4b#wqP=O9lIhbuI{chek57U&6VIs>ubYp>3D@a)IuHNInt`{{Owc!HHeU0afVr_n z={F9HMb;@Axk zgID5X%UIa%Q`5f3I~0e^#`{4l@uL6dcr$qdUiKXQ5JpSP)_6QrrWsFdlKnxAUE^NC zL((2WY44!@Aq|FxyHcEXCO*iYkDiI&qLcHdQf!dphduU8#G8o|(A&uz&y2K2yP+#E zc5^0XC+6UvAuG^pw+a4vd@hDuw4!@83qzuudH>-r81GqZetkW~Ib?1WTckdo5k~P` zDNioP+?{f@BOEF2$hNtKjgJdMucS$MGl_VnPLg7+F9v;%S0hJCG1%8*N8_2F$H3@c zi}1{s))>6q8{GrH#XA(2?sw`Z^ga3`r3>(vo!?;b{?iZnXS~*M6(0R*AH(83a+&3{ zkFuXD@y~AJ$=qE|J?OFZl(v!#EzLYL53dD|p?)5Zm&1okdp$W$$Z_L8Q4ICZl-J&h zz9|RIMcdIc(bfGc^r3O}_e0b1I>i=y?)?_MQ@+E%s5RJhyyhYQE%Er=jAEOc@?_52by4IP61rcJ%Gc>t8gl~ z^$?CB?tpC#n7m7i?ZjvC5iP!Q12p%*ovSFvckj9B8jBW7`tP_oEuHnPS;H$~15-kyCp*x285Y7E9&S z%$d3KH(20hycbxhxfn<>>DJ7p^fKNFo{OiP`{5~X4H&%38iChpAHoQ{rpBy;S`1HZ zKqzt8cu9kS6xVOhyg9}lP8LcQqEDmXOQajW-?c<+qC4$B=|pp(ozp+5-#?MYPZ!$%z?HqgZ`2{e=1R zFF~WRh}YDs$)MOSI(E98kA5)=@T$*9yzKo2Ui0}1qf*wvySf6O?Xkq$)W6&wo*Pf| zJ@7P^>;k@O$a}ZIz7)TldR?u@zaq4FJB0R<&^?HJP*2YadKceKT$Mcq zysvdmBk) zOHW169-vY5TpKH`IqhjqPd?y?IY&IO^2|>7SD&MDcVu7WNAVe1Q;YZqwREipZdYrm zeKnX_R!^EL@#K98F%KE-r$#d6KTNEi4{YG>45J zC$4l*T|6`EUSaK_d*_hV!dm7j=dsrg!DR1p^zs=6la!yK6p(IGx+}l zCGW_c!^pgOP%gvQTb5PM4O1#-Ra$}ev|mm7e+B-Zg(j<}V^bpa*zpT)LopJcI&~-0 z^wh2N+EcgEAX_@6iZ#zW*;t12l`@5mt74@F25SArvEpg|26sjR#p{) zoYEM?6zoO*#YlQj$iy>;)fB&>H8PXdnJk*CPw2<%()p@@mntj0Eh?|L*HvD2$L}?p z$Sl0M<~Ba|yNuMck;p6$!)v)Ub>b+k?}uoOB+Ms7znPnxSGIJ!alz4-_VHZ2dBH(_ z^TI|*R^dP?oBmunHau7IIdwqs*=;B~w+%NdHmTVc`}8RJgZ2+JYk@Q`+TJeT_+Cxf z8q2z})$w(ut18LxtE|kXlIyY$_C<58+51cj$Uo$i=lAW3WnCT=uk7)l#BxM^3GHGp sUYw*kZ&9czwx}V4-fB3n{`}%3F2iNH4%cNLe+aq%I{j}CJVp=vAC(LAUjP6A literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/favicon.png b/e2e/react-start/custom-basepath/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e77bc06091ade4496525a09d8900675afcf03f0 GIT binary patch literal 1507 zcmV<91swW`P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$^O-V#SR9Fd>S3Qp$MHK9ro!#4$ zEP@L_hX|b@f=!*_42h6mKu7{)4)_U*>1>0bCkUj;Z1X!7 zHe(Ew^Oi(|bW3J~xu+)XbtFF?4>!7TH$>(D_atUQVEj(8fGvYu2NF33#JZX>)(Vj8 zIi@z>Glt?6t~;Lf(|C8F>;WF^8F<^s7Scr!sZc01uB?HMHoL5+FZ>B(g+r-)?Sn)#3Zal#?G@GAwO5U27MpGOlC2+_saA)rl zP-<@-n~;PQOlm|Hi<+W;NdR;5+=zADzM&?!+CPD36=cGwHy6!D^vPEHG?rO`K>G|M z3FposX{yT132wuw1OR3Um_5JoKB#6?!QgBupIT;?YIr;WcpmuCE>S75mZid+ens#E zGPuYjiG0UNNVWu=f!Id^?9)34)eIpu-`j_~W0iAQzK(}XYc_!;87Tk~?4tq|h=2(! zuq0HCiNK)@+ocCKR3q1REdUju>HdYxd>JX@%oOibg+J~D+}rhz54D!NfC{h-OYk{M zkzmFtdrL@nL0bm8nF@pob1CeLC>12ef#in-Bzv2!wi)Iuwq24)`AH}|0QNQ^f$KHv z?5PBPo1*#GAuAk+Poe`?UJ>mP`@~d4a(103j0lwUx@_+$#B&VC%7r>#2$HIiD`KO8L|s3Yp%M}BT0;NJDzZtPnx=4%enhU zhW*pNN0t`^4%5MKAR+}=^Q?QeqQ`>bbK zf+-ji$Uz8V0?LpX@kh`k%DL)GCA2=@SJNKg56Wh>>pr=7{1PmHqG|~=AdLV3002ov JPDHLkV1ivgp)>#h literal 0 HcmV?d00001 diff --git a/e2e/react-start/custom-basepath/public/script.js b/e2e/react-start/custom-basepath/public/script.js new file mode 100644 index 0000000000..897477e7d0 --- /dev/null +++ b/e2e/react-start/custom-basepath/public/script.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_1 loaded') +window.SCRIPT_1 = true diff --git a/e2e/react-start/custom-basepath/public/script2.js b/e2e/react-start/custom-basepath/public/script2.js new file mode 100644 index 0000000000..819af30daf --- /dev/null +++ b/e2e/react-start/custom-basepath/public/script2.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_2 loaded') +window.SCRIPT_2 = true diff --git a/e2e/react-start/custom-basepath/public/site.webmanifest b/e2e/react-start/custom-basepath/public/site.webmanifest new file mode 100644 index 0000000000..fa99de77db --- /dev/null +++ b/e2e/react-start/custom-basepath/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/e2e/react-start/custom-basepath/src/components/CustomMessage.tsx b/e2e/react-start/custom-basepath/src/components/CustomMessage.tsx new file mode 100644 index 0000000000..d00e4eac60 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/components/CustomMessage.tsx @@ -0,0 +1,10 @@ +import * as React from 'react' + +export function CustomMessage({ message }: { message: string }) { + return ( +
+
This is a custom message:
+

{message}

+
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..15f316681c --- /dev/null +++ b/e2e/react-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,53 @@ +import { + ErrorComponent, + Link, + rootRouteId, + useMatch, + useRouter, +} from '@tanstack/react-router' +import type { ErrorComponentProps } from '@tanstack/react-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/components/NotFound.tsx b/e2e/react-start/custom-basepath/src/components/NotFound.tsx new file mode 100644 index 0000000000..af4e0e7494 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/components/NotFound.tsx @@ -0,0 +1,25 @@ +import { Link } from '@tanstack/react-router' + +export function NotFound({ children }: { children?: any }) { + return ( +
+
+ {children ||

The page you are looking for does not exist.

} +
+

+ + + Start Over + +

+
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routeTree.gen.ts b/e2e/react-start/custom-basepath/src/routeTree.gen.ts new file mode 100644 index 0000000000..3a1035bc83 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routeTree.gen.ts @@ -0,0 +1,406 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/react-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as UsersRouteImport } from './routes/users' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' + +// Create/Update Routes + +const UsersRoute = UsersRouteImport.update({ + id: '/users', + path: '/users', + getParentRoute: () => rootRoute, +} as any) + +const PostsRoute = PostsRouteImport.update({ + id: '/posts', + path: '/posts', + getParentRoute: () => rootRoute, +} as any) + +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', + getParentRoute: () => rootRoute, +} as any) + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRoute, +} as any) + +const UsersIndexRoute = UsersIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => UsersRoute, +} as any) + +const PostsIndexRoute = PostsIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => PostsRoute, +} as any) + +const UsersUserIdRoute = UsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => UsersRoute, +} as any) + +const PostsPostIdRoute = PostsPostIdRouteImport.update({ + id: '/$postId', + path: '/$postId', + getParentRoute: () => PostsRoute, +} as any) + +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ + id: '/posts_/$postId/deep', + path: '/posts/$postId/deep', + getParentRoute: () => rootRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + '/deferred': { + id: '/deferred' + path: '/deferred' + fullPath: '/deferred' + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRoute + } + '/posts': { + id: '/posts' + path: '/posts' + fullPath: '/posts' + preLoaderRoute: typeof PostsRouteImport + parentRoute: typeof rootRoute + } + '/users': { + id: '/users' + path: '/users' + fullPath: '/users' + preLoaderRoute: typeof UsersRouteImport + parentRoute: typeof rootRoute + } + '/posts/$postId': { + id: '/posts/$postId' + path: '/$postId' + fullPath: '/posts/$postId' + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/$userId': { + id: '/users/$userId' + path: '/$userId' + fullPath: '/users/$userId' + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport + } + '/posts/': { + id: '/posts/' + path: '/' + fullPath: '/posts/' + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/': { + id: '/users/' + path: '/' + fullPath: '/users/' + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport + } + '/posts_/$postId/deep': { + id: '/posts_/$postId/deep' + path: '/posts/$postId/deep' + fullPath: '/posts/$postId/deep' + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + +// Create and export the route tree + +interface PostsRouteChildren { + PostsPostIdRoute: typeof PostsPostIdRoute + PostsIndexRoute: typeof PostsIndexRoute +} + +const PostsRouteChildren: PostsRouteChildren = { + PostsPostIdRoute: PostsPostIdRoute, + PostsIndexRoute: PostsIndexRoute, +} + +const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) + +interface UsersRouteChildren { + UsersUserIdRoute: typeof UsersUserIdRoute + UsersIndexRoute: typeof UsersIndexRoute +} + +const UsersRouteChildren: UsersRouteChildren = { + UsersUserIdRoute: UsersUserIdRoute, + UsersIndexRoute: UsersIndexRoute, +} + +const UsersRouteWithChildren = UsersRoute._addFileChildren(UsersRouteChildren) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/users': typeof UsersRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts': typeof PostsIndexRoute + '/users': typeof UsersIndexRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/users': typeof UsersRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/posts_/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/deferred' + | '/posts' + | '/users' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/posts/$postId/deep' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/deferred' + | '/posts/$postId' + | '/users/$userId' + | '/posts' + | '/users' + | '/posts/$postId/deep' + id: + | '__root__' + | '/' + | '/deferred' + | '/posts' + | '/users' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/posts_/$postId/deep' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + DeferredRoute: typeof DeferredRoute + PostsRoute: typeof PostsRouteWithChildren + UsersRoute: typeof UsersRouteWithChildren + PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + DeferredRoute: DeferredRoute, + PostsRoute: PostsRouteWithChildren, + UsersRoute: UsersRouteWithChildren, + PostsPostIdDeepRoute: PostsPostIdDeepRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/deferred", + "/posts", + "/users", + "/posts_/$postId/deep" + ] + }, + "/": { + "filePath": "index.tsx" + }, + "/deferred": { + "filePath": "deferred.tsx" + }, + "/posts": { + "filePath": "posts.tsx", + "children": [ + "/posts/$postId", + "/posts/" + ] + }, + "/users": { + "filePath": "users.tsx", + "children": [ + "/users/$userId", + "/users/" + ] + }, + "/posts/$postId": { + "filePath": "posts.$postId.tsx", + "parent": "/posts" + }, + "/users/$userId": { + "filePath": "users.$userId.tsx", + "parent": "/users" + }, + "/posts/": { + "filePath": "posts.index.tsx", + "parent": "/posts" + }, + "/users/": { + "filePath": "users.index.tsx", + "parent": "/users" + }, + "/posts_/$postId/deep": { + "filePath": "posts_.$postId.deep.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/react-start/custom-basepath/src/router.tsx b/e2e/react-start/custom-basepath/src/router.tsx new file mode 100644 index 0000000000..418650e112 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/router.tsx @@ -0,0 +1,24 @@ +import { createRouter as createTanStackRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' +import { NotFound } from './components/NotFound' +import { basepath } from './utils/basepath' + +export function createRouter() { + const router = createTanStackRouter({ + routeTree, + defaultPreload: 'intent', + defaultErrorComponent: DefaultCatchBoundary, + defaultNotFoundComponent: () => , + scrollRestoration: true, + basepath: basepath, + }) + + return router +} + +declare module '@tanstack/react-router' { + interface Register { + router: ReturnType + } +} diff --git a/e2e/react-start/custom-basepath/src/routes/__root.tsx b/e2e/react-start/custom-basepath/src/routes/__root.tsx new file mode 100644 index 0000000000..404af043a7 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/__root.tsx @@ -0,0 +1,141 @@ +import * as React from 'react' +import { + HeadContent, + Link, + Outlet, + Scripts, + createRootRoute, +} from '@tanstack/react-router' + +import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' +import { NotFound } from '~/components/NotFound' +import appCss from '~/styles/app.css?url' +import { seo } from '~/utils/seo' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { + charSet: 'utf-8', + }, + { + name: 'viewport', + content: 'width=device-width, initial-scale=1', + }, + ...seo({ + title: + 'TanStack Start | Type-Safe, Client-First, Full-Stack React Framework', + description: `TanStack Start is a type-safe, client-first, full-stack React framework. `, + }), + ], + links: [ + { rel: 'stylesheet', href: appCss }, + { + rel: 'apple-touch-icon', + sizes: '180x180', + href: '/apple-touch-icon.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '32x32', + href: '/favicon-32x32.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '16x16', + href: '/favicon-16x16.png', + }, + { rel: 'manifest', href: '/site.webmanifest', color: '#fffff' }, + { rel: 'icon', href: '/favicon.ico' }, + ], + }), + errorComponent: (props) => { + return ( + + + + ) + }, + notFoundComponent: () => , + component: RootComponent, +}) + +function RootComponent() { + return ( + + + + ) +} + +const RouterDevtools = + process.env.NODE_ENV === 'production' + ? () => null // Render nothing in production + : React.lazy(() => + // Lazy load in development + import('@tanstack/react-router-devtools').then((res) => ({ + default: res.TanStackRouterDevtools, + })), + ) + +function RootDocument({ children }: { children: React.ReactNode }) { + return ( + + + + + +
+ + Home + {' '} + + Posts + {' '} + + Users + {' '} + + Deferred + {' '} + + This Route Does Not Exist + +
+
+ {children} + + + + + ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/api.users.ts b/e2e/react-start/custom-basepath/src/routes/api.users.ts new file mode 100644 index 0000000000..5d16d71aa6 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/api.users.ts @@ -0,0 +1,17 @@ +import { json } from '@tanstack/react-start' +import axios from 'redaxios' + +import type { User } from '~/utils/users' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request }) => { + console.info('Fetching users... @', request.url) + const res = await axios.get>( + 'https://jsonplaceholder.typicode.com/users', + ) + + const list = res.data.slice(0, 10) + + return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) + }, +}) diff --git a/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts new file mode 100644 index 0000000000..3998d60611 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts @@ -0,0 +1,23 @@ +import { json } from '@tanstack/react-start' +import axios from 'redaxios' +import type { User } from '~/utils/users' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ request, params }) => { + console.info(`Fetching users by id=${params.id}... @`, request.url) + try { + const res = await axios.get( + 'https://jsonplaceholder.typicode.com/users/' + params.id, + ) + + return json({ + id: res.data.id, + name: res.data.name, + email: res.data.email, + }) + } catch (e) { + console.error(e) + return json({ error: 'User not found' }, { status: 404 }) + } + }, +}) diff --git a/e2e/react-start/custom-basepath/src/routes/deferred.tsx b/e2e/react-start/custom-basepath/src/routes/deferred.tsx new file mode 100644 index 0000000000..6b128efea0 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/deferred.tsx @@ -0,0 +1,62 @@ +import { Await } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import { Suspense, useState } from 'react' + +const personServerFn = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(({ data }) => { + return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } + }) + +const slowServerFn = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(async ({ data }) => { + await new Promise((r) => setTimeout(r, 1000)) + return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } + }) + +export const Route = createFileRoute({ + loader: async () => { + return { + deferredStuff: new Promise((r) => + setTimeout(() => r('Hello deferred!'), 2000), + ), + deferredPerson: slowServerFn({ data: { name: 'Tanner Linsley' } }), + person: await personServerFn({ data: { name: 'John Doe' } }), + } + }, + component: Deferred, +}) + +function Deferred() { + const [count, setCount] = useState(0) + const { deferredStuff, deferredPerson, person } = Route.useLoaderData() + + return ( +
+
+ {person.name} - {person.randomNumber} +
+ Loading person...
}> + ( +
+ {data.name} - {data.randomNumber} +
+ )} + /> + + Loading stuff...
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/index.tsx b/e2e/react-start/custom-basepath/src/routes/index.tsx new file mode 100644 index 0000000000..f2bb5d3f32 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/index.tsx @@ -0,0 +1,14 @@ +import { CustomMessage } from '~/components/CustomMessage' + +export const Route = createFileRoute({ + component: Home, +}) + +function Home() { + return ( +
+

Welcome Home!!!

+ +
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/posts.$postId.tsx b/e2e/react-start/custom-basepath/src/routes/posts.$postId.tsx new file mode 100644 index 0000000000..68c663c7e8 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/posts.$postId.tsx @@ -0,0 +1,39 @@ +import { ErrorComponent, Link } from '@tanstack/react-router' +import type { ErrorComponentProps } from '@tanstack/react-router' + +import { fetchPost } from '~/utils/posts' +import { NotFound } from '~/components/NotFound' + +export const Route = createFileRoute({ + loader: async ({ params: { postId } }) => fetchPost({ data: postId }), + errorComponent: PostErrorComponent, + component: PostComponent, + notFoundComponent: () => { + return Post not found + }, +}) + +export function PostErrorComponent({ error }: ErrorComponentProps) { + return +} + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.title}

+
{post.body}
+ + Deep View + +
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/posts.index.tsx b/e2e/react-start/custom-basepath/src/routes/posts.index.tsx new file mode 100644 index 0000000000..07e41d1b0b --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/posts.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: PostsIndexComponent, +}) + +function PostsIndexComponent() { + return
Select a post.
+} diff --git a/e2e/react-start/custom-basepath/src/routes/posts.tsx b/e2e/react-start/custom-basepath/src/routes/posts.tsx new file mode 100644 index 0000000000..6fa5bfbe8b --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/posts.tsx @@ -0,0 +1,46 @@ +import { Link, Outlet } from '@tanstack/react-router' + +import { fetchPosts } from '~/utils/posts' + +export const Route = createFileRoute({ + head: () => ({ + meta: [ + { + title: 'Posts page', + }, + ], + }), + loader: async () => fetchPosts(), + component: PostsComponent, +}) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }].map( + (post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
    • + ) + }, + )} +
+
+ +
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/posts_.$postId.deep.tsx b/e2e/react-start/custom-basepath/src/routes/posts_.$postId.deep.tsx new file mode 100644 index 0000000000..ea326087b8 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/posts_.$postId.deep.tsx @@ -0,0 +1,27 @@ +import { Link } from '@tanstack/react-router' + +import { PostErrorComponent } from './posts.$postId' +import { fetchPost } from '~/utils/posts' + +export const Route = createFileRoute({ + loader: async ({ params: { postId } }) => fetchPost({ data: postId }), + errorComponent: PostErrorComponent, + component: PostDeepComponent, +}) + +function PostDeepComponent() { + const post = Route.useLoaderData() + + return ( +
+ + ← All Posts + +

{post.title}

+
{post.body}
+
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/users.$userId.tsx b/e2e/react-start/custom-basepath/src/routes/users.$userId.tsx new file mode 100644 index 0000000000..14c62c8e3d --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/users.$userId.tsx @@ -0,0 +1,38 @@ +import { ErrorComponent } from '@tanstack/react-router' +import axios from 'redaxios' +import type { ErrorComponentProps } from '@tanstack/react-router' + +import type { User } from '~/utils/users' +import { NotFound } from '~/components/NotFound' +import { basepath } from '~/utils/basepath' + +export const Route = createFileRoute({ + loader: async ({ params: { userId } }) => { + return await axios + .get(basepath + '/api/users/' + userId) + .then((r) => r.data) + .catch(() => { + throw new Error('Failed to fetch user') + }) + }, + errorComponent: UserErrorComponent, + component: UserComponent, + notFoundComponent: () => { + return User not found + }, +}) + +function UserErrorComponent({ error }: ErrorComponentProps) { + return +} + +function UserComponent() { + const user = Route.useLoaderData() + + return ( +
+

{user.name}

+
{user.email}
+
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/routes/users.index.tsx b/e2e/react-start/custom-basepath/src/routes/users.index.tsx new file mode 100644 index 0000000000..662e8b6c68 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/users.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: UsersIndexComponent, +}) + +function UsersIndexComponent() { + return
Select a user.
+} diff --git a/e2e/react-start/custom-basepath/src/routes/users.tsx b/e2e/react-start/custom-basepath/src/routes/users.tsx new file mode 100644 index 0000000000..a6cdb0e897 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/routes/users.tsx @@ -0,0 +1,48 @@ +import { Link, Outlet } from '@tanstack/react-router' +import axios from 'redaxios' +import type { User } from '~/utils/users' +import { basepath } from '~/utils/basepath' + +export const Route = createFileRoute({ + loader: async () => { + return await axios + .get>(basepath + '/api/users') + .then((r) => r.data) + .catch(() => { + throw new Error('Failed to fetch users') + }) + }, + component: UsersComponent, +}) + +function UsersComponent() { + const users = Route.useLoaderData() + + return ( +
+
    + {[ + ...users, + { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, + ].map((user) => { + return ( +
  • + +
    {user.name}
    + +
    • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/react-start/custom-basepath/src/styles/app.css b/e2e/react-start/custom-basepath/src/styles/app.css new file mode 100644 index 0000000000..c53c870665 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/styles/app.css @@ -0,0 +1,22 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + html { + color-scheme: light dark; + } + + * { + @apply border-gray-200 dark:border-gray-800; + } + + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/e2e/react-start/custom-basepath/src/tanstack-start.d.ts b/e2e/react-start/custom-basepath/src/tanstack-start.d.ts new file mode 100644 index 0000000000..3adaf59556 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/tanstack-start.d.ts @@ -0,0 +1,2 @@ +/// +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/react-start/custom-basepath/src/utils/basepath.ts b/e2e/react-start/custom-basepath/src/utils/basepath.ts new file mode 100644 index 0000000000..6e719f196c --- /dev/null +++ b/e2e/react-start/custom-basepath/src/utils/basepath.ts @@ -0,0 +1 @@ +export const basepath = '/custom/basepath' diff --git a/e2e/react-start/custom-basepath/src/utils/posts.tsx b/e2e/react-start/custom-basepath/src/utils/posts.tsx new file mode 100644 index 0000000000..9fdff27673 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/utils/posts.tsx @@ -0,0 +1,36 @@ +import { notFound } from '@tanstack/react-router' +import { createServerFn } from '@tanstack/react-start' +import axios from 'redaxios' + +export type PostType = { + id: string + title: string + body: string +} + +export const fetchPost = createServerFn({ method: 'GET' }) + .validator((postId: string) => postId) + .handler(async ({ data: postId }) => { + console.info(`Fetching post with id ${postId}...`) + const post = await axios + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .then((r) => r.data) + .catch((err) => { + console.error(err) + if (err.status === 404) { + throw notFound() + } + throw err + }) + + return post + }) + +export const fetchPosts = createServerFn({ method: 'GET' }).handler( + async () => { + console.info('Fetching posts...') + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) diff --git a/e2e/react-start/custom-basepath/src/utils/seo.ts b/e2e/react-start/custom-basepath/src/utils/seo.ts new file mode 100644 index 0000000000..d18ad84b74 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/utils/seo.ts @@ -0,0 +1,33 @@ +export const seo = ({ + title, + description, + keywords, + image, +}: { + title: string + description?: string + image?: string + keywords?: string +}) => { + const tags = [ + { title }, + { name: 'description', content: description }, + { name: 'keywords', content: keywords }, + { name: 'twitter:title', content: title }, + { name: 'twitter:description', content: description }, + { name: 'twitter:creator', content: '@tannerlinsley' }, + { name: 'twitter:site', content: '@tannerlinsley' }, + { name: 'og:type', content: 'website' }, + { name: 'og:title', content: title }, + { name: 'og:description', content: description }, + ...(image + ? [ + { name: 'twitter:image', content: image }, + { name: 'twitter:card', content: 'summary_large_image' }, + { name: 'og:image', content: image }, + ] + : []), + ] + + return tags +} diff --git a/e2e/react-start/custom-basepath/src/utils/users.tsx b/e2e/react-start/custom-basepath/src/utils/users.tsx new file mode 100644 index 0000000000..46be4b1580 --- /dev/null +++ b/e2e/react-start/custom-basepath/src/utils/users.tsx @@ -0,0 +1,9 @@ +export type User = { + id: number + name: string + email: string +} + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/custom-basepath/tailwind.config.mjs b/e2e/react-start/custom-basepath/tailwind.config.mjs new file mode 100644 index 0000000000..e49f4eb776 --- /dev/null +++ b/e2e/react-start/custom-basepath/tailwind.config.mjs @@ -0,0 +1,4 @@ +/** @type {import('tailwindcss').Config} */ +export default { + content: ['./src/**/*.{js,jsx,ts,tsx}'], +} diff --git a/e2e/react-start/custom-basepath/tests/navigation.spec.ts b/e2e/react-start/custom-basepath/tests/navigation.spec.ts new file mode 100644 index 0000000000..2a6b1f36d2 --- /dev/null +++ b/e2e/react-start/custom-basepath/tests/navigation.spec.ts @@ -0,0 +1,34 @@ +import { expect, test } from '@playwright/test' + +test('Navigating to post', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Posts' }).click() + await page.getByRole('link', { name: 'sunt aut facere repe' }).click() + await page.getByRole('link', { name: 'Deep View' }).click() + await expect(page.getByRole('heading')).toContainText('sunt aut facere') +}) + +test('Navigating to user', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Users' }).click() + await page.getByRole('link', { name: 'Leanne Graham' }).click() + await expect(page.getByRole('heading')).toContainText('Leanne Graham') +}) + +test('Navigating to a not-found route', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'This Route Does Not Exist' }).click() + await page.getByRole('link', { name: 'Start Over' }).click() + await expect(page.getByRole('heading')).toContainText('Welcome Home!') +}) + +test('Should change title on client side navigation', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Posts' }).click() + + await expect(page).toHaveTitle('Posts page') +}) diff --git a/e2e/react-start/custom-basepath/tsconfig.json b/e2e/react-start/custom-basepath/tsconfig.json new file mode 100644 index 0000000000..b3a2d67dfa --- /dev/null +++ b/e2e/react-start/custom-basepath/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx", "public/script*.js"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "baseUrl": ".", + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true + } +} diff --git a/e2e/react-start/custom-basepath/vite.config.ts b/e2e/react-start/custom-basepath/vite.config.ts new file mode 100644 index 0000000000..c304ad647b --- /dev/null +++ b/e2e/react-start/custom-basepath/vite.config.ts @@ -0,0 +1,16 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' + +export default defineConfig({ + base: '/custom/basepath', + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart(), + ], +}) diff --git a/e2e/solid-start/custom-basepath/.gitignore b/e2e/solid-start/custom-basepath/.gitignore new file mode 100644 index 0000000000..a79d5cf129 --- /dev/null +++ b/e2e/solid-start/custom-basepath/.gitignore @@ -0,0 +1,20 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.env +.vercel +.output + +/build/ +/api/ +/server/build +/public/build +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ diff --git a/e2e/solid-start/custom-basepath/.prettierignore b/e2e/solid-start/custom-basepath/.prettierignore new file mode 100644 index 0000000000..2be5eaa6ec --- /dev/null +++ b/e2e/solid-start/custom-basepath/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts \ No newline at end of file diff --git a/e2e/solid-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts b/e2e/solid-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts new file mode 100644 index 0000000000..e36fccb479 --- /dev/null +++ b/e2e/solid-start/custom-basepath/.tanstack-start/server-routes/routeTree.gen.ts @@ -0,0 +1,155 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +// Import Routes + +import type { + FileRoutesByPath, + CreateServerFileRoute, +} from '@tanstack/solid-start/server' +import { + createServerRoute, + createServerFileRoute, +} from '@tanstack/solid-start/server' + +import { ServerRoute as ApiUsersRouteImport } from './../../src/routes/api/users' +import { ServerRoute as ApiUsersUserIdRouteImport } from './../../src/routes/api/users.$userId' + +// Create/Update Routes + +const rootRoute = createServerRoute() + +const ApiUsersRoute = ApiUsersRouteImport.update({ + id: '/api/users', + path: '/api/users', + getParentRoute: () => rootRoute, +} as any) + +const ApiUsersUserIdRoute = ApiUsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => ApiUsersRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-start/server' { + interface FileRoutesByPath { + '/api/users': { + id: '/api/users' + path: '/api/users' + fullPath: '/api/users' + preLoaderRoute: typeof ApiUsersRouteImport + parentRoute: typeof rootRoute + } + '/api/users/$userId': { + id: '/api/users/$userId' + path: '/$userId' + fullPath: '/api/users/$userId' + preLoaderRoute: typeof ApiUsersUserIdRouteImport + parentRoute: typeof ApiUsersRouteImport + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './../../src/routes/api/users' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users']['parentRoute'], + FileRoutesByPath['/api/users']['id'], + FileRoutesByPath['/api/users']['path'], + FileRoutesByPath['/api/users']['fullPath'], + ApiUsersRouteChildren + > +} +declare module './../../src/routes/api/users.$userId' { + const createServerFileRoute: CreateServerFileRoute< + FileRoutesByPath['/api/users/$userId']['parentRoute'], + FileRoutesByPath['/api/users/$userId']['id'], + FileRoutesByPath['/api/users/$userId']['path'], + FileRoutesByPath['/api/users/$userId']['fullPath'], + unknown + > +} + +// Create and export the route tree + +interface ApiUsersRouteChildren { + ApiUsersUserIdRoute: typeof ApiUsersUserIdRoute +} + +const ApiUsersRouteChildren: ApiUsersRouteChildren = { + ApiUsersUserIdRoute: ApiUsersUserIdRoute, +} + +const ApiUsersRouteWithChildren = ApiUsersRoute._addFileChildren( + ApiUsersRouteChildren, +) + +export interface FileRoutesByFullPath { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesByTo { + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/api/users': typeof ApiUsersRouteWithChildren + '/api/users/$userId': typeof ApiUsersUserIdRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/api/users' | '/api/users/$userId' + fileRoutesByTo: FileRoutesByTo + to: '/api/users' | '/api/users/$userId' + id: '__root__' | '/api/users' | '/api/users/$userId' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + ApiUsersRoute: typeof ApiUsersRouteWithChildren +} + +const rootRouteChildren: RootRouteChildren = { + ApiUsersRoute: ApiUsersRouteWithChildren, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/api/users" + ] + }, + "/api/users": { + "filePath": "api/users.ts", + "children": [ + "/api/users/$userId" + ] + }, + "/api/users/$userId": { + "filePath": "api/users.$userId.ts", + "parent": "/api/users" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json new file mode 100644 index 0000000000..ecb511ecb4 --- /dev/null +++ b/e2e/solid-start/custom-basepath/package.json @@ -0,0 +1,35 @@ +{ + "name": "tanstack-solid-start-e2e-custom-basepath", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "vite dev --port 3000", + "dev:e2e": "vite dev", + "build": "vite build && tsc --noEmit", + "start": "node .output/server/index.mjs", + "test:e2e": "playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/solid-router": "workspace:^", + "@tanstack/solid-router-devtools": "workspace:^", + "@tanstack/solid-start": "workspace:^", + "redaxios": "^0.5.1", + "solid-js": "^1.9.5", + "tailwind-merge": "^2.6.0", + "vite": "6.3.5", + "zod": "^3.24.2" + }, + "devDependencies": { + "@playwright/test": "^1.50.1", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "^22.10.2", + "autoprefixer": "^10.4.20", + "combinate": "^1.1.11", + "postcss": "^8.5.1", + "tailwindcss": "^3.4.17", + "typescript": "^5.7.2", + "vite-plugin-solid": "^2.11.2", + "vite-tsconfig-paths": "^5.1.4" + } +} diff --git a/e2e/solid-start/custom-basepath/playwright.config.ts b/e2e/solid-start/custom-basepath/playwright.config.ts new file mode 100644 index 0000000000..8b913adada --- /dev/null +++ b/e2e/solid-start/custom-basepath/playwright.config.ts @@ -0,0 +1,35 @@ +import { defineConfig, devices } from '@playwright/test' +import { derivePort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } + +const PORT = derivePort(packageJson.name) +const baseURL = `http://localhost:${PORT}/custom/basepath` + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + workers: 1, + + reporter: [['line']], + + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL, + }, + + webServer: { + command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, + stdout: 'pipe', + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/solid-start/custom-basepath/postcss.config.mjs b/e2e/solid-start/custom-basepath/postcss.config.mjs new file mode 100644 index 0000000000..2e7af2b7f1 --- /dev/null +++ b/e2e/solid-start/custom-basepath/postcss.config.mjs @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +} diff --git a/e2e/solid-start/custom-basepath/public/android-chrome-192x192.png b/e2e/solid-start/custom-basepath/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..09c8324f8c6781bc90fcf5dd38e0702bd5f171f3 GIT binary patch literal 29964 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 b=FG literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/android-chrome-512x512.png b/e2e/solid-start/custom-basepath/public/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..11d626ea3d00fddd52861bf0af5554a92fc30d69 GIT binary patch literal 109271 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 Ef@mE(_W%F@ literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/apple-touch-icon.png b/e2e/solid-start/custom-basepath/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9423cc02c40ea066d2a061cdcdf621c0718cb1 GIT binary patch literal 27246 zcmV)0K+eC3P)PyA07*naRCr$OeFvOfMfLx8?t5>0FWHvfdm})IKmh4Yf;2%;fge8wDFHVRn*nc_!V)g&V^58TUP{ybc zoX&t`mGN;5N`L`FIOn-w0Oy2bfa?XB1l1p!&yA0ypGID@4MrYDWwI6kRg9}4D6E{T z=u>=nlZVu8_l`?i_up}Ir@(&!4d8sveaCEve{T+w&=$UmgCE9$a{-oYK~-bH+TRA* z47fUp>x8%rcR7y}=-+rjKcRXwIVS}0f4Q?~SXfafsT@}_j$^=3Aa}@w3(3P0 zMTCs2{~ZNQ7mPUt3ny_sVJQ`E6KM4M#WP0(5`s8KBN#qX7#{Yk%BI^!rtbby4`c$3 z|4IY;&dQDn9Q+p?Y%(}Tf*~mZntb&>;Ru3ZrvknaU_bxa@XRe=y-sR9`pNtPEJa7 ziV~!6^m4U&v^PfGwt7T)Mw_XAy?CP@c?7ASqM7=TNKz$|B)&1;GCk$@-DggUS4`?!YWK=g@0#*4lfGnqO*kHVF zGPA5ew#lR}*f1Hd*E<(HN9B=}e&St%d5pHZ<#F4>+MdZHEX`86ZH%LxE9wtB%krQ4 zvKw%|w1B?1swyv_B%c)F?1vm|4mgyr0*4uBABwA1qqurCLMdrz8Z;iAS*7UAC{4UL z29<#?yK3L$Kd1KXdxy%%zgf54EI(~1<8-Y(I-h%C= z^YjWVG*iEiZ2KifT}FU+D!>7^=(W;$O3$jM{RfhwE@b^$}o@+(BgGaeRsZz6D?po27XNei73b z7SIpVrY{M%fa6jQxbAM;6jiZAVJ{Ilwt~#=l4Kua_aTiXYI}*(#+u_SaUf#5ktY!B zL{95Ar1k7WW>+QPW2h_o8X9vZM>Tv@=Lq&HW+}YEB zn|7Z&pkHs;dI@LB?EuCYE2t0|BnD@?PU;NUAe!vEW8^WIw=71=B8VXx2*xMXW0Yn3 zAxWlbr|*#|-5AP44-rUn7IGZViuO0Me4mUuoo#d0qnB&0335F;-OPcN+a`(Va(~O( z-^5`xH&|FCx+KP-W&DyneFvM1r#??me{O*OfOCI$+qQ4;2!EIXInJX_mf0cEeZH4| z!)580mUnmahSOBW!4vQjH9IeP0Xmd(LMyEy^Ak$ID6I#1y>@1SK0CSTn-j|E`WZg zc~v%NX?Lg`*8-Xkh8R*8#c(V*4@B?av1hX#bajrBTRl!#%X#9x>yPdwR#^n*NzdGd z;&pF<`BlwAXjlo2-}S$PnR%!leJ-|5zA=i=!X049C~1Yrh!z!aX-Siot=b3 z?wWeY0nIsA-fi9VdqBCKK~>ycvSsdP?%1L@OSGBWt2-_;#gH4sPq%yyxhINSI$`g| zv7K%2&te?E&4I2K9CPcj0z-6&%rtd7z-)j#l#z=yNBl^6V7_fl|h~= zj(TF~Q*39z<#r_0pBU%I9Ri3A4Kl~}_jY2|Z_h(YQ?)mDmN<69$WyTO@L!rvN=8{@ z_bxz5%ZqkElfd91RYe_o_mcL2-$21V?07UDDo7tPK!4P_J{M5`3dSxtRGs_E*TXqd z8>$fKY|>^r{UZU+<7ZdSXhZ^;QDiAjM4klL8Cs9rL<)mtN$+fq6CQbVov~&BakBAv^*A?-#xX5<{gB5%S~G0R zg?HQRr^zL9oBHSe48Z{E@uIb~Q*DAiMAkxVmV88`&1GNYOYSc39SawsjX6~?z9v%}#vW=7CoQ};9@hG3ntJuo6?vRet;{xDx-I94 zTc;b>wx)r#3Q0nLynaWuIZ-4zcM-DM&t-?gpry z1SOHf&?L(!aVM~+WF;+kTKOvOgCBPsES26t0W{|y__y?={$AzmT7a8p{k$M*TKrse z`L6GrmNE}!=B!UXlxow2I4pYc#Ko4bMtrj41E^dxryVxpSPaV2JzQh8O=?h7+pP7* z)|*&DRlF%5Ey~(FK5X@j*>FCRdaJBwq=zQ4y1 z4^bGQ%n}5%N9wg(!(XuXugI@?+}^eBIB1SHque-ymWM!n0XqYduJFLjoC6N%Z9Pjb z0mq-g$eiuu5wZUE0;yxb^?)z-jiWKJ26W_l4B6d!C;Qqtk8&AHdR^OIyuRjHY^hm? zJxx1f+JT?@;SwlhQkL2lJ#pl=8Jj_SpRJ9k7f59Q>lQ=%tD#^w)^)KHF;eVY*I zu7N+?2o?w1=8egqs+s}pv?=p&)$uoe?!EQ5)FY{? z0%@B+LVEdPC~B8wY>|vBJjIXQ-+E8@cF4&WZb#{ctKjdgwjPt%K@OsB$xUXm$#Dtg z+Xe;au+tBmm)-#bbOT>n+S3<#8Vpe`pkDik=q@Mz<^CZkx}FGEv3Tpd_~**UP}^n= zs^U`+2>9Xi`M`V(3RBSA(}z${J689*3m(Au675LSp=!Oe@97^cMD}Zs!q?U4?#rQ@ z!g+cMI%ZyiwyBp!nfsX( zT00RAM^KnK2#;O<3>Z_ivJ5{}H|fbsizpFH?q}RSOXU^MKL<)j8$gb9bkf`5*U>ZW zM0CyiCW3>;>ap~qk1tR&((2wo&W`&4E*+F54t?b? zS4KD^cP$agMDt&^OLTp)2Bw5Ac(y>I3xU*8Pg9*XrT6XsSALrU{ z4&BE8H6|2c%K?@jH8YG+F*Yuy-b|vbbDg$L2BX9T7jxTZj*XH_J(W$B_|c2Ept(zn zdgb%`P*9vFL<|j?(s3_+*==cTLsv&Pl6*<{@u|1qxN#(5d2MK=_B*43%EU6;=HeM; zj*xTXXO+!@LHHW$H1$D7Hh5|pcz{^7SCZ?o*O|WKuSnVZf;}T`4iAnBPp+p4J{-l) z+P{Oh`vvH>wnceJSKd;ABcckDF4VD6$MAob^tI-D$7v4NF_#{SA@<56`Ptjrray1$ zYQ}ZX-h}E_O4>uEx&D;x@A?~Ym_mK0?b;lXeH5qar(CTDh9#XTe) z?L49LD4`R34(?`%u?f>zFVCP+LT%IAmHqMgU?ItsnF^u(@jx9x6Xn#vCkWv*cEP~o z>J1psoUaOWsf~AX;Fc)Eo?8bJ@02za2Slhgmo)7cX>;?Z5B`Q1*S>~`8bM}G28zlG zg@|EK#_4M9>E4~S=|(1p zo5?MceQw#96CV$y*t>Aum9wX5-wb#yEIwdaMUk2rzaNba_fr4Y%JnZQ2 zY%us>zw>eaW?_)?Hz*KH^o+2eBUd0p)c}r>*JbGRHZgScbz)`Z8fTl?nGUN}^ z?#(p4PsPDjj^6G*w6%1gy}2DdU45qRx!(i>FgT|KGlxvY;lrllsNshpD&RrQy5VL|nMJU-4l`ZYi!l`ZCNNHCxN7 zx6RR2!|I)|A zx1%QwN73Lyy(}(t%gyzz0?fVLmcXbe3j6^d0!aZOXVc%ZXkycKI|e!w3L_GZX#aGu z8$FseWGc>`dMds?W{wb>bjCV>QSqQ@M;nxF>)~7e8rZ&a`a< zr4#Yv6TXijIVFPA-}&zSc)NTFl2ei}{cDqulBNX#kA%Y5w5r0?F>8#InZ^~e5V}u) zY2z5hwJcpBS5-tJ9KAigLX*{86k%`{gxvDJ~LvN@L>uNURSMNWF+Kzg&?F3*F2}lD$ z$vVU0h&ChjmViy%n&jS|u3l4I7?C#wzdYqelw=m-hSz_I^|f1(otr5D?f3i9Sl5ho zE3BYDv;xp3F(W%2ioQWJHiI;NeZ4`!aW&8bDXA%73i)|3C<=q(*DQy|U^~a0)PLLH^|6Qf|IvQ3(y5xD#An+N- zBYgCQ_6r%KOVYN7 z%S-k9{{`SMd2N(6Rae(+!Zokl4)Uci66u38vonNF*hsQCVe7w%Z%GK? z5F$f!L#qHbrJ*^c_|~+u@Z@JNqo$)CrNfFab@oJTU9(My7zRM;Tbf8@2O$uvVHG6S z5D4QX5=F>36G-w4?Fs3&X(jMl!@4`V(bCjzmR*pRi`!4U7PE&=mnMT8RMFTB+Wi#C1q!h`ILYfKLVi&$(lS!a@|??bb!DA7 z@e0#(@z-zMiJ>`$4%2Mph1-@>zr^-_fE_Sq&=x zZPe&is*_Dg-;l;(N#&>b!}2Fk+o1uBM2?c7g(w+Xq_cHdNu@VHFVm(lkwe0gbuS!2 z&F+0@sA+^MfaaYvQ6oig*p!qc1X2R#M$phxn=6LfGNJdWtD^_O-k^}@$xI#!hLN0_ zjO@HjA?i@yWZ{!Gi?w^|g&0DqC?g-gIN>_XBpEl65waNV{*6sv2b9VWfPf$B;A4QK zOsBgzl$zI})Vyl9BpS3JE=>#Kfj5&c#Wu`k3*y@<6CoFZEzevEraWeZ?Xpu@MruOE zNl=hS0%+@P$IbuxJ=QuLg{B-a9w})g1PYcRo&S)zv(*mTAnx1SXfEXhYWh3a7l+bx z#72p}9gbvGl8tG_$Scf2PC>TNde~ZH&J}CYkf=gp3u#V>3lmo-F>2V@!Gg}Zd!SpgdXmN@1y&mG^_=Z86u-kgF5Ll z7e$x~*1iS)O?S9+25JI{A;hucOKFKPUHV1^!*|&wcrspwxCm_D`*?mzTJkP1rcGBP z6sO6JW#9;vt2|%uWaS z))V)m-2$mPu_S2xM{L!S~r(KjXKF9p$MvX)uO4sRa8HI+GwO^ z*d2&yaoM(E7uuRNEzfmFd>fZeJxgn@YY0|-ayxa@&JK!EcC=0Mek4tZ?}PinIxEdX z0qU5O5t%|Bos!5S)x&!BLfP{al-4!gaAuJ3!e0)p@!SOsZuyXQ95qu zEZlv<4Z1bciC!nF4SpI+476y?I$Gd+_AaoF8Vk(Xxlrd^3AJp7-nDpTF|h7E@a=vC z#I+HLcd}M5mZZN}T$@%r(h1my;vEEVeyk7(F##Rg_ap)NW#b}vhmOJ=3a{tpV7pv- z<_2N;S#LOq#Z{~E#?GZ!yRRJGA-k)Wp(4}jAX$|_sm9&-If0s#6c8XLwH#UX2-tMo zDv<1l-xuvlYUC%5P4Y2uQki>a#E>;OIFWBiGM~rJz&oDIEmkR^x~E#uV8aw{d}DBMH(j=2i4=a&oTI1P zIxi@+9jPQAlcB`g@S8kK|AjOfB*Po!laXcA#9~)&-AyGZt4d0$ep|pOgtN0RMHRGb1;dOR8&h9s$dCe0O!r+@_p6|7XwhEVz z=SNp*=6C9>jg^H1iz=7nfwj-0mJWRCi9k#nL(N}V<1vv40XZZ%D{*TA9|1`KOIOcn zS_OIz!AUh>lbPI3U@Bi&1xeK4nj=5yuBm)_MyfojU-*!?F`r zscur)k=#t8I&pF;kDlii=2)_{-ZVNHv+SMKLj8B@@S||Yod1PS=*4BRLps*x)iB4@ zA^Iurz5?alm$Wm8NdO-{8j*8;0Av^H6V81}Wt~-ERd0cXyPys|9Xw~8U9D%q`UgmmTv!}=rs(S2s zFr4Q?5BEkm&@TRz#V^X`%H}LN>Gow0;r+d<&=b})^fcgUX{qo9d}jCndQL#=>FN<2 zF*!L2$!SSK+!D2i07!XaCBmdX5YYO>7)b1)M3ZvJ=rZ_xcN2LXW5X&o!1vfaqE22?3iXm3z(uvzmjD1D07*naRPzSe zo9yIXp>Ft=-3b<~6%&DHk3i(G+oSZwXYM;t;C>a zP6kqnG^JY35#WIwz?TO2j1$0kAu!~-=eyC^70^99A0FoO`4-W^3y&$7*vv}st6(IA z2iCucr^>Y>^u)D@Bc^4him(AD$mo!2PY|6Q-2$lOSVSTLanz2sE>o5zj!WRBwv${; zvM7~DRy#6<6L-&O1x9TE%4Y(-x=NVL?HO5VmMf*c5_Grspu4+An+O@HNYA1Jw3;5; z4cwtV?I11HW29tX60(!hQQtGLFv%aB`v5YN(h{U-{Lk3-jX-M?FmfVzp3a%QveAZl z$9qsV{}b>>gntMhGzF1qvEq@$U(e&W(u;9mYa|jmHFe~bmI_S&)D_U-%12ME}J<~U|WD{^HJ_d0_!+D6FrKOXZ zSrMB=QiBoaq@|xYeotqw0C{>VFkv~+l?7BB0Yn1YicnCLD}e75N@-Of{V<6%N)jFj|`0#A-sRATto6eeD0Ug@$&`VI* zJln_dwKv-5u_mUo3=VwOSb?iPyxZi=1XKzmU?nXRaoN_UHX$#QL4$xxfFxQYAo{=aZizvj+2}~p# z8=iYzo!w$`q_+X%KL!GQK*SGJP6ZlnMOvSxzIF^s(ZdBgCz=dmd-e87>88VT zD@y_z+pz||cOKN-P=%;543W9l0_3~xkyojC8?1RX;7f%%;$m=;hux6pWPY*QE@MeV z3}B6GTh-E8v;NoS=NC1fBRl?ny{hs*M7O~44#pY9~ZI1?I^Jv+2;3FKdW z!{qaE@#wF|CGmhiH~?cK>h9}>?~T8MRd3P&odiUVy8?XV5n9t+>S0~A@U6K6P`L2N zR)?GowMw4we7)Bl4<~$Iu)khoVC6Q@oYS*^lO62QK;G zF4Xt7iVa@T;6X@E(KxS>`g%3)MzSpdCXgHu%$uBz>Z=mTZL=bArpt1tw z=4XqOHJa~)uIeF^c4v?9`lAgjZ4Uo1`x;Ei)xz332f@6#*29qPU{*GNYbUdIQ!E+d zCYR&cF7HR)oB-M`)V9G=_t zp{Rj?L;uXtEaw;c%%f%%!+D(nSK}Ki2fs zIoXJO>qkJQ7Ffr<9uDQxzkxNZ*W_&((heAWrETiL!3%Ex~J z>uuC@)uof6&iX;@I_j50sr*0f8^s58?A72|<6S3>OF?vo?fd>oKQyD_n1JTbJ?D!| zsJkDG#cn}A2=DdjYkODXu8q$Kha&>(pi=w(v!$U`c%)_JWTJFLk;$29APJ0BJG4zC z>7WZr@~l9RI%u2fTZA@)PNf(|3j@$}EQM|(uaxb|$X5l6phBRX=zP}9*#>p+wk3W4q24)_A##Y2Il*jijxw++gNe*sunqg#urS0isb8X zIE*2q$~4)RX?_T#tFEtY6t1TRppyvD26r|ZE6~Sq!foHiotvIUNR5a|L;e|ggL0(_ z77c33S+Q=XSP955G;zild)$wIhuLhZYsRkfDzReB$Q_Bl9dR9e!hqzm`!oqS(6NZ2 zX7ca=i9NdB>MmvRlVCeP(Zr3kbVSbig_sPn602STWz*AI*J&k~{(bN~0(4^i<={*F zsqADn<~qTeEI@DlM`om#t|aAp3!=6vQoFne@3ob*sv>Y)w(=fSbW{uV*og5%EoUPR zRPU}6+KbZRMJO!N2A_^h~I8FO51~?zEM&Ju9KCd&c6>NBl2%0Rh_CAGfxNc7=Q?8ToAd z6+(_Pdl~uc4>xh}-;0N0gYI(rB3^_ax04g12E7_`%vVD=`hy>flhkBHA+Bdc3?dG? ze&rUVrX^$Sv{B-@JVi*RrbDmfT$EdwZEYl_VQs8y5jyLU7dSn^U z@~JDMKC)V$chUJc@@up4a`g)Qdh7F|7AljLgO$n3rG({kh$WDEZcZ8-G6 zUL5FX?ZCPfnt#pEv_d>Q>ssW~89q6=&@+DIDVK3G2h{;aIdrQdl2w1}Vf(6}{PSKd zbb=31=bQ;XT~|%Uzzy5=36#~(XuT#5{k5yWMPPP2ZtP^SN8e&#H~VJZAe>W7K!-oO z=V@^EEjvXI{9kX?t;TJep3(+#beT|fiH2}sXZaqqHnw5Z#Nh($&e=@C66>lO1kg#` z5Pla%FZ8jZrJRf?Lq_S>tm$2#*EC^Bbw*l=A$^$`{ZSuySCHsvCIL$FxQhT~gUfK! zEjI}uKDzroJhbay2dYVphi zPw+!jBI|5}@_%;&eLX-*8q{-t0A8p~29Hw+x7}M`}D$@ z$Xr;1eRXvpdyF28$;=Xp06951`2N-3N8z9XAxFQp?=#%7RXa^jlZvz`jRo+au_|;L6`j^D+Ng(?Q)4&ede&9)~fbbdu6VmX<`Pb?f+Lx1(LZ zU24urddwP$i$*IrIri?V6GxJa_K}%;*qFfr*s_e=+|VWrG31Lu=4fZTg26C$Y}TBB z=9L_Y{P&u$tztW!+J}7Vidq_s0I8|zxZ;ZMV)%&R=AbOxw;F%m`6e2IR=6?}n@Co+ zPNwS}l19=gdD0i;z_jM$jY7pp>4Q0UXeM!k9(v>=^KYjS#&w+ZO7*d_)4*{bxa&94 zy67U3XmiL~@`aB%MXWNOOJRWBq;~s+2iUf?P~Op2Z1@zYr(XdK8Eer%r@U=vpw~}P zos1MgWO~w(KUpWf3$OV7d5o*Nkm%tPX`5zt=GULi`OJ?fKDtJfqfb5DJkDda%{~Ns zw(mvtt~y&JPjX%&Io7!o-o3qAsOyG~D%E^K9EmtModltD-H6jMrYadPyzsIBw6K~> ziDYO3^@SIlhuKH!re2)}8#}7-pm4$m==@An?)*hou=aU$HU3vSD_7|{OWMsIU(H`u~|fYn!l=M{sWc?FQ39n%NM zYL2?8^wO~qxGULqZ&)7lW`DxRud ziU;@n3n4XZ?#W3vK4!{D3>#A_j&6A-iDfT*>Rs)SE>rNyoV#=fD|wf1(8yrXI=_;w zJkFCWhOORwF1IA!cpBRmna4)0!xoAS49J=ZTif;zH_;w&F0^6nQQuKNzWm=@dx4^U zob)81T@JKCUqW#$(3iZ(fu8pcMHP|r5C5)h!JUpn19Rvqm>S_8;LQDT|uC< zv=ldAf30Ub_x3j9@#@8RqhSqtRm<^0vtG@6;D+nWX#W@>|XGS;OX0E*J zahIMJw`{@uaxM7Hu+e2gHD{YdI^!V22!*yK)t8_7Fn`!-!iDnQ-I_o5&{1W`FSg9# zR0f%oNt__vG&vN}tTwK7pga`HcKu2#!sutSe1;B52HEMiF+#F#JkNKZCEf4^-i2QR_NA^;EnP}%0is#_! z!6)MJ+K+I56$L+q;CuxF(AJD@sA}8sHSLvnvHlZm>Z-<`-X_~c zo?6?>P*{>L!imv|7upX{6w(h~T_&8S=H^bouSQ*fRQ+U&wu;NaE_Hf})=Txf-H2e~ zHO6?#ICibas6($$KHzMs8RX!PM*AGJaXP{D12^Vv4^jOwXe0W!UJ3Bi8UNs}$z(p{ z;2O(w23;^lS7r>($rvk-w2CZlEyw)rnj;Er>c-EI0L{r^zYU))-6;Hri8Ehbd@Qak zJq~_F!K1ZHaQ|K{90OVF$OF%uOaOLl*)0x~&YC;TQm*TRMTVH2TXvh;gtw;s2t`Sn zx^UHJYw^^JFCr~TlB0EvA>Am^(F;tPI008&LK2zFX=vxn5s|Mrs(V|ox33vb)Gfv8 zj!J~(+gWu#6mcdpEm?&2tysTP94{N2R*VP7eiyj`{h*`FTulIZy1ThBFOMJ^E}~Bq z;oO*}tv#}F(^1cXz>N!Sz3|DvS{T@|Eco7nBYaR+8cV;XA=HwFMJJMFG`npSB+lWW z(BihOn7{pLQTCY0BQbuuA##vTwgt=IS*>l3z;J5bRNOY~ETkyptHJST?NZ!dqXC-C z?-_niQC?cRewJ^Zkcp;H}h2ZWza zGL0*K{Q9=r;MZ@KwbRAuuRG1?+nT;sywda;{?)tzE#Yo-t9@cq>6KoYbUlWqH87g`C?@jI-3+UtmZ?j{1ssFv$-a#d0s zs7EsX?k|qwTwUfSnHd#&y^A%;-ST|cR*v~QH8Up#VVN*p|_FeW zE!DlRp#cv*{scO^I*_ev`ef$P*-H_te7Nq4D=@4qPDCMxp4hpo=vBk0=&8fb-Uh5} z--+G9CT#82F7lMqeIvhxx!L2Q7-lRucuB)@xo%9;izPYpIT^Few%mS~Vd!jIe{mD5 zEE(2}DRUTqXTjZEo@qm5 z7)?&hnTR`vd;_UUl0KlCG2qeqrMSQLJ(1VE>__U&$8UcsxOSB0gaKXAG>1xY{7vYl+)(Zb*>gLz8 zCgP`qPe-mlI{w6C^~>FvcM&pn6jyDO2C8f{<+hAD0}aKceX;p`I~F)RDg_oz?Zh|7Vky>$pMA4a8U z{j+^`pa;aO{r#=SO)A|V+Qe#?G|QtVDCZBe$Q!pl#F%nr{L80fXp&qegKaeQ4lnMk zzzw^f6R*fAslBO}>1jx%BmOP~-Oyc)%XU60@{XN4Qkb{pWCW8j-8#vT z(-+3t<(tf~yKjuU7Nr!0$28_>Eb#G{UdGxjn~9PdOfE$z;_PDgmRX-xMLe`sL}v!BKeK1fmWRRsHv5TL! zvdNi$>zeJtY<_IU82oYQ1+LwE<-K?D;mVcBO0hPE^7z+x0>y=caLpy(MtW-OHXaH( z{@btAkM8ON2-KIHaV8F*G}%6%$0+T|TnU;1&P z(>{^u8vTu9V$In8TcJKXGjlR-C^!ze6jjnKxiFcV>R!hCofX2mHtX1F4v#vk8+1f# z#d~W+gi=bsDmn|NWli*){&ZOP=6ipSWIvFfW_Kku#pUcvia+r%l6S;tOAX083g~`r`H+HDGd;iIp5F;T7p7~QLRp5U_K_SNRu$Yc|0c}2Hes3wm7UhW6oqrb!SZp;?ApbSF6QDlp;5ZGI(b(SHF2>c=xk48e{xxrha1aE00^j`ON{G{;> zgm?r~XHO7LN;V`gVDF9^arl({qR&j9h}-i|MnH-&9W4NBEqL|gC3t_;rx-%9wPp6K z`(L&804+VhWv88v!^V<(r`wRZX&f!y>VAoXK|;AaW1TcOuN&OlrjA9?*c(U}1lcx; zZsTmNoL1Rx<;Y_itKD`9z>Ya#rO5WbiIp#HQoj7*#3we-afx@eN zw?U1bD;2>;{IKC=)JHmn9{Pymr`y!$#GT)MVX-(2OLF?7MHgaPG98wc*B7_8alEtY zQ!HGz6eU?eia**y*Bt`(bpn$|jKY;?ej^4?b}!#u(2d8>6Ja1;WyGRsT>kFCsG=ub zw8kruHaltLg{N5c$$6~r7=L=c%V@^}UcA}uoOup*XJ1?$D!>>F9~|v!A1-fr4%l|bXeYDp^mT4gO-;J(r?zViZumiK=e zU%;n*+Oe#2zIUn_h>`ToE8bl#g3yfg=i#Ly!&cEmG>x$k~a5M7b>jqjW+fK2YA zbe-E!Uk;usxEPttxOUiWX^d`1FcicC3tz(SeYF^Cg!Is}8YR$?tlh1^oC#BK;oK9Y zLSn4~UiJ4EH1Q|9^~FHO)5)0=qnmrHVyzUhFfve@Sos)#eEwE)PqsI#KQk^Cum=KQ zuNiOEb5+ZW_#{{*Lh({4gca|8CY<+^;KO}6XX9(h@*!EbHbl2M7!KoaZ@q%;HB}fd zT?*wK)`~`8c=2Fdcee9Zv3QeFEQs+4lEA7mkU{Uyc*=ltwmDwi{i&xv-zK~wl{5b6 z{Kx2QW&)J{!hG_6a64{ndtDfV=m-;e+L3kW+o>~gbH>~OwNn84Z4J;92HBw}!*EX< z(9s9nbH#P=E75nb45;$|W;#$5c%1P^ZhQ#fnm_cHB<+ec)>gAOmV#(&U7?uNMNnUsI;cBuLR??MlgGb`36G~B4BF~}cg{Gs`DNuccrRzd{)oIiS`_Y?f7M~h`K&0mVgGcVll7QMB0 z1s1JYE&!cPfOd$y^k-if*x3T4r)J?tXJ3N!WcT|+_Pa6vEnpxN_#NYaz2PV*Y}r6^ zf1Y`^N1AY6#}mk6$#@|BTukvhgP-@mbpp_9H9+S$a4P$C>}Uo;JQ-IUe-_4;SmzVH zYUDjV2sbo}*MXt&zwdv`|C>WlK;?57e{lX0U|5+jNj%xU-B~B$@;sL+kHFp1_c!+} z#2}V|n^WcrQ@3|YY;AjM-3lyPw;aQBH9$K{6n`^-^wE3U8O}T6cpN=0&Ow7v2wktg zj&NO_2Iw*4kbaVMN1>M} z%zh*B&=pXjHX?_mVi40!d;3|n0QCCh7(sxh3vDI)hYW7ga#S<{vqw+HMYB(`ok4Uq zA=1!*&R1W7+S#e2DuC2kvyd|9aJo5iKU@6Y>=p%B3!ofJ9J&lD-UMS)g@Hw=2lXi! zr7Dz$RrX0V^HA}6h%D1LQu0fc9VFyDQT~laJ#IE17ynkHEK|K~gw8U$8-t}tD(Sa2 zXn-D>3*pmY_E!JJD20BmsRi;g^YH)9yiC6oNdL&u7v2{{*S{7av~!0RLsboc`BIR2 z#u-RD?Q~$*M!Fiy&b~~#JK7yZGiSe~%RUX3ESKe^Gx?axKCA}0WDK~ncWHcV^~AxA zU=Y⪼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 N002ovPDHLkV1k;v<;Va4 literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/favicon-16x16.png b/e2e/solid-start/custom-basepath/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..e3389b00443d602a249b48ae0e21e333971c9c1e GIT binary patch literal 832 zcmV-G1Hb%Px%`bk7VR5(v%lW%BSRTRK~=OuZ4FYhI3vvy^4t8t~UDHGBS#44K%hSiDal!9Nj zeb^RZ;3&cb72F3w6s4;uUA7>Cf>1=Z56;a$8wZ=NKHtq z33GDV=_|V0E(QPTEB1=edhG{{=-+C??RQi7*e9J7YBnZR+PppIKjA8EV+}Yt`zH<7 zGR%O5D3|Ef)99hUXu19=Cxaki@6toZIe&u-X0(oDFRl|x6P7Bwc^mB(i9|gOY)Jh6DaPkmt z8Wr!@TP1|RPlYRlJe^eRB0K(gn91{(=zi{HrkpHIflw8&q%;+U!V&dFPYDQAWJh@< zwcklN9VEX?vG;}75GqCepKC25M^xV%BcR%A8c!)S5k4P0$g}HS#lA6zy`~K@9&EX4 zOrvr%_1U2dp~gg6G*;&`Jag*?jZTJv+$S`*#)zme_SFWOCm*F4U&hJihqxAu;8z}x zWv7!u>YKRa3PUJQs55wC)i4QvFOAV0jW$?1cnUJJ7Vl?z_ge{9q!zpfCJxd8vJ>-ql@0&`Bttn1~4;s>8tax%hr(^q#A_*wqAv( zh(T&>hJD?OhiP$sxAzkd1W1^EHV1WL3xM&6$*HhG@|8}OjPpG{+!;GC>w;ha0000< KMNUMnLSTZGXp5cz literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/favicon-32x32.png b/e2e/solid-start/custom-basepath/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..900c77d444c9b31e6144b6ac0bb1ab7bb7ca767f GIT binary patch literal 2115 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 literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/favicon.ico b/e2e/solid-start/custom-basepath/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a1751676f7e22811b1070572093996c93c87617 GIT binary patch literal 15406 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 literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/favicon.png b/e2e/solid-start/custom-basepath/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e77bc06091ade4496525a09d8900675afcf03f0 GIT binary patch literal 1507 zcmV<91swW`P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$^O-V#SR9Fd>S3Qp$MHK9ro!#4$ zEP@L_hX|b@f=!*_42h6mKu7{)4)_U*>1>0bCkUj;Z1X!7 zHe(Ew^Oi(|bW3J~xu+)XbtFF?4>!7TH$>(D_atUQVEj(8fGvYu2NF33#JZX>)(Vj8 zIi@z>Glt?6t~;Lf(|C8F>;WF^8F<^s7Scr!sZc01uB?HMHoL5+FZ>B(g+r-)?Sn)#3Zal#?G@GAwO5U27MpGOlC2+_saA)rl zP-<@-n~;PQOlm|Hi<+W;NdR;5+=zADzM&?!+CPD36=cGwHy6!D^vPEHG?rO`K>G|M z3FposX{yT132wuw1OR3Um_5JoKB#6?!QgBupIT;?YIr;WcpmuCE>S75mZid+ens#E zGPuYjiG0UNNVWu=f!Id^?9)34)eIpu-`j_~W0iAQzK(}XYc_!;87Tk~?4tq|h=2(! zuq0HCiNK)@+ocCKR3q1REdUju>HdYxd>JX@%oOibg+J~D+}rhz54D!NfC{h-OYk{M zkzmFtdrL@nL0bm8nF@pob1CeLC>12ef#in-Bzv2!wi)Iuwq24)`AH}|0QNQ^f$KHv z?5PBPo1*#GAuAk+Poe`?UJ>mP`@~d4a(103j0lwUx@_+$#B&VC%7r>#2$HIiD`KO8L|s3Yp%M}BT0;NJDzZtPnx=4%enhU zhW*pNN0t`^4%5MKAR+}=^Q?QeqQ`>bbK zf+-ji$Uz8V0?LpX@kh`k%DL)GCA2=@SJNKg56Wh>>pr=7{1PmHqG|~=AdLV3002ov JPDHLkV1ivgp)>#h literal 0 HcmV?d00001 diff --git a/e2e/solid-start/custom-basepath/public/script.js b/e2e/solid-start/custom-basepath/public/script.js new file mode 100644 index 0000000000..897477e7d0 --- /dev/null +++ b/e2e/solid-start/custom-basepath/public/script.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_1 loaded') +window.SCRIPT_1 = true diff --git a/e2e/solid-start/custom-basepath/public/script2.js b/e2e/solid-start/custom-basepath/public/script2.js new file mode 100644 index 0000000000..819af30daf --- /dev/null +++ b/e2e/solid-start/custom-basepath/public/script2.js @@ -0,0 +1,2 @@ +console.log('SCRIPT_2 loaded') +window.SCRIPT_2 = true diff --git a/e2e/solid-start/custom-basepath/public/site.webmanifest b/e2e/solid-start/custom-basepath/public/site.webmanifest new file mode 100644 index 0000000000..fa99de77db --- /dev/null +++ b/e2e/solid-start/custom-basepath/public/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/e2e/solid-start/custom-basepath/src/components/CustomMessage.tsx b/e2e/solid-start/custom-basepath/src/components/CustomMessage.tsx new file mode 100644 index 0000000000..c038b66d2f --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/components/CustomMessage.tsx @@ -0,0 +1,8 @@ +export function CustomMessage({ message }: { message: string }) { + return ( +
+
This is a custom message:
+

{message}

+
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..32aed20e67 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,53 @@ +import { + ErrorComponent, + Link, + rootRouteId, + useMatch, + useRouter, +} from '@tanstack/solid-router' +import type { ErrorComponentProps } from '@tanstack/solid-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useMatch({ + strict: false, + select: (state) => state.id === rootRouteId, + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot() ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/components/NotFound.tsx b/e2e/solid-start/custom-basepath/src/components/NotFound.tsx new file mode 100644 index 0000000000..eb0a968d39 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/components/NotFound.tsx @@ -0,0 +1,25 @@ +import { Link } from '@tanstack/solid-router' + +export function NotFound({ children }: { children?: any }) { + return ( +
+
+ {children ||

The page you are looking for does not exist.

} +
+

+ + + Start Over + +

+
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/components/PostErrorComponent.tsx b/e2e/solid-start/custom-basepath/src/components/PostErrorComponent.tsx new file mode 100644 index 0000000000..3e5d62c79b --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/components/PostErrorComponent.tsx @@ -0,0 +1,5 @@ +import { ErrorComponent, ErrorComponentProps } from '@tanstack/solid-router' + +export function PostErrorComponent({ error }: ErrorComponentProps) { + return +} diff --git a/e2e/solid-start/custom-basepath/src/components/UserErrorComponent.tsx b/e2e/solid-start/custom-basepath/src/components/UserErrorComponent.tsx new file mode 100644 index 0000000000..529c544ce5 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/components/UserErrorComponent.tsx @@ -0,0 +1,6 @@ +import { ErrorComponent } from '@tanstack/solid-router' +import type { ErrorComponentProps } from '@tanstack/solid-router' + +export function UserErrorComponent({ error }: ErrorComponentProps) { + return +} diff --git a/e2e/solid-start/custom-basepath/src/routeTree.gen.ts b/e2e/solid-start/custom-basepath/src/routeTree.gen.ts new file mode 100644 index 0000000000..64c7703a04 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routeTree.gen.ts @@ -0,0 +1,406 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import type { CreateFileRoute, FileRoutesByPath } from '@tanstack/solid-router' + +// Import Routes + +import { Route as rootRoute } from './routes/__root' +import { Route as UsersRouteImport } from './routes/users' +import { Route as PostsRouteImport } from './routes/posts' +import { Route as DeferredRouteImport } from './routes/deferred' +import { Route as IndexRouteImport } from './routes/index' +import { Route as UsersIndexRouteImport } from './routes/users.index' +import { Route as PostsIndexRouteImport } from './routes/posts.index' +import { Route as UsersUserIdRouteImport } from './routes/users.$userId' +import { Route as PostsPostIdRouteImport } from './routes/posts.$postId' +import { Route as PostsPostIdDeepRouteImport } from './routes/posts_.$postId.deep' + +// Create/Update Routes + +const UsersRoute = UsersRouteImport.update({ + id: '/users', + path: '/users', + getParentRoute: () => rootRoute, +} as any) + +const PostsRoute = PostsRouteImport.update({ + id: '/posts', + path: '/posts', + getParentRoute: () => rootRoute, +} as any) + +const DeferredRoute = DeferredRouteImport.update({ + id: '/deferred', + path: '/deferred', + getParentRoute: () => rootRoute, +} as any) + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRoute, +} as any) + +const UsersIndexRoute = UsersIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => UsersRoute, +} as any) + +const PostsIndexRoute = PostsIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => PostsRoute, +} as any) + +const UsersUserIdRoute = UsersUserIdRouteImport.update({ + id: '/$userId', + path: '/$userId', + getParentRoute: () => UsersRoute, +} as any) + +const PostsPostIdRoute = PostsPostIdRouteImport.update({ + id: '/$postId', + path: '/$postId', + getParentRoute: () => PostsRoute, +} as any) + +const PostsPostIdDeepRoute = PostsPostIdDeepRouteImport.update({ + id: '/posts_/$postId/deep', + path: '/posts/$postId/deep', + getParentRoute: () => rootRoute, +} as any) + +// Populate the FileRoutesByPath interface + +declare module '@tanstack/solid-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRoute + } + '/deferred': { + id: '/deferred' + path: '/deferred' + fullPath: '/deferred' + preLoaderRoute: typeof DeferredRouteImport + parentRoute: typeof rootRoute + } + '/posts': { + id: '/posts' + path: '/posts' + fullPath: '/posts' + preLoaderRoute: typeof PostsRouteImport + parentRoute: typeof rootRoute + } + '/users': { + id: '/users' + path: '/users' + fullPath: '/users' + preLoaderRoute: typeof UsersRouteImport + parentRoute: typeof rootRoute + } + '/posts/$postId': { + id: '/posts/$postId' + path: '/$postId' + fullPath: '/posts/$postId' + preLoaderRoute: typeof PostsPostIdRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/$userId': { + id: '/users/$userId' + path: '/$userId' + fullPath: '/users/$userId' + preLoaderRoute: typeof UsersUserIdRouteImport + parentRoute: typeof UsersRouteImport + } + '/posts/': { + id: '/posts/' + path: '/' + fullPath: '/posts/' + preLoaderRoute: typeof PostsIndexRouteImport + parentRoute: typeof PostsRouteImport + } + '/users/': { + id: '/users/' + path: '/' + fullPath: '/users/' + preLoaderRoute: typeof UsersIndexRouteImport + parentRoute: typeof UsersRouteImport + } + '/posts_/$postId/deep': { + id: '/posts_/$postId/deep' + path: '/posts/$postId/deep' + fullPath: '/posts/$postId/deep' + preLoaderRoute: typeof PostsPostIdDeepRouteImport + parentRoute: typeof rootRoute + } + } +} + +// Add type-safety to the createFileRoute function across the route tree + +declare module './routes/index' { + const createFileRoute: CreateFileRoute< + '/', + FileRoutesByPath['/']['parentRoute'], + FileRoutesByPath['/']['id'], + FileRoutesByPath['/']['path'], + FileRoutesByPath['/']['fullPath'] + > +} +declare module './routes/deferred' { + const createFileRoute: CreateFileRoute< + '/deferred', + FileRoutesByPath['/deferred']['parentRoute'], + FileRoutesByPath['/deferred']['id'], + FileRoutesByPath['/deferred']['path'], + FileRoutesByPath['/deferred']['fullPath'] + > +} +declare module './routes/posts' { + const createFileRoute: CreateFileRoute< + '/posts', + FileRoutesByPath['/posts']['parentRoute'], + FileRoutesByPath['/posts']['id'], + FileRoutesByPath['/posts']['path'], + FileRoutesByPath['/posts']['fullPath'] + > +} +declare module './routes/users' { + const createFileRoute: CreateFileRoute< + '/users', + FileRoutesByPath['/users']['parentRoute'], + FileRoutesByPath['/users']['id'], + FileRoutesByPath['/users']['path'], + FileRoutesByPath['/users']['fullPath'] + > +} +declare module './routes/posts.$postId' { + const createFileRoute: CreateFileRoute< + '/posts/$postId', + FileRoutesByPath['/posts/$postId']['parentRoute'], + FileRoutesByPath['/posts/$postId']['id'], + FileRoutesByPath['/posts/$postId']['path'], + FileRoutesByPath['/posts/$postId']['fullPath'] + > +} +declare module './routes/users.$userId' { + const createFileRoute: CreateFileRoute< + '/users/$userId', + FileRoutesByPath['/users/$userId']['parentRoute'], + FileRoutesByPath['/users/$userId']['id'], + FileRoutesByPath['/users/$userId']['path'], + FileRoutesByPath['/users/$userId']['fullPath'] + > +} +declare module './routes/posts.index' { + const createFileRoute: CreateFileRoute< + '/posts/', + FileRoutesByPath['/posts/']['parentRoute'], + FileRoutesByPath['/posts/']['id'], + FileRoutesByPath['/posts/']['path'], + FileRoutesByPath['/posts/']['fullPath'] + > +} +declare module './routes/users.index' { + const createFileRoute: CreateFileRoute< + '/users/', + FileRoutesByPath['/users/']['parentRoute'], + FileRoutesByPath['/users/']['id'], + FileRoutesByPath['/users/']['path'], + FileRoutesByPath['/users/']['fullPath'] + > +} +declare module './routes/posts_.$postId.deep' { + const createFileRoute: CreateFileRoute< + '/posts_/$postId/deep', + FileRoutesByPath['/posts_/$postId/deep']['parentRoute'], + FileRoutesByPath['/posts_/$postId/deep']['id'], + FileRoutesByPath['/posts_/$postId/deep']['path'], + FileRoutesByPath['/posts_/$postId/deep']['fullPath'] + > +} + +// Create and export the route tree + +interface PostsRouteChildren { + PostsPostIdRoute: typeof PostsPostIdRoute + PostsIndexRoute: typeof PostsIndexRoute +} + +const PostsRouteChildren: PostsRouteChildren = { + PostsPostIdRoute: PostsPostIdRoute, + PostsIndexRoute: PostsIndexRoute, +} + +const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) + +interface UsersRouteChildren { + UsersUserIdRoute: typeof UsersUserIdRoute + UsersIndexRoute: typeof UsersIndexRoute +} + +const UsersRouteChildren: UsersRouteChildren = { + UsersUserIdRoute: UsersUserIdRoute, + UsersIndexRoute: UsersIndexRoute, +} + +const UsersRouteWithChildren = UsersRoute._addFileChildren(UsersRouteChildren) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/users': typeof UsersRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts': typeof PostsIndexRoute + '/users': typeof UsersIndexRoute + '/posts/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRoutesById { + __root__: typeof rootRoute + '/': typeof IndexRoute + '/deferred': typeof DeferredRoute + '/posts': typeof PostsRouteWithChildren + '/users': typeof UsersRouteWithChildren + '/posts/$postId': typeof PostsPostIdRoute + '/users/$userId': typeof UsersUserIdRoute + '/posts/': typeof PostsIndexRoute + '/users/': typeof UsersIndexRoute + '/posts_/$postId/deep': typeof PostsPostIdDeepRoute +} + +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/deferred' + | '/posts' + | '/users' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/posts/$postId/deep' + fileRoutesByTo: FileRoutesByTo + to: + | '/' + | '/deferred' + | '/posts/$postId' + | '/users/$userId' + | '/posts' + | '/users' + | '/posts/$postId/deep' + id: + | '__root__' + | '/' + | '/deferred' + | '/posts' + | '/users' + | '/posts/$postId' + | '/users/$userId' + | '/posts/' + | '/users/' + | '/posts_/$postId/deep' + fileRoutesById: FileRoutesById +} + +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + DeferredRoute: typeof DeferredRoute + PostsRoute: typeof PostsRouteWithChildren + UsersRoute: typeof UsersRouteWithChildren + PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + DeferredRoute: DeferredRoute, + PostsRoute: PostsRouteWithChildren, + UsersRoute: UsersRouteWithChildren, + PostsPostIdDeepRoute: PostsPostIdDeepRoute, +} + +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() + +/* ROUTE_MANIFEST_START +{ + "routes": { + "__root__": { + "filePath": "__root.tsx", + "children": [ + "/", + "/deferred", + "/posts", + "/users", + "/posts_/$postId/deep" + ] + }, + "/": { + "filePath": "index.tsx" + }, + "/deferred": { + "filePath": "deferred.tsx" + }, + "/posts": { + "filePath": "posts.tsx", + "children": [ + "/posts/$postId", + "/posts/" + ] + }, + "/users": { + "filePath": "users.tsx", + "children": [ + "/users/$userId", + "/users/" + ] + }, + "/posts/$postId": { + "filePath": "posts.$postId.tsx", + "parent": "/posts" + }, + "/users/$userId": { + "filePath": "users.$userId.tsx", + "parent": "/users" + }, + "/posts/": { + "filePath": "posts.index.tsx", + "parent": "/posts" + }, + "/users/": { + "filePath": "users.index.tsx", + "parent": "/users" + }, + "/posts_/$postId/deep": { + "filePath": "posts_.$postId.deep.tsx" + } + } +} +ROUTE_MANIFEST_END */ diff --git a/e2e/solid-start/custom-basepath/src/router.tsx b/e2e/solid-start/custom-basepath/src/router.tsx new file mode 100644 index 0000000000..f2825f2bed --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/router.tsx @@ -0,0 +1,24 @@ +import { createRouter as createTanStackRouter } from '@tanstack/solid-router' +import { routeTree } from './routeTree.gen' +import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' +import { NotFound } from './components/NotFound' +import { basepath } from './utils/basepath' + +export function createRouter() { + const router = createTanStackRouter({ + routeTree, + defaultPreload: 'intent', + defaultErrorComponent: DefaultCatchBoundary, + defaultNotFoundComponent: () => , + scrollRestoration: true, + basepath: basepath, + }) + + return router +} + +declare module '@tanstack/solid-router' { + interface Register { + router: ReturnType + } +} diff --git a/e2e/solid-start/custom-basepath/src/routes/__root.tsx b/e2e/solid-start/custom-basepath/src/routes/__root.tsx new file mode 100644 index 0000000000..47d4033043 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/__root.tsx @@ -0,0 +1,100 @@ +import { Link, Outlet, createRootRoute } from '@tanstack/solid-router' + +import { TanStackRouterDevtoolsInProd } from '@tanstack/solid-router-devtools' +import { NotFound } from '~/components/NotFound' +import appCss from '~/styles/app.css?url' +import { seo } from '~/utils/seo' + +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { + name: 'viewport', + content: 'width=device-width, initial-scale=1', + }, + ...seo({ + title: + 'TanStack Start | Type-Safe, Client-First, Full-Stack React Framework', + description: `TanStack Start is a type-safe, client-first, full-stack React framework. `, + }), + ], + links: [ + { rel: 'stylesheet', href: appCss }, + { + rel: 'apple-touch-icon', + sizes: '180x180', + href: '/apple-touch-icon.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '32x32', + href: '/favicon-32x32.png', + }, + { + rel: 'icon', + type: 'image/png', + sizes: '16x16', + href: '/favicon-16x16.png', + }, + { rel: 'manifest', href: '/site.webmanifest', color: '#fffff' }, + { rel: 'icon', href: '/favicon.ico' }, + ], + }), + errorComponent: (props) =>

{props.error.stack}

, + notFoundComponent: () => , + component: RootComponent, +}) + +function RootComponent() { + return ( + <> +
+ + Home + {' '} + + Posts + {' '} + + Users + {' '} + + Deferred + {' '} + + This Route Does Not Exist + +
+ + + + ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts b/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts new file mode 100644 index 0000000000..69d966d982 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/api/users.$userId.ts @@ -0,0 +1,27 @@ +import { json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' + +export const ServerRoute = createServerFileRoute().methods({ + GET: async ({ params, request }) => { + console.info(`Fetching users by id=${params.userId}... @`, request.url) + try { + const res = await fetch( + 'https://jsonplaceholder.typicode.com/users/' + params.userId, + ) + if (!res.ok) { + throw new Error('Failed to fetch user') + } + + const user = (await res.json()) as User + + return json({ + id: user.id, + name: user.name, + email: user.email, + }) + } catch (e) { + console.error(e) + return json({ error: 'User not found' }, { status: 404 }) + } + }, +}) diff --git a/e2e/solid-start/custom-basepath/src/routes/api/users.ts b/e2e/solid-start/custom-basepath/src/routes/api/users.ts new file mode 100644 index 0000000000..c0a6a1a6a2 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/api/users.ts @@ -0,0 +1,58 @@ +import { createMiddleware, json } from '@tanstack/solid-start' +import type { User } from '~/utils/users' + +const userLoggerMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: /users') + const result = await next() + result.response.headers.set('x-users', 'true') + console.info('Out: /users') + return result + }, +) + +const testParentMiddleware = createMiddleware({ type: 'request' }).server( + async ({ next, request }) => { + console.info('In: testParentMiddleware') + const result = await next() + result.response.headers.set('x-test-parent', 'true') + console.info('Out: testParentMiddleware') + return result + }, +) + +const testMiddleware = createMiddleware({ type: 'request' }) + .middleware([testParentMiddleware]) + .server(async ({ next, request }) => { + console.info('In: testMiddleware') + const result = await next() + result.response.headers.set('x-test', 'true') + + // if (Math.random() > 0.5) { + // throw new Response(null, { + // status: 302, + // headers: { Location: 'https://www.google.com' }, + // }) + // } + + console.info('Out: testMiddleware') + return result + }) + +export const ServerRoute = createServerFileRoute() + .middleware([testMiddleware, userLoggerMiddleware, testParentMiddleware]) + .methods({ + GET: async ({ request }) => { + console.info('Fetching users... @', request.url) + const res = await fetch('https://jsonplaceholder.typicode.com/users') + if (!res.ok) { + throw new Error('Failed to fetch users') + } + + const data = (await res.json()) as Array + + const list = data.slice(0, 10) + + return json(list.map((u) => ({ id: u.id, name: u.name, email: u.email }))) + }, + }) diff --git a/e2e/solid-start/custom-basepath/src/routes/deferred.tsx b/e2e/solid-start/custom-basepath/src/routes/deferred.tsx new file mode 100644 index 0000000000..5bb96ca571 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/deferred.tsx @@ -0,0 +1,65 @@ +import { Await } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import { Suspense, createSignal } from 'solid-js' + +const personServerFn = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(({ data }) => { + return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } + }) + +const slowServerFn = createServerFn({ method: 'GET' }) + .validator((data: { name: string }) => data) + .handler(async ({ data }) => { + await new Promise((r) => setTimeout(r, 1000)) + return { name: data.name, randomNumber: Math.floor(Math.random() * 100) } + }) + +export const Route = createFileRoute({ + loader: async () => { + return { + deferredStuff: new Promise((r) => + setTimeout(() => r('Hello deferred!'), 2000), + ), + deferredPerson: slowServerFn({ data: { name: 'Tanner Linsley' } }), + person: await personServerFn({ data: { name: 'John Doe' } }), + } + }, + component: Deferred, +}) + +function Deferred() { + const [count, setCount] = createSignal(0) + // const { deferredStuff, deferredPerson, person } = Route.useLoaderData() + const loaderData = Route.useLoaderData() + + return ( +
+
+ {loaderData().person.name} - {loaderData().person.randomNumber} +
+ Loading person...
}> + ( +
+ {data.name} - {data.randomNumber} +
+ )} + /> + + Loading stuff...
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/index.tsx b/e2e/solid-start/custom-basepath/src/routes/index.tsx new file mode 100644 index 0000000000..4024800b8e --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/index.tsx @@ -0,0 +1,14 @@ +import { CustomMessage } from '~/components/CustomMessage' + +export const Route = createFileRoute({ + component: Home, +}) + +function Home() { + return ( +
+

Welcome Home!!!

+ +
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/posts.$postId.tsx b/e2e/solid-start/custom-basepath/src/routes/posts.$postId.tsx new file mode 100644 index 0000000000..cefc75cdf1 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/posts.$postId.tsx @@ -0,0 +1,36 @@ +import { ErrorComponent, Link } from '@tanstack/solid-router' +import type { ErrorComponentProps } from '@tanstack/solid-router' + +import { fetchPost } from '~/utils/posts' +import { NotFound } from '~/components/NotFound' +import { PostErrorComponent } from '~/components/PostErrorComponent' + +export const Route = createFileRoute({ + loader: async ({ params: { postId } }) => fetchPost({ data: postId }), + errorComponent: PostErrorComponent, + component: PostComponent, + notFoundComponent: () => { + return Post not found + }, +}) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post().title}

+
{post().body}
+ + Deep View + +
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/posts.index.tsx b/e2e/solid-start/custom-basepath/src/routes/posts.index.tsx new file mode 100644 index 0000000000..07e41d1b0b --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/posts.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: PostsIndexComponent, +}) + +function PostsIndexComponent() { + return
Select a post.
+} diff --git a/e2e/solid-start/custom-basepath/src/routes/posts.tsx b/e2e/solid-start/custom-basepath/src/routes/posts.tsx new file mode 100644 index 0000000000..c053d0de56 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/posts.tsx @@ -0,0 +1,47 @@ +import { Link, Outlet } from '@tanstack/solid-router' +import { For } from 'solid-js' + +import { fetchPosts } from '~/utils/posts' + +export const Route = createFileRoute({ + head: () => ({ + meta: [ + { + title: 'Posts page', + }, + ], + }), + loader: async () => fetchPosts(), + component: PostsComponent, +}) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + + {(post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
    • + ) + }} +     +
+
+ +
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/posts_.$postId.deep.tsx b/e2e/solid-start/custom-basepath/src/routes/posts_.$postId.deep.tsx new file mode 100644 index 0000000000..4133a9ade9 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/posts_.$postId.deep.tsx @@ -0,0 +1,24 @@ +import { Link } from '@tanstack/solid-router' +import { PostErrorComponent } from '~/components/PostErrorComponent' + +import { fetchPost } from '~/utils/posts' + +export const Route = createFileRoute({ + loader: async ({ params: { postId } }) => fetchPost({ data: postId }), + errorComponent: PostErrorComponent, + component: PostDeepComponent, +}) + +function PostDeepComponent() { + const post = Route.useLoaderData() + + return ( +
+ + ← All Posts + +

{post().title}

+
{post().body}
+
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/users.$userId.tsx b/e2e/solid-start/custom-basepath/src/routes/users.$userId.tsx new file mode 100644 index 0000000000..dfc72402ce --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/users.$userId.tsx @@ -0,0 +1,33 @@ +import axios from 'redaxios' + +import type { User } from '~/utils/users' +import { NotFound } from '~/components/NotFound' +import { UserErrorComponent } from '~/components/UserErrorComponent' +import { basepath } from '~/utils/basepath' + +export const Route = createFileRoute({ + loader: async ({ params: { userId } }) => { + return await axios + .get(basepath + '/api/users/' + userId) + .then((r) => r.data) + .catch(() => { + throw new Error('Failed to fetch user') + }) + }, + errorComponent: UserErrorComponent, + component: UserComponent, + notFoundComponent: () => { + return User not found + }, +}) + +function UserComponent() { + const user = Route.useLoaderData() + + return ( +
+

{user().name}

+
{user().email}
+
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/routes/users.index.tsx b/e2e/solid-start/custom-basepath/src/routes/users.index.tsx new file mode 100644 index 0000000000..662e8b6c68 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/users.index.tsx @@ -0,0 +1,7 @@ +export const Route = createFileRoute({ + component: UsersIndexComponent, +}) + +function UsersIndexComponent() { + return
Select a user.
+} diff --git a/e2e/solid-start/custom-basepath/src/routes/users.tsx b/e2e/solid-start/custom-basepath/src/routes/users.tsx new file mode 100644 index 0000000000..7d66c194a3 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/routes/users.tsx @@ -0,0 +1,48 @@ +import { Link, Outlet } from '@tanstack/solid-router' +import axios from 'redaxios' +import type { User } from '~/utils/users' +import { basepath } from '~/utils/basepath' + +export const Route = createFileRoute({ + loader: async () => { + return await axios + .get>(basepath + '/api/users') + .then((r) => r.data) + .catch(() => { + throw new Error('Failed to fetch users') + }) + }, + component: UsersComponent, +}) + +function UsersComponent() { + const users = Route.useLoaderData() + + return ( +
+
    + {[ + ...users(), + { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, + ].map((user) => { + return ( +
  • + +
    {user.name}
    + +
    • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/solid-start/custom-basepath/src/styles/app.css b/e2e/solid-start/custom-basepath/src/styles/app.css new file mode 100644 index 0000000000..c53c870665 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/styles/app.css @@ -0,0 +1,22 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + html { + color-scheme: light dark; + } + + * { + @apply border-gray-200 dark:border-gray-800; + } + + html, + body { + @apply text-gray-900 bg-gray-50 dark:bg-gray-950 dark:text-gray-200; + } + + .using-mouse * { + outline: none !important; + } +} diff --git a/e2e/solid-start/custom-basepath/src/tanstack-start.d.ts b/e2e/solid-start/custom-basepath/src/tanstack-start.d.ts new file mode 100644 index 0000000000..3adaf59556 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/tanstack-start.d.ts @@ -0,0 +1,2 @@ +/// +import '../.tanstack-start/server-routes/routeTree.gen' diff --git a/e2e/solid-start/custom-basepath/src/utils/basepath.ts b/e2e/solid-start/custom-basepath/src/utils/basepath.ts new file mode 100644 index 0000000000..6e719f196c --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/utils/basepath.ts @@ -0,0 +1 @@ +export const basepath = '/custom/basepath' diff --git a/e2e/solid-start/custom-basepath/src/utils/posts.tsx b/e2e/solid-start/custom-basepath/src/utils/posts.tsx new file mode 100644 index 0000000000..6c12105ab8 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/utils/posts.tsx @@ -0,0 +1,36 @@ +import { notFound } from '@tanstack/solid-router' +import { createServerFn } from '@tanstack/solid-start' +import axios from 'redaxios' + +export type PostType = { + id: string + title: string + body: string +} + +export const fetchPost = createServerFn({ method: 'GET' }) + .validator((postId: string) => postId) + .handler(async ({ data: postId }) => { + console.info(`Fetching post with id ${postId}...`) + const post = await axios + .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .then((r) => r.data) + .catch((err) => { + console.error(err) + if (err.status === 404) { + throw notFound() + } + throw err + }) + + return post + }) + +export const fetchPosts = createServerFn({ method: 'GET' }).handler( + async () => { + console.info('Fetching posts...') + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) diff --git a/e2e/solid-start/custom-basepath/src/utils/seo.ts b/e2e/solid-start/custom-basepath/src/utils/seo.ts new file mode 100644 index 0000000000..d18ad84b74 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/utils/seo.ts @@ -0,0 +1,33 @@ +export const seo = ({ + title, + description, + keywords, + image, +}: { + title: string + description?: string + image?: string + keywords?: string +}) => { + const tags = [ + { title }, + { name: 'description', content: description }, + { name: 'keywords', content: keywords }, + { name: 'twitter:title', content: title }, + { name: 'twitter:description', content: description }, + { name: 'twitter:creator', content: '@tannerlinsley' }, + { name: 'twitter:site', content: '@tannerlinsley' }, + { name: 'og:type', content: 'website' }, + { name: 'og:title', content: title }, + { name: 'og:description', content: description }, + ...(image + ? [ + { name: 'twitter:image', content: image }, + { name: 'twitter:card', content: 'summary_large_image' }, + { name: 'og:image', content: image }, + ] + : []), + ] + + return tags +} diff --git a/e2e/solid-start/custom-basepath/src/utils/users.tsx b/e2e/solid-start/custom-basepath/src/utils/users.tsx new file mode 100644 index 0000000000..46be4b1580 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/utils/users.tsx @@ -0,0 +1,9 @@ +export type User = { + id: number + name: string + email: string +} + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/solid-start/custom-basepath/src/vite-env.d.ts b/e2e/solid-start/custom-basepath/src/vite-env.d.ts new file mode 100644 index 0000000000..0b2af560d6 --- /dev/null +++ b/e2e/solid-start/custom-basepath/src/vite-env.d.ts @@ -0,0 +1,4 @@ +declare module '*?url' { + const url: string + export default url +} diff --git a/e2e/solid-start/custom-basepath/tailwind.config.mjs b/e2e/solid-start/custom-basepath/tailwind.config.mjs new file mode 100644 index 0000000000..e49f4eb776 --- /dev/null +++ b/e2e/solid-start/custom-basepath/tailwind.config.mjs @@ -0,0 +1,4 @@ +/** @type {import('tailwindcss').Config} */ +export default { + content: ['./src/**/*.{js,jsx,ts,tsx}'], +} diff --git a/e2e/solid-start/custom-basepath/tests/navigation.spec.ts b/e2e/solid-start/custom-basepath/tests/navigation.spec.ts new file mode 100644 index 0000000000..2a6b1f36d2 --- /dev/null +++ b/e2e/solid-start/custom-basepath/tests/navigation.spec.ts @@ -0,0 +1,34 @@ +import { expect, test } from '@playwright/test' + +test('Navigating to post', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Posts' }).click() + await page.getByRole('link', { name: 'sunt aut facere repe' }).click() + await page.getByRole('link', { name: 'Deep View' }).click() + await expect(page.getByRole('heading')).toContainText('sunt aut facere') +}) + +test('Navigating to user', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Users' }).click() + await page.getByRole('link', { name: 'Leanne Graham' }).click() + await expect(page.getByRole('heading')).toContainText('Leanne Graham') +}) + +test('Navigating to a not-found route', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'This Route Does Not Exist' }).click() + await page.getByRole('link', { name: 'Start Over' }).click() + await expect(page.getByRole('heading')).toContainText('Welcome Home!') +}) + +test('Should change title on client side navigation', async ({ page }) => { + await page.goto('/') + + await page.getByRole('link', { name: 'Posts' }).click() + + await expect(page).toHaveTitle('Posts page') +}) diff --git a/e2e/solid-start/custom-basepath/tsconfig.json b/e2e/solid-start/custom-basepath/tsconfig.json new file mode 100644 index 0000000000..57ea27b286 --- /dev/null +++ b/e2e/solid-start/custom-basepath/tsconfig.json @@ -0,0 +1,23 @@ +{ + "include": ["**/*.ts", "**/*.tsx", "public/script*.js"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "preserve", + "jsxImportSource": "solid-js", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "baseUrl": ".", + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true + } +} diff --git a/e2e/solid-start/custom-basepath/vite.config.ts b/e2e/solid-start/custom-basepath/vite.config.ts new file mode 100644 index 0000000000..d6784f657c --- /dev/null +++ b/e2e/solid-start/custom-basepath/vite.config.ts @@ -0,0 +1,16 @@ +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' +import { tanstackStart } from '@tanstack/solid-start/plugin/vite' + +export default defineConfig({ + base: '/custom/basepath', + server: { + port: 3000, + }, + plugins: [ + tsConfigPaths({ + projects: ['./tsconfig.json'], + }), + tanstackStart({}), + ], +}) diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index fdbdb23ccc..9e1d18cf3d 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -79,7 +79,7 @@ "babel-dead-code-elimination": "^1.0.9", "cheerio": "^1.0.0", "h3": "1.13.0", - "nitropack": "^2.11.8", + "nitropack": "^2.11.12", "pathe": "^2.0.3", "ufo": "^1.5.4", "xmlbuilder2": "^3.1.1", diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index d1606b4c3c..ae3b63e1a0 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -1,6 +1,5 @@ import path from 'node:path' import { rmSync } from 'node:fs' -import * as fsp from 'node:fs/promises' import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' import { dirname, resolve } from 'pathe' import { clientDistDir, ssrEntryFile } from '../plugin' @@ -23,7 +22,6 @@ export function nitroPlugin( ): Array { const buildPreset = process.env['START_TARGET'] ?? (options.target as string | undefined) - return [ devServerPlugin(), { @@ -76,9 +74,12 @@ export function nitroPlugin( compatibilityDate: '2024-11-19', logLevel: 3, preset: buildPreset, + baseURL: globalThis.TSS_APP_BASE, publicAssets: [ { dir: path.resolve(options.root, clientDistDir), + baseURL: '/', + maxAge: 31536000, // 1 year }, ], typescript: { @@ -91,7 +92,7 @@ export function nitroPlugin( scanDirs: [], imports: false, // unjs/unimport for global/magic imports rollupConfig: { - plugins: [virtualBundlePlugin(getSsrBundle())], + plugins: [virtualBundlePlugin(getSsrBundle()) as any], }, virtual: { // This is Nitro's way of defining virtual modules @@ -178,18 +179,6 @@ async function buildNitroApp( // Build the nitro app await build(nitro) - // Cleanup the vite public directory - // As a part of the build process, a `.vite/` directory - // is copied over from `.tanstack-start/build/client-dist/` - // to the nitro `publicDir` (e.g. `.output/public/`). - // This directory (and its contents including the vite client manifest) - // should not be included in the final build, so we remove it. - const nitroPublicDir = nitro.options.output.publicDir - const viteDir = path.resolve(nitroPublicDir, '.vite') - if (await fsp.stat(viteDir).catch(() => false)) { - await fsp.rm(viteDir, { recursive: true, force: true }) - } - // Close the nitro instance await nitro.close() nitro.logger.success( diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 3049fbe74c..cc893ceb11 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -1,5 +1,6 @@ import path from 'node:path' import { createNitro } from 'nitropack' +import { trimPathRight } from '@tanstack/router-core' import { tanstackRouter } from '@tanstack/router-plugin/vite' import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import * as vite from 'vite' @@ -30,6 +31,11 @@ export type TanStackStartOutputConfig = ReturnType< typeof getTanStackStartOptions > +declare global { + // eslint-disable-next-line no-var + var TSS_APP_BASE: string +} + export const clientDistDir = '.tanstack-start/build/client-dist' export const ssrEntryFile = 'ssr.mjs' @@ -60,7 +66,10 @@ export function TanStackStartVitePluginCore( resolveVirtualEntriesPlugin(opts, startConfig), { name: 'tanstack-start-core:config-client', - async config() { + async config(viteConfig) { + const viteAppBase = trimPathRight(viteConfig.base || '/') + globalThis.TSS_APP_BASE = viteAppBase + const nitroOutputPublicDir = await (async () => { // Create a dummy nitro app to get the resolved public output path const dummyNitroApp = await createNitro({ @@ -94,6 +103,7 @@ export function TanStackStartVitePluginCore( } return { + base: viteAppBase, environments: { [VITE_ENVIRONMENT_NAMES.client]: { consumer: 'client', @@ -106,7 +116,7 @@ export function TanStackStartVitePluginCore( output: { dir: path.resolve(startConfig.root, clientDistDir), }, - // TODO this should be removed + // TODO: this should be removed external: ['node:fs', 'node:path', 'node:os', 'node:crypto'], }, }, @@ -126,8 +136,8 @@ export function TanStackStartVitePluginCore( plugins: [ { name: 'capture-output', - generateBundle(options, bundle) { - // TODO can this hook be called more than once? + generateBundle(_options, bundle) { + // TODO: can this hook be called more than once? ssrBundle = bundle }, }, @@ -164,6 +174,7 @@ export function TanStackStartVitePluginCore( ...injectDefineEnv('TSS_CLIENT_ENTRY', getClientEntryPath(startConfig)), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), + ...injectDefineEnv('TSS_APP_BASE', viteAppBase) }, } }, diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index 36606c0d90..a61671a67a 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -71,7 +71,7 @@ export async function prerender({ ...nodeNitroRollupOptions.output, sourcemap: undefined, }, - } + } as any await buildNitro(nodeNitro) diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/routesManifestPlugin.ts index 1abdd288e0..189a74e438 100644 --- a/packages/start-plugin-core/src/routesManifestPlugin.ts +++ b/packages/start-plugin-core/src/routesManifestPlugin.ts @@ -1,4 +1,4 @@ -import { readFileSync } from 'node:fs' +import { mkdirSync, readFileSync, rmSync, writeFile } from 'node:fs' import path from 'node:path' import { joinURL } from 'ufo' import { rootRouteId } from '@tanstack/router-core' @@ -15,6 +15,7 @@ import type { TanStackStartOutputConfig } from './plugin' const getCSSRecursively = ( file: ViteManifestChunk, filesByRouteFilePath: ViteManifest, + basePath: string, ) => { const result: Array = [] @@ -24,7 +25,7 @@ const getCSSRecursively = ( tag: 'link', attrs: { rel: 'stylesheet', - href: joinURL('/', cssFile), + href: joinURL(basePath, cssFile), type: 'text/css', }, }) @@ -34,7 +35,9 @@ const getCSSRecursively = ( for (const imp of file.imports ?? []) { const importInfo = filesByRouteFilePath[imp] if (importInfo) { - result.push(...getCSSRecursively(importInfo, filesByRouteFilePath)) + result.push( + ...getCSSRecursively(importInfo, filesByRouteFilePath, basePath), + ) } } @@ -72,15 +75,17 @@ export function startManifestPlugin( // TODO: do we need special handling for `serve`? return `export default {}` } - // If we're in development, return a dummy manifest + // If we're in development, return a dummy manifest if (config.command === 'serve') { return `export const tsrStartManifest = () => ({ - entry: "$${process.env.TSS_CLIENT_BASE}/", routes: {} })` } + // This is the basepath for the application + const APP_BASE = globalThis.TSS_APP_BASE + const clientViteManifestPath = path.resolve( opts.root, '.tanstack-start/build/client-dist/.vite/manifest.json', @@ -119,8 +124,12 @@ export function startManifestPlugin( )?.[1] || '{ routes: {} }', ) as Manifest - const routes = routerManifest.routes + // This the manifest pulled from the generated route tree and later used by the Router. + // i.e what's located in `src/generatedRouteTree.gen.ts` + const routeTreeRoutes = routerManifest.routes + // This is where hydration will start, from when the SSR'd page reaches the browser. + // By default, this'd be the virtual entry of `/~start/default-client-entry.tsx`, unless a custom entry is provided. let entryFile: ViteManifestChunk | undefined const filesByRouteFilePath: ViteManifest = Object.fromEntries( @@ -141,24 +150,34 @@ export function startManifestPlugin( ) // Add preloads to the routes from the vite manifest - Object.entries(routes).forEach(([k, v]) => { + Object.entries(routeTreeRoutes).forEach(([routeId, v]) => { const file = filesByRouteFilePath[ path.join(routesDirectoryFromRoot, v.filePath as string) ] if (file) { - const preloads = (file.imports ?? []).map((d) => - path.join('/', viteManifest[d]!.file), - ) + // Map the relevant imports to their route paths, + // so that it can be imported in the browser. + const preloads = (file.imports ?? []).map((d) => { + const assetPath = joinURL(APP_BASE, viteManifest[d]!.file) + return assetPath + }) + // Since this is the most important JS entry for the route, + // it should be moved to the front of the preloads so that + // it has the best chance of being loaded first. if (file.file) { - preloads.unshift(path.join('/', file.file)) + preloads.unshift(path.join(APP_BASE, file.file)) } - const cssAssetsList = getCSSRecursively(file, filesByRouteFilePath) + const cssAssetsList = getCSSRecursively( + file, + filesByRouteFilePath, + APP_BASE, + ) - routes[k] = { + routeTreeRoutes[routeId] = { ...v, assets: [...(v.assets || []), ...cssAssetsList], preloads, @@ -167,10 +186,10 @@ export function startManifestPlugin( }) if (entryFile) { - routes[rootRouteId]!.preloads = [ - path.join('/', entryFile.file), + routeTreeRoutes[rootRouteId]!.preloads = [ + joinURL(APP_BASE, entryFile.file), ...(entryFile.imports?.map((d) => - path.join('/', viteManifest[d]!.file), + joinURL(APP_BASE, viteManifest[d]!.file), ) || []), ] @@ -179,15 +198,16 @@ export function startManifestPlugin( const entryCssAssetsList = getCSSRecursively( entryFile, filesByRouteFilePath, + APP_BASE, ) - routes[rootRouteId]!.assets = [ - ...(routes[rootRouteId]!.assets || []), + routeTreeRoutes[rootRouteId]!.assets = [ + ...(routeTreeRoutes[rootRouteId]!.assets || []), ...entryCssAssetsList, { tag: 'script', attrs: { - src: joinURL('/', entryFile.file), + src: joinURL(APP_BASE, entryFile.file), type: 'module', }, }, @@ -211,22 +231,52 @@ export function startManifestPlugin( if (route.children) { route.children.forEach((child) => { - const childRoute = routes[child]! + const childRoute = routeTreeRoutes[child]! recurseRoute(childRoute, { ...seenPreloads }) }) } } // @ts-expect-error - recurseRoute(routes[rootRouteId]) + recurseRoute(routeTreeRoutes[rootRouteId]) const routesManifest = { - routes, + routes: routeTreeRoutes, + } + + try { + const routesManifestOutputDirPath = path.resolve( + opts.root, + '.tanstack-start/build/routes-manifest', + ) + rmSync(routesManifestOutputDirPath, { + recursive: true, + force: true, + }) + mkdirSync(routesManifestOutputDirPath, { recursive: true }) + writeFile( + path.join(routesManifestOutputDirPath, 'manifest.json'), + JSON.stringify(routesManifest), + (err) => { + if (err) { + console.error( + 'There was an error writing the routes manifest to disk.\nYou can ignore this error. It does not affect the runtime of your application.', + ) + console.error(err) + } + }, + ) + } catch (err) { + console.error( + 'There was an error writing the routes manifest to disk.\nYou can ignore this error. It does not affect the runtime of your application.', + ) + console.error(err) } return `export const tsrStartManifest = () => (${JSON.stringify(routesManifest)})` } - return + + return undefined }, } } diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index ad44b6c2a7..ad0c4fc547 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -102,11 +102,14 @@ export function createStartHandler({ initialEntries: [href], }) + const APP_BASE = process.env.TSS_APP_BASE || '/' + // Create the client-side router const router = createRouter() // Attach the server-side SSR utils to the client-side router - attachRouterServerSsrUtils(router, await getStartManifest()) + const startRoutesManifest = await getStartManifest({ basePath: APP_BASE }) + attachRouterServerSsrUtils(router, startRoutesManifest) // Update the client-side router with the history and context router.update({ @@ -124,7 +127,7 @@ export function createStartHandler({ // First, let's attempt to handle server functions // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE const serverFnBase = joinPaths([ - '/', + APP_BASE, trimPath(process.env.TSS_SERVER_FN_BASE), '/', ]) @@ -151,6 +154,7 @@ export function createStartHandler({ const [_matchedRoutes, response] = await handleServerRoutes({ routeTree: serverRouteTreeModule.routeTree, request, + basePath: APP_BASE, }) if (response) return response @@ -271,9 +275,11 @@ export function createStartHandler({ async function handleServerRoutes({ routeTree, request, + basePath, }: { routeTree: AnyServerRouteWithTypes request: Request + basePath: string }) { const { flatRoutes, routesById, routesByPath } = processRouteTree({ routeTree, @@ -294,7 +300,7 @@ async function handleServerRoutes({ const { matchedRoutes, foundRoute, routeParams } = getMatchedRoutes({ pathname: history.location.pathname, - basepath: '/', + basepath: basePath, caseSensitive: true, routesByPath, routesById, diff --git a/packages/start-server-core/src/router-manifest.ts b/packages/start-server-core/src/router-manifest.ts index 393691c3e5..ca0b1024da 100644 --- a/packages/start-server-core/src/router-manifest.ts +++ b/packages/start-server-core/src/router-manifest.ts @@ -1,4 +1,4 @@ -import { rootRouteId } from '@tanstack/router-core' +import { joinPaths, rootRouteId } from '@tanstack/router-core' declare global { // eslint-disable-next-line no-var @@ -11,7 +11,7 @@ declare global { * special assets that are needed for the client. It does not include relationships * between routes or any other data that is not needed for the client. */ -export async function getStartManifest() { +export async function getStartManifest(opts: { basePath: string }) { const { tsrStartManifest } = await import('tanstack-start-router-manifest:v') const startManifest = tsrStartManifest() @@ -45,7 +45,9 @@ export async function getStartManifest() { // ) // } - const script = `${globalThis.TSS_INJECTED_HEAD_SCRIPTS ? globalThis.TSS_INJECTED_HEAD_SCRIPTS + '; ' : ''}import(${JSON.stringify(process.env.TSS_CLIENT_ENTRY)})` + const clientEntry = joinPaths([opts.basePath, process.env.TSS_CLIENT_ENTRY]) + + const script = `${globalThis.TSS_INJECTED_HEAD_SCRIPTS ? globalThis.TSS_INJECTED_HEAD_SCRIPTS + '; ' : ''}import('${clientEntry}')` rootRoute.assets.push({ tag: 'script', diff --git a/packages/start-server-functions-client/src/index.ts b/packages/start-server-functions-client/src/index.ts index 2c66bc01c9..f77869c8d5 100644 --- a/packages/start-server-functions-client/src/index.ts +++ b/packages/start-server-functions-client/src/index.ts @@ -6,7 +6,10 @@ function sanitizeBase(base: string) { } export const createClientRpc: CreateRpcFn = (functionId, serverBase) => { - const url = `/${sanitizeBase(serverBase)}/${functionId}` + const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/') + const sanitizedServerBase = sanitizeBase(serverBase) + + const url = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ``}/${sanitizedServerBase}/${functionId}` const clientFn = (...args: Array) => { return serverFnFetcher(url, args, fetch) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b2b0a9245..26c3cc387a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,7 +68,7 @@ importers: version: 1.52.0 '@tanstack/config': specifier: ^0.16.1 - version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 0.16.1(@types/node@22.13.4)(esbuild@0.25.4)(eslint@9.22.0(jiti@2.4.2))(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) '@tanstack/react-query': specifier: 5.66.0 version: 5.66.0(react@19.0.0) @@ -243,7 +243,7 @@ importers: version: 19.0.3(@types/react@19.0.8) esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 e2e/react-router/basic-file-based: dependencies: @@ -1229,6 +1229,73 @@ importers: specifier: ^5.7.2 version: 5.8.2 + e2e/react-start/custom-basepath: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../../../packages/react-router + '@tanstack/react-router-devtools': + specifier: workspace:^ + version: link:../../../packages/react-router-devtools + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + redaxios: + specifier: ^0.5.1 + version: 0.5.1 + tailwind-merge: + specifier: ^2.6.0 + version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: + '@playwright/test': + specifier: ^1.52.0 + version: 1.52.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: ^22.10.2 + version: 22.13.4 + '@types/react': + specifier: ^19.0.8 + version: 19.0.8 + '@types/react-dom': + specifier: ^19.0.3 + version: 19.0.3(@types/react@19.0.8) + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + autoprefixer: + specifier: ^10.4.20 + version: 10.4.20(postcss@8.5.3) + combinate: + specifier: ^1.1.11 + version: 1.1.11 + postcss: + specifier: ^8.5.1 + version: 8.5.3 + tailwindcss: + specifier: ^3.4.17 + version: 3.4.17 + typescript: + specifier: ^5.7.2 + version: 5.8.2 + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + e2e/react-start/scroll-restoration: dependencies: '@tanstack/react-router': @@ -1575,10 +1642,10 @@ importers: version: link:../../e2e-utils esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 esbuild-plugin-solid: specifier: ^0.6.0 - version: 0.6.0(esbuild@0.25.2)(solid-js@1.9.5) + version: 0.6.0(esbuild@0.25.4)(solid-js@1.9.5) e2e/solid-router/basic-file-based: dependencies: @@ -2123,6 +2190,64 @@ importers: specifier: ^5.1.4 version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + e2e/solid-start/custom-basepath: + dependencies: + '@tanstack/solid-router': + specifier: workspace:^ + version: link:../../../packages/solid-router + '@tanstack/solid-router-devtools': + specifier: workspace:^ + version: link:../../../packages/solid-router-devtools + '@tanstack/solid-start': + specifier: workspace:* + version: link:../../../packages/solid-start + redaxios: + specifier: ^0.5.1 + version: 0.5.1 + solid-js: + specifier: ^1.9.5 + version: 1.9.5 + tailwind-merge: + specifier: ^2.6.0 + version: 2.6.0 + vite: + specifier: 6.3.5 + version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.2 + version: 3.24.2 + devDependencies: + '@playwright/test': + specifier: ^1.52.0 + version: 1.52.0 + '@tanstack/router-e2e-utils': + specifier: workspace:^ + version: link:../../e2e-utils + '@types/node': + specifier: ^22.10.2 + version: 22.13.4 + autoprefixer: + specifier: ^10.4.20 + version: 10.4.20(postcss@8.5.3) + combinate: + specifier: ^1.1.11 + version: 1.1.11 + postcss: + specifier: ^8.5.1 + version: 8.5.3 + tailwindcss: + specifier: ^3.4.17 + version: 3.4.17 + typescript: + specifier: ^5.7.2 + version: 5.8.2 + vite-plugin-solid: + specifier: ^2.11.2 + version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + e2e/solid-start/scroll-restoration: dependencies: '@tanstack/solid-router': @@ -3324,7 +3449,7 @@ importers: version: 19.0.3(@types/react@19.0.8) esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 examples/react/quickstart-file-based: dependencies: @@ -3456,7 +3581,7 @@ importers: version: 5.8.2 webpack: specifier: ^5.97.1 - version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) @@ -3511,7 +3636,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -3560,7 +3685,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -3597,7 +3722,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-react-query/packages/post-query: dependencies: @@ -3668,7 +3793,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple: dependencies: @@ -3711,7 +3836,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -3754,7 +3879,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -3800,7 +3925,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -3834,7 +3959,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -3877,7 +4002,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -3923,7 +4048,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -3954,7 +4079,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -3997,7 +4122,7 @@ importers: version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) vite-plugin-dts: specifier: ^4.5.0 - version: 4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + version: 4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) examples/react/scroll-restoration: dependencies: @@ -5622,7 +5747,7 @@ importers: version: 7.26.8 '@babel/types': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.1 '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils @@ -5788,7 +5913,7 @@ importers: devDependencies: esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 packages/react-start-client: dependencies: @@ -5893,7 +6018,7 @@ importers: version: 4.3.4(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 react: specifier: ^19.0.0 version: 19.0.0 @@ -6022,7 +6147,7 @@ importers: version: 7.26.8 '@babel/types': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.1 '@rsbuild/core': specifier: '>=1.0.2' version: 1.2.4 @@ -6058,7 +6183,7 @@ importers: version: 3.6.0 unplugin: specifier: ^2.1.2 - version: 2.2.2 + version: 2.3.4 vite: specifier: 6.3.5 version: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -6067,7 +6192,7 @@ importers: version: 2.11.6(@testing-library/jest-dom@6.6.3)(solid-js@1.9.5)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) webpack: specifier: '>=5.92.0' - version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) + version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4) zod: specifier: ^3.24.2 version: 3.24.2 @@ -6079,7 +6204,7 @@ importers: version: 7.26.8 '@babel/parser': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.2 ansis: specifier: ^3.11.0 version: 3.11.0 @@ -6089,7 +6214,7 @@ importers: devDependencies: '@babel/types': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.1 '@types/babel__generator': specifier: ^7.6.8 version: 7.6.8 @@ -6125,7 +6250,7 @@ importers: version: 7.26.8 '@babel/types': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.1 '@tanstack/directive-functions-plugin': specifier: workspace:* version: link:../directive-functions-plugin @@ -6249,7 +6374,7 @@ importers: devDependencies: esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 packages/solid-start-client: dependencies: @@ -6351,7 +6476,7 @@ importers: version: 3.0.3 esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 solid-js: specifier: ^1.9.5 version: 1.9.5 @@ -6387,7 +6512,7 @@ importers: version: 7.26.8 '@babel/types': specifier: ^7.26.8 - version: 7.26.8 + version: 7.27.1 '@tanstack/router-core': specifier: workspace:* version: link:../router-core @@ -6419,14 +6544,14 @@ importers: specifier: 1.13.0 version: 1.13.0 nitropack: - specifier: ^2.11.8 - version: 2.11.8 + specifier: ^2.11.12 + version: 2.11.12 pathe: specifier: ^2.0.3 version: 2.0.3 ufo: specifier: ^1.5.4 - version: 1.5.4 + version: 1.6.1 xmlbuilder2: specifier: ^3.1.1 version: 3.1.1 @@ -6473,7 +6598,7 @@ importers: version: 3.0.3 esbuild: specifier: ^0.25.0 - version: 0.25.2 + version: 0.25.4 typescript: specifier: ^5.7.2 version: 5.8.2 @@ -6664,12 +6789,12 @@ packages: resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.25.9': - resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} + '@babel/helper-string-parser@7.27.1': + resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.25.9': - resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + '@babel/helper-validator-identifier@7.27.1': + resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==} engines: {node: '>=6.9.0'} '@babel/helper-validator-option@7.25.9': @@ -6680,8 +6805,8 @@ packages: resolution: {integrity: sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==} engines: {node: '>=6.9.0'} - '@babel/parser@7.26.8': - resolution: {integrity: sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==} + '@babel/parser@7.27.2': + resolution: {integrity: sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==} engines: {node: '>=6.0.0'} hasBin: true @@ -6757,8 +6882,8 @@ packages: resolution: {integrity: sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==} engines: {node: '>=6.9.0'} - '@babel/types@7.26.8': - resolution: {integrity: sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==} + '@babel/types@7.27.1': + resolution: {integrity: sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==} engines: {node: '>=6.9.0'} '@bundled-es-modules/cookie@2.0.1': @@ -6814,6 +6939,10 @@ packages: resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} + '@colors/colors@1.6.0': + resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} + engines: {node: '>=0.1.90'} + '@commitlint/parse@19.5.0': resolution: {integrity: sha512-cZ/IxfAlfWYhAQV0TwcbdR1Oc0/r0Ik1GEessDJ3Lbuma/MRO8FRQX76eurcXtmhJC//rj52ZSZuXUg0oIX0Fw==} engines: {node: '>=v18'} @@ -6856,6 +6985,13 @@ packages: resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==} engines: {node: '>=18'} + '@dabh/diagnostics@2.0.3': + resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==} + + '@dependents/detective-less@5.0.1': + resolution: {integrity: sha512-Y6+WUMsTFWE5jb20IFP4YGa5IrGY/+a/FbOSjDF/wz9gepU2hwCYSXRHP/vPwBvwcY3SVMASt4yXxbXNXigmZQ==} + engines: {node: '>=18'} + '@discoveryjs/json-ext@0.5.7': resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} engines: {node: '>=10.0.0'} @@ -6935,8 +7071,8 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.25.2': - resolution: {integrity: sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==} + '@esbuild/aix-ppc64@0.25.4': + resolution: {integrity: sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] @@ -6953,8 +7089,8 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.25.2': - resolution: {integrity: sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==} + '@esbuild/android-arm64@0.25.4': + resolution: {integrity: sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==} engines: {node: '>=18'} cpu: [arm64] os: [android] @@ -6971,8 +7107,8 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.25.2': - resolution: {integrity: sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==} + '@esbuild/android-arm@0.25.4': + resolution: {integrity: sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==} engines: {node: '>=18'} cpu: [arm] os: [android] @@ -6989,8 +7125,8 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.25.2': - resolution: {integrity: sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==} + '@esbuild/android-x64@0.25.4': + resolution: {integrity: sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==} engines: {node: '>=18'} cpu: [x64] os: [android] @@ -7007,8 +7143,8 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.25.2': - resolution: {integrity: sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==} + '@esbuild/darwin-arm64@0.25.4': + resolution: {integrity: sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] @@ -7025,8 +7161,8 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.25.2': - resolution: {integrity: sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==} + '@esbuild/darwin-x64@0.25.4': + resolution: {integrity: sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==} engines: {node: '>=18'} cpu: [x64] os: [darwin] @@ -7043,8 +7179,8 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.25.2': - resolution: {integrity: sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==} + '@esbuild/freebsd-arm64@0.25.4': + resolution: {integrity: sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] @@ -7061,8 +7197,8 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.25.2': - resolution: {integrity: sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==} + '@esbuild/freebsd-x64@0.25.4': + resolution: {integrity: sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] @@ -7079,8 +7215,8 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.25.2': - resolution: {integrity: sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==} + '@esbuild/linux-arm64@0.25.4': + resolution: {integrity: sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==} engines: {node: '>=18'} cpu: [arm64] os: [linux] @@ -7097,8 +7233,8 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.25.2': - resolution: {integrity: sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==} + '@esbuild/linux-arm@0.25.4': + resolution: {integrity: sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==} engines: {node: '>=18'} cpu: [arm] os: [linux] @@ -7115,8 +7251,8 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.25.2': - resolution: {integrity: sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==} + '@esbuild/linux-ia32@0.25.4': + resolution: {integrity: sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] @@ -7133,8 +7269,8 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.25.2': - resolution: {integrity: sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==} + '@esbuild/linux-loong64@0.25.4': + resolution: {integrity: sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==} engines: {node: '>=18'} cpu: [loong64] os: [linux] @@ -7151,8 +7287,8 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.25.2': - resolution: {integrity: sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==} + '@esbuild/linux-mips64el@0.25.4': + resolution: {integrity: sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] @@ -7169,8 +7305,8 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.25.2': - resolution: {integrity: sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==} + '@esbuild/linux-ppc64@0.25.4': + resolution: {integrity: sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] @@ -7187,8 +7323,8 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.25.2': - resolution: {integrity: sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==} + '@esbuild/linux-riscv64@0.25.4': + resolution: {integrity: sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] @@ -7205,8 +7341,8 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.25.2': - resolution: {integrity: sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==} + '@esbuild/linux-s390x@0.25.4': + resolution: {integrity: sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==} engines: {node: '>=18'} cpu: [s390x] os: [linux] @@ -7223,14 +7359,14 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.25.2': - resolution: {integrity: sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==} + '@esbuild/linux-x64@0.25.4': + resolution: {integrity: sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.25.2': - resolution: {integrity: sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==} + '@esbuild/netbsd-arm64@0.25.4': + resolution: {integrity: sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] @@ -7247,8 +7383,8 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.25.2': - resolution: {integrity: sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==} + '@esbuild/netbsd-x64@0.25.4': + resolution: {integrity: sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] @@ -7265,8 +7401,8 @@ packages: cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.25.2': - resolution: {integrity: sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==} + '@esbuild/openbsd-arm64@0.25.4': + resolution: {integrity: sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] @@ -7283,8 +7419,8 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.25.2': - resolution: {integrity: sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==} + '@esbuild/openbsd-x64@0.25.4': + resolution: {integrity: sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] @@ -7301,8 +7437,8 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.25.2': - resolution: {integrity: sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==} + '@esbuild/sunos-x64@0.25.4': + resolution: {integrity: sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==} engines: {node: '>=18'} cpu: [x64] os: [sunos] @@ -7319,8 +7455,8 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.25.2': - resolution: {integrity: sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==} + '@esbuild/win32-arm64@0.25.4': + resolution: {integrity: sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==} engines: {node: '>=18'} cpu: [arm64] os: [win32] @@ -7337,8 +7473,8 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.25.2': - resolution: {integrity: sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==} + '@esbuild/win32-ia32@0.25.4': + resolution: {integrity: sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==} engines: {node: '>=18'} cpu: [ia32] os: [win32] @@ -7355,8 +7491,8 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.25.2': - resolution: {integrity: sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==} + '@esbuild/win32-x64@0.25.4': + resolution: {integrity: sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -7433,6 +7569,9 @@ packages: resolution: {integrity: sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@fastify/busboy@3.1.1': + resolution: {integrity: sha512-5DGmA8FTdB2XbDeEwc/5ZXBl6UbBAyBOOLlPuBnZ/N1SwdH9Ii+cOX3tBROlDgcTXxjOYnLMVoKk9+FXAw0CJw==} + '@firebase/analytics-compat@0.2.18': resolution: {integrity: sha512-Hw9mzsSMZaQu6wrTbi3kYYwGw9nBqOHr47pVLxfr5v8CalsdrG5gfs9XUlPOZjHRVISp3oQrh1j7d3E+ulHPjQ==} peerDependencies: @@ -7906,14 +8045,38 @@ packages: '@napi-rs/wasm-runtime@0.2.4': resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==} - '@netlify/functions@3.0.4': - resolution: {integrity: sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==} - engines: {node: '>=18.0.0'} + '@netlify/binary-info@1.0.0': + resolution: {integrity: sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==} - '@netlify/serverless-functions-api@1.36.0': - resolution: {integrity: sha512-z6okREyK8in0486a22Oro0k+YsuyEjDXJt46FpgeOgXqKJ9ElM8QPll0iuLBkpbH33ENiNbIPLd1cuClRQnhiw==} + '@netlify/blobs@9.1.2': + resolution: {integrity: sha512-7dMjExSH4zj4ShvLem49mE3mf0K171Tx2pV4WDWhJbRUWW3SJIR2qntz0LvUGS97N5HO1SmnzrgWUhEXCsApiw==} + engines: {node: ^14.16.0 || >=16.0.0} + + '@netlify/dev-utils@2.2.0': + resolution: {integrity: sha512-5XUvZuffe3KetyhbWwd4n2ktd7wraocCYw10tlM+/u/95iAz29GjNiuNxbCD1T6Bn1MyGc4QLVNKOWhzJkVFAw==} + engines: {node: ^14.16.0 || >=16.0.0} + + '@netlify/functions@3.1.9': + resolution: {integrity: sha512-mbmQIylPzOTDicMFbJF839W3bywJVR0Fm77uvjS6AkDl000VlLwQb+4eO3p0BV7j8+l5IgN/3ltQ/Byi/esTEQ==} + engines: {node: '>=14.0.0'} + + '@netlify/open-api@2.37.0': + resolution: {integrity: sha512-zXnRFkxgNsalSgU8/vwTWnav3R+8KG8SsqHxqaoJdjjJtnZR7wo3f+qqu4z+WtZ/4V7fly91HFUwZ6Uz2OdW7w==} + engines: {node: '>=14.8.0'} + + '@netlify/runtime-utils@1.3.1': + resolution: {integrity: sha512-7/vIJlMYrPJPlEW84V2yeRuG3QBu66dmlv9neTmZ5nXzwylhBEOhy11ai+34A8mHCSZI4mKns25w3HM9kaDdJg==} + engines: {node: '>=16.0.0'} + + '@netlify/serverless-functions-api@1.41.2': + resolution: {integrity: sha512-pfCkH50JV06SGMNsNPjn8t17hOcId4fA881HeYQgMBOrewjsw4csaYgHEnCxCEu24Y5x75E2ULbFpqm9CvRCqw==} engines: {node: '>=18.0.0'} + '@netlify/zip-it-and-ship-it@12.1.0': + resolution: {integrity: sha512-+ND2fNnfeOZwnho79aMQ5rreFpI9tu/l4N9/F5H8t9rKYwVHHlv5Zi9o6g/gxZHDLfSbGC9th7Z46CihV8JaZw==} + engines: {node: '>=18.14.0'} + hasBin: true + '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -8931,103 +9094,103 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.38.0': - resolution: {integrity: sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==} + '@rollup/rollup-android-arm-eabi@4.41.1': + resolution: {integrity: sha512-NELNvyEWZ6R9QMkiytB4/L4zSEaBC03KIXEghptLGLZWJ6VPrL63ooZQCOnlx36aQPGhzuOMwDerC1Eb2VmrLw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.38.0': - resolution: {integrity: sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==} + '@rollup/rollup-android-arm64@4.41.1': + resolution: {integrity: sha512-DXdQe1BJ6TK47ukAoZLehRHhfKnKg9BjnQYUu9gzhI8Mwa1d2fzxA1aw2JixHVl403bwp1+/o/NhhHtxWJBgEA==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.38.0': - resolution: {integrity: sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==} + '@rollup/rollup-darwin-arm64@4.41.1': + resolution: {integrity: sha512-5afxvwszzdulsU2w8JKWwY8/sJOLPzf0e1bFuvcW5h9zsEg+RQAojdW0ux2zyYAz7R8HvvzKCjLNJhVq965U7w==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.38.0': - resolution: {integrity: sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==} + '@rollup/rollup-darwin-x64@4.41.1': + resolution: {integrity: sha512-egpJACny8QOdHNNMZKf8xY0Is6gIMz+tuqXlusxquWu3F833DcMwmGM7WlvCO9sB3OsPjdC4U0wHw5FabzCGZg==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.38.0': - resolution: {integrity: sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==} + '@rollup/rollup-freebsd-arm64@4.41.1': + resolution: {integrity: sha512-DBVMZH5vbjgRk3r0OzgjS38z+atlupJ7xfKIDJdZZL6sM6wjfDNo64aowcLPKIx7LMQi8vybB56uh1Ftck/Atg==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.38.0': - resolution: {integrity: sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==} + '@rollup/rollup-freebsd-x64@4.41.1': + resolution: {integrity: sha512-3FkydeohozEskBxNWEIbPfOE0aqQgB6ttTkJ159uWOFn42VLyfAiyD9UK5mhu+ItWzft60DycIN1Xdgiy8o/SA==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.38.0': - resolution: {integrity: sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==} + '@rollup/rollup-linux-arm-gnueabihf@4.41.1': + resolution: {integrity: sha512-wC53ZNDgt0pqx5xCAgNunkTzFE8GTgdZ9EwYGVcg+jEjJdZGtq9xPjDnFgfFozQI/Xm1mh+D9YlYtl+ueswNEg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.38.0': - resolution: {integrity: sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==} + '@rollup/rollup-linux-arm-musleabihf@4.41.1': + resolution: {integrity: sha512-jwKCca1gbZkZLhLRtsrka5N8sFAaxrGz/7wRJ8Wwvq3jug7toO21vWlViihG85ei7uJTpzbXZRcORotE+xyrLA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.38.0': - resolution: {integrity: sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==} + '@rollup/rollup-linux-arm64-gnu@4.41.1': + resolution: {integrity: sha512-g0UBcNknsmmNQ8V2d/zD2P7WWfJKU0F1nu0k5pW4rvdb+BIqMm8ToluW/eeRmxCared5dD76lS04uL4UaNgpNA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.38.0': - resolution: {integrity: sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==} + '@rollup/rollup-linux-arm64-musl@4.41.1': + resolution: {integrity: sha512-XZpeGB5TKEZWzIrj7sXr+BEaSgo/ma/kCgrZgL0oo5qdB1JlTzIYQKel/RmhT6vMAvOdM2teYlAaOGJpJ9lahg==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.38.0': - resolution: {integrity: sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==} + '@rollup/rollup-linux-loongarch64-gnu@4.41.1': + resolution: {integrity: sha512-bkCfDJ4qzWfFRCNt5RVV4DOw6KEgFTUZi2r2RuYhGWC8WhCA8lCAJhDeAmrM/fdiAH54m0mA0Vk2FGRPyzI+tw==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.38.0': - resolution: {integrity: sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==} + '@rollup/rollup-linux-powerpc64le-gnu@4.41.1': + resolution: {integrity: sha512-3mr3Xm+gvMX+/8EKogIZSIEF0WUu0HL9di+YWlJpO8CQBnoLAEL/roTCxuLncEdgcfJcvA4UMOf+2dnjl4Ut1A==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.38.0': - resolution: {integrity: sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==} + '@rollup/rollup-linux-riscv64-gnu@4.41.1': + resolution: {integrity: sha512-3rwCIh6MQ1LGrvKJitQjZFuQnT2wxfU+ivhNBzmxXTXPllewOF7JR1s2vMX/tWtUYFgphygxjqMl76q4aMotGw==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-musl@4.38.0': - resolution: {integrity: sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==} + '@rollup/rollup-linux-riscv64-musl@4.41.1': + resolution: {integrity: sha512-LdIUOb3gvfmpkgFZuccNa2uYiqtgZAz3PTzjuM5bH3nvuy9ty6RGc/Q0+HDFrHrizJGVpjnTZ1yS5TNNjFlklw==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.38.0': - resolution: {integrity: sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==} + '@rollup/rollup-linux-s390x-gnu@4.41.1': + resolution: {integrity: sha512-oIE6M8WC9ma6xYqjvPhzZYk6NbobIURvP/lEbh7FWplcMO6gn7MM2yHKA1eC/GvYwzNKK/1LYgqzdkZ8YFxR8g==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.38.0': - resolution: {integrity: sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==} + '@rollup/rollup-linux-x64-gnu@4.41.1': + resolution: {integrity: sha512-cWBOvayNvA+SyeQMp79BHPK8ws6sHSsYnK5zDcsC3Hsxr1dgTABKjMnMslPq1DvZIp6uO7kIWhiGwaTdR4Og9A==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.38.0': - resolution: {integrity: sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==} + '@rollup/rollup-linux-x64-musl@4.41.1': + resolution: {integrity: sha512-y5CbN44M+pUCdGDlZFzGGBSKCA4A/J2ZH4edTYSSxFg7ce1Xt3GtydbVKWLlzL+INfFIZAEg1ZV6hh9+QQf9YQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.38.0': - resolution: {integrity: sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==} + '@rollup/rollup-win32-arm64-msvc@4.41.1': + resolution: {integrity: sha512-lZkCxIrjlJlMt1dLO/FbpZbzt6J/A8p4DnqzSa4PWqPEUUUnzXLeki/iyPLfV0BmHItlYgHUqJe+3KiyydmiNQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.38.0': - resolution: {integrity: sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==} + '@rollup/rollup-win32-ia32-msvc@4.41.1': + resolution: {integrity: sha512-+psFT9+pIh2iuGsxFYYa/LhS5MFKmuivRsx9iPJWNSGbh2XVEjk90fmpUEjCnILPEPJnikAU6SFDiEUyOv90Pg==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.38.0': - resolution: {integrity: sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==} + '@rollup/rollup-win32-x64-msvc@4.41.1': + resolution: {integrity: sha512-Wq2zpapRYLfi4aKxf2Xff0tN+7slj2d4R87WEzqw7ZLsVvO5zwYCIuEGSZYiK41+GlwUo1HiR+GdkLEJnCKTCw==} cpu: [x64] os: [win32] @@ -9843,6 +10006,9 @@ packages: '@types/node@22.13.4': resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==} + '@types/normalize-package-data@2.4.4': + resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} + '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -9895,6 +10061,9 @@ packages: '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} + '@types/triple-beam@1.3.5': + resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==} + '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} @@ -9907,6 +10076,9 @@ packages: '@types/yargs@17.0.33': resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} + '@types/yauzl@2.10.3': + resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} + '@typescript-eslint/eslint-plugin@8.22.0': resolution: {integrity: sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -9992,8 +10164,8 @@ packages: resolution: {integrity: sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vercel/nft@0.29.2': - resolution: {integrity: sha512-A/Si4mrTkQqJ6EXJKv5EYCDQ3NL6nJXxG8VGXePsaiQigsomHYQC9xSpX8qGk7AEZk4b1ssbYIqJ0ISQQ7bfcA==} + '@vercel/nft@0.29.3': + resolution: {integrity: sha512-aVV0E6vJpuvImiMwU1/5QKkw2N96BRFE7mBYGS7FhXUoS6V7SarQ+8tuj33o7ofECz8JtHpmQ9JW+oVzOoB7MA==} engines: {node: '>=18'} hasBin: true @@ -10061,11 +10233,17 @@ packages: '@volar/typescript@2.4.11': resolution: {integrity: sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==} - '@vue/compiler-core@3.5.13': - resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==} + '@vue/compiler-core@3.5.14': + resolution: {integrity: sha512-k7qMHMbKvoCXIxPhquKQVw3Twid3Kg4s7+oYURxLGRd56LiuHJVrvFKI4fm2AM3c8apqODPfVJGoh8nePbXMRA==} - '@vue/compiler-dom@3.5.13': - resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==} + '@vue/compiler-dom@3.5.14': + resolution: {integrity: sha512-1aOCSqxGOea5I80U2hQJvXYpPm/aXo95xL/m/mMhgyPUsKe9jhjwWpziNAw7tYRnbz1I61rd9Mld4W9KmmRoug==} + + '@vue/compiler-sfc@3.5.14': + resolution: {integrity: sha512-9T6m/9mMr81Lj58JpzsiSIjBgv2LiVoWjIVa7kuXHICUi8LiDSIotMpPRXYJsXKqyARrzjT24NAwttrMnMaCXA==} + + '@vue/compiler-ssr@3.5.14': + resolution: {integrity: sha512-Y0G7PcBxr1yllnHuS/NxNCSPWnRGH4Ogrp0tsLA5QemDZuJLs99YjAKQ7KqkHE0vCg4QTKlQzXLKCMF7WPSl7Q==} '@vue/compiler-vue2@2.7.16': resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==} @@ -10086,8 +10264,8 @@ packages: typescript: optional: true - '@vue/shared@3.5.13': - resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} + '@vue/shared@3.5.14': + resolution: {integrity: sha512-oXTwNxVfc9EtP1zzXAlSlgARLXNC84frFYkS0HHz0h3E4WZSP9sywqjqzGCP9Y34M8ipNmd380pVgmMuwELDyQ==} '@webassemblyjs/ast@1.14.1': resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} @@ -10159,6 +10337,26 @@ packages: webpack-dev-server: optional: true + '@whatwg-node/disposablestack@0.0.6': + resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==} + engines: {node: '>=18.0.0'} + + '@whatwg-node/fetch@0.10.8': + resolution: {integrity: sha512-Rw9z3ctmeEj8QIB9MavkNJqekiu9usBCSMZa+uuAvM0lF3v70oQVCXNppMIqaV6OTZbdaHF1M2HLow58DEw+wg==} + engines: {node: '>=18.0.0'} + + '@whatwg-node/node-fetch@0.7.21': + resolution: {integrity: sha512-QC16IdsEyIW7kZd77aodrMO7zAoDyyqRCTLg+qG4wqtP4JV9AA+p7/lgqMdD29XyiYdVvIdFrfI9yh7B1QvRvw==} + engines: {node: '>=18.0.0'} + + '@whatwg-node/promise-helpers@1.3.2': + resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==} + engines: {node: '>=16.0.0'} + + '@whatwg-node/server@0.9.71': + resolution: {integrity: sha512-ueFCcIPaMgtuYDS9u0qlUoEvj6GiSsKrwnOLPp9SshqjtcRaR1IEHRjoReq3sXNydsF5i0ZnmuYgXq9dV53t0g==} + engines: {node: '>=18.0.0'} + '@workos-inc/node@7.46.0': resolution: {integrity: sha512-r/j+l/nlHkOqgIt0U70shZMKIQwLYFFU9aYmFW53l16+FwG+61SfldaK3ckjb3gscoGxWq+t7RlxcEe7Tz5eRA==} engines: {node: '>=16'} @@ -10369,6 +10567,10 @@ packages: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} + ast-module-types@6.0.1: + resolution: {integrity: sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA==} + engines: {node: '>=18'} + async-sema@3.1.1: resolution: {integrity: sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==} @@ -10458,6 +10660,9 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + buffer-crc32@0.2.13: + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + buffer-crc32@1.0.0: resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==} engines: {node: '>=8.0.0'} @@ -10471,6 +10676,10 @@ packages: buffer@6.0.3: resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} + builtin-modules@3.3.0: + resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} + engines: {node: '>=6'} + bundle-name@4.1.0: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} @@ -10479,8 +10688,8 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} - c12@3.0.2: - resolution: {integrity: sha512-6Tzk1/TNeI3WBPpK0j/Ss4+gPj3PUJYbWl/MWDJBThFvwNGNkXtd7Cz8BJtD4aRwoGHtzQD0SnxamgUiBH0/Nw==} + c12@3.0.4: + resolution: {integrity: sha512-t5FaZTYbbCtvxuZq9xxIruYydrAGsJ+8UdP0pZzMiK2xl/gNiSOy0OxhLzHUEEb0m1QXYqfzfvyIFEmz/g9lqg==} peerDependencies: magicast: ^0.3.5 peerDependenciesMeta: @@ -10499,6 +10708,9 @@ packages: resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==} engines: {node: '>= 0.4'} + callsite@1.0.0: + resolution: {integrity: sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==} + callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} @@ -10621,16 +10833,31 @@ packages: resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==} engines: {node: '>=0.10.0'} + color-convert@1.9.3: + resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} + color-name@1.1.3: + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} + color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + color-string@1.9.1: + resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + + color@3.2.1: + resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} + colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} + colorspace@1.1.4: + resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} + combinate@1.1.11: resolution: {integrity: sha512-+2MNAQ29HtNejOxkgaTQPC2Bm+pQvFuqf7o18uObl/Bx3daX06kjLUNY/qa9f+YSqzqm/ic3SdrlfN0fvTlw2g==} @@ -10642,6 +10869,10 @@ packages: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} engines: {node: '>=14'} + commander@12.1.0: + resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} + engines: {node: '>=18'} + commander@13.1.0: resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==} engines: {node: '>=18'} @@ -10657,6 +10888,9 @@ packages: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} + common-path-prefix@3.0.0: + resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} + commondir@1.0.1: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} @@ -10666,8 +10900,8 @@ packages: compare-versions@6.1.1: resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==} - compatx@0.1.8: - resolution: {integrity: sha512-jcbsEAR81Bt5s1qOFymBufmCbXCXbk0Ql+K5ouj6gCyx2yHlu6AgmGIi9HxfKixpUDO5bCFJUHQ5uM6ecbTebw==} + compatx@0.2.0: + resolution: {integrity: sha512-6gLRNt4ygsi5NyMVhceOCFv14CIdDFN7fQjX1U4+47qVE/+kjPoXMK65KWK+dWxmFzMTuKazoQ9sch6pM0p5oA==} compress-commons@6.0.2: resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==} @@ -10695,8 +10929,8 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} - confbox@0.2.1: - resolution: {integrity: sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==} + confbox@0.2.2: + resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==} connect-history-api-fallback@2.0.0: resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} @@ -10773,6 +11007,10 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} + copy-file@11.0.0: + resolution: {integrity: sha512-mFsNh/DIANLqFt5VHZoGirdg7bK5+oTWlhnGu6tgRhzBlnEKWaPX2xrFaLltii/6rmhqFMJqffUgknuRdpYlHw==} + engines: {node: '>=18'} + core-js@3.40.0: resolution: {integrity: sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==} @@ -10792,6 +11030,10 @@ packages: resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} engines: {node: '>= 14'} + cron-parser@4.9.0: + resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==} + engines: {node: '>=12.0.0'} + croner@9.0.0: resolution: {integrity: sha512-onMB0OkDjkXunhdW9htFjEhqrD54+M94i6ackoUkjHKbRnXdyEyKRelp4nJ1kAz32+s27jP1FsebpJCVl0BsvA==} engines: {node: '>=18.0'} @@ -10800,8 +11042,8 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - crossws@0.3.4: - resolution: {integrity: sha512-uj0O1ETYX1Bh6uSgktfPvwDiPYGQ3aI4qVsaC/LWpkIzGj1nUYm5FK3K+t11oOlpN01lGbprFCH4wBlKdJjVgw==} + crossws@0.3.5: + resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==} css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} @@ -10828,6 +11070,10 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + data-uri-to-buffer@4.0.1: + resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==} + engines: {node: '>= 12'} + data-urls@5.0.0: resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==} engines: {node: '>=18'} @@ -10836,8 +11082,8 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} - db0@0.3.1: - resolution: {integrity: sha512-3RogPLE2LLq6t4YiFCREyl572aBjkfMvfwPyN51df00TbPbryL3XqBYuJ/j6mgPssPK8AKfYdLxizaO5UG10sA==} + db0@0.3.2: + resolution: {integrity: sha512-xzWNQ6jk/+NtdfLyXEipbX55dmDSeteLFt/ayF+wZUU5bzKgmrDOxmInUTbyVRp46YwnJdkDA1KhB7WIXFofJw==} peerDependencies: '@electric-sql/pglite': '*' '@libsql/client': '*' @@ -10887,6 +11133,9 @@ packages: supports-color: optional: true + decache@4.6.2: + resolution: {integrity: sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==} + decimal.js@10.5.0: resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==} @@ -10943,8 +11192,8 @@ packages: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} - destr@2.0.3: - resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} + destr@2.0.5: + resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==} destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -10969,6 +11218,49 @@ packages: detect-node@2.1.0: resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} + detective-amd@6.0.1: + resolution: {integrity: sha512-TtyZ3OhwUoEEIhTFoc1C9IyJIud3y+xYkSRjmvCt65+ycQuc3VcBrPRTMWoO/AnuCyOB8T5gky+xf7Igxtjd3g==} + engines: {node: '>=18'} + hasBin: true + + detective-cjs@6.0.1: + resolution: {integrity: sha512-tLTQsWvd2WMcmn/60T2inEJNhJoi7a//PQ7DwRKEj1yEeiQs4mrONgsUtEJKnZmrGWBBmE0kJ1vqOG/NAxwaJw==} + engines: {node: '>=18'} + + detective-es6@5.0.1: + resolution: {integrity: sha512-XusTPuewnSUdoxRSx8OOI6xIA/uld/wMQwYsouvFN2LAg7HgP06NF1lHRV3x6BZxyL2Kkoih4ewcq8hcbGtwew==} + engines: {node: '>=18'} + + detective-postcss@7.0.1: + resolution: {integrity: sha512-bEOVpHU9picRZux5XnwGsmCN4+8oZo7vSW0O0/Enq/TO5R2pIAP2279NsszpJR7ocnQt4WXU0+nnh/0JuK4KHQ==} + engines: {node: ^14.0.0 || >=16.0.0} + peerDependencies: + postcss: ^8.4.47 + + detective-sass@6.0.1: + resolution: {integrity: sha512-jSGPO8QDy7K7pztUmGC6aiHkexBQT4GIH+mBAL9ZyBmnUIOFbkfZnO8wPRRJFP/QP83irObgsZHCoDHZ173tRw==} + engines: {node: '>=18'} + + detective-scss@5.0.1: + resolution: {integrity: sha512-MAyPYRgS6DCiS6n6AoSBJXLGVOydsr9huwXORUlJ37K3YLyiN0vYHpzs3AdJOgHobBfispokoqrEon9rbmKacg==} + engines: {node: '>=18'} + + detective-stylus@5.0.1: + resolution: {integrity: sha512-Dgn0bUqdGbE3oZJ+WCKf8Dmu7VWLcmRJGc6RCzBgG31DLIyai9WAoEhYRgIHpt/BCRMrnXLbGWGPQuBUrnF0TA==} + engines: {node: '>=18'} + + detective-typescript@14.0.0: + resolution: {integrity: sha512-pgN43/80MmWVSEi5LUuiVvO/0a9ss5V7fwVfrJ4QzAQRd3cwqU1SfWGXJFcNKUqoD5cS+uIovhw5t/0rSeC5Mw==} + engines: {node: '>=18'} + peerDependencies: + typescript: ^5.4.4 + + detective-vue2@2.2.0: + resolution: {integrity: sha512-sVg/t6O2z1zna8a/UIV6xL5KUa2cMTQbdTIIvqNM0NIPswp52fe43Nwmbahzj3ww4D844u/vC2PYfiGLvD3zFA==} + engines: {node: '>=18'} + peerDependencies: + typescript: ^5.4.4 + didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} @@ -11045,6 +11337,10 @@ packages: resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==} engines: {node: '>=12'} + dotenv@16.5.0: + resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==} + engines: {node: '>=12'} + dunder-proto@1.0.1: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} @@ -11070,6 +11366,9 @@ packages: emojilib@2.4.0: resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==} + enabled@2.0.0: + resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} + encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} @@ -11103,6 +11402,10 @@ packages: resolution: {integrity: sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==} engines: {node: '>=0.12'} + env-paths@3.0.0: + resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} engines: {node: '>=4'} @@ -11157,8 +11460,8 @@ packages: engines: {node: '>=18'} hasBin: true - esbuild@0.25.2: - resolution: {integrity: sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==} + esbuild@0.25.4: + resolution: {integrity: sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==} engines: {node: '>=18'} hasBin: true @@ -11181,6 +11484,11 @@ packages: resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} engines: {node: '>=12'} + escodegen@2.1.0: + resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==} + engines: {node: '>=6.0'} + hasBin: true + eslint-compat-utils@0.5.1: resolution: {integrity: sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==} engines: {node: '>=12'} @@ -11393,12 +11701,17 @@ packages: resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} engines: {node: '>= 0.10.0'} - exsolve@1.0.4: - resolution: {integrity: sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==} + exsolve@1.0.5: + resolution: {integrity: sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==} extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} + extract-zip@2.0.1: + resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} + engines: {node: '>= 10.17.0'} + hasBin: true + fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -11429,6 +11742,9 @@ packages: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} engines: {node: '>=0.8.0'} + fd-slicer@1.1.0: + resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + fdir@6.4.4: resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} peerDependencies: @@ -11437,6 +11753,13 @@ packages: picomatch: optional: true + fecha@4.2.3: + resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==} + + fetch-blob@3.2.0: + resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} + engines: {node: ^12.20 || >= 14.13} + fflate@0.8.2: resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} @@ -11455,6 +11778,10 @@ packages: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} + filter-obj@6.1.0: + resolution: {integrity: sha512-xdMtCAODmPloU9qtmPcdBV9Kd27NtMse+4ayThxqIHUES5Z2S6bGpap5PpdmNM56ub7y3i1eyr+vJJIIgWGKmA==} + engines: {node: '>=18'} + finalhandler@1.3.1: resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} engines: {node: '>= 0.8'} @@ -11462,6 +11789,10 @@ packages: find-root@1.1.0: resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} + find-up-simple@1.0.1: + resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==} + engines: {node: '>=18'} + find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -11470,6 +11801,10 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} + find-up@7.0.0: + resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} + engines: {node: '>=18'} + findup-sync@5.0.0: resolution: {integrity: sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==} engines: {node: '>= 10.13.0'} @@ -11496,6 +11831,9 @@ packages: flatted@3.3.2: resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} + fn.name@1.1.0: + resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} + follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} engines: {node: '>=4.0'} @@ -11521,6 +11859,10 @@ packages: resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==} engines: {node: '>= 6'} + formdata-polyfill@4.0.10: + resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} + engines: {node: '>=12.20.0'} + forwarded@0.2.0: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} engines: {node: '>= 0.6'} @@ -11546,6 +11888,10 @@ packages: resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} engines: {node: '>= 0.6'} + fresh@2.0.0: + resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} + engines: {node: '>= 0.8'} + front-matter@4.0.2: resolution: {integrity: sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==} @@ -11580,6 +11926,10 @@ packages: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} + get-amd-module-type@6.0.1: + resolution: {integrity: sha512-MtjsmYiCXcYDDrGqtNbeIYdAl85n+5mSv2r3FbzER/YV3ZILw4HNNIw34HuV5pyl0jzs6GFYU1VHVEefhgcNHQ==} + engines: {node: '>=18'} + get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} @@ -11599,6 +11949,10 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} + get-stream@5.2.0: + resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} + engines: {node: '>=8'} + get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -11630,6 +11984,11 @@ packages: engines: {node: 20 || >=22} hasBin: true + glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + deprecated: Glob versions prior to v9 are no longer supported + glob@9.3.5: resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} engines: {node: '>=16 || 14 >=14.17'} @@ -11661,6 +12020,11 @@ packages: globrex@0.1.2: resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} + gonzales-pe@4.3.0: + resolution: {integrity: sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==} + engines: {node: '>=0.6.0'} + hasBin: true + goober@2.1.16: resolution: {integrity: sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==} peerDependencies: @@ -11687,8 +12051,8 @@ packages: h3@1.13.0: resolution: {integrity: sha512-vFEAu/yf8UMUcB4s43OaDaigcqpQd14yanmOsn+NcRX3/guSKncyE2rOYhq8RIchgJrPSs/QiIddnTTR1ddiAg==} - h3@1.15.1: - resolution: {integrity: sha512-+ORaOBttdUm1E2Uu/obAyCguiI7MbBvsLTndc3gyK3zU+SYLoZXlyCP9Xgy0gikkGufFLTZXCXD6+4BsufnmHA==} + h3@1.15.3: + resolution: {integrity: sha512-z6GknHqyX0h9aQaTx22VZDf6QyZn+0Nh+Ym8O/u0SGSkyF5cuTJYKlc8MkzW3Nzf9LE1ivcpmYC3FUGpywhuUQ==} handle-thing@2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} @@ -11725,6 +12089,10 @@ packages: hookable@5.5.3: resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} + hosted-git-info@7.0.2: + resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} + engines: {node: ^16.14.0 || >=18.0.0} + hpack.js@2.1.6: resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} @@ -11868,6 +12236,14 @@ packages: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} + index-to-position@1.1.0: + resolution: {integrity: sha512-XPdx9Dq4t9Qk1mTMbWONJqU7boCoumEH7fRET37HX5+khDUl3J2W6PdALxhILYlIYx2amlwYcRPp28p0tSiojg==} + engines: {node: '>=18'} + + inflight@1.0.6: + resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. + inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -11884,8 +12260,8 @@ packages: resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==} engines: {node: '>=10.13.0'} - ioredis@5.6.0: - resolution: {integrity: sha512-tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==} + ioredis@5.6.1: + resolution: {integrity: sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==} engines: {node: '>=12.22.0'} ipaddr.js@1.9.1: @@ -11927,10 +12303,17 @@ packages: is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + is-arrayish@0.3.2: + resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} + is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} + is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + is-core-module@2.16.1: resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} @@ -11994,6 +12377,14 @@ packages: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} engines: {node: '>=8'} + is-path-inside@4.0.0: + resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==} + engines: {node: '>=12'} + + is-plain-obj@2.1.0: + resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==} + engines: {node: '>=8'} + is-plain-obj@3.0.0: resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==} engines: {node: '>=10'} @@ -12024,6 +12415,10 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + is-stream@4.0.1: + resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} + engines: {node: '>=18'} + is-text-path@2.0.0: resolution: {integrity: sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==} engines: {node: '>=8'} @@ -12036,6 +12431,13 @@ packages: resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} engines: {node: '>=10'} + is-url-superb@4.0.0: + resolution: {integrity: sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==} + engines: {node: '>=10'} + + is-url@1.2.4: + resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==} + is-what@4.1.16: resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==} engines: {node: '>=12.13'} @@ -12175,9 +12577,17 @@ packages: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} engines: {'0': node >= 0.2.0} + junk@4.0.1: + resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==} + engines: {node: '>=12.20'} + jwt-decode@3.1.2: resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==} + jwt-decode@4.0.0: + resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} + engines: {node: '>=18'} + kebab-case@1.0.2: resolution: {integrity: sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==} @@ -12205,10 +12615,18 @@ packages: kolorist@1.8.0: resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} + kuler@2.0.0: + resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} + ky@1.7.4: resolution: {integrity: sha512-zYEr/gh7uLW2l4su11bmQ2M9xLgQLjyvx58UyNM/6nuqyWFHPX5ktMjvpev3F8QWdjSsHUpnWew4PBCswBNuMQ==} engines: {node: '>=18'} + lambda-local@2.2.0: + resolution: {integrity: sha512-bPcgpIXbHnVGfI/omZIlgucDqlf4LrsunwoKue5JdZeGybt8L6KyJz2Zu19ffuZwIwLj2NAI2ZyaqNT6/cetcg==} + engines: {node: '>=8'} + hasBin: true + launch-editor@2.9.1: resolution: {integrity: sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==} @@ -12329,9 +12747,19 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} + locate-path@7.2.0: + resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} + lodash.debounce@4.0.8: + resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + lodash.defaults@4.2.0: resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} @@ -12348,6 +12776,10 @@ packages: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} engines: {node: '>=10'} + logform@2.7.0: + resolution: {integrity: sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==} + engines: {node: '>= 12.0.0'} + long@5.3.1: resolution: {integrity: sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==} @@ -12378,6 +12810,10 @@ packages: lunr@2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} + luxon@3.6.1: + resolution: {integrity: sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==} + engines: {node: '>=12'} + lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true @@ -12449,6 +12885,10 @@ packages: merge-descriptors@1.0.3: resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} + merge-options@3.0.4: + resolution: {integrity: sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==} + engines: {node: '>=10'} + merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -12460,6 +12900,9 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} + micro-api-client@3.3.0: + resolution: {integrity: sha512-y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg==} + micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} @@ -12468,14 +12911,18 @@ packages: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} - mime-db@1.53.0: - resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==} + mime-db@1.54.0: + resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==} engines: {node: '>= 0.6'} mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} + mime-types@3.0.1: + resolution: {integrity: sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==} + engines: {node: '>= 0.6'} + mime@1.6.0: resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} engines: {node: '>=4'} @@ -12486,8 +12933,8 @@ packages: engines: {node: '>=10.0.0'} hasBin: true - mime@4.0.6: - resolution: {integrity: sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A==} + mime@4.0.7: + resolution: {integrity: sha512-2OfDPL+e03E0LrXaGYOtTFIYhiuzep94NSsuhrNULq+stylcJedcHdzHtz0atMUuGwJfFYs0YL5xeC/Ca2x0eQ==} engines: {node: '>=16'} hasBin: true @@ -12555,6 +13002,11 @@ packages: mlly@1.7.4: resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} + module-definition@6.0.1: + resolution: {integrity: sha512-FeVc50FTfVVQnolk/WQT8MX+2WVcDnTGiq6Wo+/+lJ2ET1bRVi3HG3YlJUfqagNMc/kUlFSoR96AJkxGpKz13g==} + engines: {node: '>=18'} + hasBin: true + motion-dom@11.18.1: resolution: {integrity: sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==} @@ -12618,8 +13070,12 @@ packages: neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - nitropack@2.11.8: - resolution: {integrity: sha512-ummTu4R8Lhd1nO3nWrW7eeiHA2ey3ntbWFKkYakm4rcbvT6meWp+oykyrYBNFQKhobQl9CydmUWlCyztYXFPJw==} + netlify@13.3.5: + resolution: {integrity: sha512-Nc3loyVASW59W+8fLDZT1lncpG7llffyZ2o0UQLx/Fr20i7P8oP+lE7+TEcFvXj9IUWU6LjB9P3BH+iFGyp+mg==} + engines: {node: ^14.16.0 || >=16.0.0} + + nitropack@2.11.12: + resolution: {integrity: sha512-e2AdQrEY1IVoNTdyjfEQV93xkqz4SQxAMR0xWF8mZUUHxMLm6S4nPzpscjksmT4OdUxl0N8/DCaGjKQ9ghdodA==} engines: {node: ^16.11.0 || >=17.0.0} hasBin: true peerDependencies: @@ -12634,6 +13090,11 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} + node-domexception@1.0.0: + resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} + engines: {node: '>=10.5.0'} + deprecated: Use your platform's native DOMException instead + node-emoji@2.2.0: resolution: {integrity: sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==} engines: {node: '>=18'} @@ -12650,6 +13111,10 @@ packages: encoding: optional: true + node-fetch@3.3.2: + resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + node-forge@1.3.1: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} @@ -12667,11 +13132,23 @@ packages: node-releases@2.0.19: resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} + node-source-walk@7.0.1: + resolution: {integrity: sha512-3VW/8JpPqPvnJvseXowjZcirPisssnBuDikk6JIZ8jQzF7KJQX52iPFX4RYYxLycYH7IbMRSPUOga/esVjy5Yg==} + engines: {node: '>=18'} + nopt@8.1.0: resolution: {integrity: sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==} engines: {node: ^18.17.0 || >=20.5.0} hasBin: true + normalize-package-data@6.0.2: + resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} + engines: {node: ^16.14.0 || >=18.0.0} + + normalize-path@2.1.1: + resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==} + engines: {node: '>=0.10.0'} + normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} @@ -12754,6 +13231,9 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} + one-time@1.0.0: + resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} + onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -12781,6 +13261,10 @@ packages: outvariant@1.4.3: resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} + p-event@6.0.1: + resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==} + engines: {node: '>=16.17'} + p-limit@2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} @@ -12789,6 +13273,10 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} + p-limit@4.0.0: + resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -12797,14 +13285,30 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} + p-locate@6.0.0: + resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + p-map@7.0.3: + resolution: {integrity: sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==} + engines: {node: '>=18'} + p-retry@6.2.1: resolution: {integrity: sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==} engines: {node: '>=16.17'} + p-timeout@6.1.4: + resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==} + engines: {node: '>=14.16'} + p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + p-wait-for@5.0.2: + resolution: {integrity: sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA==} + engines: {node: '>=12'} + package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} @@ -12822,10 +13326,18 @@ packages: resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==} engines: {node: '>=0.8'} + parse-gitignore@2.0.0: + resolution: {integrity: sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==} + engines: {node: '>=14'} + parse-json@5.2.0: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} + parse-json@8.3.0: + resolution: {integrity: sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==} + engines: {node: '>=18'} + parse-passwd@1.0.0: resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==} engines: {node: '>=0.10.0'} @@ -12862,6 +13374,10 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} + path-exists@5.0.0: + resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} @@ -12913,6 +13429,9 @@ packages: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} engines: {node: '>= 14.16'} + pend@1.2.0: + resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} + perfect-debounce@1.0.0: resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} @@ -12996,10 +13515,21 @@ packages: postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} + postcss-values-parser@6.0.2: + resolution: {integrity: sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==} + engines: {node: '>=10'} + peerDependencies: + postcss: ^8.2.9 + postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} + precinct@12.2.0: + resolution: {integrity: sha512-NFBMuwIfaJ4SocE9YXPU/n4AcNSoFMVFjP72nvl3cx69j/ke61/hPOWFREVxLkFhhEGnA8ZuVfTqJBa+PK3b5w==} + engines: {node: '>=18'} + hasBin: true + prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -13067,6 +13597,9 @@ packages: engines: {node: '>=18'} hasBin: true + pump@3.0.2: + resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==} + punycode.js@2.3.1: resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} engines: {node: '>=6'} @@ -13095,6 +13628,9 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + quote-unquote@1.0.0: + resolution: {integrity: sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==} + radix-ui@1.2.0: resolution: {integrity: sha512-05auM88p3yNwAarx3JQGnRHbtzDNATbMx6/Qkr2gXg5QNLPUjdeduJvlhhVzlGxfUMBnwzYmydUIzAdrOz3J5w==} peerDependencies: @@ -13200,6 +13736,14 @@ packages: read-cache@1.0.0: resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==} + read-package-up@11.0.0: + resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==} + engines: {node: '>=18'} + + read-pkg@9.0.1: + resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==} + engines: {node: '>=18'} + readable-stream@2.3.8: resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} @@ -13251,6 +13795,9 @@ packages: resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==} engines: {node: '>= 0.10'} + remove-trailing-separator@1.1.0: + resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==} + renderkid@3.0.0: resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==} @@ -13262,6 +13809,9 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} + require-package-name@2.0.1: + resolution: {integrity: sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==} + requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} @@ -13293,6 +13843,10 @@ packages: engines: {node: '>= 0.4'} hasBin: true + resolve@2.0.0-next.5: + resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==} + hasBin: true + restore-cursor@3.1.0: resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} engines: {node: '>=8'} @@ -13332,8 +13886,8 @@ packages: rollup: optional: true - rollup@4.38.0: - resolution: {integrity: sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==} + rollup@4.41.1: + resolution: {integrity: sha512-cPmwD3FnFv8rKMBc1MxWCwVQFxwf1JEmSX3iQXrRVVG15zerAIXRjMFVWnd5Q5QvgKF7Aj+5ykXFhUl+QGnyOw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -13363,6 +13917,10 @@ packages: safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + safe-stable-stringify@2.5.0: + resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==} + engines: {node: '>=10'} + safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} @@ -13400,8 +13958,8 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.7.1: - resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} + semver@7.7.2: + resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} engines: {node: '>=10'} hasBin: true @@ -13409,6 +13967,10 @@ packages: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} + send@1.2.0: + resolution: {integrity: sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==} + engines: {node: '>= 18'} + serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -13433,6 +13995,10 @@ packages: resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} engines: {node: '>= 0.8.0'} + serve-static@2.2.0: + resolution: {integrity: sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==} + engines: {node: '>= 18'} + setprototypeof@1.1.0: resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} @@ -13488,6 +14054,9 @@ packages: resolution: {integrity: sha512-d3nebH+gVXaEsHEy3juuX2EJ9H3Es6gHJTyz58Vcx33zAoCwWPQiOC0ONsEHOg7ciwZanFH1FEnJFB4OKzWrdw==} engines: {node: '>=0.12.18'} + simple-swizzle@0.2.2: + resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + sirv@3.0.1: resolution: {integrity: sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==} engines: {node: '>=18'} @@ -13543,6 +14112,18 @@ packages: spawn-command@0.0.2: resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} + spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + + spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + + spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + + spdx-license-ids@3.0.21: + resolution: {integrity: sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==} + spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} @@ -13560,6 +14141,9 @@ packages: stable-hash@0.0.4: resolution: {integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==} + stack-trace@0.0.10: + resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==} + stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} @@ -13577,8 +14161,8 @@ packages: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} - std-env@3.8.1: - resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==} + std-env@3.9.0: + resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==} streamx@2.22.0: resolution: {integrity: sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==} @@ -13737,6 +14321,9 @@ packages: resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==} engines: {node: '>=8'} + text-hex@1.0.0: + resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} + thenify-all@1.6.0: resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} engines: {node: '>=0.8'} @@ -13791,6 +14378,9 @@ packages: resolution: {integrity: sha512-6U2ti64/nppsDxQs9hw8ephA3nO6nSQvVVfxwRw8wLQPFtLI1cFI1a1eP22g+LUP+1TA2pKKjUTwWB+K2coqmQ==} hasBin: true + tmp-promise@3.0.3: + resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==} + tmp@0.2.3: resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} engines: {node: '>=14.14'} @@ -13803,6 +14393,9 @@ packages: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} + toml@3.0.0: + resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==} + totalist@3.0.1: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} @@ -13832,6 +14425,10 @@ packages: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true + triple-beam@1.4.1: + resolution: {integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==} + engines: {node: '>= 14.0.0'} + ts-api-utils@2.0.1: resolution: {integrity: sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==} engines: {node: '>=18.12'} @@ -13879,8 +14476,8 @@ packages: resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} - type-fest@4.33.0: - resolution: {integrity: sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==} + type-fest@4.41.0: + resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} engines: {node: '>=16'} type-is@1.6.18: @@ -13960,11 +14557,11 @@ packages: uc.micro@2.1.0: resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} - ufo@1.5.4: - resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} + ufo@1.6.1: + resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - ultrahtml@1.5.3: - resolution: {integrity: sha512-GykOvZwgDWZlTQMtp5jrD4BVL+gNn2NVlVafjcFUJ7taY20tqYdwdoWBFy6GBJsNTZe1GkGPkSl5knQAjtgceg==} + ultrahtml@1.6.0: + resolution: {integrity: sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==} unc-path-regex@0.1.2: resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==} @@ -13986,19 +14583,23 @@ packages: unenv@1.10.0: resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==} - unenv@2.0.0-rc.15: - resolution: {integrity: sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==} + unenv@2.0.0-rc.17: + resolution: {integrity: sha512-B06u0wXkEd+o5gOCMl/ZHl5cfpYbDZKAT+HWTL+Hws6jWu7dCiqBBXXXzMFcFVJb8D4ytAnYmxJA83uwOQRSsg==} unicode-emoji-modifier-base@1.0.0: resolution: {integrity: sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==} engines: {node: '>=4'} + unicorn-magic@0.1.0: + resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} + engines: {node: '>=18'} + unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} engines: {node: '>=18'} - unimport@4.1.3: - resolution: {integrity: sha512-H+IVJ7rAkE3b+oC8rSJ2FsPaVsweeMC8eKZc+C6Mz7+hxDF45AnrY/tVCNRBvzMwWNcJEV67WdAVcal27iMjOw==} + unimport@5.0.1: + resolution: {integrity: sha512-1YWzPj6wYhtwHE+9LxRlyqP4DiRrhGfJxdtH475im8ktyZXO3jHj/3PZ97zDdvkYoovFdi0K4SKl3a7l92v3sQ==} engines: {node: '>=18.12.0'} universalify@0.1.2: @@ -14013,6 +14614,10 @@ packages: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} + unixify@1.0.0: + resolution: {integrity: sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==} + engines: {node: '>=0.10.0'} + unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} @@ -14028,12 +14633,12 @@ packages: resolution: {integrity: sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==} engines: {node: '>=14.0.0'} - unplugin@2.2.2: - resolution: {integrity: sha512-Qp+iiD+qCRnUek+nDoYvtWX7tfnYyXsrOnJ452FRTgOyKmTM7TUJ3l+PLPJOOWPTUyKISKp4isC5JJPSXUjGgw==} + unplugin@2.3.4: + resolution: {integrity: sha512-m4PjxTurwpWfpMomp8AptjD5yj8qEZN5uQjjGM3TAs9MWWD2tXSSNNj6jGR2FoVGod4293ytyV6SwBbertfyJg==} engines: {node: '>=18.12.0'} - unstorage@1.15.0: - resolution: {integrity: sha512-m40eHdGY/gA6xAPqo8eaxqXgBuzQTlAKfmB1iF7oCKXE1HfwHwzDJBywK+qQGn52dta+bPlZluPF7++yR3p/bg==} + unstorage@1.16.0: + resolution: {integrity: sha512-WQ37/H5A7LcRPWfYOrDa1Ys02xAbpPJq6q5GkO88FBXVSQzHd7+BjEwfRqyaSWCv9MbsJy058GWjjPjcJ16GGA==} peerDependencies: '@azure/app-configuration': ^1.8.0 '@azure/cosmos': ^4.2.0 @@ -14041,7 +14646,7 @@ packages: '@azure/identity': ^4.6.0 '@azure/keyvault-secrets': ^4.9.0 '@azure/storage-blob': ^12.26.0 - '@capacitor/preferences': ^6.0.3 + '@capacitor/preferences': ^6.0.3 || ^7.0.0 '@deno/kv': '>=0.9.0' '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 '@planetscale/database': ^1.19.0 @@ -14121,6 +14726,12 @@ packages: url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + urlpattern-polyfill@10.1.0: + resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==} + + urlpattern-polyfill@8.0.2: + resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==} + use-callback-ref@1.3.3: resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==} engines: {node: '>=10'} @@ -14156,6 +14767,10 @@ packages: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} + uuid@11.1.0: + resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} + hasBin: true + uuid@8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true @@ -14175,6 +14790,9 @@ packages: validate-html-nesting@1.2.2: resolution: {integrity: sha512-hGdgQozCsQJMyfK5urgFcWEqsSSrK63Awe0t/IMR0bZ0QMtnuaiHzThW81guu3qx9abLi99NEuiaN6P9gVYsNg==} + validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + validate-npm-package-name@5.0.1: resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -14335,6 +14953,10 @@ packages: wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + web-streams-polyfill@3.3.3: + resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==} + engines: {node: '>= 8'} + web-vitals@4.2.4: resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==} @@ -14451,6 +15073,14 @@ packages: wildcard@2.0.1: resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} + winston-transport@4.9.0: + resolution: {integrity: sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==} + engines: {node: '>= 12.0.0'} + + winston@3.17.0: + resolution: {integrity: sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==} + engines: {node: '>= 12.0.0'} + word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -14470,6 +15100,10 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + write-file-atomic@6.0.0: + resolution: {integrity: sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==} + engines: {node: ^18.17.0 || >=20.5.0} + ws@8.18.0: resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} @@ -14532,10 +15166,17 @@ packages: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} + yauzl@2.10.0: + resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} + yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} + yocto-queue@1.2.1: + resolution: {integrity: sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==} + engines: {node: '>=12.20'} + yoctocolors-cjs@2.1.2: resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==} engines: {node: '>=18'} @@ -14576,7 +15217,7 @@ snapshots: commander: 10.0.1 marked: 9.1.6 marked-terminal: 7.3.0(marked@9.1.6) - semver: 7.7.1 + semver: 7.7.2 '@arethetypeswrong/core@0.17.3': dependencies: @@ -14584,7 +15225,7 @@ snapshots: cjs-module-lexer: 1.4.3 fflate: 0.8.2 lru-cache: 10.4.3 - semver: 7.7.1 + semver: 7.7.2 typescript: 5.6.1-rc validate-npm-package-name: 5.0.1 @@ -14604,7 +15245,7 @@ snapshots: '@babel/code-frame@7.26.2': dependencies: - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-validator-identifier': 7.27.1 js-tokens: 4.0.0 picocolors: 1.1.1 @@ -14618,10 +15259,10 @@ snapshots: '@babel/helper-compilation-targets': 7.26.5 '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.8) '@babel/helpers': 7.26.7 - '@babel/parser': 7.26.8 + '@babel/parser': 7.27.2 '@babel/template': 7.26.8 '@babel/traverse': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@types/gensync': 1.0.4 convert-source-map: 2.0.0 debug: 4.4.0 @@ -14633,15 +15274,15 @@ snapshots: '@babel/generator@7.26.8': dependencies: - '@babel/parser': 7.26.8 - '@babel/types': 7.26.8 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 jsesc: 3.1.0 '@babel/helper-annotate-as-pure@7.25.9': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@babel/helper-compilation-targets@7.26.5': dependencies: @@ -14667,18 +15308,18 @@ snapshots: '@babel/helper-member-expression-to-functions@7.25.9': dependencies: '@babel/traverse': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.18.6': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@babel/helper-module-imports@7.25.9': dependencies: '@babel/traverse': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 transitivePeerDependencies: - supports-color @@ -14686,14 +15327,14 @@ snapshots: dependencies: '@babel/core': 7.26.8 '@babel/helper-module-imports': 7.25.9 - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-validator-identifier': 7.27.1 '@babel/traverse': 7.26.8 transitivePeerDependencies: - supports-color '@babel/helper-optimise-call-expression@7.25.9': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@babel/helper-plugin-utils@7.26.5': {} @@ -14709,24 +15350,24 @@ snapshots: '@babel/helper-skip-transparent-expression-wrappers@7.25.9': dependencies: '@babel/traverse': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 transitivePeerDependencies: - supports-color - '@babel/helper-string-parser@7.25.9': {} + '@babel/helper-string-parser@7.27.1': {} - '@babel/helper-validator-identifier@7.25.9': {} + '@babel/helper-validator-identifier@7.27.1': {} '@babel/helper-validator-option@7.25.9': {} '@babel/helpers@7.26.7': dependencies: '@babel/template': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 - '@babel/parser@7.26.8': + '@babel/parser@7.27.2': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@babel/plugin-proposal-decorators@7.25.9(@babel/core@7.26.8)': dependencies: @@ -14807,25 +15448,25 @@ snapshots: '@babel/template@7.26.8': dependencies: '@babel/code-frame': 7.26.2 - '@babel/parser': 7.26.8 - '@babel/types': 7.26.8 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 '@babel/traverse@7.26.8': dependencies: '@babel/code-frame': 7.26.2 '@babel/generator': 7.26.8 - '@babel/parser': 7.26.8 + '@babel/parser': 7.27.2 '@babel/template': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 debug: 4.4.0 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.26.8': + '@babel/types@7.27.1': dependencies: - '@babel/helper-string-parser': 7.25.9 - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-string-parser': 7.27.1 + '@babel/helper-validator-identifier': 7.27.1 '@bundled-es-modules/cookie@2.0.1': dependencies: @@ -14865,7 +15506,7 @@ snapshots: dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 - std-env: 3.8.1 + std-env: 3.9.0 swr: 2.3.0(react@19.0.0) optionalDependencies: react: 19.0.0 @@ -14894,6 +15535,8 @@ snapshots: '@colors/colors@1.5.0': optional: true + '@colors/colors@1.6.0': {} + '@commitlint/parse@19.5.0': dependencies: '@commitlint/types': 19.5.0 @@ -14930,6 +15573,17 @@ snapshots: '@csstools/css-tokenizer@3.0.3': {} + '@dabh/diagnostics@2.0.3': + dependencies: + colorspace: 1.1.4 + enabled: 2.0.0 + kuler: 2.0.0 + + '@dependents/detective-less@5.0.1': + dependencies: + gonzales-pe: 4.3.0 + node-source-walk: 7.0.1 + '@discoveryjs/json-ext@0.5.7': {} '@emnapi/core@1.3.1': @@ -15034,7 +15688,7 @@ snapshots: '@esbuild/aix-ppc64@0.23.1': optional: true - '@esbuild/aix-ppc64@0.25.2': + '@esbuild/aix-ppc64@0.25.4': optional: true '@esbuild/android-arm64@0.23.0': @@ -15043,7 +15697,7 @@ snapshots: '@esbuild/android-arm64@0.23.1': optional: true - '@esbuild/android-arm64@0.25.2': + '@esbuild/android-arm64@0.25.4': optional: true '@esbuild/android-arm@0.23.0': @@ -15052,7 +15706,7 @@ snapshots: '@esbuild/android-arm@0.23.1': optional: true - '@esbuild/android-arm@0.25.2': + '@esbuild/android-arm@0.25.4': optional: true '@esbuild/android-x64@0.23.0': @@ -15061,7 +15715,7 @@ snapshots: '@esbuild/android-x64@0.23.1': optional: true - '@esbuild/android-x64@0.25.2': + '@esbuild/android-x64@0.25.4': optional: true '@esbuild/darwin-arm64@0.23.0': @@ -15070,7 +15724,7 @@ snapshots: '@esbuild/darwin-arm64@0.23.1': optional: true - '@esbuild/darwin-arm64@0.25.2': + '@esbuild/darwin-arm64@0.25.4': optional: true '@esbuild/darwin-x64@0.23.0': @@ -15079,7 +15733,7 @@ snapshots: '@esbuild/darwin-x64@0.23.1': optional: true - '@esbuild/darwin-x64@0.25.2': + '@esbuild/darwin-x64@0.25.4': optional: true '@esbuild/freebsd-arm64@0.23.0': @@ -15088,7 +15742,7 @@ snapshots: '@esbuild/freebsd-arm64@0.23.1': optional: true - '@esbuild/freebsd-arm64@0.25.2': + '@esbuild/freebsd-arm64@0.25.4': optional: true '@esbuild/freebsd-x64@0.23.0': @@ -15097,7 +15751,7 @@ snapshots: '@esbuild/freebsd-x64@0.23.1': optional: true - '@esbuild/freebsd-x64@0.25.2': + '@esbuild/freebsd-x64@0.25.4': optional: true '@esbuild/linux-arm64@0.23.0': @@ -15106,7 +15760,7 @@ snapshots: '@esbuild/linux-arm64@0.23.1': optional: true - '@esbuild/linux-arm64@0.25.2': + '@esbuild/linux-arm64@0.25.4': optional: true '@esbuild/linux-arm@0.23.0': @@ -15115,7 +15769,7 @@ snapshots: '@esbuild/linux-arm@0.23.1': optional: true - '@esbuild/linux-arm@0.25.2': + '@esbuild/linux-arm@0.25.4': optional: true '@esbuild/linux-ia32@0.23.0': @@ -15124,7 +15778,7 @@ snapshots: '@esbuild/linux-ia32@0.23.1': optional: true - '@esbuild/linux-ia32@0.25.2': + '@esbuild/linux-ia32@0.25.4': optional: true '@esbuild/linux-loong64@0.23.0': @@ -15133,7 +15787,7 @@ snapshots: '@esbuild/linux-loong64@0.23.1': optional: true - '@esbuild/linux-loong64@0.25.2': + '@esbuild/linux-loong64@0.25.4': optional: true '@esbuild/linux-mips64el@0.23.0': @@ -15142,7 +15796,7 @@ snapshots: '@esbuild/linux-mips64el@0.23.1': optional: true - '@esbuild/linux-mips64el@0.25.2': + '@esbuild/linux-mips64el@0.25.4': optional: true '@esbuild/linux-ppc64@0.23.0': @@ -15151,7 +15805,7 @@ snapshots: '@esbuild/linux-ppc64@0.23.1': optional: true - '@esbuild/linux-ppc64@0.25.2': + '@esbuild/linux-ppc64@0.25.4': optional: true '@esbuild/linux-riscv64@0.23.0': @@ -15160,7 +15814,7 @@ snapshots: '@esbuild/linux-riscv64@0.23.1': optional: true - '@esbuild/linux-riscv64@0.25.2': + '@esbuild/linux-riscv64@0.25.4': optional: true '@esbuild/linux-s390x@0.23.0': @@ -15169,7 +15823,7 @@ snapshots: '@esbuild/linux-s390x@0.23.1': optional: true - '@esbuild/linux-s390x@0.25.2': + '@esbuild/linux-s390x@0.25.4': optional: true '@esbuild/linux-x64@0.23.0': @@ -15178,10 +15832,10 @@ snapshots: '@esbuild/linux-x64@0.23.1': optional: true - '@esbuild/linux-x64@0.25.2': + '@esbuild/linux-x64@0.25.4': optional: true - '@esbuild/netbsd-arm64@0.25.2': + '@esbuild/netbsd-arm64@0.25.4': optional: true '@esbuild/netbsd-x64@0.23.0': @@ -15190,7 +15844,7 @@ snapshots: '@esbuild/netbsd-x64@0.23.1': optional: true - '@esbuild/netbsd-x64@0.25.2': + '@esbuild/netbsd-x64@0.25.4': optional: true '@esbuild/openbsd-arm64@0.23.0': @@ -15199,7 +15853,7 @@ snapshots: '@esbuild/openbsd-arm64@0.23.1': optional: true - '@esbuild/openbsd-arm64@0.25.2': + '@esbuild/openbsd-arm64@0.25.4': optional: true '@esbuild/openbsd-x64@0.23.0': @@ -15208,7 +15862,7 @@ snapshots: '@esbuild/openbsd-x64@0.23.1': optional: true - '@esbuild/openbsd-x64@0.25.2': + '@esbuild/openbsd-x64@0.25.4': optional: true '@esbuild/sunos-x64@0.23.0': @@ -15217,7 +15871,7 @@ snapshots: '@esbuild/sunos-x64@0.23.1': optional: true - '@esbuild/sunos-x64@0.25.2': + '@esbuild/sunos-x64@0.25.4': optional: true '@esbuild/win32-arm64@0.23.0': @@ -15226,7 +15880,7 @@ snapshots: '@esbuild/win32-arm64@0.23.1': optional: true - '@esbuild/win32-arm64@0.25.2': + '@esbuild/win32-arm64@0.25.4': optional: true '@esbuild/win32-ia32@0.23.0': @@ -15235,7 +15889,7 @@ snapshots: '@esbuild/win32-ia32@0.23.1': optional: true - '@esbuild/win32-ia32@0.25.2': + '@esbuild/win32-ia32@0.25.4': optional: true '@esbuild/win32-x64@0.23.0': @@ -15244,7 +15898,7 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@esbuild/win32-x64@0.25.2': + '@esbuild/win32-x64@0.25.4': optional: true '@eslint-community/eslint-utils@4.4.1(eslint@9.22.0(jiti@2.4.2))': @@ -15384,6 +16038,8 @@ snapshots: '@eslint/core': 0.12.0 levn: 0.4.1 + '@fastify/busboy@3.1.1': {} + '@firebase/analytics-compat@0.2.18(@firebase/app-compat@0.2.51)(@firebase/app@0.11.2)': dependencies: '@firebase/analytics': 0.10.12(@firebase/app@0.11.2) @@ -15851,7 +16507,7 @@ snapshots: https-proxy-agent: 7.0.6 node-fetch: 2.7.0 nopt: 8.1.0 - semver: 7.7.1 + semver: 7.7.2 tar: 7.4.3 transitivePeerDependencies: - encoding @@ -16031,11 +16687,92 @@ snapshots: '@emnapi/runtime': 1.3.1 '@tybys/wasm-util': 0.9.0 - '@netlify/functions@3.0.4': + '@netlify/binary-info@1.0.0': {} + + '@netlify/blobs@9.1.2': + dependencies: + '@netlify/dev-utils': 2.2.0 + '@netlify/runtime-utils': 1.3.1 + + '@netlify/dev-utils@2.2.0': dependencies: - '@netlify/serverless-functions-api': 1.36.0 + '@whatwg-node/server': 0.9.71 + chokidar: 4.0.3 + decache: 4.6.2 + dot-prop: 9.0.0 + env-paths: 3.0.0 + find-up: 7.0.0 + lodash.debounce: 4.0.8 + netlify: 13.3.5 + parse-gitignore: 2.0.0 + uuid: 11.1.0 + write-file-atomic: 6.0.0 + + '@netlify/functions@3.1.9(rollup@4.41.1)': + dependencies: + '@netlify/blobs': 9.1.2 + '@netlify/dev-utils': 2.2.0 + '@netlify/serverless-functions-api': 1.41.2 + '@netlify/zip-it-and-ship-it': 12.1.0(rollup@4.41.1) + cron-parser: 4.9.0 + decache: 4.6.2 + extract-zip: 2.0.1 + is-stream: 4.0.1 + jwt-decode: 4.0.0 + lambda-local: 2.2.0 + read-package-up: 11.0.0 + source-map-support: 0.5.21 + transitivePeerDependencies: + - encoding + - rollup + - supports-color + + '@netlify/open-api@2.37.0': {} + + '@netlify/runtime-utils@1.3.1': {} - '@netlify/serverless-functions-api@1.36.0': {} + '@netlify/serverless-functions-api@1.41.2': {} + + '@netlify/zip-it-and-ship-it@12.1.0(rollup@4.41.1)': + dependencies: + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 + '@netlify/binary-info': 1.0.0 + '@netlify/serverless-functions-api': 1.41.2 + '@vercel/nft': 0.29.3(rollup@4.41.1) + archiver: 7.0.1 + common-path-prefix: 3.0.0 + copy-file: 11.0.0 + es-module-lexer: 1.6.0 + esbuild: 0.25.4 + execa: 8.0.1 + fast-glob: 3.3.3 + filter-obj: 6.1.0 + find-up: 7.0.0 + glob: 8.1.0 + is-builtin-module: 3.2.1 + is-path-inside: 4.0.0 + junk: 4.0.1 + locate-path: 7.2.0 + merge-options: 3.0.4 + minimatch: 9.0.5 + normalize-path: 3.0.0 + p-map: 7.0.3 + path-exists: 5.0.0 + precinct: 12.2.0 + require-package-name: 2.0.1 + resolve: 2.0.0-next.5 + semver: 7.7.2 + tmp-promise: 3.0.3 + toml: 3.0.0 + unixify: 1.0.0 + urlpattern-polyfill: 8.0.2 + yargs: 17.7.2 + zod: 3.24.2 + transitivePeerDependencies: + - encoding + - rollup + - supports-color '@nodelib/fs.scandir@2.1.5': dependencies: @@ -16972,13 +17709,13 @@ snapshots: '@types/react': 19.0.8 '@types/react-dom': 19.0.3(@types/react@19.0.8) - '@rollup/plugin-alias@5.1.1(rollup@4.38.0)': + '@rollup/plugin-alias@5.1.1(rollup@4.41.1)': optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-commonjs@28.0.3(rollup@4.38.0)': + '@rollup/plugin-commonjs@28.0.3(rollup@4.41.1)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) commondir: 1.0.1 estree-walker: 2.0.2 fdir: 6.4.4(picomatch@4.0.2) @@ -16986,113 +17723,113 @@ snapshots: magic-string: 0.30.17 picomatch: 4.0.2 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-inject@5.0.5(rollup@4.38.0)': + '@rollup/plugin-inject@5.0.5(rollup@4.41.1)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) estree-walker: 2.0.2 magic-string: 0.30.17 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-json@6.1.0(rollup@4.38.0)': + '@rollup/plugin-json@6.1.0(rollup@4.41.1)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-node-resolve@16.0.1(rollup@4.38.0)': + '@rollup/plugin-node-resolve@16.0.1(rollup@4.41.1)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.10 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-replace@6.0.2(rollup@4.38.0)': + '@rollup/plugin-replace@6.0.2(rollup@4.41.1)': dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) magic-string: 0.30.17 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/plugin-terser@0.4.4(rollup@4.38.0)': + '@rollup/plugin-terser@0.4.4(rollup@4.41.1)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.37.0 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/pluginutils@5.1.4(rollup@4.38.0)': + '@rollup/pluginutils@5.1.4(rollup@4.41.1)': dependencies: '@types/estree': 1.0.7 estree-walker: 2.0.2 picomatch: 4.0.2 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - '@rollup/rollup-android-arm-eabi@4.38.0': + '@rollup/rollup-android-arm-eabi@4.41.1': optional: true - '@rollup/rollup-android-arm64@4.38.0': + '@rollup/rollup-android-arm64@4.41.1': optional: true - '@rollup/rollup-darwin-arm64@4.38.0': + '@rollup/rollup-darwin-arm64@4.41.1': optional: true - '@rollup/rollup-darwin-x64@4.38.0': + '@rollup/rollup-darwin-x64@4.41.1': optional: true - '@rollup/rollup-freebsd-arm64@4.38.0': + '@rollup/rollup-freebsd-arm64@4.41.1': optional: true - '@rollup/rollup-freebsd-x64@4.38.0': + '@rollup/rollup-freebsd-x64@4.41.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.38.0': + '@rollup/rollup-linux-arm-gnueabihf@4.41.1': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.38.0': + '@rollup/rollup-linux-arm-musleabihf@4.41.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.38.0': + '@rollup/rollup-linux-arm64-gnu@4.41.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.38.0': + '@rollup/rollup-linux-arm64-musl@4.41.1': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.38.0': + '@rollup/rollup-linux-loongarch64-gnu@4.41.1': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.38.0': + '@rollup/rollup-linux-powerpc64le-gnu@4.41.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.38.0': + '@rollup/rollup-linux-riscv64-gnu@4.41.1': optional: true - '@rollup/rollup-linux-riscv64-musl@4.38.0': + '@rollup/rollup-linux-riscv64-musl@4.41.1': optional: true - '@rollup/rollup-linux-s390x-gnu@4.38.0': + '@rollup/rollup-linux-s390x-gnu@4.41.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.38.0': + '@rollup/rollup-linux-x64-gnu@4.41.1': optional: true - '@rollup/rollup-linux-x64-musl@4.38.0': + '@rollup/rollup-linux-x64-musl@4.41.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.38.0': + '@rollup/rollup-win32-arm64-msvc@4.41.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.38.0': + '@rollup/rollup-win32-ia32-msvc@4.41.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.38.0': + '@rollup/rollup-win32-x64-msvc@4.41.1': optional: true '@rsbuild/core@1.2.4': @@ -17294,7 +18031,7 @@ snapshots: '@babel/core': 7.26.8 '@sentry/babel-plugin-component-annotate': 3.1.2 '@sentry/cli': 2.41.1 - dotenv: 16.4.7 + dotenv: 16.5.0 find-up: 5.0.0 glob: 9.3.5 magic-string: 0.30.8 @@ -17703,13 +18440,13 @@ snapshots: tailwindcss: 4.1.6 vite: 6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.2)(eslint@9.22.0(jiti@2.4.2))(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': + '@tanstack/config@0.16.1(@types/node@22.13.4)(esbuild@0.25.4)(eslint@9.22.0(jiti@2.4.2))(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0))': dependencies: '@commitlint/parse': 19.5.0 '@eslint/js': 9.22.0 '@stylistic/eslint-plugin-js': 2.13.0(eslint@9.22.0(jiti@2.4.2)) commander: 13.1.0 - esbuild-register: 3.6.0(esbuild@0.25.2) + esbuild-register: 3.6.0(esbuild@0.25.4) eslint-plugin-import-x: 4.6.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) eslint-plugin-n: 17.15.1(eslint@9.22.0(jiti@2.4.2)) globals: 15.14.0 @@ -17717,15 +18454,15 @@ snapshots: jsonfile: 6.1.0 liftoff: 5.0.0 minimist: 1.2.8 - rollup-plugin-preserve-directives: 0.4.0(rollup@4.38.0) - semver: 7.7.1 + rollup-plugin-preserve-directives: 0.4.0(rollup@4.41.1) + semver: 7.7.2 simple-git: 3.27.0 typedoc: 0.27.6(typescript@5.8.2) typedoc-plugin-frontmatter: 1.1.2(typedoc-plugin-markdown@4.4.1(typedoc@0.27.6(typescript@5.8.2))) typedoc-plugin-markdown: 4.4.1(typedoc@0.27.6(typescript@5.8.2)) typescript-eslint: 8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) v8flags: 4.0.1 - vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + vite-plugin-dts: 4.0.3(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-plugin-externalize-deps: 0.9.0(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vite-tsconfig-paths: 5.1.4(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) vue-eslint-parser: 9.4.3(eslint@9.22.0(jiti@2.4.2)) @@ -17864,24 +18601,24 @@ snapshots: '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.26.8 - '@babel/types': 7.26.8 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.6 '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@types/babel__template@7.4.4': dependencies: - '@babel/parser': 7.26.8 - '@babel/types': 7.26.8 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 '@types/babel__traverse@7.20.6': dependencies: - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 '@types/body-parser@1.19.5': dependencies: @@ -18006,6 +18743,8 @@ snapshots: dependencies: undici-types: 6.20.0 + '@types/normalize-package-data@2.4.4': {} + '@types/parse-json@4.0.2': {} '@types/phoenix@1.6.6': {} @@ -18055,6 +18794,8 @@ snapshots: '@types/tough-cookie@4.0.5': {} + '@types/triple-beam@1.3.5': {} + '@types/unist@3.0.3': {} '@types/ws@8.5.14': @@ -18067,6 +18808,11 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 + '@types/yauzl@2.10.3': + dependencies: + '@types/node': 22.13.4 + optional: true + '@typescript-eslint/eslint-plugin@8.22.0(@typescript-eslint/parser@8.22.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2))(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2)': dependencies: '@eslint-community/regexpp': 4.12.1 @@ -18104,7 +18850,7 @@ snapshots: eslint: 9.22.0(jiti@2.4.2) json-stable-stringify-without-jsonify: 1.0.1 lodash.merge: 4.6.2 - semver: 7.7.1 + semver: 7.7.2 transitivePeerDependencies: - supports-color - typescript @@ -18153,7 +18899,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.1 + semver: 7.7.2 ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 transitivePeerDependencies: @@ -18167,7 +18913,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.1 + semver: 7.7.2 ts-api-utils: 2.0.1(typescript@5.8.2) typescript: 5.8.2 transitivePeerDependencies: @@ -18205,10 +18951,10 @@ snapshots: '@typescript-eslint/types': 8.23.0 eslint-visitor-keys: 4.2.0 - '@vercel/nft@0.29.2(rollup@4.38.0)': + '@vercel/nft@0.29.3(rollup@4.41.1)': dependencies: '@mapbox/node-pre-gyp': 2.0.0 - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) acorn: 8.14.1 acorn-import-attributes: 1.9.5(acorn@8.14.1) async-sema: 3.1.1 @@ -18320,18 +19066,35 @@ snapshots: path-browserify: 1.0.1 vscode-uri: 3.0.8 - '@vue/compiler-core@3.5.13': + '@vue/compiler-core@3.5.14': dependencies: - '@babel/parser': 7.26.8 - '@vue/shared': 3.5.13 + '@babel/parser': 7.27.2 + '@vue/shared': 3.5.14 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.2.1 - '@vue/compiler-dom@3.5.13': + '@vue/compiler-dom@3.5.14': dependencies: - '@vue/compiler-core': 3.5.13 - '@vue/shared': 3.5.13 + '@vue/compiler-core': 3.5.14 + '@vue/shared': 3.5.14 + + '@vue/compiler-sfc@3.5.14': + dependencies: + '@babel/parser': 7.27.2 + '@vue/compiler-core': 3.5.14 + '@vue/compiler-dom': 3.5.14 + '@vue/compiler-ssr': 3.5.14 + '@vue/shared': 3.5.14 + estree-walker: 2.0.2 + magic-string: 0.30.17 + postcss: 8.5.3 + source-map-js: 1.2.1 + + '@vue/compiler-ssr@3.5.14': + dependencies: + '@vue/compiler-dom': 3.5.14 + '@vue/shared': 3.5.14 '@vue/compiler-vue2@2.7.16': dependencies: @@ -18341,9 +19104,9 @@ snapshots: '@vue/language-core@2.0.29(typescript@5.8.2)': dependencies: '@volar/language-core': 2.4.11 - '@vue/compiler-dom': 3.5.13 + '@vue/compiler-dom': 3.5.14 '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.13 + '@vue/shared': 3.5.14 computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -18354,9 +19117,9 @@ snapshots: '@vue/language-core@2.2.0(typescript@5.8.2)': dependencies: '@volar/language-core': 2.4.11 - '@vue/compiler-dom': 3.5.13 + '@vue/compiler-dom': 3.5.14 '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.13 + '@vue/shared': 3.5.14 alien-signals: 0.4.14 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -18364,7 +19127,7 @@ snapshots: optionalDependencies: typescript: 5.8.2 - '@vue/shared@3.5.13': {} + '@vue/shared@3.5.14': {} '@webassemblyjs/ast@1.14.1': dependencies: @@ -18444,21 +19207,49 @@ snapshots: '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.2.0)(webpack@5.97.1)': dependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) + '@whatwg-node/disposablestack@0.0.6': + dependencies: + '@whatwg-node/promise-helpers': 1.3.2 + tslib: 2.8.1 + + '@whatwg-node/fetch@0.10.8': + dependencies: + '@whatwg-node/node-fetch': 0.7.21 + urlpattern-polyfill: 10.1.0 + + '@whatwg-node/node-fetch@0.7.21': + dependencies: + '@fastify/busboy': 3.1.1 + '@whatwg-node/disposablestack': 0.0.6 + '@whatwg-node/promise-helpers': 1.3.2 + tslib: 2.8.1 + + '@whatwg-node/promise-helpers@1.3.2': + dependencies: + tslib: 2.8.1 + + '@whatwg-node/server@0.9.71': + dependencies: + '@whatwg-node/disposablestack': 0.0.6 + '@whatwg-node/fetch': 0.10.8 + '@whatwg-node/promise-helpers': 1.3.2 + tslib: 2.8.1 + '@workos-inc/node@7.46.0(express@4.21.2)': dependencies: iron-session: 6.3.1(express@4.21.2) @@ -18662,6 +19453,8 @@ snapshots: assertion-error@2.0.1: {} + ast-module-types@6.0.1: {} + async-sema@3.1.1: {} async@3.2.6: {} @@ -18691,9 +19484,9 @@ snapshots: babel-dead-code-elimination@1.0.10: dependencies: '@babel/core': 7.26.8 - '@babel/parser': 7.26.8 + '@babel/parser': 7.27.2 '@babel/traverse': 7.26.8 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 transitivePeerDependencies: - supports-color @@ -18702,7 +19495,7 @@ snapshots: '@babel/core': 7.26.8 '@babel/helper-module-imports': 7.18.6 '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.8) - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 html-entities: 2.3.3 parse5: 7.3.0 validate-html-nesting: 1.2.2 @@ -18785,6 +19578,8 @@ snapshots: node-releases: 2.0.19 update-browserslist-db: 1.1.2(browserslist@4.24.4) + buffer-crc32@0.2.13: {} + buffer-crc32@1.0.0: {} buffer-from@1.1.2: {} @@ -18799,19 +19594,21 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 + builtin-modules@3.3.0: {} + bundle-name@4.1.0: dependencies: run-applescript: 7.0.0 bytes@3.1.2: {} - c12@3.0.2(magicast@0.3.5): + c12@3.0.4(magicast@0.3.5): dependencies: chokidar: 4.0.3 - confbox: 0.1.8 + confbox: 0.2.2 defu: 6.1.4 - dotenv: 16.4.7 - exsolve: 1.0.4 + dotenv: 16.5.0 + exsolve: 1.0.5 giget: 2.0.0 jiti: 2.4.2 ohash: 2.0.11 @@ -18834,6 +19631,8 @@ snapshots: call-bind-apply-helpers: 1.0.1 get-intrinsic: 1.2.7 + callsite@1.0.0: {} + callsites@3.1.0: {} camel-case@4.1.2: @@ -18977,14 +19776,35 @@ snapshots: cluster-key-slot@1.1.2: {} + color-convert@1.9.3: + dependencies: + color-name: 1.1.3 + color-convert@2.0.1: dependencies: color-name: 1.1.4 + color-name@1.1.3: {} + color-name@1.1.4: {} + color-string@1.9.1: + dependencies: + color-name: 1.1.4 + simple-swizzle: 0.2.2 + + color@3.2.1: + dependencies: + color-convert: 1.9.3 + color-string: 1.9.1 + colorette@2.0.20: {} + colorspace@1.1.4: + dependencies: + color: 3.2.1 + text-hex: 1.0.0 + combinate@1.1.11: {} combined-stream@1.0.8: @@ -18993,6 +19813,8 @@ snapshots: commander@10.0.1: {} + commander@12.1.0: {} + commander@13.1.0: {} commander@2.20.3: {} @@ -19001,6 +19823,8 @@ snapshots: commander@8.3.0: {} + common-path-prefix@3.0.0: {} + commondir@1.0.1: {} compare-func@2.0.0: @@ -19010,7 +19834,7 @@ snapshots: compare-versions@6.1.1: {} - compatx@0.1.8: {} + compatx@0.2.0: {} compress-commons@6.0.2: dependencies: @@ -19022,7 +19846,7 @@ snapshots: compressible@2.0.18: dependencies: - mime-db: 1.53.0 + mime-db: 1.54.0 compression@1.7.5: dependencies: @@ -19054,7 +19878,7 @@ snapshots: confbox@0.1.8: {} - confbox@0.2.1: {} + confbox@0.2.2: {} connect-history-api-fallback@2.0.0: {} @@ -19105,6 +19929,11 @@ snapshots: cookie@1.0.2: {} + copy-file@11.0.0: + dependencies: + graceful-fs: 4.2.11 + p-event: 6.0.1 + core-js@3.40.0: {} core-util-is@1.0.3: {} @@ -19124,6 +19953,10 @@ snapshots: crc-32: 1.2.2 readable-stream: 4.7.0 + cron-parser@4.9.0: + dependencies: + luxon: 3.6.1 + croner@9.0.0: {} cross-spawn@7.0.6: @@ -19132,7 +19965,7 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - crossws@0.3.4: + crossws@0.3.5: dependencies: uncrypto: 0.1.3 @@ -19165,6 +19998,8 @@ snapshots: csstype@3.1.3: {} + data-uri-to-buffer@4.0.1: {} + data-urls@5.0.0: dependencies: whatwg-mimetype: 4.0.0 @@ -19174,7 +20009,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 - db0@0.3.1: {} + db0@0.3.2: {} de-indent@1.0.2: {} @@ -19190,6 +20025,10 @@ snapshots: dependencies: ms: 2.1.3 + decache@4.6.2: + dependencies: + callsite: 1.0.0 + decimal.js@10.5.0: {} deep-eql@5.0.2: {} @@ -19225,7 +20064,7 @@ snapshots: dequal@2.0.3: {} - destr@2.0.3: {} + destr@2.0.5: {} destroy@1.2.0: {} @@ -19239,6 +20078,62 @@ snapshots: detect-node@2.1.0: {} + detective-amd@6.0.1: + dependencies: + ast-module-types: 6.0.1 + escodegen: 2.1.0 + get-amd-module-type: 6.0.1 + node-source-walk: 7.0.1 + + detective-cjs@6.0.1: + dependencies: + ast-module-types: 6.0.1 + node-source-walk: 7.0.1 + + detective-es6@5.0.1: + dependencies: + node-source-walk: 7.0.1 + + detective-postcss@7.0.1(postcss@8.5.3): + dependencies: + is-url: 1.2.4 + postcss: 8.5.3 + postcss-values-parser: 6.0.2(postcss@8.5.3) + + detective-sass@6.0.1: + dependencies: + gonzales-pe: 4.3.0 + node-source-walk: 7.0.1 + + detective-scss@5.0.1: + dependencies: + gonzales-pe: 4.3.0 + node-source-walk: 7.0.1 + + detective-stylus@5.0.1: {} + + detective-typescript@14.0.0(typescript@5.8.2): + dependencies: + '@typescript-eslint/typescript-estree': 8.23.0(typescript@5.8.2) + ast-module-types: 6.0.1 + node-source-walk: 7.0.1 + typescript: 5.8.2 + transitivePeerDependencies: + - supports-color + + detective-vue2@2.2.0(typescript@5.8.2): + dependencies: + '@dependents/detective-less': 5.0.1 + '@vue/compiler-sfc': 3.5.14 + detective-es6: 5.0.1 + detective-sass: 6.0.1 + detective-scss: 5.0.1 + detective-stylus: 5.0.1 + detective-typescript: 14.0.0(typescript@5.8.2) + typescript: 5.8.2 + transitivePeerDependencies: + - supports-color + didyoumean@1.2.2: {} diff-sequences@29.6.3: {} @@ -19313,14 +20208,16 @@ snapshots: dot-prop@9.0.0: dependencies: - type-fest: 4.33.0 + type-fest: 4.41.0 dotenv-expand@11.0.7: dependencies: - dotenv: 16.4.7 + dotenv: 16.5.0 dotenv@16.4.7: {} + dotenv@16.5.0: {} + dunder-proto@1.0.1: dependencies: call-bind-apply-helpers: 1.0.1 @@ -19341,6 +20238,8 @@ snapshots: emojilib@2.4.0: {} + enabled@2.0.0: {} + encodeurl@1.0.2: {} encodeurl@2.0.0: {} @@ -19369,6 +20268,8 @@ snapshots: entities@6.0.0: {} + env-paths@3.0.0: {} + envinfo@7.14.0: {} environment@1.1.0: {} @@ -19393,20 +20294,20 @@ snapshots: dependencies: es-errors: 1.3.0 - esbuild-plugin-solid@0.6.0(esbuild@0.25.2)(solid-js@1.9.5): + esbuild-plugin-solid@0.6.0(esbuild@0.25.4)(solid-js@1.9.5): dependencies: '@babel/core': 7.26.8 '@babel/preset-typescript': 7.26.0(@babel/core@7.26.8) babel-preset-solid: 1.9.3(@babel/core@7.26.8) - esbuild: 0.25.2 + esbuild: 0.25.4 solid-js: 1.9.5 transitivePeerDependencies: - supports-color - esbuild-register@3.6.0(esbuild@0.25.2): + esbuild-register@3.6.0(esbuild@0.25.4): dependencies: debug: 4.4.0 - esbuild: 0.25.2 + esbuild: 0.25.4 transitivePeerDependencies: - supports-color @@ -19464,33 +20365,33 @@ snapshots: '@esbuild/win32-ia32': 0.23.1 '@esbuild/win32-x64': 0.23.1 - esbuild@0.25.2: + esbuild@0.25.4: optionalDependencies: - '@esbuild/aix-ppc64': 0.25.2 - '@esbuild/android-arm': 0.25.2 - '@esbuild/android-arm64': 0.25.2 - '@esbuild/android-x64': 0.25.2 - '@esbuild/darwin-arm64': 0.25.2 - '@esbuild/darwin-x64': 0.25.2 - '@esbuild/freebsd-arm64': 0.25.2 - '@esbuild/freebsd-x64': 0.25.2 - '@esbuild/linux-arm': 0.25.2 - '@esbuild/linux-arm64': 0.25.2 - '@esbuild/linux-ia32': 0.25.2 - '@esbuild/linux-loong64': 0.25.2 - '@esbuild/linux-mips64el': 0.25.2 - '@esbuild/linux-ppc64': 0.25.2 - '@esbuild/linux-riscv64': 0.25.2 - '@esbuild/linux-s390x': 0.25.2 - '@esbuild/linux-x64': 0.25.2 - '@esbuild/netbsd-arm64': 0.25.2 - '@esbuild/netbsd-x64': 0.25.2 - '@esbuild/openbsd-arm64': 0.25.2 - '@esbuild/openbsd-x64': 0.25.2 - '@esbuild/sunos-x64': 0.25.2 - '@esbuild/win32-arm64': 0.25.2 - '@esbuild/win32-ia32': 0.25.2 - '@esbuild/win32-x64': 0.25.2 + '@esbuild/aix-ppc64': 0.25.4 + '@esbuild/android-arm': 0.25.4 + '@esbuild/android-arm64': 0.25.4 + '@esbuild/android-x64': 0.25.4 + '@esbuild/darwin-arm64': 0.25.4 + '@esbuild/darwin-x64': 0.25.4 + '@esbuild/freebsd-arm64': 0.25.4 + '@esbuild/freebsd-x64': 0.25.4 + '@esbuild/linux-arm': 0.25.4 + '@esbuild/linux-arm64': 0.25.4 + '@esbuild/linux-ia32': 0.25.4 + '@esbuild/linux-loong64': 0.25.4 + '@esbuild/linux-mips64el': 0.25.4 + '@esbuild/linux-ppc64': 0.25.4 + '@esbuild/linux-riscv64': 0.25.4 + '@esbuild/linux-s390x': 0.25.4 + '@esbuild/linux-x64': 0.25.4 + '@esbuild/netbsd-arm64': 0.25.4 + '@esbuild/netbsd-x64': 0.25.4 + '@esbuild/openbsd-arm64': 0.25.4 + '@esbuild/openbsd-x64': 0.25.4 + '@esbuild/sunos-x64': 0.25.4 + '@esbuild/win32-arm64': 0.25.4 + '@esbuild/win32-ia32': 0.25.4 + '@esbuild/win32-x64': 0.25.4 escalade@3.2.0: {} @@ -19502,10 +20403,18 @@ snapshots: escape-string-regexp@5.0.0: {} + escodegen@2.1.0: + dependencies: + esprima: 4.0.1 + estraverse: 5.3.0 + esutils: 2.0.3 + optionalDependencies: + source-map: 0.6.1 + eslint-compat-utils@0.5.1(eslint@9.22.0(jiti@2.4.2)): dependencies: eslint: 9.22.0(jiti@2.4.2) - semver: 7.7.1 + semver: 7.7.2 eslint-import-resolver-node@0.3.9: dependencies: @@ -19535,7 +20444,7 @@ snapshots: get-tsconfig: 4.10.0 is-glob: 4.0.3 minimatch: 9.0.5 - semver: 7.7.1 + semver: 7.7.2 stable-hash: 0.0.4 tslib: 2.8.1 transitivePeerDependencies: @@ -19552,7 +20461,7 @@ snapshots: globals: 15.14.0 ignore: 5.3.2 minimatch: 9.0.5 - semver: 7.7.1 + semver: 7.7.2 eslint-plugin-react-debug@1.26.2(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): dependencies: @@ -19855,10 +20764,20 @@ snapshots: transitivePeerDependencies: - supports-color - exsolve@1.0.4: {} + exsolve@1.0.5: {} extend@3.0.2: {} + extract-zip@2.0.1: + dependencies: + debug: 4.4.0 + get-stream: 5.2.0 + yauzl: 2.10.0 + optionalDependencies: + '@types/yauzl': 2.10.3 + transitivePeerDependencies: + - supports-color + fast-deep-equal@3.1.3: {} fast-fifo@1.3.2: {} @@ -19887,10 +20806,21 @@ snapshots: dependencies: websocket-driver: 0.7.4 + fd-slicer@1.1.0: + dependencies: + pend: 1.2.0 + fdir@6.4.4(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 + fecha@4.2.3: {} + + fetch-blob@3.2.0: + dependencies: + node-domexception: 1.0.0 + web-streams-polyfill: 3.3.3 + fflate@0.8.2: {} figures@3.2.0: @@ -19907,6 +20837,8 @@ snapshots: dependencies: to-regex-range: 5.0.1 + filter-obj@6.1.0: {} + finalhandler@1.3.1: dependencies: debug: 2.6.9 @@ -19921,6 +20853,8 @@ snapshots: find-root@1.1.0: {} + find-up-simple@1.0.1: {} + find-up@4.1.0: dependencies: locate-path: 5.0.0 @@ -19931,6 +20865,12 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 + find-up@7.0.0: + dependencies: + locate-path: 7.2.0 + path-exists: 5.0.0 + unicorn-magic: 0.1.0 + findup-sync@5.0.0: dependencies: detect-file: 1.0.0 @@ -19990,6 +20930,8 @@ snapshots: flatted@3.3.2: {} + fn.name@1.1.0: {} + follow-redirects@1.15.9: {} for-in@1.0.2: {} @@ -20009,6 +20951,10 @@ snapshots: combined-stream: 1.0.8 mime-types: 2.1.35 + formdata-polyfill@4.0.10: + dependencies: + fetch-blob: 3.2.0 + forwarded@0.2.0: {} fraction.js@4.3.7: {} @@ -20025,6 +20971,8 @@ snapshots: fresh@0.5.2: {} + fresh@2.0.0: {} + front-matter@4.0.2: dependencies: js-yaml: 3.14.1 @@ -20055,6 +21003,11 @@ snapshots: gensync@1.0.0-beta.2: {} + get-amd-module-type@6.0.1: + dependencies: + ast-module-types: 6.0.1 + node-source-walk: 7.0.1 + get-caller-file@2.0.5: {} get-intrinsic@1.2.7: @@ -20079,6 +21032,10 @@ snapshots: dunder-proto: 1.0.1 es-object-atoms: 1.1.1 + get-stream@5.2.0: + dependencies: + pump: 3.0.2 + get-stream@8.0.1: {} get-tsconfig@4.10.0: @@ -20122,6 +21079,14 @@ snapshots: package-json-from-dist: 1.0.1 path-scurry: 2.0.0 + glob@8.1.0: + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.6 + once: 1.4.0 + glob@9.3.5: dependencies: fs.realpath: 1.0.0 @@ -20160,6 +21125,10 @@ snapshots: globrex@0.1.2: {} + gonzales-pe@4.3.0: + dependencies: + minimist: 1.2.8 + goober@2.1.16(csstype@3.1.3): dependencies: csstype: 3.1.3 @@ -20179,26 +21148,26 @@ snapshots: h3@1.13.0: dependencies: cookie-es: 1.2.2 - crossws: 0.3.4 + crossws: 0.3.5 defu: 6.1.4 - destr: 2.0.3 + destr: 2.0.5 iron-webcrypto: 1.2.1 ohash: 1.1.4 radix3: 1.1.2 - ufo: 1.5.4 + ufo: 1.6.1 uncrypto: 0.1.3 unenv: 1.10.0 - h3@1.15.1: + h3@1.15.3: dependencies: cookie-es: 1.2.2 - crossws: 0.3.4 + crossws: 0.3.5 defu: 6.1.4 - destr: 2.0.3 + destr: 2.0.5 iron-webcrypto: 1.2.1 node-mock-http: 1.0.0 radix3: 1.1.2 - ufo: 1.5.4 + ufo: 1.6.1 uncrypto: 0.1.3 handle-thing@2.0.1: {} @@ -20227,6 +21196,10 @@ snapshots: hookable@5.5.3: {} + hosted-git-info@7.0.2: + dependencies: + lru-cache: 10.4.3 + hpack.js@2.1.6: dependencies: inherits: 2.0.4 @@ -20267,7 +21240,7 @@ snapshots: tapable: 2.2.1 optionalDependencies: '@rspack/core': 1.2.2(@swc/helpers@0.5.15) - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) htmlparser2@6.1.0: dependencies: @@ -20385,6 +21358,13 @@ snapshots: indent-string@4.0.0: {} + index-to-position@1.1.0: {} + + inflight@1.0.6: + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + inherits@2.0.3: {} inherits@2.0.4: {} @@ -20395,7 +21375,7 @@ snapshots: interpret@3.1.1: {} - ioredis@5.6.0: + ioredis@5.6.1: dependencies: '@ioredis/commands': 1.2.0 cluster-key-slot: 1.1.2 @@ -20444,10 +21424,16 @@ snapshots: is-arrayish@0.2.1: {} + is-arrayish@0.3.2: {} + is-binary-path@2.1.0: dependencies: binary-extensions: 2.3.0 + is-builtin-module@3.2.1: + dependencies: + builtin-modules: 3.3.0 + is-core-module@2.16.1: dependencies: hasown: 2.0.2 @@ -20494,6 +21480,10 @@ snapshots: is-obj@2.0.0: {} + is-path-inside@4.0.0: {} + + is-plain-obj@2.1.0: {} + is-plain-obj@3.0.0: {} is-plain-object@2.0.4: @@ -20516,6 +21506,8 @@ snapshots: is-stream@3.0.0: {} + is-stream@4.0.1: {} + is-text-path@2.0.0: dependencies: text-extensions: 2.4.0 @@ -20526,6 +21518,10 @@ snapshots: is-unicode-supported@0.1.0: {} + is-url-superb@4.0.0: {} + + is-url@1.2.4: {} + is-what@4.1.16: {} is-windows@1.0.2: {} @@ -20658,8 +21654,12 @@ snapshots: jsonparse@1.3.1: {} + junk@4.0.1: {} + jwt-decode@3.1.2: {} + jwt-decode@4.0.0: {} + kebab-case@1.0.2: {} keyv@4.5.4: @@ -20678,8 +21678,16 @@ snapshots: kolorist@1.8.0: {} + kuler@2.0.0: {} + ky@1.7.4: {} + lambda-local@2.2.0: + dependencies: + commander: 10.0.1 + dotenv: 16.5.0 + winston: 3.17.0 + launch-editor@2.9.1: dependencies: picocolors: 1.1.1 @@ -20768,7 +21776,7 @@ snapshots: citty: 0.1.6 clipboardy: 4.0.0 consola: 3.4.2 - crossws: 0.3.4 + crossws: 0.3.5 defu: 6.1.4 get-port-please: 3.1.2 h3: 1.13.0 @@ -20777,8 +21785,8 @@ snapshots: mlly: 1.7.4 node-forge: 1.3.1 pathe: 1.1.2 - std-env: 3.8.1 - ufo: 1.5.4 + std-env: 3.9.0 + ufo: 1.6.1 untun: 0.1.3 uqr: 0.1.2 @@ -20803,8 +21811,16 @@ snapshots: dependencies: p-locate: 5.0.0 + locate-path@7.2.0: + dependencies: + p-locate: 6.0.0 + + lodash-es@4.17.21: {} + lodash.camelcase@4.3.0: {} + lodash.debounce@4.0.8: {} + lodash.defaults@4.2.0: {} lodash.isarguments@3.1.0: {} @@ -20818,6 +21834,15 @@ snapshots: chalk: 4.1.2 is-unicode-supported: 0.1.0 + logform@2.7.0: + dependencies: + '@colors/colors': 1.6.0 + '@types/triple-beam': 1.3.5 + fecha: 4.2.3 + ms: 2.1.3 + safe-stable-stringify: 2.5.0 + triple-beam: 1.4.1 + long@5.3.1: {} loose-envify@1.4.0: @@ -20844,6 +21869,8 @@ snapshots: lunr@2.3.9: {} + luxon@3.6.1: {} + lz-string@1.5.0: {} magic-string@0.30.17: @@ -20856,8 +21883,8 @@ snapshots: magicast@0.3.5: dependencies: - '@babel/parser': 7.26.8 - '@babel/types': 7.26.8 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 source-map-js: 1.2.1 map-cache@0.2.2: {} @@ -20914,12 +21941,18 @@ snapshots: merge-descriptors@1.0.3: {} + merge-options@3.0.4: + dependencies: + is-plain-obj: 2.1.0 + merge-stream@2.0.0: {} merge2@1.4.1: {} methods@1.1.2: {} + micro-api-client@3.3.0: {} + micromatch@4.0.8: dependencies: braces: 3.0.3 @@ -20927,17 +21960,21 @@ snapshots: mime-db@1.52.0: {} - mime-db@1.53.0: {} + mime-db@1.54.0: {} mime-types@2.1.35: dependencies: mime-db: 1.52.0 + mime-types@3.0.1: + dependencies: + mime-db: 1.54.0 + mime@1.6.0: {} mime@3.0.0: {} - mime@4.0.6: {} + mime@4.0.7: {} mimic-fn@2.1.0: {} @@ -20993,7 +22030,12 @@ snapshots: acorn: 8.14.1 pathe: 2.0.3 pkg-types: 1.3.1 - ufo: 1.5.4 + ufo: 1.6.1 + + module-definition@6.0.1: + dependencies: + ast-module-types: 6.0.1 + node-source-walk: 7.0.1 motion-dom@11.18.1: dependencies: @@ -21027,7 +22069,7 @@ snapshots: path-to-regexp: 6.3.0 picocolors: 1.1.1 strict-event-emitter: 0.5.1 - type-fest: 4.33.0 + type-fest: 4.41.0 yargs: 17.7.2 optionalDependencies: typescript: 5.8.2 @@ -21059,49 +22101,58 @@ snapshots: neo-async@2.6.2: {} - nitropack@2.11.8: + netlify@13.3.5: + dependencies: + '@netlify/open-api': 2.37.0 + lodash-es: 4.17.21 + micro-api-client: 3.3.0 + node-fetch: 3.3.2 + p-wait-for: 5.0.2 + qs: 6.13.0 + + nitropack@2.11.12: dependencies: '@cloudflare/kv-asset-handler': 0.4.0 - '@netlify/functions': 3.0.4 - '@rollup/plugin-alias': 5.1.1(rollup@4.38.0) - '@rollup/plugin-commonjs': 28.0.3(rollup@4.38.0) - '@rollup/plugin-inject': 5.0.5(rollup@4.38.0) - '@rollup/plugin-json': 6.1.0(rollup@4.38.0) - '@rollup/plugin-node-resolve': 16.0.1(rollup@4.38.0) - '@rollup/plugin-replace': 6.0.2(rollup@4.38.0) - '@rollup/plugin-terser': 0.4.4(rollup@4.38.0) - '@vercel/nft': 0.29.2(rollup@4.38.0) + '@netlify/functions': 3.1.9(rollup@4.41.1) + '@rollup/plugin-alias': 5.1.1(rollup@4.41.1) + '@rollup/plugin-commonjs': 28.0.3(rollup@4.41.1) + '@rollup/plugin-inject': 5.0.5(rollup@4.41.1) + '@rollup/plugin-json': 6.1.0(rollup@4.41.1) + '@rollup/plugin-node-resolve': 16.0.1(rollup@4.41.1) + '@rollup/plugin-replace': 6.0.2(rollup@4.41.1) + '@rollup/plugin-terser': 0.4.4(rollup@4.41.1) + '@vercel/nft': 0.29.3(rollup@4.41.1) archiver: 7.0.1 - c12: 3.0.2(magicast@0.3.5) + c12: 3.0.4(magicast@0.3.5) chokidar: 4.0.3 citty: 0.1.6 - compatx: 0.1.8 - confbox: 0.2.1 + compatx: 0.2.0 + confbox: 0.2.2 consola: 3.4.2 cookie-es: 2.0.0 croner: 9.0.0 - crossws: 0.3.4 - db0: 0.3.1 + crossws: 0.3.5 + db0: 0.3.2 defu: 6.1.4 - destr: 2.0.3 + destr: 2.0.5 dot-prop: 9.0.0 - esbuild: 0.25.2 + esbuild: 0.25.4 escape-string-regexp: 5.0.0 etag: 1.8.1 - exsolve: 1.0.4 + exsolve: 1.0.5 globby: 14.1.0 gzip-size: 7.0.0 - h3: 1.15.1 + h3: 1.15.3 hookable: 5.5.3 httpxy: 0.1.7 - ioredis: 5.6.0 + ioredis: 5.6.1 jiti: 2.4.2 klona: 2.0.6 knitwork: 1.2.0 listhen: 1.9.0 magic-string: 0.30.17 magicast: 0.3.5 - mime: 4.0.6 + mime: 4.0.7 mlly: 1.7.4 node-fetch-native: 1.6.6 node-mock-http: 1.0.0 @@ -21112,22 +22163,22 @@ snapshots: pkg-types: 2.1.0 pretty-bytes: 6.1.1 radix3: 1.1.2 - rollup: 4.38.0 - rollup-plugin-visualizer: 5.14.0(rollup@4.38.0) + rollup: 4.41.1 + rollup-plugin-visualizer: 5.14.0(rollup@4.41.1) scule: 1.3.0 - semver: 7.7.1 + semver: 7.7.2 serve-placeholder: 2.0.2 - serve-static: 1.16.2 + serve-static: 2.2.0 source-map: 0.7.4 - std-env: 3.8.1 - ufo: 1.5.4 - ultrahtml: 1.5.3 + std-env: 3.9.0 + ufo: 1.6.1 + ultrahtml: 1.6.0 uncrypto: 0.1.3 unctx: 2.4.1 - unenv: 2.0.0-rc.15 - unimport: 4.1.3 + unenv: 2.0.0-rc.17 + unimport: 5.0.1 unplugin-utils: 0.2.4 - unstorage: 1.15.0(db0@0.3.1)(ioredis@5.6.0) + unstorage: 1.16.0(db0@0.3.2)(ioredis@5.6.1) untyped: 2.0.0 unwasm: 0.3.9 youch: 4.1.0-beta.7 @@ -21166,6 +22217,8 @@ snapshots: node-addon-api@7.1.1: {} + node-domexception@1.0.0: {} + node-emoji@2.2.0: dependencies: '@sindresorhus/is': 4.6.0 @@ -21179,6 +22232,12 @@ snapshots: dependencies: whatwg-url: 5.0.0 + node-fetch@3.3.2: + dependencies: + data-uri-to-buffer: 4.0.1 + fetch-blob: 3.2.0 + formdata-polyfill: 4.0.10 + node-forge@1.3.1: {} node-gyp-build@4.8.4: {} @@ -21189,10 +22248,24 @@ snapshots: node-releases@2.0.19: {} + node-source-walk@7.0.1: + dependencies: + '@babel/parser': 7.27.2 + nopt@8.1.0: dependencies: abbrev: 3.0.0 + normalize-package-data@6.0.2: + dependencies: + hosted-git-info: 7.0.2 + semver: 7.7.2 + validate-npm-package-license: 3.0.4 + + normalize-path@2.1.1: + dependencies: + remove-trailing-separator: 1.1.0 + normalize-path@3.0.0: {} normalize-range@0.1.2: {} @@ -21238,7 +22311,7 @@ snapshots: open: 8.4.2 ora: 5.3.0 resolve.exports: 2.0.3 - semver: 7.7.1 + semver: 7.7.2 string-width: 4.2.3 tar-stream: 2.2.0 tmp: 0.2.3 @@ -21291,9 +22364,9 @@ snapshots: ofetch@1.4.1: dependencies: - destr: 2.0.3 + destr: 2.0.5 node-fetch-native: 1.6.6 - ufo: 1.5.4 + ufo: 1.6.1 ohash@1.1.4: {} @@ -21309,6 +22382,10 @@ snapshots: dependencies: wrappy: 1.0.2 + one-time@1.0.0: + dependencies: + fn.name: 1.1.0 + onetime@5.1.2: dependencies: mimic-fn: 2.1.0 @@ -21352,6 +22429,10 @@ snapshots: outvariant@1.4.3: {} + p-event@6.0.1: + dependencies: + p-timeout: 6.1.4 + p-limit@2.3.0: dependencies: p-try: 2.2.0 @@ -21360,6 +22441,10 @@ snapshots: dependencies: yocto-queue: 0.1.0 + p-limit@4.0.0: + dependencies: + yocto-queue: 1.2.1 + p-locate@4.1.0: dependencies: p-limit: 2.3.0 @@ -21368,14 +22453,26 @@ snapshots: dependencies: p-limit: 3.1.0 + p-locate@6.0.0: + dependencies: + p-limit: 4.0.0 + + p-map@7.0.3: {} + p-retry@6.2.1: dependencies: '@types/retry': 0.12.2 is-network-error: 1.1.0 retry: 0.13.1 + p-timeout@6.1.4: {} + p-try@2.2.0: {} + p-wait-for@5.0.2: + dependencies: + p-timeout: 6.1.4 + package-json-from-dist@1.0.1: {} package-manager-detector@0.2.9: {} @@ -21395,6 +22492,8 @@ snapshots: map-cache: 0.2.2 path-root: 0.1.1 + parse-gitignore@2.0.0: {} + parse-json@5.2.0: dependencies: '@babel/code-frame': 7.26.2 @@ -21402,6 +22501,12 @@ snapshots: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 + parse-json@8.3.0: + dependencies: + '@babel/code-frame': 7.26.2 + index-to-position: 1.1.0 + type-fest: 4.41.0 + parse-passwd@1.0.0: {} parse5-htmlparser2-tree-adapter@6.0.1: @@ -21436,6 +22541,8 @@ snapshots: path-exists@4.0.0: {} + path-exists@5.0.0: {} + path-key@3.1.1: {} path-key@4.0.0: {} @@ -21472,6 +22579,8 @@ snapshots: pathval@2.0.0: {} + pend@1.2.0: {} + perfect-debounce@1.0.0: {} picocolors@1.1.1: {} @@ -21496,8 +22605,8 @@ snapshots: pkg-types@2.1.0: dependencies: - confbox: 0.2.1 - exsolve: 1.0.4 + confbox: 0.2.2 + exsolve: 1.0.5 pathe: 2.0.3 playwright-core@1.52.0: {} @@ -21541,12 +22650,39 @@ snapshots: postcss-value-parser@4.2.0: {} + postcss-values-parser@6.0.2(postcss@8.5.3): + dependencies: + color-name: 1.1.4 + is-url-superb: 4.0.0 + postcss: 8.5.3 + quote-unquote: 1.0.0 + postcss@8.5.3: dependencies: nanoid: 3.3.11 picocolors: 1.1.1 source-map-js: 1.2.1 + precinct@12.2.0: + dependencies: + '@dependents/detective-less': 5.0.1 + commander: 12.1.0 + detective-amd: 6.0.1 + detective-cjs: 6.0.1 + detective-es6: 5.0.1 + detective-postcss: 7.0.1(postcss@8.5.3) + detective-sass: 6.0.1 + detective-scss: 5.0.1 + detective-stylus: 5.0.1 + detective-typescript: 14.0.0(typescript@5.8.2) + detective-vue2: 2.2.0(typescript@5.8.2) + module-definition: 6.0.1 + node-source-walk: 7.0.1 + postcss: 8.5.3 + typescript: 5.8.2 + transitivePeerDependencies: + - supports-color + prelude-ls@1.2.1: {} prettier@3.4.2: {} @@ -21623,6 +22759,11 @@ snapshots: picocolors: 1.1.1 sade: 1.8.1 + pump@3.0.2: + dependencies: + end-of-stream: 1.4.4 + once: 1.4.0 + punycode.js@2.3.1: {} punycode@2.3.1: {} @@ -21643,6 +22784,8 @@ snapshots: queue-microtask@1.2.3: {} + quote-unquote@1.0.0: {} + radix-ui@1.2.0(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@radix-ui/primitive': 1.1.2 @@ -21719,7 +22862,7 @@ snapshots: rc9@2.1.2: dependencies: defu: 6.1.4 - destr: 2.0.3 + destr: 2.0.5 react-dom@19.0.0(react@19.0.0): dependencies: @@ -21787,6 +22930,20 @@ snapshots: dependencies: pify: 2.3.0 + read-package-up@11.0.0: + dependencies: + find-up-simple: 1.0.1 + read-pkg: 9.0.1 + type-fest: 4.41.0 + + read-pkg@9.0.1: + dependencies: + '@types/normalize-package-data': 2.4.4 + normalize-package-data: 6.0.2 + parse-json: 8.3.0 + type-fest: 4.41.0 + unicorn-magic: 0.1.0 + readable-stream@2.3.8: dependencies: core-util-is: 1.0.3 @@ -21844,6 +23001,8 @@ snapshots: relateurl@0.2.7: {} + remove-trailing-separator@1.1.0: {} + renderkid@3.0.0: dependencies: css-select: 4.3.0 @@ -21856,6 +23015,8 @@ snapshots: require-from-string@2.0.2: {} + require-package-name@2.0.1: {} + requires-port@1.0.0: {} resolve-cwd@3.0.0: @@ -21881,6 +23042,12 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + resolve@2.0.0-next.5: + dependencies: + is-core-module: 2.16.1 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + restore-cursor@3.1.0: dependencies: onetime: 5.1.2 @@ -21899,45 +23066,45 @@ snapshots: glob: 11.0.1 package-json-from-dist: 1.0.1 - rollup-plugin-preserve-directives@0.4.0(rollup@4.38.0): + rollup-plugin-preserve-directives@0.4.0(rollup@4.41.1): dependencies: - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) magic-string: 0.30.17 - rollup: 4.38.0 + rollup: 4.41.1 - rollup-plugin-visualizer@5.14.0(rollup@4.38.0): + rollup-plugin-visualizer@5.14.0(rollup@4.41.1): dependencies: open: 8.4.2 picomatch: 4.0.2 source-map: 0.7.4 yargs: 17.7.2 optionalDependencies: - rollup: 4.38.0 + rollup: 4.41.1 - rollup@4.38.0: + rollup@4.41.1: dependencies: '@types/estree': 1.0.7 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.38.0 - '@rollup/rollup-android-arm64': 4.38.0 - '@rollup/rollup-darwin-arm64': 4.38.0 - '@rollup/rollup-darwin-x64': 4.38.0 - '@rollup/rollup-freebsd-arm64': 4.38.0 - '@rollup/rollup-freebsd-x64': 4.38.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.38.0 - '@rollup/rollup-linux-arm-musleabihf': 4.38.0 - '@rollup/rollup-linux-arm64-gnu': 4.38.0 - '@rollup/rollup-linux-arm64-musl': 4.38.0 - '@rollup/rollup-linux-loongarch64-gnu': 4.38.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.38.0 - '@rollup/rollup-linux-riscv64-gnu': 4.38.0 - '@rollup/rollup-linux-riscv64-musl': 4.38.0 - '@rollup/rollup-linux-s390x-gnu': 4.38.0 - '@rollup/rollup-linux-x64-gnu': 4.38.0 - '@rollup/rollup-linux-x64-musl': 4.38.0 - '@rollup/rollup-win32-arm64-msvc': 4.38.0 - '@rollup/rollup-win32-ia32-msvc': 4.38.0 - '@rollup/rollup-win32-x64-msvc': 4.38.0 + '@rollup/rollup-android-arm-eabi': 4.41.1 + '@rollup/rollup-android-arm64': 4.41.1 + '@rollup/rollup-darwin-arm64': 4.41.1 + '@rollup/rollup-darwin-x64': 4.41.1 + '@rollup/rollup-freebsd-arm64': 4.41.1 + '@rollup/rollup-freebsd-x64': 4.41.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.41.1 + '@rollup/rollup-linux-arm-musleabihf': 4.41.1 + '@rollup/rollup-linux-arm64-gnu': 4.41.1 + '@rollup/rollup-linux-arm64-musl': 4.41.1 + '@rollup/rollup-linux-loongarch64-gnu': 4.41.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.41.1 + '@rollup/rollup-linux-riscv64-gnu': 4.41.1 + '@rollup/rollup-linux-riscv64-musl': 4.41.1 + '@rollup/rollup-linux-s390x-gnu': 4.41.1 + '@rollup/rollup-linux-x64-gnu': 4.41.1 + '@rollup/rollup-linux-x64-musl': 4.41.1 + '@rollup/rollup-win32-arm64-msvc': 4.41.1 + '@rollup/rollup-win32-ia32-msvc': 4.41.1 + '@rollup/rollup-win32-x64-msvc': 4.41.1 fsevents: 2.3.3 rrweb-cssom@0.7.1: {} @@ -21962,6 +23129,8 @@ snapshots: safe-buffer@5.2.1: {} + safe-stable-stringify@2.5.0: {} + safer-buffer@2.1.2: {} saxes@6.0.0: @@ -21998,7 +23167,7 @@ snapshots: dependencies: lru-cache: 6.0.0 - semver@7.7.1: {} + semver@7.7.2: {} send@0.19.0: dependencies: @@ -22018,6 +23187,22 @@ snapshots: transitivePeerDependencies: - supports-color + send@1.2.0: + dependencies: + debug: 4.4.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 2.0.0 + http-errors: 2.0.0 + mime-types: 3.0.1 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 @@ -22053,6 +23238,15 @@ snapshots: transitivePeerDependencies: - supports-color + serve-static@2.2.0: + dependencies: + encodeurl: 2.0.0 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 1.2.0 + transitivePeerDependencies: + - supports-color + setprototypeof@1.1.0: {} setprototypeof@1.2.0: {} @@ -22113,6 +23307,10 @@ snapshots: simple-icons@14.9.0: {} + simple-swizzle@0.2.2: + dependencies: + is-arrayish: 0.3.2 + sirv@3.0.1: dependencies: '@polka/url': 1.0.0-next.28 @@ -22136,7 +23334,7 @@ snapshots: dependencies: map-obj: 4.3.0 snake-case: 3.0.4 - type-fest: 4.33.0 + type-fest: 4.41.0 sockjs@0.3.24: dependencies: @@ -22154,7 +23352,7 @@ snapshots: dependencies: '@babel/generator': 7.26.8 '@babel/helper-module-imports': 7.25.9 - '@babel/types': 7.26.8 + '@babel/types': 7.27.1 solid-js: 1.9.5 transitivePeerDependencies: - supports-color @@ -22174,6 +23372,20 @@ snapshots: spawn-command@0.0.2: {} + spdx-correct@3.2.0: + dependencies: + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.21 + + spdx-exceptions@2.5.0: {} + + spdx-expression-parse@3.0.1: + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.21 + + spdx-license-ids@3.0.21: {} + spdy-transport@3.0.0: dependencies: debug: 4.4.0 @@ -22201,6 +23413,8 @@ snapshots: stable-hash@0.0.4: {} + stack-trace@0.0.10: {} + stackback@0.0.2: {} stackframe@1.3.4: {} @@ -22211,7 +23425,7 @@ snapshots: statuses@2.0.1: {} - std-env@3.8.1: {} + std-env@3.9.0: {} streamx@2.22.0: dependencies: @@ -22305,7 +23519,7 @@ snapshots: dependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) '@swc/counter': 0.1.3 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) swr@2.3.0(react@19.0.0): dependencies: @@ -22373,29 +23587,29 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) - esbuild: 0.25.2 + esbuild: 0.25.4 - terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1): + terser-webpack-plugin@5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack@5.97.1): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.0 serialize-javascript: 6.0.2 terser: 5.37.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.10.15(@swc/helpers@0.5.15) - esbuild: 0.25.2 + esbuild: 0.25.4 terser@5.37.0: dependencies: @@ -22410,6 +23624,8 @@ snapshots: text-extensions@2.4.0: {} + text-hex@1.0.0: {} + thenify-all@1.6.0: dependencies: thenify: 3.3.1 @@ -22451,6 +23667,10 @@ snapshots: dependencies: tldts-core: 6.1.76 + tmp-promise@3.0.3: + dependencies: + tmp: 0.2.3 + tmp@0.2.3: {} to-regex-range@5.0.1: @@ -22459,6 +23679,8 @@ snapshots: toidentifier@1.0.1: {} + toml@3.0.0: {} + totalist@3.0.1: {} tough-cookie@4.1.4: @@ -22484,6 +23706,8 @@ snapshots: tree-kill@1.2.2: {} + triple-beam@1.4.1: {} + ts-api-utils@2.0.1(typescript@5.8.2): dependencies: typescript: 5.8.2 @@ -22522,7 +23746,7 @@ snapshots: type-fest@0.21.3: {} - type-fest@4.33.0: {} + type-fest@4.41.0: {} type-is@1.6.18: dependencies: @@ -22577,9 +23801,9 @@ snapshots: uc.micro@2.1.0: {} - ufo@1.5.4: {} + ufo@1.6.1: {} - ultrahtml@1.5.3: {} + ultrahtml@1.6.0: {} unc-path-regex@0.1.2: {} @@ -22590,7 +23814,7 @@ snapshots: acorn: 8.14.1 estree-walker: 3.0.3 magic-string: 0.30.17 - unplugin: 2.2.2 + unplugin: 2.3.4 undici-types@6.20.0: {} @@ -22604,19 +23828,21 @@ snapshots: node-fetch-native: 1.6.6 pathe: 1.1.2 - unenv@2.0.0-rc.15: + unenv@2.0.0-rc.17: dependencies: defu: 6.1.4 - exsolve: 1.0.4 + exsolve: 1.0.5 ohash: 2.0.11 pathe: 2.0.3 - ufo: 1.5.4 + ufo: 1.6.1 unicode-emoji-modifier-base@1.0.0: {} + unicorn-magic@0.1.0: {} + unicorn-magic@0.3.0: {} - unimport@4.1.3: + unimport@5.0.1: dependencies: acorn: 8.14.1 escape-string-regexp: 5.0.0 @@ -22630,7 +23856,7 @@ snapshots: scule: 1.3.0 strip-literal: 3.0.0 tinyglobby: 0.2.13 - unplugin: 2.2.2 + unplugin: 2.3.4 unplugin-utils: 0.2.4 universalify@0.1.2: {} @@ -22639,6 +23865,10 @@ snapshots: universalify@2.0.1: {} + unixify@1.0.0: + dependencies: + normalize-path: 2.1.1 + unpipe@1.0.0: {} unplugin-utils@0.2.4: @@ -22658,24 +23888,25 @@ snapshots: acorn: 8.14.1 webpack-virtual-modules: 0.6.2 - unplugin@2.2.2: + unplugin@2.3.4: dependencies: acorn: 8.14.1 + picomatch: 4.0.2 webpack-virtual-modules: 0.6.2 - unstorage@1.15.0(db0@0.3.1)(ioredis@5.6.0): + unstorage@1.16.0(db0@0.3.2)(ioredis@5.6.1): dependencies: anymatch: 3.1.3 chokidar: 4.0.3 - destr: 2.0.3 - h3: 1.15.1 + destr: 2.0.5 + h3: 1.15.3 lru-cache: 10.4.3 node-fetch-native: 1.6.6 ofetch: 1.4.1 - ufo: 1.5.4 + ufo: 1.6.1 optionalDependencies: - db0: 0.3.1 - ioredis: 5.6.0 + db0: 0.3.2 + ioredis: 5.6.1 untun@0.1.3: dependencies: @@ -22719,6 +23950,10 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 + urlpattern-polyfill@10.1.0: {} + + urlpattern-polyfill@8.0.2: {} + use-callback-ref@1.3.3(@types/react@19.0.8)(react@19.0.0): dependencies: react: 19.0.0 @@ -22744,6 +23979,8 @@ snapshots: utils-merge@1.0.1: {} + uuid@11.1.0: {} + uuid@8.3.2: {} v8flags@4.0.1: {} @@ -22754,6 +23991,11 @@ snapshots: validate-html-nesting@1.2.2: {} + validate-npm-package-license@3.0.4: + dependencies: + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 + validate-npm-package-name@5.0.1: {} vary@1.1.2: {} @@ -22779,10 +24021,10 @@ snapshots: - tsx - yaml - vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.0.3(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@22.13.4) - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) '@volar/typescript': 2.4.11 '@vue/language-core': 2.0.29(typescript@5.8.2) compare-versions: 6.1.1 @@ -22799,10 +24041,10 @@ snapshots: - rollup - supports-color - vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.38.0)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): + vite-plugin-dts@4.5.0(@types/node@22.13.4)(rollup@4.41.1)(typescript@5.8.2)(vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)): dependencies: '@microsoft/api-extractor': 7.49.2(@types/node@22.13.4) - '@rollup/pluginutils': 5.1.4(rollup@4.38.0) + '@rollup/pluginutils': 5.1.4(rollup@4.41.1) '@volar/typescript': 2.4.11 '@vue/language-core': 2.2.0(typescript@5.8.2) compare-versions: 6.1.1 @@ -22850,11 +24092,11 @@ snapshots: vite@6.3.5(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0): dependencies: - esbuild: 0.25.2 + esbuild: 0.25.4 fdir: 6.4.4(picomatch@4.0.2) picomatch: 4.0.2 postcss: 8.5.3 - rollup: 4.38.0 + rollup: 4.41.1 tinyglobby: 0.2.13 optionalDependencies: '@types/node': 22.13.4 @@ -22883,7 +24125,7 @@ snapshots: expect-type: 1.1.0 magic-string: 0.30.17 pathe: 2.0.3 - std-env: 3.8.1 + std-env: 3.9.0 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 @@ -22921,7 +24163,7 @@ snapshots: espree: 9.6.1 esquery: 1.6.0 lodash: 4.17.21 - semver: 7.7.1 + semver: 7.7.2 transitivePeerDependencies: - supports-color @@ -22929,7 +24171,7 @@ snapshots: dependencies: '@volar/typescript': 2.4.11 '@vue/language-core': 2.0.29(typescript@5.8.2) - semver: 7.7.1 + semver: 7.7.2 typescript: 5.8.2 w3c-xmlserializer@5.0.0: @@ -22949,6 +24191,8 @@ snapshots: dependencies: defaults: 1.0.4 + web-streams-polyfill@3.3.3: {} + web-vitals@4.2.4: {} webcrypto-core@1.8.1: @@ -22977,7 +24221,7 @@ snapshots: import-local: 3.2.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-merge: 5.10.0 optionalDependencies: webpack-dev-server: 5.2.0(webpack-cli@5.1.4)(webpack@5.97.1) @@ -22991,7 +24235,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.3.0 optionalDependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-dev-server@5.2.0(webpack-cli@5.1.4)(webpack@5.97.1): dependencies: @@ -23023,7 +24267,7 @@ snapshots: webpack-dev-middleware: 7.4.2(webpack@5.97.1) ws: 8.18.0 optionalDependencies: - webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@5.2.0)(webpack@5.97.1) transitivePeerDependencies: - bufferutil @@ -23043,7 +24287,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2): + webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -23065,7 +24309,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)) watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -23073,7 +24317,7 @@ snapshots: - esbuild - uglify-js - webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack-cli@5.1.4): + webpack@5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -23095,7 +24339,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.2)(webpack@5.97.1) + terser-webpack-plugin: 5.3.11(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.4)(webpack@5.97.1) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: @@ -23144,6 +24388,26 @@ snapshots: wildcard@2.0.1: {} + winston-transport@4.9.0: + dependencies: + logform: 2.7.0 + readable-stream: 3.6.2 + triple-beam: 1.4.1 + + winston@3.17.0: + dependencies: + '@colors/colors': 1.6.0 + '@dabh/diagnostics': 2.0.3 + async: 3.2.6 + is-stream: 2.0.1 + logform: 2.7.0 + one-time: 1.0.0 + readable-stream: 3.6.2 + safe-stable-stringify: 2.5.0 + stack-trace: 0.0.10 + triple-beam: 1.4.1 + winston-transport: 4.9.0 + word-wrap@1.2.5: {} wrap-ansi@6.2.0: @@ -23166,6 +24430,11 @@ snapshots: wrappy@1.0.2: {} + write-file-atomic@6.0.0: + dependencies: + imurmurhash: 0.1.4 + signal-exit: 4.1.0 + ws@8.18.0: {} xml-name-validator@5.0.0: {} @@ -23215,8 +24484,15 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 + yauzl@2.10.0: + dependencies: + buffer-crc32: 0.2.13 + fd-slicer: 1.1.0 + yocto-queue@0.1.0: {} + yocto-queue@1.2.1: {} + yoctocolors-cjs@2.1.2: {} youch-core@0.3.2: From b74d5f267de91622c660d90fc68f2898f1f0640a Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Tue, 27 May 2025 08:08:40 +0000 Subject: [PATCH 118/126] release: v1.121.0-alpha.17 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start-server/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start-server/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- packages/start-server-core/package.json | 2 +- packages/start-server-functions-client/package.json | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 386fdc77c4..71b32a339b 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 2eeecad873..50808bf486 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 68e4982f8b..a1c380b302 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index babf39ae6f..1a1d5c4c84 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 4cbdfda6a0..bbd89c8822 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index b5c2f595f5..74e8e71f1e 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index a668964a50..6cb4032e94 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 1e51dad3a6..e3a3d64958 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 7f0076eb05..d3aeddeac9 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index ea16be9208..53b722eccd 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 6d24f368f2..73894c7938 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 59396dcd2e..098f4045cc 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 95c1584b96..d58c463b7c 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 56ef209e7d..be68c08251 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 77446a9a1c..62fcc751d1 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index a05ddbb7f8..416833ef29 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 4bdd0065b7..f1ac2a42f5 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.16", + "@tanstack/react-start": "^1.121.0-alpha.17", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index a7e3ac8df3..d8553ca5b7 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.16", + "@tanstack/solid-start": "^1.121.0-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 1480f3ce83..093eb89c9f 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.16", + "@tanstack/solid-start": "^1.121.0-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 6a47e5b7b4..30ea0dd47a 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.16", + "@tanstack/solid-start": "^1.121.0-alpha.17", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 25a5203bd1..3c1507c488 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.16", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index 35fcd83154..1b01ee22e4 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 5de8d55bdd..81818f2c23 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.16", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index cff0de969c..fb0ef067d3 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.16", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index 497843dcb6..b14ce93bde 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index f1f6f68cd8..3fa6d0e31d 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.16", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 9e1d18cf3d..e682fb4a04 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.16", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-core/package.json b/packages/start-server-core/package.json index f4a7318785..b24d05d55e 100644 --- a/packages/start-server-core/package.json +++ b/packages/start-server-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-core", - "version": "1.121.0-alpha.15", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-server-functions-client/package.json b/packages/start-server-functions-client/package.json index 01580d8dae..82e5fadb23 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/start-server-functions-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-server-functions-client", - "version": "1.121.0-alpha.14", + "version": "1.121.0-alpha.17", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 6832dbbf86c3e275deb323d2a3c8bcb25f0a5f3f Mon Sep 17 00:00:00 2001 From: SeanCassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Wed, 28 May 2025 13:58:28 +1200 Subject: [PATCH 119/126] refactor(start-plugin-core): rename output to `route-assets-manifest` making this change so that in the future, we could move the routes manifest (currently, in the form of comments) in the generated route-tree, to live somewhere in here the `.tanstack-start` directory --- packages/start-plugin-core/src/routesManifestPlugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/routesManifestPlugin.ts index 189a74e438..e65bdf8ee0 100644 --- a/packages/start-plugin-core/src/routesManifestPlugin.ts +++ b/packages/start-plugin-core/src/routesManifestPlugin.ts @@ -247,7 +247,7 @@ export function startManifestPlugin( try { const routesManifestOutputDirPath = path.resolve( opts.root, - '.tanstack-start/build/routes-manifest', + '.tanstack-start/build/route-assets-manifest', ) rmSync(routesManifestOutputDirPath, { recursive: true, From e578e5f3417b7b07dc7b1fa2ff92df493500bd11 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 28 May 2025 02:07:35 +0000 Subject: [PATCH 120/126] release: v1.121.0-alpha.18 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 71b32a339b..291ba0e540 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 50808bf486..27b501ddac 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index a1c380b302..24e0f6c88c 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index 1a1d5c4c84..b1bbb2178b 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index bbd89c8822..5035998254 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 74e8e71f1e..8a9d1275b6 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 6cb4032e94..2b795a35f7 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index e3a3d64958..80dad05e05 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index d3aeddeac9..d961ab36c0 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 53b722eccd..6dbd68e73c 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 73894c7938..80e8535f96 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 098f4045cc..20299ef312 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index d58c463b7c..a55af148b8 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index be68c08251..2cd00029db 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 62fcc751d1..3e62bcd9eb 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 416833ef29..9c2471cdc4 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index f1ac2a42f5..20d59faf24 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.17", + "@tanstack/react-start": "^1.121.0-alpha.18", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index d8553ca5b7..8e8c09c207 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.17", + "@tanstack/solid-start": "^1.121.0-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 093eb89c9f..1ced8fb590 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.17", + "@tanstack/solid-start": "^1.121.0-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 30ea0dd47a..690ce0a9c3 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.17", + "@tanstack/solid-start": "^1.121.0-alpha.18", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 3c1507c488..067e8a763f 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.17", + "version": "1.121.0-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 81818f2c23..fafa9147d5 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.17", + "version": "1.121.0-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index fb0ef067d3..fd3b258821 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.17", + "version": "1.121.0-alpha.18", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 3fa6d0e31d..0b70073826 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.17", + "version": "1.121.0-alpha.18", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index e682fb4a04..f95f68c3bd 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.17", + "version": "1.121.0-alpha.18", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From f8ca2a6fd3a606669e9a340da38667401e449a0b Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Wed, 28 May 2025 19:43:31 +1200 Subject: [PATCH 121/126] chore(start-plugin-core): add comments for internal (#4261) --- .../src/nitro/dev-server-plugin.ts | 10 ++++++ .../src/nitro/nitro-plugin.ts | 31 +++++++++++++------ packages/start-plugin-core/src/plugin.ts | 25 +++++++-------- packages/start-plugin-core/src/prerender.ts | 2 +- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts index 3fc02ba95e..3293d9e0e5 100644 --- a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts +++ b/packages/start-plugin-core/src/nitro/dev-server-plugin.ts @@ -29,8 +29,12 @@ export function devServerPlugin(): Plugin { return () => { remove_html_middlewares(viteDevServer.middlewares) let cachedScripts: string | undefined + viteDevServer.middlewares.use(async (req, res) => { + // Create an H3Event to have it passed into the server entry + // i.e: event => defineEventHandler(event) const event = createEvent(req, res) + const serverEnv = viteDevServer.environments[ VITE_ENVIRONMENT_NAMES.server ] as DevEnvironment | undefined @@ -41,11 +45,14 @@ export function devServerPlugin(): Plugin { `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`, ) } + if (!isRunnableDevEnvironment(serverEnv)) { throw new Error( `Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`, ) } + + // Extract the scripts that Vite plugins would inject into the initial HTML if (cachedScripts === undefined) { const templateHtml = `` const transformedHtml = await viteDevServer.transformIndexHtml( @@ -57,6 +64,9 @@ export function devServerPlugin(): Plugin { .map((script) => script.content ?? '') .join(';') } + + // Import and resolve the request by running the server entry point + // i.e export default defineEventHandler((event) => { ... }) const serverEntry = await serverEnv.runner.import( '/~start/server-entry', ) diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index ae3b63e1a0..5e878bc082 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -49,24 +49,25 @@ export function nitroPlugin( builder: { sharedPlugins: true, async buildApp(builder) { - const clientEnv = - builder.environments[VITE_ENVIRONMENT_NAMES.client] - const serverEnv = - builder.environments[VITE_ENVIRONMENT_NAMES.server] + const client = builder.environments[VITE_ENVIRONMENT_NAMES.client] + const server = builder.environments[VITE_ENVIRONMENT_NAMES.server] - if (!clientEnv) { + if (!client) { throw new Error('Client environment not found') } - if (!serverEnv) { + if (!server) { throw new Error('SSR environment not found') } + // Build the client bundle + // i.e client entry file with `hydrateRoot(...)` const clientOutputDir = resolve(options.root, clientDistDir) rmSync(clientOutputDir, { recursive: true, force: true }) - await builder.build(clientEnv) + await builder.build(client) - await builder.build(serverEnv) + // Build the SSR bundle + await builder.build(server) const nitroConfig: NitroConfig = { dev: false, @@ -92,7 +93,7 @@ export function nitroPlugin( scanDirs: [], imports: false, // unjs/unimport for global/magic imports rollupConfig: { - plugins: [virtualBundlePlugin(getSsrBundle()) as any], + plugins: [virtualBundlePlugin(getSsrBundle())], }, virtual: { // This is Nitro's way of defining virtual modules @@ -177,6 +178,10 @@ async function buildNitroApp( } // Build the nitro app + // We only build the nitro app, once we've prepared the public assets, + // prerendered the pages and built the sitemap. + // If we try to do this earlier, then the public assets may not be available + // in the production build. await build(nitro) // Close the nitro instance @@ -186,7 +191,13 @@ async function buildNitroApp( ) } -function virtualBundlePlugin(ssrBundle: Rollup.OutputBundle): Rollup.Plugin { +type NitroRollupPluginOption = NonNullable< + NitroConfig['rollupConfig'] +>['plugins'] + +function virtualBundlePlugin( + ssrBundle: Rollup.OutputBundle, +): NitroRollupPluginOption { type VirtualModule = { code: string; map: string | null } const _modules = new Map() diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index cc893ceb11..1d801e4a19 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -4,22 +4,19 @@ import { trimPathRight } from '@tanstack/router-core' import { tanstackRouter } from '@tanstack/router-plugin/vite' import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import * as vite from 'vite' -import { - createTanStackConfig, - createTanStackStartOptionsSchema, -} from './schema' +import { createTanStackConfig } from './schema' import { nitroPlugin } from './nitro/nitro-plugin' import { startManifestPlugin } from './routesManifestPlugin' import { TanStackStartCompilerPlugin } from './start-compiler-plugin' import { VITE_ENVIRONMENT_NAMES } from './constants' import { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin' +import type { createTanStackStartOptionsSchema } from './schema' import type { PluginOption, Rollup } from 'vite' import type { z } from 'zod' import type { CompileStartFrameworkOptions } from './compilers' -const TanStackStartOptionsSchema = createTanStackStartOptionsSchema() export type TanStackStartInputConfig = z.input< - typeof TanStackStartOptionsSchema + ReturnType > const defaultConfig = createTanStackConfig() @@ -169,12 +166,14 @@ export function TanStackStartVitePluginCore( }, /* prettier-ignore */ define: { - ...injectDefineEnv('TSS_PUBLIC_BASE', startConfig.public.base), - ...injectDefineEnv('TSS_CLIENT_BASE', startConfig.client.base), - ...injectDefineEnv('TSS_CLIENT_ENTRY', getClientEntryPath(startConfig)), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved - ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), - ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), - ...injectDefineEnv('TSS_APP_BASE', viteAppBase) + // define is an esbuild function that replaces the any instances of given keys with the given values + // i.e: __FRAMEWORK_NAME__ can be replaced with JSON.stringify("TanStack Start") + // This is not the same as injecting environment variables. + + ...defineReplaceEnv('TSS_CLIENT_ENTRY', getClientEntryPath(startConfig)), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved + ...defineReplaceEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base), + ...defineReplaceEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), + ...defineReplaceEnv('TSS_APP_BASE', viteAppBase) }, } }, @@ -280,7 +279,7 @@ function resolveVirtualEntriesPlugin( } } -function injectDefineEnv( +function defineReplaceEnv( key: TKey, value: TValue, ): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/prerender.ts index a61671a67a..36606c0d90 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/prerender.ts @@ -71,7 +71,7 @@ export async function prerender({ ...nodeNitroRollupOptions.output, sourcemap: undefined, }, - } as any + } await buildNitro(nodeNitro) From a02afb6719f66b29306144eccc1e8cb8677a9be3 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Wed, 28 May 2025 20:20:45 +1200 Subject: [PATCH 122/126] feat(start-plugin-core): load all environment variables for dev (#4262) --- .../start-plugin-core/src/nitro/nitro-plugin.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro/nitro-plugin.ts index 5e878bc082..ef8c2aaa81 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro/nitro-plugin.ts @@ -2,6 +2,7 @@ import path from 'node:path' import { rmSync } from 'node:fs' import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' import { dirname, resolve } from 'pathe' +import { loadEnv } from 'vite' import { clientDistDir, ssrEntryFile } from '../plugin' import { prerender } from '../prerender' import { VITE_ENVIRONMENT_NAMES } from '../constants' @@ -16,6 +17,19 @@ import type { import type { Nitro, NitroConfig } from 'nitropack' import type { TanStackStartOutputConfig } from '../plugin' +function setupLoadEnv(startOpts: TanStackStartOutputConfig): PluginOption { + return { + name: 'tanstack-vite-plugin-nitro-load-env', + enforce: 'pre', + config(userConfig, envConfig) { + Object.assign( + process.env, + loadEnv(envConfig.mode, userConfig.root ?? startOpts.root, ''), + ) + }, + } +} + export function nitroPlugin( options: TanStackStartOutputConfig, getSsrBundle: () => Rollup.OutputBundle, @@ -23,6 +37,7 @@ export function nitroPlugin( const buildPreset = process.env['START_TARGET'] ?? (options.target as string | undefined) return [ + setupLoadEnv(options), devServerPlugin(), { name: 'tanstack-vite-plugin-nitro', From 6d500133d66e4c316368c047ef849b34ca8576e1 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 28 May 2025 08:21:54 +0000 Subject: [PATCH 123/126] release: v1.121.0-alpha.19 --- examples/react/start-bare/package.json | 2 +- examples/react/start-basic-auth/package.json | 2 +- examples/react/start-basic-react-query/package.json | 2 +- examples/react/start-basic-rsc/package.json | 2 +- examples/react/start-basic-static/package.json | 2 +- examples/react/start-basic/package.json | 2 +- examples/react/start-clerk-basic/package.json | 2 +- examples/react/start-convex-trellaux/package.json | 2 +- examples/react/start-counter/package.json | 2 +- examples/react/start-large/package.json | 2 +- examples/react/start-material-ui/package.json | 2 +- examples/react/start-supabase-basic/package.json | 2 +- examples/react/start-tailwind-v4/package.json | 2 +- examples/react/start-trellaux/package.json | 2 +- examples/react/start-workos/package.json | 2 +- examples/react/with-trpc-react-query/package.json | 2 +- examples/react/with-trpc/package.json | 2 +- examples/solid/start-bare/package.json | 2 +- examples/solid/start-basic-static/package.json | 2 +- examples/solid/start-basic/package.json | 2 +- packages/react-start-plugin/package.json | 2 +- packages/react-start/package.json | 2 +- packages/solid-start-plugin/package.json | 2 +- packages/solid-start/package.json | 2 +- packages/start-plugin-core/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 291ba0e540..520122da34 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^3.24.2" diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 27b501ddac..8805462ab4 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -13,7 +13,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 24e0f6c88c..e609542222 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsc/package.json b/examples/react/start-basic-rsc/package.json index b1bbb2178b..b8dbe0b470 100644 --- a/examples/react/start-basic-rsc/package.json +++ b/examples/react/start-basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index 5035998254..2f3830b80d 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 8a9d1275b6..2fafe201eb 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 2b795a35f7..759acc36f4 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -12,7 +12,7 @@ "@clerk/tanstack-react-start": "0.12.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 80dad05e05..541d9ecd4c 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -17,7 +17,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index d961ab36c0..7e480e9f8c 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 6dbd68e73c..c883552511 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -14,7 +14,7 @@ "@tanstack/react-query": "^5.66.0", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index 80e8535f96..e96ccc7d6a 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,7 +15,7 @@ "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", "@tanstack/react-router": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 20299ef312..61a21a0085 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -17,7 +17,7 @@ "@supabase/supabase-js": "^2.48.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index a55af148b8..d28ba171ca 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^2.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 2cd00029db..2a20484472 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -14,7 +14,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-with-query": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 3e62bcd9eb..3de3a51579 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -16,7 +16,7 @@ "@radix-ui/themes": "^3.2.1", "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "@workos-inc/node": "^7.45.0", "iron-session": "^8.0.4", "jose": "^6.0.10", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 9c2471cdc4..17c33f3c86 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,7 +13,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "@trpc/tanstack-react-query": "11.0.0-rc.772", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 20d59faf24..7f30ddcca6 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,7 +11,7 @@ "@tanstack/react-router": "^1.121.0-alpha.14", "@tanstack/react-router-devtools": "^1.121.0-alpha.14", "@tanstack/router-plugin": "^1.121.0-alpha.14", - "@tanstack/react-start": "^1.121.0-alpha.18", + "@tanstack/react-start": "^1.121.0-alpha.19", "@trpc/client": "11.0.0-rc.772", "@trpc/server": "11.0.0-rc.772", "react": "^19.0.0", diff --git a/examples/solid/start-bare/package.json b/examples/solid/start-bare/package.json index 8e8c09c207..56123e5cad 100644 --- a/examples/solid/start-bare/package.json +++ b/examples/solid/start-bare/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.18", + "@tanstack/solid-start": "^1.121.0-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index 1ced8fb590..b11d394ff7 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.18", + "@tanstack/solid-start": "^1.121.0-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.5.5" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 690ce0a9c3..42eeec13ef 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -11,7 +11,7 @@ "dependencies": { "@tanstack/solid-router": "^1.121.0-alpha.14", "@tanstack/solid-router-devtools": "^1.121.0-alpha.14", - "@tanstack/solid-start": "^1.121.0-alpha.18", + "@tanstack/solid-start": "^1.121.0-alpha.19", "solid-js": "^1.9.5", "redaxios": "^0.5.1", "tailwind-merge": "^2.6.0", diff --git a/packages/react-start-plugin/package.json b/packages/react-start-plugin/package.json index 067e8a763f..ef52174c9d 100644 --- a/packages/react-start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-plugin", - "version": "1.121.0-alpha.18", + "version": "1.121.0-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/package.json b/packages/react-start/package.json index fafa9147d5..ad528c388b 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.121.0-alpha.18", + "version": "1.121.0-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-plugin/package.json b/packages/solid-start-plugin/package.json index fd3b258821..72e8d77e10 100644 --- a/packages/solid-start-plugin/package.json +++ b/packages/solid-start-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-plugin", - "version": "1.121.0-alpha.18", + "version": "1.121.0-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 0b70073826..5d4be96c01 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.121.0-alpha.18", + "version": "1.121.0-alpha.19", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index f95f68c3bd..ca9a5c3e08 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.121.0-alpha.18", + "version": "1.121.0-alpha.19", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", From 423f6c0e9b29aa4a467e84a7f4fbcc96ab7fa9a8 Mon Sep 17 00:00:00 2001 From: Sean Cassiere <33615041+SeanCassiere@users.noreply.github.com> Date: Thu, 29 May 2025 11:08:59 +1200 Subject: [PATCH 124/126] chore(start-plugin-core): reorganize and centralize the plugin orchestration (#4266) --- packages/start-plugin-core/src/constants.ts | 3 + .../extract-html-scripts.ts} | 0 .../plugin.ts} | 2 +- .../src/load-env-plugin/plugin.ts | 17 ++++ .../src/{ => nitro-plugin}/build-sitemap.ts | 4 +- .../plugin.ts} | 34 +++----- .../src/{ => nitro-plugin}/prerender.ts | 8 +- .../src/{ => nitro-plugin}/queue.ts | 0 packages/start-plugin-core/src/plugin.ts | 85 ++++--------------- .../resolve-virtual-entries-plugin/plugin.ts | 63 ++++++++++++++ .../src/start-compiler-plugin.ts | 2 +- .../plugin.ts} | 6 +- 12 files changed, 121 insertions(+), 103 deletions(-) rename packages/start-plugin-core/src/{extractHtmlScripts.ts => dev-server-plugin/extract-html-scripts.ts} (100%) rename packages/start-plugin-core/src/{nitro/dev-server-plugin.ts => dev-server-plugin/plugin.ts} (98%) create mode 100644 packages/start-plugin-core/src/load-env-plugin/plugin.ts rename packages/start-plugin-core/src/{ => nitro-plugin}/build-sitemap.ts (98%) rename packages/start-plugin-core/src/{nitro/nitro-plugin.ts => nitro-plugin/plugin.ts} (88%) rename packages/start-plugin-core/src/{ => nitro-plugin}/prerender.ts (97%) rename packages/start-plugin-core/src/{ => nitro-plugin}/queue.ts (100%) create mode 100644 packages/start-plugin-core/src/resolve-virtual-entries-plugin/plugin.ts rename packages/start-plugin-core/src/{routesManifestPlugin.ts => start-routes-manifest-plugin/plugin.ts} (98%) diff --git a/packages/start-plugin-core/src/constants.ts b/packages/start-plugin-core/src/constants.ts index 5ae26d8748..c27fc47c91 100644 --- a/packages/start-plugin-core/src/constants.ts +++ b/packages/start-plugin-core/src/constants.ts @@ -4,3 +4,6 @@ export const VITE_ENVIRONMENT_NAMES = { server: 'ssr', client: 'client', } as const + +export const CLIENT_DIST_DIR = '.tanstack-start/build/client-dist' +export const SSR_ENTRY_FILE = 'ssr.mjs' diff --git a/packages/start-plugin-core/src/extractHtmlScripts.ts b/packages/start-plugin-core/src/dev-server-plugin/extract-html-scripts.ts similarity index 100% rename from packages/start-plugin-core/src/extractHtmlScripts.ts rename to packages/start-plugin-core/src/dev-server-plugin/extract-html-scripts.ts diff --git a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts b/packages/start-plugin-core/src/dev-server-plugin/plugin.ts similarity index 98% rename from packages/start-plugin-core/src/nitro/dev-server-plugin.ts rename to packages/start-plugin-core/src/dev-server-plugin/plugin.ts index 3293d9e0e5..426f8e9018 100644 --- a/packages/start-plugin-core/src/nitro/dev-server-plugin.ts +++ b/packages/start-plugin-core/src/dev-server-plugin/plugin.ts @@ -1,7 +1,7 @@ import { createEvent, getHeader, sendWebResponse } from 'h3' import { isRunnableDevEnvironment } from 'vite' -import { extractHtmlScripts } from '../extractHtmlScripts' import { VITE_ENVIRONMENT_NAMES } from '../constants' +import { extractHtmlScripts } from './extract-html-scripts' import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite' declare global { diff --git a/packages/start-plugin-core/src/load-env-plugin/plugin.ts b/packages/start-plugin-core/src/load-env-plugin/plugin.ts new file mode 100644 index 0000000000..a17e1abde0 --- /dev/null +++ b/packages/start-plugin-core/src/load-env-plugin/plugin.ts @@ -0,0 +1,17 @@ +import * as vite from 'vite' +import type { TanStackStartOutputConfig } from '../plugin' + +export function loadEnvPlugin( + startOpts: TanStackStartOutputConfig, +): vite.Plugin { + return { + name: 'tanstack-vite-plugin-nitro-load-env', + enforce: 'pre', + config(userConfig, envConfig) { + Object.assign( + process.env, + vite.loadEnv(envConfig.mode, userConfig.root ?? startOpts.root, ''), + ) + }, + } +} diff --git a/packages/start-plugin-core/src/build-sitemap.ts b/packages/start-plugin-core/src/nitro-plugin/build-sitemap.ts similarity index 98% rename from packages/start-plugin-core/src/build-sitemap.ts rename to packages/start-plugin-core/src/nitro-plugin/build-sitemap.ts index 180ac876b2..723a128480 100644 --- a/packages/start-plugin-core/src/build-sitemap.ts +++ b/packages/start-plugin-core/src/nitro-plugin/build-sitemap.ts @@ -1,8 +1,8 @@ import { writeFileSync } from 'node:fs' import path from 'node:path' import { create } from 'xmlbuilder2' -import { createLogger } from './utils' -import type { TanStackStartOutputConfig } from './plugin' +import { createLogger } from '../utils' +import type { TanStackStartOutputConfig } from '../plugin' import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' export type SitemapUrl = { diff --git a/packages/start-plugin-core/src/nitro/nitro-plugin.ts b/packages/start-plugin-core/src/nitro-plugin/plugin.ts similarity index 88% rename from packages/start-plugin-core/src/nitro/nitro-plugin.ts rename to packages/start-plugin-core/src/nitro-plugin/plugin.ts index ef8c2aaa81..aa0574744a 100644 --- a/packages/start-plugin-core/src/nitro/nitro-plugin.ts +++ b/packages/start-plugin-core/src/nitro-plugin/plugin.ts @@ -2,12 +2,13 @@ import path from 'node:path' import { rmSync } from 'node:fs' import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' import { dirname, resolve } from 'pathe' -import { loadEnv } from 'vite' -import { clientDistDir, ssrEntryFile } from '../plugin' -import { prerender } from '../prerender' -import { VITE_ENVIRONMENT_NAMES } from '../constants' -import { buildSitemap } from '../build-sitemap' -import { devServerPlugin } from './dev-server-plugin' +import { + CLIENT_DIST_DIR, + SSR_ENTRY_FILE, + VITE_ENVIRONMENT_NAMES, +} from '../constants' +import { buildSitemap } from './build-sitemap' +import { prerender } from './prerender' import type { EnvironmentOptions, PluginOption, @@ -17,19 +18,6 @@ import type { import type { Nitro, NitroConfig } from 'nitropack' import type { TanStackStartOutputConfig } from '../plugin' -function setupLoadEnv(startOpts: TanStackStartOutputConfig): PluginOption { - return { - name: 'tanstack-vite-plugin-nitro-load-env', - enforce: 'pre', - config(userConfig, envConfig) { - Object.assign( - process.env, - loadEnv(envConfig.mode, userConfig.root ?? startOpts.root, ''), - ) - }, - } -} - export function nitroPlugin( options: TanStackStartOutputConfig, getSsrBundle: () => Rollup.OutputBundle, @@ -37,8 +25,6 @@ export function nitroPlugin( const buildPreset = process.env['START_TARGET'] ?? (options.target as string | undefined) return [ - setupLoadEnv(options), - devServerPlugin(), { name: 'tanstack-vite-plugin-nitro', configEnvironment(name) { @@ -77,7 +63,7 @@ export function nitroPlugin( // Build the client bundle // i.e client entry file with `hydrateRoot(...)` - const clientOutputDir = resolve(options.root, clientDistDir) + const clientOutputDir = resolve(options.root, CLIENT_DIST_DIR) rmSync(clientOutputDir, { recursive: true, force: true }) await builder.build(client) @@ -93,7 +79,7 @@ export function nitroPlugin( baseURL: globalThis.TSS_APP_BASE, publicAssets: [ { - dir: path.resolve(options.root, clientDistDir), + dir: path.resolve(options.root, CLIENT_DIST_DIR), baseURL: '/', maxAge: 31536000, // 1 year }, @@ -102,7 +88,7 @@ export function nitroPlugin( generateTsConfig: false, }, prerender: undefined, - renderer: ssrEntryFile, + renderer: SSR_ENTRY_FILE, plugins: [], // Nitro's plugins appConfigFiles: [], scanDirs: [], diff --git a/packages/start-plugin-core/src/prerender.ts b/packages/start-plugin-core/src/nitro-plugin/prerender.ts similarity index 97% rename from packages/start-plugin-core/src/prerender.ts rename to packages/start-plugin-core/src/nitro-plugin/prerender.ts index 36606c0d90..371ce438c3 100644 --- a/packages/start-plugin-core/src/prerender.ts +++ b/packages/start-plugin-core/src/nitro-plugin/prerender.ts @@ -4,13 +4,13 @@ import path from 'node:path' import { getRollupConfig } from 'nitropack/rollup' import { build as buildNitro, createNitro } from 'nitropack' import { joinURL, withBase, withoutBase } from 'ufo' +import { VITE_ENVIRONMENT_NAMES } from '../constants' +import { createLogger } from '../utils' import { Queue } from './queue' -import { VITE_ENVIRONMENT_NAMES } from './constants' -import { createLogger } from './utils' import type { ViteBuilder } from 'vite' import type { $Fetch, Nitro } from 'nitropack' -import type { TanStackStartOutputConfig } from './plugin' -import type { Page } from './schema' +import type { TanStackStartOutputConfig } from '../plugin' +import type { Page } from '../schema' export async function prerender({ options, diff --git a/packages/start-plugin-core/src/queue.ts b/packages/start-plugin-core/src/nitro-plugin/queue.ts similarity index 100% rename from packages/start-plugin-core/src/queue.ts rename to packages/start-plugin-core/src/nitro-plugin/queue.ts diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts index 1d801e4a19..442035a470 100644 --- a/packages/start-plugin-core/src/plugin.ts +++ b/packages/start-plugin-core/src/plugin.ts @@ -5,11 +5,18 @@ import { tanstackRouter } from '@tanstack/router-plugin/vite' import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin' import * as vite from 'vite' import { createTanStackConfig } from './schema' -import { nitroPlugin } from './nitro/nitro-plugin' -import { startManifestPlugin } from './routesManifestPlugin' -import { TanStackStartCompilerPlugin } from './start-compiler-plugin' -import { VITE_ENVIRONMENT_NAMES } from './constants' +import { nitroPlugin } from './nitro-plugin/plugin' +import { startRoutesManifestPlugin } from './start-routes-manifest-plugin/plugin' +import { startCompilerPlugin } from './start-compiler-plugin' +import { + CLIENT_DIST_DIR, + SSR_ENTRY_FILE, + VITE_ENVIRONMENT_NAMES, +} from './constants' import { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin' +import { loadEnvPlugin } from './load-env-plugin/plugin' +import { devServerPlugin } from './dev-server-plugin/plugin' +import { resolveVirtualEntriesPlugin } from './resolve-virtual-entries-plugin/plugin' import type { createTanStackStartOptionsSchema } from './schema' import type { PluginOption, Rollup } from 'vite' import type { z } from 'zod' @@ -33,9 +40,6 @@ declare global { var TSS_APP_BASE: string } -export const clientDistDir = '.tanstack-start/build/client-dist' -export const ssrEntryFile = 'ssr.mjs' - export interface TanStackStartVitePluginCoreOptions { framework: CompileStartFrameworkOptions getVirtualServerRootHandler: (ctx: { @@ -111,7 +115,7 @@ export function TanStackStartVitePluginCore( main: getClientEntryPath(startConfig), }, output: { - dir: path.resolve(startConfig.root, clientDistDir), + dir: path.resolve(startConfig.root, CLIENT_DIST_DIR), }, // TODO: this should be removed external: ['node:fs', 'node:path', 'node:os', 'node:crypto'], @@ -128,7 +132,7 @@ export function TanStackStartVitePluginCore( copyPublicDir: false, rollupOptions: { output: { - entryFileNames: ssrEntryFile, + entryFileNames: SSR_ENTRY_FILE, }, plugins: [ { @@ -179,7 +183,7 @@ export function TanStackStartVitePluginCore( }, }, // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPluginEnv - TanStackStartCompilerPlugin(opts.framework, { + startCompilerPlugin(opts.framework, { client: { envName: VITE_ENVIRONMENT_NAMES.client }, server: { envName: VITE_ENVIRONMENT_NAMES.server }, }), @@ -213,7 +217,9 @@ export function TanStackStartVitePluginCore( return serverEnv.runner.import(fn.extractedFilename) }, }), - startManifestPlugin(startConfig), + loadEnvPlugin(startConfig), + startRoutesManifestPlugin(startConfig), + devServerPlugin(), nitroPlugin(startConfig, () => ssrBundle), TanStackStartServerRoutesVite({ ...startConfig.tsr, @@ -222,63 +228,6 @@ export function TanStackStartVitePluginCore( ] } -function resolveVirtualEntriesPlugin( - opts: TanStackStartVitePluginCoreOptions, - startConfig: TanStackStartOutputConfig, -): PluginOption { - let resolvedConfig: vite.ResolvedConfig - - const modules = new Set([ - '/~start/server-entry', - '/~start/default-server-entry', - '/~start/default-client-entry', - ]) - - return { - name: 'tanstack-start-core:resolve-virtual-entries', - configResolved(config) { - resolvedConfig = config - }, - resolveId(id) { - if (modules.has(id)) { - return `${id}.tsx` - } - - return undefined - }, - load(id) { - const routerFilepath = vite.normalizePath( - path.resolve(startConfig.root, startConfig.tsr.srcDirectory, 'router'), - ) - - if (id === '/~start/server-entry.tsx') { - const ssrEntryFilepath = startConfig.serverEntryPath.startsWith( - '/~start/default-server-entry', - ) - ? startConfig.serverEntryPath - : vite.normalizePath( - path.resolve(resolvedConfig.root, startConfig.serverEntryPath), - ) - - return opts.getVirtualServerRootHandler({ - routerFilepath, - serverEntryFilepath: ssrEntryFilepath, - }) - } - - if (id === '/~start/default-client-entry.tsx') { - return opts.getVirtualClientEntry({ routerFilepath }) - } - - if (id === '/~start/default-server-entry.tsx') { - return opts.getVirtualServerEntry({ routerFilepath }) - } - - return undefined - }, - } -} - function defineReplaceEnv( key: TKey, value: TValue, diff --git a/packages/start-plugin-core/src/resolve-virtual-entries-plugin/plugin.ts b/packages/start-plugin-core/src/resolve-virtual-entries-plugin/plugin.ts new file mode 100644 index 0000000000..11170befb8 --- /dev/null +++ b/packages/start-plugin-core/src/resolve-virtual-entries-plugin/plugin.ts @@ -0,0 +1,63 @@ +import path from 'node:path' +import * as vite from 'vite' +import type { + TanStackStartOutputConfig, + TanStackStartVitePluginCoreOptions, +} from '../plugin' + +export function resolveVirtualEntriesPlugin( + opts: TanStackStartVitePluginCoreOptions, + startConfig: TanStackStartOutputConfig, +): vite.Plugin { + let resolvedConfig: vite.ResolvedConfig + + const modules = new Set([ + '/~start/server-entry', + '/~start/default-server-entry', + '/~start/default-client-entry', + ]) + + return { + name: 'tanstack-start-core:resolve-virtual-entries', + configResolved(config) { + resolvedConfig = config + }, + resolveId(id) { + if (modules.has(id)) { + return `${id}.tsx` + } + + return undefined + }, + load(id) { + const routerFilepath = vite.normalizePath( + path.resolve(startConfig.root, startConfig.tsr.srcDirectory, 'router'), + ) + + if (id === '/~start/server-entry.tsx') { + const ssrEntryFilepath = startConfig.serverEntryPath.startsWith( + '/~start/default-server-entry', + ) + ? startConfig.serverEntryPath + : vite.normalizePath( + path.resolve(resolvedConfig.root, startConfig.serverEntryPath), + ) + + return opts.getVirtualServerRootHandler({ + routerFilepath, + serverEntryFilepath: ssrEntryFilepath, + }) + } + + if (id === '/~start/default-client-entry.tsx') { + return opts.getVirtualClientEntry({ routerFilepath }) + } + + if (id === '/~start/default-server-entry.tsx') { + return opts.getVirtualServerEntry({ routerFilepath }) + } + + return undefined + }, + } +} diff --git a/packages/start-plugin-core/src/start-compiler-plugin.ts b/packages/start-plugin-core/src/start-compiler-plugin.ts index e381536c4b..a716c0f755 100644 --- a/packages/start-plugin-core/src/start-compiler-plugin.ts +++ b/packages/start-plugin-core/src/start-compiler-plugin.ts @@ -24,7 +24,7 @@ const transformFuncs = [ const tokenRegex = new RegExp(transformFuncs.join('|')) -export function TanStackStartCompilerPlugin( +export function startCompilerPlugin( framework: CompileStartFrameworkOptions, inputOpts?: { client?: { diff --git a/packages/start-plugin-core/src/routesManifestPlugin.ts b/packages/start-plugin-core/src/start-routes-manifest-plugin/plugin.ts similarity index 98% rename from packages/start-plugin-core/src/routesManifestPlugin.ts rename to packages/start-plugin-core/src/start-routes-manifest-plugin/plugin.ts index e65bdf8ee0..9e45202f55 100644 --- a/packages/start-plugin-core/src/routesManifestPlugin.ts +++ b/packages/start-plugin-core/src/start-routes-manifest-plugin/plugin.ts @@ -2,7 +2,7 @@ import { mkdirSync, readFileSync, rmSync, writeFile } from 'node:fs' import path from 'node:path' import { joinURL } from 'ufo' import { rootRouteId } from '@tanstack/router-core' -import { resolveViteId } from './utils' +import { resolveViteId } from '../utils' import type { PluginOption, ResolvedConfig, @@ -10,7 +10,7 @@ import type { ManifestChunk as ViteManifestChunk, } from 'vite' import type { Manifest, RouterManagedTag } from '@tanstack/router-core' -import type { TanStackStartOutputConfig } from './plugin' +import type { TanStackStartOutputConfig } from '../plugin' const getCSSRecursively = ( file: ViteManifestChunk, @@ -44,7 +44,7 @@ const getCSSRecursively = ( return result } -export function startManifestPlugin( +export function startRoutesManifestPlugin( opts: TanStackStartOutputConfig, ): PluginOption { let config: ResolvedConfig From 81e67873048df1537a668b9e2cdd8bd4f2c83c19 Mon Sep 17 00:00:00 2001 From: chorobin Date: Fri, 30 May 2025 01:25:06 +0200 Subject: [PATCH 125/126] feat: add serialisation of loaders, beforeLoad and context --- packages/react-router/src/fileRoute.ts | 9 +- packages/react-router/src/index.tsx | 4 +- packages/react-router/src/route.tsx | 24 ++++++ packages/router-core/src/fileRoute.ts | 10 ++- packages/router-core/src/index.ts | 4 +- packages/router-core/src/route.ts | 105 +++++++++++++---------- packages/router-core/src/serializer.ts | 4 + packages/router-core/src/start.ts | 17 +++- packages/start-server-core/src/index.tsx | 6 ++ 9 files changed, 125 insertions(+), 58 deletions(-) diff --git a/packages/react-router/src/fileRoute.ts b/packages/react-router/src/fileRoute.ts index 0b77e986e7..177c28cd30 100644 --- a/packages/react-router/src/fileRoute.ts +++ b/packages/react-router/src/fileRoute.ts @@ -17,7 +17,7 @@ import type { AnyRouter, Constrain, ConstrainLiteral, - FileBaseRouteOptions, + LifecycleRouteOptions, FileRoutesByPath, LazyRouteOptions, RegisteredRouter, @@ -29,6 +29,8 @@ import type { RouteLoaderFn, UpdatableRouteOptions, UseNavigateResult, + DefaultStartRegister, + StartRegister, } from '@tanstack/router-core' import type { UseLoaderDepsRoute } from './useLoaderDeps' import type { UseLoaderDataRoute } from './useLoaderData' @@ -76,6 +78,7 @@ export class FileRoute< } createRoute = < + TStart extends DefaultStartRegister = StartRegister, TSearchValidator = undefined, TParams = ResolveParams, TRouteContextFn = AnyContext, @@ -84,7 +87,8 @@ export class FileRoute< TLoaderFn = undefined, TChildren = unknown, >( - options?: FileBaseRouteOptions< + options?: LifecycleRouteOptions< + TStart, TParentRoute, TId, TPath, @@ -109,6 +113,7 @@ export class FileRoute< TBeforeLoadFn >, ): Route< + TStart, TParentRoute, TPath, TFullPath, diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 7099a02fa4..95ace662a2 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -209,13 +209,11 @@ export type { MakeRouteMatchUnion, RouteMatch, AnyRouteMatch, - RouteContextFn, RouteContextOptions, - BeforeLoadFn, BeforeLoadContextOptions, ContextOptions, RouteOptions, - FileBaseRouteOptions, + LifecycleRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, diff --git a/packages/react-router/src/route.tsx b/packages/react-router/src/route.tsx index d3730e819e..c238e2ac93 100644 --- a/packages/react-router/src/route.tsx +++ b/packages/react-router/src/route.tsx @@ -18,6 +18,7 @@ import type { AnyRoute, AnyRouter, ConstrainLiteral, + DefaultStartRegister, ErrorComponentProps, NotFoundError, NotFoundRouteProps, @@ -35,6 +36,7 @@ import type { RouteOptions, RouteTypesById, RouterCore, + StartRegister, ToMaskOptions, UseNavigateResult, } from '@tanstack/router-core' @@ -150,6 +152,7 @@ export class RouteApi< } export class Route< + in out TStart extends DefaultStartRegister = StartRegister, in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, in out TPath extends RouteConstraints['TPath'] = '/', in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< @@ -173,6 +176,7 @@ export class Route< in out TFileRouteTypes = unknown, > extends BaseRoute< + TStart, TParentRoute, TPath, TFullPath, @@ -190,6 +194,7 @@ export class Route< > implements RouteCore< + TStart, TParentRoute, TPath, TFullPath, @@ -211,6 +216,7 @@ export class Route< */ constructor( options?: RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -283,6 +289,7 @@ export class Route< } export function createRoute< + TStart extends DefaultStartRegister = StartRegister, TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, TPath extends RouteConstraints['TPath'] = '/', TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< @@ -304,6 +311,7 @@ export function createRoute< TChildren = unknown, >( options: RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -318,6 +326,7 @@ export function createRoute< TBeforeLoadFn >, ): Route< + TStart, TParentRoute, TPath, TFullPath, @@ -333,6 +342,7 @@ export function createRoute< TChildren > { return new Route< + TStart, TParentRoute, TPath, TFullPath, @@ -353,6 +363,7 @@ export type AnyRootRoute = RootRoute export function createRootRouteWithContext() { return < + TStart extends DefaultStartRegister = StartRegister, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TSearchValidator = undefined, @@ -360,6 +371,7 @@ export function createRootRouteWithContext() { TLoaderFn = undefined, >( options?: RootRouteOptions< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -369,6 +381,7 @@ export function createRootRouteWithContext() { >, ) => { return createRootRoute< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -385,6 +398,7 @@ export function createRootRouteWithContext() { export const rootRouteWithContext = createRootRouteWithContext export class RootRoute< + in out TStart extends DefaultStartRegister = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -395,6 +409,7 @@ export class RootRoute< in out TFileRouteTypes = unknown, > extends BaseRootRoute< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -406,6 +421,7 @@ export class RootRoute< > implements RootRouteCore< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -421,6 +437,7 @@ export class RootRoute< */ constructor( options?: RootRouteOptions< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -487,6 +504,7 @@ export class RootRoute< } export function createRootRoute< + TStart extends DefaultStartRegister = StartRegister, TSearchValidator = undefined, TRouterContext = {}, TRouteContextFn = AnyContext, @@ -495,6 +513,7 @@ export function createRootRoute< TLoaderFn = undefined, >( options?: RootRouteOptions< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -503,6 +522,7 @@ export function createRootRoute< TLoaderFn >, ): RootRoute< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -513,6 +533,7 @@ export function createRootRoute< unknown > { return new RootRoute< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, @@ -551,6 +572,7 @@ export type ErrorRouteComponent = RouteComponent export type NotFoundRouteComponent = SyncRouteComponent export class NotFoundRoute< + TStart extends DefaultStartRegister, TParentRoute extends AnyRootRoute, TRouterContext = AnyContext, TRouteContextFn = AnyContext, @@ -560,6 +582,7 @@ export class NotFoundRoute< TLoaderFn = undefined, TChildren = unknown, > extends Route< + TStart, TParentRoute, '/404', '/404', @@ -577,6 +600,7 @@ export class NotFoundRoute< constructor( options: Omit< RouteOptions< + TStart, TParentRoute, string, string, diff --git a/packages/router-core/src/fileRoute.ts b/packages/router-core/src/fileRoute.ts index 2c689c3929..309304ef9d 100644 --- a/packages/router-core/src/fileRoute.ts +++ b/packages/router-core/src/fileRoute.ts @@ -2,12 +2,13 @@ import type { AnyContext, AnyPathParams, AnyRoute, - FileBaseRouteOptions, + LifecycleRouteOptions, ResolveParams, Route, RouteConstraints, UpdatableRouteOptions, } from './route' +import type { DefaultStartRegister, StartRegister } from './start' import type { AnyValidator } from './validators' export interface FileRouteTypes { @@ -33,6 +34,7 @@ export interface FileRoutesByPath { } export interface FileRouteOptions< + TStart extends DefaultStartRegister, TFilePath extends string, TParentRoute extends AnyRoute, TId extends RouteConstraints['TId'], @@ -44,7 +46,8 @@ export interface FileRouteOptions< TBeforeLoadFn = AnyContext, TLoaderDeps extends Record = {}, TLoaderFn = undefined, -> extends FileBaseRouteOptions< +> extends LifecycleRouteOptions< + TStart, TParentRoute, TId, TPath, @@ -76,6 +79,7 @@ export type CreateFileRoute< TPath extends RouteConstraints['TPath'], TFullPath extends RouteConstraints['TFullPath'], > = < + TStart extends DefaultStartRegister = StartRegister, TSearchValidator = undefined, TParams = ResolveParams, TRouteContextFn = AnyContext, @@ -84,6 +88,7 @@ export type CreateFileRoute< TLoaderFn = undefined, >( options?: FileRouteOptions< + TStart, TFilePath, TParentRoute, TId, @@ -97,6 +102,7 @@ export type CreateFileRoute< TLoaderFn >, ) => Route< + TStart, TParentRoute, TPath, TFullPath, diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 4c6b71e965..dff77bdc29 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -180,13 +180,11 @@ export type { ResolveFullPath, AnyRouteWithContext, RouteOptions, - FileBaseRouteOptions, + LifecycleRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, LoaderFnContext, - RouteContextFn, - BeforeLoadFn, ContextOptions, RouteContextOptions, BeforeLoadContextOptions, diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 4d55371437..743fd191f4 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -40,6 +40,11 @@ import type { ValidatorFn, ValidatorObj, } from './validators' +import type { + DefaultStartRegister, + StartRegister, + TypeSerializerStringifyReturnType, +} from './start' export type AnyPathParams = {} @@ -439,6 +444,7 @@ export type RouteLazyFn = ( ) => TRoute export type RouteAddChildrenFn< + in out TStart extends DefaultStartRegister, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -458,6 +464,7 @@ export type RouteAddChildrenFn< ReadonlyArray | Record >, ) => Route< + TStart, TParentRoute, TPath, TFullPath, @@ -475,6 +482,7 @@ export type RouteAddChildrenFn< > export type RouteAddFileChildrenFn< + in out TStart extends DefaultStartRegister, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -491,6 +499,7 @@ export type RouteAddFileChildrenFn< > = ( children: TNewChildren, ) => Route< + TStart, TParentRoute, TPath, TFullPath, @@ -508,6 +517,7 @@ export type RouteAddFileChildrenFn< > export type RouteAddFileTypesFn< + TStart extends DefaultStartRegister, TParentRoute extends AnyRoute, TPath extends string, TFullPath extends string, @@ -522,6 +532,7 @@ export type RouteAddFileTypesFn< TLoaderFn, TChildren, > = () => Route< + TStart, TParentRoute, TPath, TFullPath, @@ -539,6 +550,7 @@ export type RouteAddFileTypesFn< > export interface Route< + in out TStart extends DefaultStartRegister, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -574,6 +586,7 @@ export interface Route< TFileRouteTypes > options: RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -592,6 +605,7 @@ export interface Route< lazyFn?: () => Promise< LazyRoute< Route< + TStart, TParentRoute, TPath, TFullPath, @@ -629,6 +643,7 @@ export interface Route< ) => this lazy: RouteLazyFn< Route< + TStart, TParentRoute, TPath, TFullPath, @@ -646,6 +661,7 @@ export interface Route< > > addChildren: RouteAddChildrenFn< + TStart, TParentRoute, TPath, TFullPath, @@ -661,6 +677,7 @@ export interface Route< TFileRouteTypes > _addFileChildren: RouteAddFileChildrenFn< + TStart, TParentRoute, TPath, TFullPath, @@ -676,6 +693,7 @@ export interface Route< TFileRouteTypes > _addFileTypes: RouteAddFileTypesFn< + TStart, TParentRoute, TPath, TFullPath, @@ -706,6 +724,7 @@ export type AnyRoute = Route< any, any, any, + any, any > @@ -714,6 +733,7 @@ export type AnyRouteWithContext = AnyRoute & { } export type RouteOptions< + TStart extends DefaultStartRegister = StartRegister, TParentRoute extends AnyRoute = AnyRoute, TId extends string = string, TCustomId extends string = string, @@ -727,6 +747,7 @@ export type RouteOptions< TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, > = BaseRouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -752,49 +773,20 @@ export type RouteOptions< NoInfer > -export type RouteContextFn< - in out TParentRoute extends AnyRoute, - in out TSearchValidator, - in out TParams, - in out TRouterContext, -> = ( - ctx: RouteContextOptions< - TParentRoute, - TSearchValidator, - TParams, - TRouterContext - >, -) => any - -export type BeforeLoadFn< - in out TParentRoute extends AnyRoute, - in out TSearchValidator, - in out TParams, - in out TRouterContext, - in out TRouteContextFn, -> = ( - ctx: BeforeLoadContextOptions< - TParentRoute, - TSearchValidator, - TParams, - TRouterContext, - TRouteContextFn - >, -) => any - -export type FileBaseRouteOptions< - TParentRoute extends AnyRoute = AnyRoute, - TId extends string = string, - TPath extends string = string, - TSearchValidator = undefined, - TParams = {}, - TLoaderDeps extends Record = {}, - TLoaderFn = undefined, - TRouterContext = {}, - TRouteContextFn = AnyContext, - TBeforeLoadFn = AnyContext, - TRemountDepsFn = AnyContext, -> = ParamsOptions & { +export interface LifecycleRouteOptions< + in out TStart extends DefaultStartRegister = StartRegister, + in out TParentRoute extends AnyRoute = AnyRoute, + in out TId extends string = string, + in out TPath extends string = string, + in out TSearchValidator = undefined, + in out TParams = {}, + in out TLoaderDeps extends Record = {}, + in out TLoaderFn = undefined, + in out TRouterContext = {}, + in out TRouteContextFn = AnyContext, + in out TBeforeLoadFn = AnyContext, + in out TRemountDepsFn = AnyContext, +> extends ParamsOptions { validateSearch?: Constrain shouldReload?: @@ -820,7 +812,7 @@ export type FileBaseRouteOptions< TRouterContext, TLoaderDeps >, - ) => any + ) => TypeSerializerStringifyReturnType > // This async function is called before a route is loaded. @@ -837,7 +829,7 @@ export type FileBaseRouteOptions< TRouterContext, TRouteContextFn >, - ) => any + ) => TypeSerializerStringifyReturnType > loaderDeps?: ( @@ -868,11 +860,12 @@ export type FileBaseRouteOptions< TRouteContextFn, TBeforeLoadFn >, - ) => any + ) => TypeSerializerStringifyReturnType > } export type BaseRouteOptions< + TStart extends DefaultStartRegister = StartRegister, TParentRoute extends AnyRoute = AnyRoute, TId extends string = string, TCustomId extends string = string, @@ -885,7 +878,8 @@ export type BaseRouteOptions< TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, > = RoutePathOptions & - FileBaseRouteOptions< + LifecycleRouteOptions< + TStart, TParentRoute, TId, TPath, @@ -1206,6 +1200,7 @@ export interface LoaderFnContext< } export type RootRouteOptions< + TStart extends DefaultStartRegister = StartRegister, TSearchValidator = undefined, TRouterContext = {}, TRouteContextFn = AnyContext, @@ -1214,6 +1209,7 @@ export type RootRouteOptions< TLoaderFn = undefined, > = Omit< RouteOptions< + TStart, any, // TParentRoute RootRouteId, // TId RootRouteId, // TCustomId @@ -1290,6 +1286,7 @@ export type NotFoundRouteProps = { } export class BaseRoute< + in out TStart extends DefaultStartRegister = StartRegister, in out TParentRoute extends AnyRoute = AnyRoute, in out TPath extends string = '/', in out TFullPath extends string = ResolveFullPath, @@ -1307,6 +1304,7 @@ export class BaseRoute< > { isRoot: TParentRoute extends AnyRoute ? true : false options: RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -1356,6 +1354,7 @@ export class BaseRoute< lazyFn?: () => Promise< LazyRoute< Route< + TStart, TParentRoute, TPath, TFullPath, @@ -1378,6 +1377,7 @@ export class BaseRoute< constructor( options?: RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -1422,6 +1422,7 @@ export class BaseRoute< const options = this.options as | (RouteOptions< + TStart, TParentRoute, TId, TCustomId, @@ -1497,6 +1498,7 @@ export class BaseRoute< } addChildren: RouteAddChildrenFn< + TStart, TParentRoute, TPath, TFullPath, @@ -1515,6 +1517,7 @@ export class BaseRoute< } _addFileChildren: RouteAddFileChildrenFn< + TStart, TParentRoute, TPath, TFullPath, @@ -1541,6 +1544,7 @@ export class BaseRoute< } _addFileTypes: RouteAddFileTypesFn< + TStart, TParentRoute, TPath, TFullPath, @@ -1574,6 +1578,7 @@ export class BaseRoute< }) => { Object.assign(this.options, options) return this as unknown as BaseRoute< + TStart, TParentRoute, TPath, TFullPath, @@ -1611,6 +1616,7 @@ export class BaseRoute< lazy: RouteLazyFn< Route< + TStart, TParentRoute, TPath, TFullPath, @@ -1645,6 +1651,7 @@ export class BaseRouteApi { } export interface RootRoute< + in out TStart extends DefaultStartRegister = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -1654,6 +1661,7 @@ export interface RootRoute< in out TChildren = unknown, in out TFileRouteTypes = unknown, > extends Route< + TStart, any, // TParentRoute '/', // TPath '/', // TFullPath @@ -1671,6 +1679,7 @@ export interface RootRoute< > {} export class BaseRootRoute< + in out TStart extends DefaultStartRegister = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -1680,6 +1689,7 @@ export class BaseRootRoute< in out TChildren = unknown, in out TFileRouteTypes = unknown, > extends BaseRoute< + TStart, any, // TParentRoute '/', // TPath '/', // TFullPath @@ -1697,6 +1707,7 @@ export class BaseRootRoute< > { constructor( options?: RootRouteOptions< + TStart, TSearchValidator, TRouterContext, TRouteContextFn, diff --git a/packages/router-core/src/serializer.ts b/packages/router-core/src/serializer.ts index 6aa9781436..c9844e6df0 100644 --- a/packages/router-core/src/serializer.ts +++ b/packages/router-core/src/serializer.ts @@ -123,7 +123,11 @@ export type SerovalTypeSerializable = | RegExp | Date | undefined + | string + | number + | bigint | Error + | null | SerovalPluginsTypeSerializable export type SerovalTypeSetStringify = diff --git a/packages/router-core/src/start.ts b/packages/router-core/src/start.ts index e024eb2756..0da18078e3 100644 --- a/packages/router-core/src/start.ts +++ b/packages/router-core/src/start.ts @@ -1,4 +1,9 @@ -import type { Serializer, SerovalTypeSerializer } from './serializer' +import type { + Serializer, + SerovalTypeSerializer, + TypeSerializerStringify, +} from './serializer' +import type { LooseAsyncReturnType } from './utils' export interface StartConfigTypes { serializer: TSerializer @@ -16,6 +21,7 @@ export interface CreateStartConfig { export interface DefaultStartRegister { start: AnyStartConfig + ssr: boolean } export interface StartRegister extends DefaultStartRegister {} @@ -24,3 +30,12 @@ export type InferSerializer = unknown extends TStart['start']['_types']['serializer'] ? SerovalTypeSerializer : TStart['start']['_types']['serializer']['~types']['serializer'] + +export type TypeSerializerStringifyReturnType< + TStart extends DefaultStartRegister, + TFn, + TStringify = TypeSerializerStringify< + InferSerializer, + LooseAsyncReturnType + >, +> = boolean extends TStart['ssr'] ? any : TStringify | Promise diff --git a/packages/start-server-core/src/index.tsx b/packages/start-server-core/src/index.tsx index 9337b7c4cd..6e8cc456ba 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -20,3 +20,9 @@ export * from './h3' export { createServerRoute, createServerFileRoute } from './serverRoute' export type { CreateServerFileRoute } from './serverRoute' + +declare module '@tanstack/router-core' { + export interface StartRegister { + ssr: true + } +} From ada0a09aea32f57d53c91d3a5e08923dd64fd880 Mon Sep 17 00:00:00 2001 From: chorobin Date: Sun, 1 Jun 2025 23:47:32 +0200 Subject: [PATCH 126/126] feat: add serialization settings --- packages/react-router/src/fileRoute.ts | 10 +- packages/react-router/src/route.tsx | 78 +++++++--- packages/router-core/src/fileRoute.ts | 18 ++- packages/router-core/src/route.ts | 142 +++++++++++++----- packages/router-core/src/start.ts | 54 +++++-- .../src/BaseTanStackRouterDevtoolsPanel.tsx | 4 +- 6 files changed, 222 insertions(+), 84 deletions(-) diff --git a/packages/react-router/src/fileRoute.ts b/packages/react-router/src/fileRoute.ts index 177c28cd30..9b45d06c6a 100644 --- a/packages/react-router/src/fileRoute.ts +++ b/packages/react-router/src/fileRoute.ts @@ -29,7 +29,6 @@ import type { RouteLoaderFn, UpdatableRouteOptions, UseNavigateResult, - DefaultStartRegister, StartRegister, } from '@tanstack/router-core' import type { UseLoaderDepsRoute } from './useLoaderDeps' @@ -78,7 +77,7 @@ export class FileRoute< } createRoute = < - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TSearchValidator = undefined, TParams = ResolveParams, TRouteContextFn = AnyContext, @@ -86,6 +85,7 @@ export class FileRoute< TLoaderDeps extends Record = {}, TLoaderFn = undefined, TChildren = unknown, + TLifecycleSerialization = unknown, >( options?: LifecycleRouteOptions< TStart, @@ -98,7 +98,8 @@ export class FileRoute< TLoaderFn, AnyContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > & UpdatableRouteOptions< TParentRoute, @@ -127,7 +128,8 @@ export class FileRoute< TLoaderDeps, TLoaderFn, TChildren, - unknown + unknown, + TLifecycleSerialization > => { warning( this.silent, diff --git a/packages/react-router/src/route.tsx b/packages/react-router/src/route.tsx index c238e2ac93..9ea4a7cf2a 100644 --- a/packages/react-router/src/route.tsx +++ b/packages/react-router/src/route.tsx @@ -18,7 +18,6 @@ import type { AnyRoute, AnyRouter, ConstrainLiteral, - DefaultStartRegister, ErrorComponentProps, NotFoundError, NotFoundRouteProps, @@ -152,7 +151,7 @@ export class RouteApi< } export class Route< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, in out TPath extends RouteConstraints['TPath'] = '/', in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< @@ -174,6 +173,7 @@ export class Route< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, + in out TLifecycleSerialization = unknown, > extends BaseRoute< TStart, @@ -190,7 +190,8 @@ export class Route< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > implements RouteCore< @@ -208,7 +209,8 @@ export class Route< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > { /** @@ -228,7 +230,8 @@ export class Route< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization >, ) { super(options) @@ -289,7 +292,7 @@ export class Route< } export function createRoute< - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, TPath extends RouteConstraints['TPath'] = '/', TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath< @@ -309,6 +312,7 @@ export function createRoute< TLoaderDeps extends Record = {}, TLoaderFn = undefined, TChildren = unknown, + TLifecycleSerialization = unknown, >( options: RouteOptions< TStart, @@ -323,7 +327,8 @@ export function createRoute< TLoaderFn, AnyContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization >, ): Route< TStart, @@ -339,7 +344,8 @@ export function createRoute< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TChildren + TChildren, + TLifecycleSerialization > { return new Route< TStart, @@ -355,20 +361,32 @@ export function createRoute< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TChildren + TChildren, + TLifecycleSerialization >(options) } -export type AnyRootRoute = RootRoute +export type AnyRootRoute = RootRoute< + any, + any, + any, + any, + any, + any, + any, + any, + any +> export function createRootRouteWithContext() { return < - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TSearchValidator = undefined, TLoaderDeps extends Record = {}, TLoaderFn = undefined, + TLifecycleSerialization = unknown, >( options?: RootRouteOptions< TStart, @@ -377,7 +395,8 @@ export function createRootRouteWithContext() { TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >, ) => { return createRootRoute< @@ -387,7 +406,8 @@ export function createRootRouteWithContext() { TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >(options as any) } } @@ -398,7 +418,7 @@ export function createRootRouteWithContext() { export const rootRouteWithContext = createRootRouteWithContext export class RootRoute< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -407,6 +427,7 @@ export class RootRoute< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, + in out TLifecycleSerialization = unknown, > extends BaseRootRoute< TStart, @@ -417,7 +438,8 @@ export class RootRoute< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > implements RootRouteCore< @@ -429,7 +451,8 @@ export class RootRoute< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > { /** @@ -443,7 +466,8 @@ export class RootRoute< TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >, ) { super(options) @@ -504,13 +528,14 @@ export class RootRoute< } export function createRootRoute< - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TSearchValidator = undefined, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TLoaderDeps extends Record = {}, TLoaderFn = undefined, + TLifecycleSerialization = unknown, >( options?: RootRouteOptions< TStart, @@ -519,7 +544,8 @@ export function createRootRoute< TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >, ): RootRoute< TStart, @@ -530,7 +556,8 @@ export function createRootRoute< TLoaderDeps, TLoaderFn, unknown, - unknown + unknown, + TLifecycleSerialization > { return new RootRoute< TStart, @@ -539,7 +566,10 @@ export function createRootRoute< TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + unknown, + unknown, + TLifecycleSerialization >(options) } @@ -572,7 +602,7 @@ export type ErrorRouteComponent = RouteComponent export type NotFoundRouteComponent = SyncRouteComponent export class NotFoundRoute< - TStart extends DefaultStartRegister, + TStart, TParentRoute extends AnyRootRoute, TRouterContext = AnyContext, TRouteContextFn = AnyContext, @@ -581,6 +611,7 @@ export class NotFoundRoute< TLoaderDeps extends Record = {}, TLoaderFn = undefined, TChildren = unknown, + TLifecycleSerialization = unknown, > extends Route< TStart, TParentRoute, @@ -612,7 +643,8 @@ export class NotFoundRoute< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization >, | 'caseSensitive' | 'parseParams' diff --git a/packages/router-core/src/fileRoute.ts b/packages/router-core/src/fileRoute.ts index 309304ef9d..f3e291a0f5 100644 --- a/packages/router-core/src/fileRoute.ts +++ b/packages/router-core/src/fileRoute.ts @@ -8,7 +8,7 @@ import type { RouteConstraints, UpdatableRouteOptions, } from './route' -import type { DefaultStartRegister, StartRegister } from './start' +import type { StartRegister } from './start' import type { AnyValidator } from './validators' export interface FileRouteTypes { @@ -34,7 +34,7 @@ export interface FileRoutesByPath { } export interface FileRouteOptions< - TStart extends DefaultStartRegister, + TStart, TFilePath extends string, TParentRoute extends AnyRoute, TId extends RouteConstraints['TId'], @@ -46,6 +46,7 @@ export interface FileRouteOptions< TBeforeLoadFn = AnyContext, TLoaderDeps extends Record = {}, TLoaderFn = undefined, + TLifecycleSerialization = unknown, > extends LifecycleRouteOptions< TStart, TParentRoute, @@ -57,7 +58,9 @@ export interface FileRouteOptions< TLoaderFn, AnyContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + AnyContext, + TLifecycleSerialization >, UpdatableRouteOptions< TParentRoute, @@ -79,7 +82,8 @@ export type CreateFileRoute< TPath extends RouteConstraints['TPath'], TFullPath extends RouteConstraints['TFullPath'], > = < - TStart extends DefaultStartRegister = StartRegister, + TLifecycleSerialization, + TStart = StartRegister, TSearchValidator = undefined, TParams = ResolveParams, TRouteContextFn = AnyContext, @@ -99,7 +103,8 @@ export type CreateFileRoute< TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >, ) => Route< TStart, @@ -116,7 +121,8 @@ export type CreateFileRoute< TLoaderDeps, TLoaderFn, unknown, - unknown + unknown, + TLifecycleSerialization > export type LazyRouteOptions = Pick< diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 743fd191f4..64960d60b7 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -41,7 +41,7 @@ import type { ValidatorObj, } from './validators' import type { - DefaultStartRegister, + LifecycleSerialization, StartRegister, TypeSerializerStringifyReturnType, } from './start' @@ -395,6 +395,7 @@ export interface RouteTypes< in out TLoaderFn, in out TChildren, in out TFileRouteTypes, + in out TLifecycleSerialization, > { parentRoute: TParentRoute path: TPath @@ -426,6 +427,7 @@ export interface RouteTypes< loaderData: ResolveLoaderData loaderDeps: TLoaderDeps fileRouteTypes: TFileRouteTypes + lifecycleSerialization: TLifecycleSerialization } export type ResolveFullPath< @@ -444,7 +446,7 @@ export type RouteLazyFn = ( ) => TRoute export type RouteAddChildrenFn< - in out TStart extends DefaultStartRegister, + in out TStart, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -458,6 +460,7 @@ export type RouteAddChildrenFn< in out TLoaderDeps extends Record, in out TLoaderFn, in out TFileRouteTypes, + in out TLifecycleSerialization, > = ( children: Constrain< TNewChildren, @@ -478,11 +481,12 @@ export type RouteAddChildrenFn< TLoaderDeps, TLoaderFn, TNewChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > export type RouteAddFileChildrenFn< - in out TStart extends DefaultStartRegister, + in out TStart, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -496,6 +500,7 @@ export type RouteAddFileChildrenFn< in out TLoaderDeps extends Record, in out TLoaderFn, in out TFileRouteTypes, + in out TLifecycleSerialization, > = ( children: TNewChildren, ) => Route< @@ -513,11 +518,12 @@ export type RouteAddFileChildrenFn< TLoaderDeps, TLoaderFn, TNewChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > export type RouteAddFileTypesFn< - TStart extends DefaultStartRegister, + TStart, TParentRoute extends AnyRoute, TPath extends string, TFullPath extends string, @@ -531,6 +537,7 @@ export type RouteAddFileTypesFn< TLoaderDeps extends Record, TLoaderFn, TChildren, + TLifecycleSerialization, > = () => Route< TStart, TParentRoute, @@ -546,11 +553,12 @@ export type RouteAddFileTypesFn< TLoaderDeps, TLoaderFn, TChildren, - TNewFileRouteTypes + TNewFileRouteTypes, + TLifecycleSerialization > export interface Route< - in out TStart extends DefaultStartRegister, + in out TStart, in out TParentRoute extends AnyRoute, in out TPath extends string, in out TFullPath extends string, @@ -565,6 +573,7 @@ export interface Route< in out TLoaderFn, in out TChildren, in out TFileRouteTypes, + in out TLifecycleSerialization, > extends RouteExtensions { path: TPath parentRoute: TParentRoute @@ -583,7 +592,8 @@ export interface Route< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > options: RouteOptions< TStart, @@ -598,7 +608,8 @@ export interface Route< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > isRoot: TParentRoute extends AnyRoute ? true : false _componentsPromise?: Promise> @@ -619,7 +630,8 @@ export interface Route< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > > > @@ -657,7 +669,8 @@ export interface Route< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > > addChildren: RouteAddChildrenFn< @@ -674,7 +687,8 @@ export interface Route< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > _addFileChildren: RouteAddFileChildrenFn< TStart, @@ -690,7 +704,8 @@ export interface Route< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > _addFileTypes: RouteAddFileTypesFn< TStart, @@ -706,7 +721,8 @@ export interface Route< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TChildren + TChildren, + TLifecycleSerialization > } @@ -725,6 +741,7 @@ export type AnyRoute = Route< any, any, any, + any, any > @@ -733,7 +750,7 @@ export type AnyRouteWithContext = AnyRoute & { } export type RouteOptions< - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TParentRoute extends AnyRoute = AnyRoute, TId extends string = string, TCustomId extends string = string, @@ -746,6 +763,7 @@ export type RouteOptions< TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, + TLifecycleSerialization = unknown, > = BaseRouteOptions< TStart, TParentRoute, @@ -758,7 +776,8 @@ export type RouteOptions< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > & UpdatableRouteOptions< NoInfer, @@ -774,7 +793,7 @@ export type RouteOptions< > export interface LifecycleRouteOptions< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TParentRoute extends AnyRoute = AnyRoute, in out TId extends string = string, in out TPath extends string = string, @@ -786,6 +805,7 @@ export interface LifecycleRouteOptions< in out TRouteContextFn = AnyContext, in out TBeforeLoadFn = AnyContext, in out TRemountDepsFn = AnyContext, + in out TLifecycleSerialization = unknown, > extends ParamsOptions { validateSearch?: Constrain @@ -812,7 +832,12 @@ export interface LifecycleRouteOptions< TRouterContext, TLoaderDeps >, - ) => TypeSerializerStringifyReturnType + ) => TypeSerializerStringifyReturnType< + TStart, + TLoaderFn, + TLifecycleSerialization, + 'context' + > > // This async function is called before a route is loaded. @@ -829,7 +854,12 @@ export interface LifecycleRouteOptions< TRouterContext, TRouteContextFn >, - ) => TypeSerializerStringifyReturnType + ) => TypeSerializerStringifyReturnType< + TStart, + TBeforeLoadFn, + TLifecycleSerialization, + 'beforeLoad' + > > loaderDeps?: ( @@ -860,12 +890,22 @@ export interface LifecycleRouteOptions< TRouteContextFn, TBeforeLoadFn >, - ) => TypeSerializerStringifyReturnType + ) => TypeSerializerStringifyReturnType< + TStart, + TLoaderFn, + TLifecycleSerialization, + 'loader' + > + > + + lifecycleSerialization?: Constrain< + TLifecycleSerialization, + LifecycleSerialization > } export type BaseRouteOptions< - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TParentRoute extends AnyRoute = AnyRoute, TId extends string = string, TCustomId extends string = string, @@ -877,6 +917,7 @@ export type BaseRouteOptions< TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, + TLifecycleSerialization = unknown, > = RoutePathOptions & LifecycleRouteOptions< TStart, @@ -889,7 +930,8 @@ export type BaseRouteOptions< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > & { getParentRoute: () => TParentRoute } @@ -1200,13 +1242,14 @@ export interface LoaderFnContext< } export type RootRouteOptions< - TStart extends DefaultStartRegister = StartRegister, + TStart = StartRegister, TSearchValidator = undefined, TRouterContext = {}, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TLoaderDeps extends Record = {}, TLoaderFn = undefined, + TLifecycleSerialization = unknown, > = Omit< RouteOptions< TStart, @@ -1221,7 +1264,8 @@ export type RootRouteOptions< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization >, | 'path' | 'id' @@ -1286,7 +1330,7 @@ export type NotFoundRouteProps = { } export class BaseRoute< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TParentRoute extends AnyRoute = AnyRoute, in out TPath extends string = '/', in out TFullPath extends string = ResolveFullPath, @@ -1301,6 +1345,7 @@ export class BaseRoute< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, + in out TLifecycleSerialization = unknown, > { isRoot: TParentRoute extends AnyRoute ? true : false options: RouteOptions< @@ -1316,7 +1361,8 @@ export class BaseRoute< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > // The following properties are set up in this.init() @@ -1368,7 +1414,8 @@ export class BaseRoute< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > > > @@ -1389,7 +1436,8 @@ export class BaseRoute< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization >, ) { this.options = (options as any) || {} @@ -1414,7 +1462,8 @@ export class BaseRoute< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > init = (opts: { originalIndex: number; defaultSsr?: boolean }): void => { @@ -1434,7 +1483,8 @@ export class BaseRoute< TLoaderFn, TRouterContext, TRouteContextFn, - TBeforeLoadFn + TBeforeLoadFn, + TLifecycleSerialization > & RoutePathOptionsIntersection) | undefined @@ -1511,7 +1561,8 @@ export class BaseRoute< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > = (children) => { return this._addFileChildren(children) as any } @@ -1530,7 +1581,8 @@ export class BaseRoute< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > = (children) => { if (Array.isArray(children)) { this.children = children as TChildren @@ -1557,7 +1609,8 @@ export class BaseRoute< TBeforeLoadFn, TLoaderDeps, TLoaderFn, - TChildren + TChildren, + TLifecycleSerialization > = () => { return this as any } @@ -1592,7 +1645,8 @@ export class BaseRoute< TLoaderDeps, TNewLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > } @@ -1630,7 +1684,8 @@ export class BaseRoute< TLoaderDeps, TLoaderFn, TChildren, - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > > = (lazyFn) => { this.lazyFn = lazyFn @@ -1651,7 +1706,7 @@ export class BaseRouteApi { } export interface RootRoute< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -1660,6 +1715,7 @@ export interface RootRoute< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, + in out TLifecycleSerialization = unknown, > extends Route< TStart, any, // TParentRoute @@ -1675,11 +1731,12 @@ export interface RootRoute< TLoaderDeps, TLoaderFn, TChildren, // TChildren - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > {} export class BaseRootRoute< - in out TStart extends DefaultStartRegister = StartRegister, + in out TStart = StartRegister, in out TSearchValidator = undefined, in out TRouterContext = {}, in out TRouteContextFn = AnyContext, @@ -1688,6 +1745,7 @@ export class BaseRootRoute< in out TLoaderFn = undefined, in out TChildren = unknown, in out TFileRouteTypes = unknown, + in out TLifecycleSerialization = unknown, > extends BaseRoute< TStart, any, // TParentRoute @@ -1703,7 +1761,8 @@ export class BaseRootRoute< TLoaderDeps, TLoaderFn, TChildren, // TChildren - TFileRouteTypes + TFileRouteTypes, + TLifecycleSerialization > { constructor( options?: RootRouteOptions< @@ -1713,7 +1772,8 @@ export class BaseRootRoute< TRouteContextFn, TBeforeLoadFn, TLoaderDeps, - TLoaderFn + TLoaderFn, + TLifecycleSerialization >, ) { super(options as any) diff --git a/packages/router-core/src/start.ts b/packages/router-core/src/start.ts index 0da18078e3..f186dd17aa 100644 --- a/packages/router-core/src/start.ts +++ b/packages/router-core/src/start.ts @@ -3,7 +3,7 @@ import type { SerovalTypeSerializer, TypeSerializerStringify, } from './serializer' -import type { LooseAsyncReturnType } from './utils' +import type { LooseAsyncReturnType, LooseReturnType } from './utils' export interface StartConfigTypes { serializer: TSerializer @@ -26,16 +26,52 @@ export interface DefaultStartRegister { export interface StartRegister extends DefaultStartRegister {} -export type InferSerializer = - unknown extends TStart['start']['_types']['serializer'] +export type SSREnabled = TStart extends DefaultStartRegister + ? TStart['ssr'] + : never + +export type InferSerializer = TStart extends DefaultStartRegister + ? unknown extends TStart['start']['_types']['serializer'] ? SerovalTypeSerializer : TStart['start']['_types']['serializer']['~types']['serializer'] + : never export type TypeSerializerStringifyReturnType< - TStart extends DefaultStartRegister, + TStart, TFn, - TStringify = TypeSerializerStringify< - InferSerializer, - LooseAsyncReturnType - >, -> = boolean extends TStart['ssr'] ? any : TStringify | Promise + TLifecycleSerialization, + TLifecycle extends keyof LifecycleSerialization, +> = + false extends SSREnabled + ? any + : false extends IsSerializationEnabled + ? any + : TFn extends (...args: Array) => Promise + ? Promise< + TypeSerializerStringify< + InferSerializer, + LooseAsyncReturnType + > + > + : TypeSerializerStringify, LooseReturnType> + +export interface LifecycleSerialization { + context?: boolean + beforeLoad?: boolean + loader?: boolean +} + +export interface DefaultLifecycleSerialization { + context: false + beforeLoad: true + loader: true +} + +export type IsSerializationEnabled< + TLifecycleSerialization, + TLifecycle extends keyof LifecycleSerialization, +> = TLifecycleSerialization extends LifecycleSerialization + ? unknown extends TLifecycleSerialization[TLifecycle] + ? DefaultLifecycleSerialization[TLifecycle] + : TLifecycleSerialization[TLifecycle] + : DefaultLifecycleSerialization[TLifecycle] diff --git a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx index a84f318bc6..039177c28d 100644 --- a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx +++ b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx @@ -98,6 +98,7 @@ function RouteComp({ routerState: Accessor< RouterState< Route< + any, any, '/', '/', @@ -111,7 +112,8 @@ function RouteComp({ {}, undefined, any, - FileRouteTypes + FileRouteTypes, + any >, MakeRouteMatchUnion >