Merge remote-tracking branch 'origin/next' into ts-5.5-beta

# Conflicts: # pnpm-lock.yaml # www/og-image/package.json
trpc · Apr 28, 2024 · 28088cf · 28088cf
2 parents 2b25b2f + 7f7c36e
commit 28088cf
Show file tree

Hide file tree

Showing 24 changed files with 590 additions and 607 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,9 +45,10 @@ jobs:
       - run: pnpm test-ci
 
       - uses: codecov/codecov-action@v4
-        # with:
-        #   # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-        #   directory: .
+        with:
+          fail_ci_if_error: true
+          # only use token if not a fork PR
+          token: ${{ github.event.pull_request.head.repo.fork == false && secrets.CODECOV_TOKEN || '' }}
 
   e2e:
     # only run on PRs

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
   <h1>tRPC</h1>
   <h3>Move fast and break nothing.<br />End-to-end typesafe APIs made easy.</h3>
   <a href="https://codecov.io/gh/trpc/trpc">
-    <img alt="codecov" src="https://codecov.io/gh/trpc/trpc/branch/main/graph/badge.svg?token=KPPS918B0G">
+    <img alt="codecov" src="https://codecov.io/gh/trpc/trpc/branch/next/graph/badge.svg?token=KPPS918B0G">
   </a>
   <a href="https://npmcharts.com/compare/@trpc/server?interval=30">
     <img alt="weekly downloads" src="https://img.shields.io/npm/dm/%40trpc/server.svg">

diff --git a/examples/.experimental/next-app-dir/package.json b/examples/.experimental/next-app-dir/package.json
@@ -18,12 +18,12 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "next": "^14.1.4",
     "next-auth": "^4.22.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "react-hook-form": "^7.43.3",
     "react-hot-toast": "^2.4.1",
     "superjson": "^1.12.4",

diff --git a/examples/.experimental/next-formdata/package.json b/examples/.experimental/next-formdata/package.json
@@ -16,16 +16,16 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "react-hook-form": "^7.43.3",
     "zod": "^3.0.0",
     "zod-form-data": "^2.0.1"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "typescript": "^5.5.0-beta"
   }

diff --git a/examples/.test/diagnostics-big-router/package.json b/examples/.test/diagnostics-big-router/package.json
@@ -13,14 +13,14 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0-beta"

diff --git a/examples/.test/ssg-infinite-serialization/package.json b/examples/.test/ssg-infinite-serialization/package.json
@@ -18,15 +18,15 @@
     "@trpc/react-query": "^10.35.0",
     "@trpc/server": "^10.35.0",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.26.1",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "start-server-and-test": "^1.12.0",
     "typescript": "^5.5.0-beta"

diff --git a/examples/.test/ssg/package.json b/examples/.test/ssg/package.json
@@ -17,16 +17,16 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "superjson": "^1.12.4",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.26.1",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "start-server-and-test": "^1.12.0",
     "typescript": "^5.5.0-beta"

diff --git a/examples/express-minimal/package.json b/examples/express-minimal/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "esbuild": "^0.17.10",
     "eslint": "^8.56.0",
     "npm-run-all": "^4.1.5",

diff --git a/examples/express-server/package.json b/examples/express-server/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "esbuild": "^0.17.10",
     "eslint": "^8.56.0",
     "npm-run-all": "^4.1.5",

diff --git a/examples/minimal-react/client/package.json b/examples/minimal-react/client/package.json
@@ -13,12 +13,12 @@
     "@trpc/client": "npm:@trpc/client@next",
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^3.1.0",
     "eslint": "^8.56.0",
     "typescript": "^5.5.0-beta",

diff --git a/examples/next-big-router/package.json b/examples/next-big-router/package.json
@@ -16,14 +16,14 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0-beta"

diff --git a/examples/next-edge-runtime/package.json b/examples/next-edge-runtime/package.json
@@ -14,14 +14,14 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "typescript": "^5.5.0-beta"
   }

diff --git a/examples/next-minimal-starter/package.json b/examples/next-minimal-starter/package.json
@@ -14,14 +14,14 @@
     "@trpc/react-query": "npm:@trpc/react-query@next",
     "@trpc/server": "npm:@trpc/server@next",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "typescript": "^5.5.0-beta"
   }

diff --git a/examples/next-prisma-starter/package.json b/examples/next-prisma-starter/package.json
@@ -39,15 +39,15 @@
     "@trpc/server": "npm:@trpc/server@next",
     "clsx": "^2.0.0",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "superjson": "^1.12.4",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.26.1",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.0.1",
     "@typescript-eslint/parser": "^7.0.1",
     "autoprefixer": "^10.4.7",

diff --git a/examples/next-prisma-todomvc/package.json b/examples/next-prisma-todomvc/package.json
@@ -31,8 +31,8 @@
     "i18next": "^22.4.13",
     "next": "^14.1.4",
     "next-i18next": "^13.2.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "react-i18next": "^12.2.0",
     "superjson": "^1.12.4",
     "todomvc-app-css": "^2.3.0",
@@ -43,7 +43,7 @@
     "@playwright/test": "^1.26.1",
     "@tanstack/react-query-devtools": "^5.0.0",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "eslint": "^8.56.0",
     "npm-run-all": "^4.1.5",
     "prisma": "^5.12.1",

diff --git a/examples/next-prisma-websockets-starter/package.json b/examples/next-prisma-websockets-starter/package.json
@@ -48,8 +48,8 @@
     "clsx": "^2.0.0",
     "next": "^14.1.4",
     "next-auth": "^4.22.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "superjson": "^1.12.4",
     "tsx": "^4.0.0",
     "ws": "^8.0.0",
@@ -59,7 +59,7 @@
     "@playwright/test": "^1.26.1",
     "@tanstack/react-query-devtools": "^5.0.0",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "@types/ws": "^8.2.0",
     "@typescript-eslint/eslint-plugin": "^7.0.1",
     "@typescript-eslint/parser": "^7.0.1",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -96,13 +96,13 @@
     "@trpc/server": "^10.45.1",
     "@types/express": "^4.17.17",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "eslint": "^8.56.0",
     "express": "^4.17.1",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "rollup": "^4.9.5",
     "tsx": "^4.0.0",
     "zod": "^3.0.0"

diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -70,12 +70,12 @@
     "@trpc/server": "^10.45.1",
     "@types/express": "^4.17.17",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.3.0",
     "eslint": "^8.56.0",
     "express": "^4.17.1",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "rollup": "^4.9.5",
     "tsx": "^4.0.0",
     "zod": "^3.0.0"

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -134,8 +134,8 @@
     "@types/express": "^4.17.17",
     "@types/hash-sum": "^1.0.0",
     "@types/node": "^20.10.0",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
     "@types/ws": "^8.2.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "devalue": "^5.0.0",
@@ -146,8 +146,8 @@
     "hash-sum": "^2.0.0",
     "myzod": "^1.3.1",
     "next": "^14.1.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "rollup": "^4.9.5",
     "superjson": "^1.12.4",
     "superstruct": "^1.0.0",

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -37,8 +37,8 @@
     "myzod": "^1.3.1",
     "next": "^14.1.4",
     "node-fetch": "^3.3.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "runtypes": "^6.6.0",
     "scale-codec": "^0.13.0",
     "superstruct": "^1.0.0",