Skip to content

Commit bb54908

Browse files
committed
Fixes for tRPC v10
1 parent 0714408 commit bb54908

File tree

6 files changed

+28
-43
lines changed

6 files changed

+28
-43
lines changed

examples/bookstall/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
},
3636
"type": "module",
3737
"dependencies": {
38-
"@trpc/client": "^11.0.0-next-beta.286",
39-
"@trpc/server": "^11.0.0-next-beta.286",
38+
"@trpc/client": "^10.0.0",
39+
"@trpc/server": "^10.0.0",
4040
"dayjs": "^1.11.10",
4141
"debounce": "^2.0.0",
4242
"hash-wasm": "^4.11.0",

examples/simple/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
},
3131
"type": "module",
3232
"dependencies": {
33-
"@trpc/client": "^11.0.0-next-beta.294",
34-
"@trpc/server": "^11.0.0-next-beta.294",
33+
"@trpc/client": "^10.0.0",
34+
"@trpc/server": "^10.0.0",
3535
"delay": "^6.0.0"
3636
}
3737
}

examples/websocket/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
},
2727
"type": "module",
2828
"dependencies": {
29-
"@trpc/client": "^11.0.0-next-beta.286",
30-
"@trpc/server": "^11.0.0-next-beta.286",
29+
"@trpc/client": "^10.0.0",
30+
"@trpc/server": "^10.0.0",
3131
"delay": "^6.0.0",
3232
"ws": "^8.16.0"
3333
}

package/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trpc-sveltekit",
3-
"version": "3.5.28",
3+
"version": "3.6.0",
44
"description": "SvelteKit adapter for tRPC.io, working with Node.js, Vercel and Netlify",
55
"keywords": [
66
"trpc",
@@ -63,15 +63,15 @@
6363
},
6464
"devDependencies": {
6565
"@sveltejs/kit": "^1.27.0",
66-
"@trpc/client": "^11.0.0-next-beta.286",
67-
"@trpc/server": "^11.0.0-next-beta.286",
66+
"@trpc/client": "^10.0.0",
67+
"@trpc/server": "^10.0.0",
6868
"@types/ws": "^8.5.10",
6969
"typescript": "^5.3.3"
7070
},
7171
"peerDependencies": {
7272
"@sveltejs/adapter-node": ">=1.2",
73-
"@trpc/client": "^10.0.0 || ^11.0.0-next-beta.286",
74-
"@trpc/server": "^10.0.0 || ^11.0.0-next-beta.286",
73+
"@trpc/client": "^10.0.0",
74+
"@trpc/server": "^10.0.0",
7575
"ws": ">=8"
7676
}
7777
}

package/src/client.ts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import {
22
httpBatchLink,
3-
createTRPCClient as internalCreateTRPCClient,
3+
createTRPCProxyClient as internalCreateTRPCClient,
44
type HTTPHeaders,
55
type TRPCLink
66
} from '@trpc/client';
7-
import type { AnyTRPCRouter, TRPCCombinedDataTransformer } from '@trpc/server';
7+
import type { AnyRouter } from '@trpc/server';
88

99
export type TRPCClientInit = { fetch?: typeof window.fetch; url: { origin: string } };
1010

