From c07e502ea00b5944174f2afc328aa28b61a760de Mon Sep 17 00:00:00 2001 From: Jason Nall Date: Sat, 13 Aug 2022 12:48:12 -0400 Subject: [PATCH 1/3] Upgrade trpc, remove source imports. --- package.json | 10 +++++----- pnpm-lock.yaml | 36 +++++++++++++++++----------------- src/main/resolveIPCResponse.ts | 17 +++++++++++----- src/renderer/ipcLink.ts | 4 +--- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 5ed8d6ca..43f75fee 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "devDependencies": { "@changesets/changelog-github": "^0.4.6", "@changesets/cli": "^2.24.1", - "@trpc/client": "^9.26.2", - "@trpc/react": "^9.26.2", - "@trpc/server": "^9.26.2", + "@trpc/client": "^9.27.0", + "@trpc/react": "^9.27.0", + "@trpc/server": "^9.27.0", "@types/node": "^17.0.10", "builtin-modules": "^3.3.0", "c8": "^7.12.0", @@ -47,8 +47,8 @@ "zod": "^3.17.10" }, "peerDependencies": { - "@trpc/client": "^9.26.0", - "@trpc/server": "^9.26.0", + "@trpc/client": "^9.27.0", + "@trpc/server": "^9.27.0", "electron": "^19.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5dec84b..3ef3ca8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,9 +3,9 @@ lockfileVersion: 5.4 specifiers: '@changesets/changelog-github': ^0.4.6 '@changesets/cli': ^2.24.1 - '@trpc/client': ^9.26.2 - '@trpc/react': ^9.26.2 - '@trpc/server': ^9.26.2 + '@trpc/client': ^9.27.0 + '@trpc/react': ^9.27.0 + '@trpc/server': ^9.27.0 '@types/node': ^17.0.10 builtin-modules: ^3.3.0 c8: ^7.12.0 @@ -24,9 +24,9 @@ specifiers: devDependencies: '@changesets/changelog-github': 0.4.6 '@changesets/cli': 2.24.2 - '@trpc/client': 9.26.2_@trpc+server@9.26.2 - '@trpc/react': 9.26.2_4zadt2mtfbx7275mbcwrjz2noe - '@trpc/server': 9.26.2 + '@trpc/client': 9.27.0_@trpc+server@9.27.0 + '@trpc/react': 9.27.0_6kynlixhwtdnconxwynxyvz5km + '@trpc/server': 9.27.0 '@types/node': 17.0.45 builtin-modules: 3.3.0 c8: 7.12.0 @@ -379,34 +379,34 @@ packages: defer-to-connect: 1.1.3 dev: true - /@trpc/client/9.26.2_@trpc+server@9.26.2: - resolution: {integrity: sha512-R7eaxEtcK1C6PwxlGZCmMEiGGfn1BUU/hnulTpHVw/Mkd/3EqQqvP3Gs7pAYnJAZ44rjNF3Hepw5q2nP2Ctnhg==} + /@trpc/client/9.27.0_@trpc+server@9.27.0: + resolution: {integrity: sha512-Yh+oDBiANArjDx69bSnXqIK36wjlRm8iGLQkMmrvTTFwVRt3hgfreCzjyj4PgNEd4SNX4iGrhLLPIDHeH+qlJA==} peerDependencies: - '@trpc/server': 9.26.2 + '@trpc/server': 9.27.0 dependencies: '@babel/runtime': 7.18.9 - '@trpc/server': 9.26.2 + '@trpc/server': 9.27.0 dev: true - /@trpc/react/9.26.2_4zadt2mtfbx7275mbcwrjz2noe: - resolution: {integrity: sha512-YCwn+Cd1/Yl6qB+/ZSF9A+32prBU4Z7un5Ms/q79mC090deCdfOL0IGNrv/7kX5EtsuOSo0RR/NUTo9f+xx1NA==} + /@trpc/react/9.27.0_6kynlixhwtdnconxwynxyvz5km: + resolution: {integrity: sha512-vAMBvI5AQP/US9MluO12V0OU/zwnGOUUTkRh22QQ20rcmR6NXPE28lMCdcJaHoTcbv1Mlr6vGXH7Er+/2+9tRg==} peerDependencies: - '@trpc/client': 9.26.2 - '@trpc/server': 9.26.2 + '@trpc/client': 9.27.0 + '@trpc/server': 9.27.0 react: '>=16.8.0' react-dom: '>=16.8.0' react-query: ^3.37.0 dependencies: '@babel/runtime': 7.18.9 - '@trpc/client': 9.26.2_@trpc+server@9.26.2 - '@trpc/server': 9.26.2 + '@trpc/client': 9.27.0_@trpc+server@9.27.0 + '@trpc/server': 9.27.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-query: 3.39.2_biqbaboplfbrettd7655fr4n2y dev: true - /@trpc/server/9.26.2: - resolution: {integrity: sha512-J1kP072cVYC5H2qFhiLQ/gV57s0of++9QLLKf9n8mVfx300tecKQW2eu/oFvRCDPRTTQ1prHz9zm15IzLwoRrw==} + /@trpc/server/9.27.0: + resolution: {integrity: sha512-5A/d5U9Y8L6+4q46a9gLackTyMRUFyNubo6JlIpSxtea/wW8teR6Azux4gg/uKIM3+6+lgg/HxQHWvwkG0VOSg==} dev: true /@types/chai-subset/1.3.3: diff --git a/src/main/resolveIPCResponse.ts b/src/main/resolveIPCResponse.ts index 5fba5be9..a86a9ec5 100644 --- a/src/main/resolveIPCResponse.ts +++ b/src/main/resolveIPCResponse.ts @@ -1,9 +1,16 @@ -import type { AnyRouter, inferRouterContext, inferRouterError, ProcedureType } from '@trpc/server'; -import { TRPCError } from '@trpc/server/src/TRPCError'; -import { transformTRPCResponse } from '@trpc/server/src/internals/transformTRPCResponse'; -import { callProcedure } from '@trpc/server/src/internals/callProcedure'; +import type { + AnyRouter, + inferRouterContext, + inferRouterError, + ProcedureType, +} from '@trpc/server'; +import { + callProcedure, + getErrorFromUnknown, + transformTRPCResponse, + TRPCError, +} from '@trpc/server'; import { TRPCResponse, TRPCErrorResponse, TRPCResultResponse } from '@trpc/server/rpc'; -import { getErrorFromUnknown } from '@trpc/server/src/internals/errors'; export async function resolveIPCResponse({ createContext, diff --git a/src/renderer/ipcLink.ts b/src/renderer/ipcLink.ts index b37e23a1..2c3b26a7 100644 --- a/src/renderer/ipcLink.ts +++ b/src/renderer/ipcLink.ts @@ -1,8 +1,6 @@ import type { AnyRouter } from '@trpc/server'; import type { TRPCLink, LinkRuntimeOptions } from '@trpc/client'; -import { TRPCClientError } from '@trpc/client'; -import { TRPCAbortError } from '@trpc/client/src/internals/TRPCAbortError'; -import { transformRPCResponse } from '@trpc/client/src/internals/transformRPCResponse'; +import { transformRPCResponse, TRPCAbortError, TRPCClientError } from '@trpc/client'; export function ipcLink(): TRPCLink { return (runtime: LinkRuntimeOptions) => { From ff75378ca09fb38858fead5acf862eee7bd7a473 Mon Sep 17 00:00:00 2001 From: Jason Nall Date: Sat, 13 Aug 2022 12:58:13 -0400 Subject: [PATCH 2/3] Update types. --- src/main/resolveIPCResponse.ts | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/resolveIPCResponse.ts b/src/main/resolveIPCResponse.ts index a86a9ec5..715d1a7a 100644 --- a/src/main/resolveIPCResponse.ts +++ b/src/main/resolveIPCResponse.ts @@ -1,15 +1,5 @@ -import type { - AnyRouter, - inferRouterContext, - inferRouterError, - ProcedureType, -} from '@trpc/server'; -import { - callProcedure, - getErrorFromUnknown, - transformTRPCResponse, - TRPCError, -} from '@trpc/server'; +import type { AnyRouter, inferRouterContext, inferRouterError, ProcedureType } from '@trpc/server'; +import { callProcedure, getErrorFromUnknown, transformTRPCResponse, TRPCError } from '@trpc/server'; import { TRPCResponse, TRPCErrorResponse, TRPCResultResponse } from '@trpc/server/rpc'; export async function resolveIPCResponse({ @@ -73,5 +63,5 @@ export async function resolveIPCResponse({ }; } - return transformTRPCResponse(router as any, json) as any; + return transformTRPCResponse(router, json) as TRPCResponse; } From 0ac58018d585e8a7f087934eb7aca033127cf060 Mon Sep 17 00:00:00 2001 From: Jason Nall Date: Sat, 13 Aug 2022 13:00:14 -0400 Subject: [PATCH 3/3] Add changeset. --- .changeset/dry-trainers-tie.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/dry-trainers-tie.md diff --git a/.changeset/dry-trainers-tie.md b/.changeset/dry-trainers-tie.md new file mode 100644 index 00000000..8d5bdb4b --- /dev/null +++ b/.changeset/dry-trainers-tie.md @@ -0,0 +1,5 @@ +--- +'electron-trpc': minor +--- + +Upgrade tRPC.