E2E tests for integrations

lemonmade · Sep 3, 2024 · a3402f7 · a3402f7
1 parent 3cd5a9e
commit a3402f7
Show file tree

Hide file tree

Showing 10 changed files with 340 additions and 71 deletions.
diff --git a/integrations/trpc/package.json b/integrations/trpc/package.json
@@ -37,8 +37,8 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@trpc/client": "^10.0.0",
-    "@trpc/server": "^10.0.0"
+    "@trpc/client": "^10.0.0 || ^11.0.0",
+    "@trpc/server": "^10.0.0 || ^11.0.0"
   },
   "peerDependenciesMeta": {
     "@trpc/client": {
@@ -49,7 +49,7 @@
     }
   },
   "devDependencies": {
-    "@trpc/client": "^10.31.0",
-    "@trpc/server": "^10.31.0"
+    "@trpc/client": "next",
+    "@trpc/server": "next"
   }
 }
diff --git a/integrations/trpc/source/server.ts b/integrations/trpc/source/server.ts
@@ -1,37 +1,33 @@
-import {callProcedure, type AnyRouter} from '@trpc/server';
+import {callProcedure, type AnyTRPCRouter} from '@trpc/server';
 import {observable} from '@trpc/server/observable';
 import {
   TRPCClientError,
   createTRPCClient,
   type CreateTRPCClientOptions,
   type TRPCLink,
 } from '@trpc/client';
-import {transformResult} from '@trpc/client/shared';
+import {transformResult} from '@trpc/server/unstable-core-do-not-import';
 
-export function createDirectClient<Router extends AnyRouter>(
+export function createDirectClient<Router extends AnyTRPCRouter>(
   router: Router,
-  {
-    links = [] as any,
-    transformer,
-  }: Partial<CreateTRPCClientOptions<Router>> = {},
+  {links = [] as any}: Partial<CreateTRPCClientOptions<Router>> = {},
 ) {
   return createTRPCClient<Router>({
-    transformer,
     links: [...links, directLink(router)],
   } as any);
 }
 
-export function directLink<Router extends AnyRouter>(
+export function directLink<Router extends AnyTRPCRouter>(
   router: Router,
 ): TRPCLink<Router> {
-  return function fancyLink(runtime) {
+  return function fancyLink() {
     return function operationLink({op}) {
       return observable((observer) => {
         const {path, input, type} = op;
 
         const result = callProcedure({
           path,
-          rawInput: input,
+          getRawInput: () => Promise.resolve(input),
           type,
           ctx: {},
           procedures: router._def.procedures,
@@ -41,7 +37,7 @@ export function directLink<Router extends AnyRouter>(
           .then((result) => {
             const transformed = transformResult(
               {result: {data: result, type: 'data'}},
-              runtime,
+              router._def._config.transformer.output,
             );
 
             if (!transformed.ok) {

diff --git a/packages/create/package.json b/packages/create/package.json
@@ -29,6 +29,9 @@
   "devDependencies": {
     "@quilted/cli-kit": "workspace:^0.2.0",
     "@types/common-tags": "^1.8.0",
+    "@trpc/client": "next",
+    "@trpc/react-query": "next",
+    "@trpc/server": "next",
     "@types/fs-extra": "^9.0.11",
     "@types/minimatch": "^3.0.5",
     "@types/prompts": "^2.0.13",
@@ -41,6 +44,7 @@
     "pkg-dir": "^6.0.0",
     "prettier": "^3.0.0",
     "prompts": "^2.4.0",
-    "yaml": "^2.1.0"
+    "yaml": "^2.1.0",
+    "zod": "^3.23.8"
   }
 }
diff --git a/packages/create/templates/app-trpc/shared/trpc.ts b/packages/create/templates/app-trpc/shared/trpc.ts
@@ -1,4 +1,4 @@
-import type {TRPCClient} from '@trpc/client';
+import type {CreateTRPCClient} from '@trpc/client';
 import {createTRPCReact, type CreateTRPCReact} from '@trpc/react-query';
 import type {QueryClient} from '@tanstack/react-query';
 
@@ -7,12 +7,12 @@ import type {QueryClient} from '@tanstack/react-query';
 // perform.
 import type {AppRouter} from '../trpc.ts';
 
-export const trpc: CreateTRPCReact<AppRouter, unknown, null> =
+export const trpc: CreateTRPCReact<AppRouter, {}> =
   createTRPCReact<AppRouter>();
 
 declare module '~/shared/context.ts' {
   interface AppContext {
-    trpc: TRPCClient<AppRouter>;
+    trpc: CreateTRPCClient<AppRouter>;
     queryClient: QueryClient;
   }
 }
diff --git a/packages/create/templates/app-trpc/trpc.ts b/packages/create/templates/app-trpc/trpc.ts
@@ -11,3 +11,5 @@ export const appRouter = t.router({
 // Our client-side code will use this type to infer the
 // procedures that are defined.
 export type AppRouter = typeof appRouter;
+
+export const createCaller = t.createCallerFactory(appRouter);
diff --git a/packages/create/templates/workspace/package.json b/packages/create/templates/workspace/package.json
@@ -16,11 +16,11 @@
     "@quilted/rollup": "^0.2.0",
     "@quilted/vite": "^0.1.0",
     "@quilted/typescript": "^0.4.0",
-    "rollup": "^4.14.0",
-    "prettier": "^3.0.0",
-    "tsx": "^4.9.0",
+    "rollup": "^4.21.0",
+    "prettier": "^3.3.0",
+    "tsx": "^4.19.0",
     "typescript": "^5.5.0",
-    "vite": "^5.3.0",
+    "vite": "^5.4.0",
     "vitest": "^2.0.0"
   },
   "prettier": {