Fixes for tRPC v10

icflorescu · Mar 3, 2024 · bb54908 · bb54908
1 parent 0714408
commit bb54908
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 43 deletions.
diff --git a/examples/bookstall/package.json b/examples/bookstall/package.json
@@ -35,8 +35,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@trpc/client": "^11.0.0-next-beta.286",
-    "@trpc/server": "^11.0.0-next-beta.286",
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0",
     "dayjs": "^1.11.10",
     "debounce": "^2.0.0",
     "hash-wasm": "^4.11.0",

diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -30,8 +30,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@trpc/client": "^11.0.0-next-beta.294",
-    "@trpc/server": "^11.0.0-next-beta.294",
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0",
     "delay": "^6.0.0"
   }
 }
diff --git a/examples/websocket/package.json b/examples/websocket/package.json
@@ -26,8 +26,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@trpc/client": "^11.0.0-next-beta.286",
-    "@trpc/server": "^11.0.0-next-beta.286",
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0",
     "delay": "^6.0.0",
     "ws": "^8.16.0"
   }

diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trpc-sveltekit",
-  "version": "3.5.28",
+  "version": "3.6.0",
   "description": "SvelteKit adapter for tRPC.io, working with Node.js, Vercel and Netlify",
   "keywords": [
     "trpc",
@@ -63,15 +63,15 @@
   },
   "devDependencies": {
     "@sveltejs/kit": "^1.27.0",
-    "@trpc/client": "^11.0.0-next-beta.286",
-    "@trpc/server": "^11.0.0-next-beta.286",
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0",
     "@types/ws": "^8.5.10",
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
     "@sveltejs/adapter-node": ">=1.2",
-    "@trpc/client": "^10.0.0 || ^11.0.0-next-beta.286",
-    "@trpc/server": "^10.0.0 || ^11.0.0-next-beta.286",
+    "@trpc/client": "^10.0.0",
+    "@trpc/server": "^10.0.0",
     "ws": ">=8"
   }
 }
diff --git a/package/src/client.ts b/package/src/client.ts
@@ -1,14 +1,14 @@
 import {
   httpBatchLink,
-  createTRPCClient as internalCreateTRPCClient,
+  createTRPCProxyClient as internalCreateTRPCClient,
   type HTTPHeaders,
   type TRPCLink
 } from '@trpc/client';
-import type { AnyTRPCRouter, TRPCCombinedDataTransformer } from '@trpc/server';
+import type { AnyRouter } from '@trpc/server';
 
 export type TRPCClientInit = { fetch?: typeof window.fetch; url: { origin: string } };
 
-type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
+type CreateTRPCClientOptions<Router extends AnyRouter> = (
   | {
       links?: never;
 
@@ -47,24 +47,19 @@ type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
    * A function that transforms the data before transferring it.
    * @see https://trpc.io/docs/data-transformers
    */
-  transformer?:
-    | {
-        serialize: (object: any) => any;
-        deserialize: (object: any) => any;
-      }
-    | TRPCCombinedDataTransformer;
+  transformer?: Router['_def']['_config']['transformer'];
 };
 
 /**
  * Create a tRPC client.
  * @see https://trpc.io/docs/vanilla
  */
-export function createTRPCClient<Router extends AnyTRPCRouter>(
+export function createTRPCClient<Router extends AnyRouter>(
   { links, url = '/trpc', transformer, init, headers }: CreateTRPCClientOptions<Router> = {
     url: '/trpc'
   }
 ) {
-  if (links) return internalCreateTRPCClient<Router>({ links });
+  if (links) return internalCreateTRPCClient<Router>({ transformer, links });
 
   if (typeof window === 'undefined' && !init) {
     throw new Error(
@@ -73,13 +68,13 @@ export function createTRPCClient<Router extends AnyTRPCRouter>(
   }
 
   return internalCreateTRPCClient<Router>({
+    transformer,
     links: [
       httpBatchLink({
         url:
           typeof window === 'undefined' ? `${init.url.origin}${url}` : `${location.origin}${url}`,
         fetch: typeof window === 'undefined' ? init.fetch : init?.fetch ?? window.fetch,
-        headers,
-        transformer
+        headers
       })
     ]
   });

diff --git a/yarn.lock b/yarn.lock
@@ -528,25 +528,15 @@
     svelte-hmr "^0.15.1"
     vitefu "^0.2.4"
 
-"@trpc/client@^11.0.0-next-beta.286":
-  version "11.0.0-next-beta.286"
-  resolved "https://registry.npmjs.org/@trpc/client/-/client-11.0.0-next-beta.286.tgz#956e30c77cdc4ce413f7c534d2af94f8d0e7a2eb"
-  integrity sha512-a9CdILE3alDtQpy5RW+CoqVGJAxRccWQiXZ9mpBs3sOnpCMCdn2g/g7hexMo2UPpSfiJMGgSyShtZNuGwPREjw==
-
-"@trpc/client@^11.0.0-next-beta.294":
-  version "11.0.0-next-beta.294"
-  resolved "https://registry.yarnpkg.com/@trpc/client/-/client-11.0.0-next-beta.294.tgz#1ea3154f70394ad5a814092d4e1df64a0e678a8d"
-  integrity sha512-9rK+bwg7TPNsvisDAanaAiR2TYmgFA2zNll4TexUGKQaQ09dt6ZPdFDqWIZqa33cyoXeK9Z5LQptr3NVfaSjNA==
-
-"@trpc/server@^11.0.0-next-beta.286":
-  version "11.0.0-next-beta.286"
-  resolved "https://registry.npmjs.org/@trpc/server/-/server-11.0.0-next-beta.286.tgz#935c90c3da068e353e227c70acb0b7e76a137fa2"
-  integrity sha512-EDIq0bUCAgDs4v9wBKTypzfALnPoq0tDhCBM/bZZc6sWytKCmSAaRYa7gvlIOkUuWYJ21Gzgr1JAsqNe6BYCZw==
-
-"@trpc/server@^11.0.0-next-beta.294":
-  version "11.0.0-next-beta.294"
-  resolved "https://registry.yarnpkg.com/@trpc/server/-/server-11.0.0-next-beta.294.tgz#8a842a2cab4eb96a0bec0a5e8e05002bcc2de887"
-  integrity sha512-wwz78kfl4c8WQ3ytjzYf3SM8uxhvhSRYVxqqChPM+IbDb9scfNyEsZOUzSWds8brFNgO3LHeHYkP0l8S4YdDXA==
+"@trpc/client@^10.0.0":
+  version "10.45.1"
+  resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.45.1.tgz#ec80a5252ac9d3e5df2e5d8ddce1e23fc5caf5ac"
+  integrity sha512-nVbAk1xpIiI64WgzXGgfxPOGgHoYvffn1IsjV1D/Ri7DL4BKuo2qtZ7UQ+OuHkzH2M8j4ikSVBDpk545fOdvpw==
+
+"@trpc/server@^10.0.0":
+  version "10.45.1"
+  resolved "https://registry.yarnpkg.com/@trpc/server/-/server-10.45.1.tgz#481b9d6747bbb585ef91b980198dd4ff3226baf4"
+  integrity sha512-KOzBEVaHW9IxEedUP9E50y0tYxAuvlzyjn80Bpemw4rcNbT4WtJnhkFPUY+qDJl7Crt3B/oY2qMgSxVWi9toLg==
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"