Merge branch 'beta' of https://github.com/TanStack/router into beta

TanStack · Aug 1, 2023 · f2074e9 · f2074e9
2 parents b40aea9 + 0a5973d
commit f2074e9
Show file tree

Hide file tree

Showing 20 changed files with 119 additions and 654 deletions.
diff --git a/examples/react/basic-ssr-streaming/package.json b/examples/react/basic-ssr-streaming/package.json
@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.129",
-    "@tanstack/react-start": "0.0.1-beta.131",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/react-start": "0.0.1-beta.132",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "18.3.0-canary-587ae49d7-20230720",
@@ -36,7 +36,7 @@
     "jsesc": "^3.0.2",
     "node-fetch": "^3.3.0",
     "serve-static": "^1.15.0",
-    "vite": "^3.2.3",
+    "vite": "^2.9.16",
     "vite-plugin-babel": "^1.1.2"
   },
   "resolutions": {

diff --git a/examples/react/basic-ssr/package.json b/examples/react/basic-ssr/package.json
@@ -12,10 +12,10 @@
     "debug": "node --inspect-brk server"
   },
   "dependencies": {
-    "@tanstack/react-start": "0.0.1-beta.131",
+    "@tanstack/react-start": "0.0.1-beta.132",
     "@tanstack/react-loaders": "0.0.1-beta.129",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",
@@ -36,7 +36,7 @@
     "jsesc": "^3.0.2",
     "node-fetch": "^3.3.0",
     "serve-static": "^1.15.0",
-    "vite": "^3.2.3",
+    "vite": "^2.9.16",
     "vite-plugin-babel": "^1.1.2"
   },
   "resolutions": {

diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json
@@ -9,10 +9,10 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/router": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
     "@tanstack/react-actions": "0.0.1-beta.123",
     "@tanstack/react-loaders": "0.0.1-beta.129",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/kitchen-sink-multi-file/package.json b/examples/react/kitchen-sink-multi-file/package.json
@@ -9,10 +9,10 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/router": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
     "@tanstack/react-loaders": "0.0.1-beta.129",
     "@tanstack/react-actions": "0.0.1-beta.123",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/kitchen-sink-multi-file/src/router.tsx b/examples/react/kitchen-sink-multi-file/src/router.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Router, RouterContext } from '@tanstack/router'
+import { Router } from '@tanstack/router'
 
 import { rootRoute } from './routes/root'
 import { indexRoute } from './routes'
@@ -23,11 +23,6 @@ import { Spinner } from './components/Spinner'
 import { loaderClient } from './loaderClient'
 import { actionClient } from './actionClient'
 
-export const routerContext = new RouterContext<{
-  loaderClient: typeof loaderClient
-  actionClient: typeof actionClient
-}>()
-
 const routeTree = rootRoute.addChildren([
   indexRoute,
   dashboardRoute.addChildren([

diff --git a/examples/react/kitchen-sink-multi-file/src/routerContext.ts b/examples/react/kitchen-sink-multi-file/src/routerContext.ts
@@ -0,0 +1,8 @@
+import { RouterContext } from '@tanstack/router'
+import { loaderClient } from './loaderClient'
+import { actionClient } from './actionClient'
+
+export const routerContext = new RouterContext<{
+  loaderClient: typeof loaderClient
+  actionClient: typeof actionClient
+}>()
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/root.tsx b/examples/react/kitchen-sink-multi-file/src/routes/root.tsx
@@ -3,7 +3,7 @@ import { Link, Outlet, useRouter } from '@tanstack/router'
 import { Spinner } from '../components/Spinner'
 import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import { useLoaderClient } from '@tanstack/react-loaders'
-import { routerContext } from '../router'
+import { routerContext } from '../routerContext'
 
 export const rootRoute = routerContext.createRootRoute({
   component: () => {

diff --git a/examples/react/kitchen-sink-single-file/package.json b/examples/react/kitchen-sink-single-file/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.129",
     "@tanstack/react-actions": "0.0.1-beta.123",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json
@@ -9,8 +9,8 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/react/wip-start-basic/package.json b/examples/react/wip-start-basic/package.json
@@ -16,9 +16,9 @@
     "@astrojs/react": "^2.0.2",
     "@tanstack/bling": "^0.4.0",
     "@tanstack/react-loaders": "0.0.1-beta.129",
-    "@tanstack/react-start": "0.0.1-beta.131",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/react-start": "0.0.1-beta.132",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^3.1.0",
     "astro": "^2.0.16",
     "concurrently": "^7.6.0",

diff --git a/examples/react/wip-start-kitchen-sink-single-file/package.json b/examples/react/wip-start-kitchen-sink-single-file/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.129",
     "@tanstack/react-actions": "0.0.1-beta.123",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/wip-trpc-react-query/package.json b/examples/react/wip-trpc-react-query/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@trpc/client": "^10.0.0-rc.6",
     "@trpc/react-query": "^10.0.0-rc.6",
     "@trpc/server": "^10.0.0-rc.6",

diff --git a/examples/react/wip-with-framer-motion/package.json b/examples/react/wip-with-framer-motion/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-actions": "0.0.1-beta.123",
     "@tanstack/react-loaders": "0.0.1-beta.129",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "framer-motion": "^10.13.0",

diff --git a/examples/react/with-react-query/package.json b/examples/react/with-react-query/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json
@@ -14,8 +14,8 @@
     "@tanstack/react-loaders": "0.0.1-beta.129",
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/router": "0.0.1-beta.131",
-    "@tanstack/router-devtools": "0.0.1-beta.131",
+    "@tanstack/router": "0.0.1-beta.132",
+    "@tanstack/router-devtools": "0.0.1-beta.132",
     "@trpc/client": "^10.0.0-rc.6",
     "@trpc/react-query": "^10.0.0-rc.6",
     "@trpc/server": "^10.0.0-rc.6",

diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "@types/fs-extra": "^9.0.13",
     "fs-extra": "^10.1.0",
     "is-ci-cli": "^2.2.0",
-    "vite": "^4.4.1",
+    "vite": "^2.9.16",
     "vitest": "^0.33.0",
     "zod": "^3.20.2"
   }

diff --git a/packages/react-start/package.json b/packages/react-start/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-start",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.131",
+  "version": "0.0.1-beta.132",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-devtools",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.131",
+  "version": "0.0.1-beta.132",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router/",

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.131",
+  "version": "0.0.1-beta.132",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",