0
Fork 0
mirror of https://github.com/TanStack/router.git synced 2026-11-16 19:38:07 +00:00
router/examples/react
Brenley Dueck 1022de9f32 Merge branch 'main' into upgrade-solidjs-rc-0-main-merge
# Conflicts:
#	benchmarks/client-nav/package.json
#	benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/head/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/history/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/links/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/mount/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
#	benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
#	examples/react/basic-default-search-params/package.json
#	examples/react/large-file-based/package.json
#	examples/react/location-masking/package.json
#	examples/react/navigation-blocking/package.json
#	examples/react/router-monorepo-react-query/packages/router/package.json
#	examples/react/search-validator-adapters/package.json
#	examples/react/start-large/package.json
#	examples/solid/authenticated-routes-firebase/package.json
#	examples/solid/authenticated-routes/package.json
#	examples/solid/basic-default-search-params/package.json
#	examples/solid/basic-devtools-panel/package.json
#	examples/solid/basic-file-based/package.json
#	examples/solid/basic-non-nested-devtools/package.json
#	examples/solid/basic-solid-query-file-based/package.json
#	examples/solid/basic-solid-query/package.json
#	examples/solid/basic-ssr-file-based/package.json
#	examples/solid/basic-ssr-streaming-file-based/package.json
#	examples/solid/basic-virtual-file-based/package.json
#	examples/solid/basic-virtual-inside-file-based/package.json
#	examples/solid/basic/package.json
#	examples/solid/deferred-data/package.json
#	examples/solid/i18n-paraglide/package.json
#	examples/solid/kitchen-sink-file-based/package.json
#	examples/solid/kitchen-sink-solid-query-file-based/package.json
#	examples/solid/kitchen-sink-solid-query/package.json
#	examples/solid/kitchen-sink/package.json
#	examples/solid/large-file-based/package.json
#	examples/solid/location-masking/package.json
#	examples/solid/navigation-blocking/package.json
#	examples/solid/quickstart-esbuild-file-based/package.json
#	examples/solid/quickstart-file-based/package.json
#	examples/solid/quickstart-rspack-file-based/package.json
#	examples/solid/quickstart-webpack-file-based/package.json
#	examples/solid/quickstart/package.json
#	examples/solid/router-monorepo-simple-lazy/package.json
#	examples/solid/router-monorepo-simple-lazy/packages/router/package.json
#	examples/solid/router-monorepo-simple/package.json
#	examples/solid/router-monorepo-simple/packages/router/package.json
#	examples/solid/router-monorepo-solid-query/package.json
#	examples/solid/router-monorepo-solid-query/packages/router/package.json
#	examples/solid/scroll-restoration/package.json
#	examples/solid/search-validator-adapters/package.json
#	examples/solid/start-basic-auth/package.json
#	examples/solid/start-basic-authjs/package.json
#	examples/solid/start-basic-cloudflare/package.json
#	examples/solid/start-basic-netlify/package.json
#	examples/solid/start-basic-nitro/package.json
#	examples/solid/start-basic-solid-query/package.json
#	examples/solid/start-basic-static/package.json
#	examples/solid/start-basic/package.json
#	examples/solid/start-bun/package.json
#	examples/solid/start-convex-better-auth/package.json
#	examples/solid/start-counter/package.json
#	examples/solid/start-i18n-paraglide/package.json
#	examples/solid/start-large/package.json
#	examples/solid/start-streaming-data-from-server-functions/package.json
#	examples/solid/start-supabase-basic/package.json
#	examples/solid/start-tailwind-v4/package.json
#	examples/solid/view-transitions/package.json
#	examples/solid/with-framer-motion/package.json
#	examples/solid/with-trpc/package.json
#	packages/solid-router/CHANGELOG.md
#	packages/solid-router/package.json
#	packages/solid-router/src/CatchBoundary.tsx
#	packages/solid-router/src/Match.tsx
#	packages/solid-router/src/link.tsx
#	packages/solid-router/src/useBlocker.tsx
#	packages/solid-router/src/useRouterState.tsx
#	packages/solid-router/src/utils.ts
#	packages/solid-start-client/CHANGELOG.md
#	packages/solid-start-client/package.json
#	packages/solid-start-client/src/GenericHydrate.tsx
#	packages/solid-start-server/CHANGELOG.md
#	packages/solid-start-server/package.json
#	packages/solid-start/CHANGELOG.md
#	packages/solid-start/package.json
#	pnpm-lock.yaml
History 2026-08-12 23:09:21 -05:00
..
authenticated-routes ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
authenticated-routes-firebase ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-default-search-params Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
basic-devtools-panel ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-non-nested-devtools ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-react-query Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
basic-react-query-file-based Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
basic-ssr-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-ssr-streaming-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-virtual-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
basic-virtual-inside-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
deferred-data ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
i18n-paraglide ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
kitchen-sink ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
kitchen-sink-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
kitchen-sink-react-query Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
kitchen-sink-react-query-file-based Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
large-file-based Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
location-masking Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
navigation-blocking Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
quickstart ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
quickstart-esbuild-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
quickstart-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
quickstart-rspack-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
quickstart-webpack-file-based ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
router-monorepo-react-query Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
router-monorepo-simple ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
router-monorepo-simple-lazy Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
scroll-restoration ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
search-validator-adapters Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-bare ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic-auth ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic-authjs ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic-cloudflare ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic-react-query Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-basic-rsbuild ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-basic-rsc/.devcontainer chore: solid router v2 pre main sync (#7517) 2026-06-02 00:48:22 +02:00
start-basic-static ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-bun Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-clerk-basic ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-convex-trellaux Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-counter ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-i18n-paraglide Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-large Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-material-ui ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-rscs ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-streaming-data-from-server-functions ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-supabase-basic ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-tailwind-v4 ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
start-trellaux Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00
start-workos ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
view-transitions ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
with-framer-motion ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
with-trpc ci: Version Packages (#8048) 2026-08-12 11:15:35 +02:00
with-trpc-react-query Merge branch 'main' into upgrade-solidjs-rc-0-main-merge 2026-08-12 23:09:21 -05:00