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

TanStack · Jul 13, 2023 · 3249cf8 · 3249cf8
2 parents b27f649 + 667d594
commit 3249cf8
Show file tree

Hide file tree

Showing 20 changed files with 99 additions and 153 deletions.
diff --git a/docs/guide/route-matching.md b/docs/guide/route-matching.md
@@ -46,45 +46,49 @@ Using that route tree, let's follow the matching process for a few different URL
 - `/blog`
   ```
   Root
+    ❌ /
+    ❌ about/us
     ❌ about
     ⏩ blog
       ✅ /
       - new
       - $postId
-    - /
     - *
   ```
 - `/blog/my-post`
   ```
   Root
+    ❌ /
+    ❌ about/us
     ❌ about
     ⏩ blog
       ❌ /
       ❌ new
       ✅ $postId
-    - /
     - *
   ```
 - `/`
   ```
   Root
-    ❌ about
-    ❌ blog
-      ❌ /
-      ❌ new
-      ❌ $postId
     ✅ /
+    - about/us
+    - about
+    - blog
+      - /
+      - new
+      - $postId
     - *
   ```
 - `/not-a-route`
   ```
   Root
+    ❌ /
+    ❌ about/us
     ❌ about
     ❌ blog
       - /
       - new
       - $postId
-    ❌ /
     ✅ *
   ```
 

diff --git a/examples/react/basic-ssr-streaming/package.json b/examples/react/basic-ssr-streaming/package.json
@@ -14,8 +14,8 @@
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.105",
     "@tanstack/react-start": "0.0.1-beta.96",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",

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.96",
+    "@tanstack/react-start": "0.0.1-beta.107",
     "@tanstack/react-loaders": "0.0.1-beta.105",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",

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.104",
-    "@tanstack/react-actions": "0.0.1-beta.106",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/react-actions": "0.0.1-beta.107",
     "@tanstack/react-loaders": "0.0.1-beta.105",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@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.104",
+    "@tanstack/router": "0.0.1-beta.107",
     "@tanstack/react-loaders": "0.0.1-beta.105",
-    "@tanstack/react-actions": "0.0.1-beta.106",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/react-actions": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/kitchen-sink-single-file/package.json b/examples/react/kitchen-sink-single-file/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.105",
-    "@tanstack/react-actions": "0.0.1-beta.106",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/react-actions": "0.0.1-beta.107",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@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.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@vitejs/plugin-react": "^1.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/react/start-basic/package.json b/examples/react/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.105",
-    "@tanstack/react-start": "0.0.1-beta.83",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/react-start": "0.0.1-beta.107",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@vitejs/plugin-react": "^3.1.0",
     "astro": "^2.0.16",
     "concurrently": "^7.6.0",

diff --git a/examples/react/start-kitchen-sink-single-file/package.json b/examples/react/start-kitchen-sink-single-file/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.105",
-    "@tanstack/react-actions": "0.0.1-beta.106",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/react-actions": "0.0.1-beta.107",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

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.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",

diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-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.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@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/with-trpc/package.json b/examples/react/with-trpc/package.json
@@ -14,8 +14,8 @@
     "@tanstack/react-loaders": "0.0.1-beta.105",
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/router": "0.0.1-beta.104",
-    "@tanstack/router-devtools": "0.0.1-beta.104",
+    "@tanstack/router": "0.0.1-beta.107",
+    "@tanstack/router-devtools": "0.0.1-beta.107",
     "@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/packages/actions/package.json b/packages/actions/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/actions",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.106",
+  "version": "0.0.1-beta.107",
   "license": "MIT",
   "repository": "tanstack/actions",
   "homepage": "https://tanstack.com/actions",

diff --git a/packages/actions/src/index.ts b/packages/actions/src/index.ts
@@ -93,6 +93,13 @@ export type ActionByKey<
   TKey extends keyof TActions,
 > = TActions[TKey]
 
+export type SubmitFn<
+  TPayload = unknown,
+  TResponse = unknown,
+> = undefined extends TPayload
+  ? () => Promise<TResponse>
+  : (payload: TPayload) => Promise<TResponse>
+
 export interface ActionOptions<
   TKey extends string = string,
   TPayload = unknown,
@@ -181,20 +188,24 @@ export class Action<
 
   #promises: Promise<any>[] = []
 
-  submit = async (payload?: TPayload): Promise<TResponse> => {
-    const promise = this.#submit(payload)
+  submit: SubmitFn<TPayload, TResponse> = async (payload?: TPayload) => {
+    const promise = this.#submit(payload as TPayload)
     this.#promises.push(promise)
 
     const res = await promise
     this.#promises = this.#promises.filter((d) => d !== promise)
     return res
   }
 
-  #submit = async (payload?: TPayload): Promise<TResponse> => {
+  #submit: SubmitFn<TPayload, TResponse> = async (payload?: TPayload) => {
     const submission: ActionSubmission<TPayload, TResponse, TError> = {
       submittedAt: Date.now(),
       status: 'pending',
-      payload: payload as TPayload,
+      payload: payload as ActionSubmission<
+        TPayload,
+        TResponse,
+        TError
+      >['payload'],
       invalidate: () => {
         setSubmission((s) => ({
           ...s,
@@ -300,7 +311,7 @@ export interface ActionSubmission<
 > {
   submittedAt: number
   status: 'pending' | 'success' | 'error'
-  payload: TPayload
+  payload: undefined extends TPayload ? undefined : TPayload
   response?: TResponse
   error?: TError
   isInvalid?: boolean

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

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.82",
+  "version": "0.0.1-beta.107",
   "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.104",
+  "version": "0.0.1-beta.107",
   "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.104",
+  "version": "0.0.1-beta.107",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",