11-
type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
11+
type CreateTRPCClientOptions<Router extends AnyRouter> = (
1212
| {
1313
links?: never;
1414

@@ -47,24 +47,19 @@ type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
4747
* A function that transforms the data before transferring it.
4848
* @see https://trpc.io/docs/data-transformers
4949
*/
50-
transformer?:
51-
| {
52-
serialize: (object: any) => any;
53-
deserialize: (object: any) => any;
54-
}
55-
| TRPCCombinedDataTransformer;
50+
transformer?: Router['_def']['_config']['transformer'];
5651
};
5752

5853
/**
5954
* Create a tRPC client.
6055
* @see https://trpc.io/docs/vanilla
6156
*/
62-
export function createTRPCClient<Router extends AnyTRPCRouter>(
57+
export function createTRPCClient<Router extends AnyRouter>(
6358
{ links, url = '/trpc', transformer, init, headers }: CreateTRPCClientOptions<Router> = {
6459
url: '/trpc'
6560
}
6661
) {
67-
if (links) return internalCreateTRPCClient<Router>({ links });
62+
if (links) return internalCreateTRPCClient<Router>({ transformer, links });
6863

6964
if (typeof window === 'undefined' && !init) {
7065
throw new Error(
@@ -73,13 +68,13 @@ export function createTRPCClient<Router extends AnyTRPCRouter>(
7368
}
7469

7570
return internalCreateTRPCClient<Router>({
71+
transformer,
7672
links: [
7773
httpBatchLink({
7874
url:
7975
typeof window === 'undefined' ? `${init.url.origin}${url}` : `${location.origin}${url}`,
8076
fetch: typeof window === 'undefined' ? init.fetch : init?.fetch ?? window.fetch,
81-
headers,
82-
transformer
77+
headers
8378
})
8479
]
8580
});

yarn.lock

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -528,25 +528,15 @@
528528
svelte-hmr "^0.15.1"
529529
vitefu "^0.2.4"
530530

531-
"@trpc/client@^11.0.0-next-beta.286":
532-
version "11.0.0-next-beta.286"
533-
resolved "https://registry.npmjs.org/@trpc/client/-/client-11.0.0-next-beta.286.tgz#956e30c77cdc4ce413f7c534d2af94f8d0e7a2eb"
534-
integrity sha512-a9CdILE3alDtQpy5RW+CoqVGJAxRccWQiXZ9mpBs3sOnpCMCdn2g/g7hexMo2UPpSfiJMGgSyShtZNuGwPREjw==
535-
536-
"@trpc/client@^11.0.0-next-beta.294":
537-
version "11.0.0-next-beta.294"
538-
resolved "https://registry.yarnpkg.com/@trpc/client/-/client-11.0.0-next-beta.294.tgz#1ea3154f70394ad5a814092d4e1df64a0e678a8d"
539-
integrity sha512-9rK+bwg7TPNsvisDAanaAiR2TYmgFA2zNll4TexUGKQaQ09dt6ZPdFDqWIZqa33cyoXeK9Z5LQptr3NVfaSjNA==
540-
541-
"@trpc/server@^11.0.0-next-beta.286":
542-
version "11.0.0-next-beta.286"
543-
resolved "https://registry.npmjs.org/@trpc/server/-/server-11.0.0-next-beta.286.tgz#935c90c3da068e353e227c70acb0b7e76a137fa2"
544-
integrity sha512-EDIq0bUCAgDs4v9wBKTypzfALnPoq0tDhCBM/bZZc6sWytKCmSAaRYa7gvlIOkUuWYJ21Gzgr1JAsqNe6BYCZw==
545-
546-
"@trpc/server@^11.0.0-next-beta.294":
547-
version "11.0.0-next-beta.294"
548-
resolved "https://registry.yarnpkg.com/@trpc/server/-/server-11.0.0-next-beta.294.tgz#8a842a2cab4eb96a0bec0a5e8e05002bcc2de887"
549-
integrity sha512-wwz78kfl4c8WQ3ytjzYf3SM8uxhvhSRYVxqqChPM+IbDb9scfNyEsZOUzSWds8brFNgO3LHeHYkP0l8S4YdDXA==
531+
"@trpc/client@^10.0.0":
532+
version "10.45.1"
533+
resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.45.1.tgz#ec80a5252ac9d3e5df2e5d8ddce1e23fc5caf5ac"
534+
integrity sha512-nVbAk1xpIiI64WgzXGgfxPOGgHoYvffn1IsjV1D/Ri7DL4BKuo2qtZ7UQ+OuHkzH2M8j4ikSVBDpk545fOdvpw==
535+
536+
"@trpc/server@^10.0.0":
537+
version "10.45.1"
538+
resolved "https://registry.yarnpkg.com/@trpc/server/-/server-10.45.1.tgz#481b9d6747bbb585ef91b980198dd4ff3226baf4"
539+
integrity sha512-KOzBEVaHW9IxEedUP9E50y0tYxAuvlzyjn80Bpemw4rcNbT4WtJnhkFPUY+qDJl7Crt3B/oY2qMgSxVWi9toLg==
550540

551541
"@tsconfig/node10@^1.0.7":
552542
version "1.0.9"

0 commit comments

Comments
 (0)