diff --git a/package.json b/package.json index fcdd247..d9bfe23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@examples/next-websockets-starter", - "version": "10.43.3", + "version": "10.43.6", "private": true, "engines": { "node": "^18.15.0" @@ -42,10 +42,10 @@ "dependencies": { "@prisma/client": "^4.14.1", "@tanstack/react-query": "^4.18.0", - "@trpc/client": "^10.43.3", - "@trpc/next": "^10.43.3", - "@trpc/react-query": "^10.43.3", - "@trpc/server": "^10.43.3", + "@trpc/client": "^10.43.6", + "@trpc/next": "^10.43.6", + "@trpc/react-query": "^10.43.6", + "@trpc/server": "^10.43.6", "clsx": "^2.0.0", "next": "^14.0.1", "next-auth": "^4.22.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 696e177..05371d4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,7 @@ dependencies: specifier: ^4.18.0 version: 4.18.0(react-dom@18.2.0)(react@18.2.0) '@trpc/client': +<<<<<<< HEAD specifier: ^10.43.3 version: 10.43.3(@trpc/server@10.43.3) '@trpc/next': @@ -19,6 +20,19 @@ dependencies: '@trpc/server': specifier: ^10.43.3 version: 10.43.3 +======= + specifier: ^10.43.6 + version: 10.43.6(@trpc/server@10.43.6) + '@trpc/next': + specifier: ^10.43.6 + version: 10.43.6(@tanstack/react-query@4.18.0)(@trpc/client@10.43.6)(@trpc/react-query@10.43.6)(@trpc/server@10.43.6)(next@14.0.1)(react-dom@18.2.0)(react@18.2.0) + '@trpc/react-query': + specifier: ^10.43.6 + version: 10.43.6(@tanstack/react-query@4.18.0)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': + specifier: ^10.43.6 + version: 10.43.6 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d clsx: specifier: ^2.0.0 version: 2.0.0 @@ -45,7 +59,11 @@ dependencies: version: 8.11.0 zod: specifier: ^3.0.0 +<<<<<<< HEAD version: 3.20.2 +======= + version: 3.22.4 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d devDependencies: '@playwright/test': @@ -613,6 +631,7 @@ packages: react-dom: 18.2.0(react@18.2.0) use-sync-external-store: 1.2.0(react@18.2.0) +<<<<<<< HEAD /@trpc/client@10.43.3(@trpc/server@10.43.3): resolution: {integrity: sha512-r/aE1l2iybJMlXCf+KWqSQpIloOqw/3jQhZD8F4VpvczWPI5fEQCmZZuPHAz2L/PiGE5K/ZwXQrJsT207ZQ2AQ==} peerDependencies: @@ -628,38 +647,80 @@ packages: '@trpc/client': 10.43.3 '@trpc/react-query': 10.43.3 '@trpc/server': 10.43.3 +======= + /@trpc/client@10.43.6(@trpc/server@10.43.6): + resolution: {integrity: sha512-gQSxCQgPeBn/wqBEScu5Nq9UKqA16e965vWBj+BbdvI4URV72T44/yg0cl/E6xtBgycCVwdzwn7CuZaM8FA/VQ==} + peerDependencies: + '@trpc/server': 10.43.6 + dependencies: + '@trpc/server': 10.43.6 + dev: false + + /@trpc/next@10.43.6(@tanstack/react-query@4.18.0)(@trpc/client@10.43.6)(@trpc/react-query@10.43.6)(@trpc/server@10.43.6)(next@14.0.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-srV4twQKp8FohivGZ5wxNUdTzgPjjKeuNWG3Bpy5hVrIvg8VHDcglPMHS+3eWTUDDtCbhWpvANre+81B8b9Fgg==} + peerDependencies: + '@tanstack/react-query': ^4.18.0 + '@trpc/client': 10.43.6 + '@trpc/react-query': 10.43.6 + '@trpc/server': 10.43.6 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d next: '*' react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: '@tanstack/react-query': 4.18.0(react-dom@18.2.0)(react@18.2.0) +<<<<<<< HEAD '@trpc/client': 10.43.3(@trpc/server@10.43.3) '@trpc/react-query': 10.43.3(@tanstack/react-query@4.18.0)(@trpc/client@10.43.3)(@trpc/server@10.43.3)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': 10.43.3 +======= + '@trpc/client': 10.43.6(@trpc/server@10.43.6) + '@trpc/react-query': 10.43.6(@tanstack/react-query@4.18.0)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': 10.43.6 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d next: 14.0.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-ssr-prepass: 1.5.0(react@18.2.0) dev: false +<<<<<<< HEAD /@trpc/react-query@10.43.3(@tanstack/react-query@4.18.0)(@trpc/client@10.43.3)(@trpc/server@10.43.3)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-yTmORp8pJ15GV8rR2QTR6bIPxk/Vbtl2vLTDz+G5GipKc+9kSRRYaVqbwzFuaPf5NOMK/JYkIsyIpitabQ1n9A==} peerDependencies: '@tanstack/react-query': ^4.18.0 '@trpc/client': 10.43.3 '@trpc/server': 10.43.3 +======= + /@trpc/react-query@10.43.6(@tanstack/react-query@4.18.0)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Twf0/wvcrDwmaJ6OLf0YVNwiv8+gtoSFyKYqe+5lMkFtUYSl+4KGvSqiN9ynbnofHCvuPgjJmjdS8pxYkcWxCw==} + peerDependencies: + '@tanstack/react-query': ^4.18.0 + '@trpc/client': 10.43.6 + '@trpc/server': 10.43.6 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: '@tanstack/react-query': 4.18.0(react-dom@18.2.0)(react@18.2.0) +<<<<<<< HEAD '@trpc/client': 10.43.3(@trpc/server@10.43.3) '@trpc/server': 10.43.3 +======= + '@trpc/client': 10.43.6(@trpc/server@10.43.6) + '@trpc/server': 10.43.6 +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false +<<<<<<< HEAD /@trpc/server@10.43.3: resolution: {integrity: sha512-U7HsNtgjupNvPzH6ho4rPlIXZ2t5PctOH6pmFX4jv4YJi98RjGuOhHUNhiiVb8KUw6Kuh5EHTAv7cUV+igbMuQ==} +======= + /@trpc/server@10.43.6: + resolution: {integrity: sha512-ziN7UXGAycxe4i3FwJstTe6jzCcKBlPociCrC9XtfPzFpMTf0hNbRQQlFiZjJk23ZGQSVYDjk9RO4yIHt94mJg==} +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d engines: {node: '>=18.0.0'} dev: false @@ -4046,8 +4107,13 @@ packages: engines: {node: '>=10'} dev: true +<<<<<<< HEAD /zod@3.20.2: resolution: {integrity: sha512-1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ==} +======= + /zod@3.22.4: + resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} +>>>>>>> 9329fe3aab402eba2d7d2dd0bf6529ed1a9cc45d dev: false settings: diff --git a/src/server/context.ts b/src/server/context.ts index 35d0d72..7c113bd 100644 --- a/src/server/context.ts +++ b/src/server/context.ts @@ -1,4 +1,3 @@ -import * as trpc from '@trpc/server'; import * as trpcNext from '@trpc/server/adapters/next'; import { NodeHTTPCreateContextFnOptions } from '@trpc/server/adapters/node-http'; import { IncomingMessage } from 'http'; @@ -23,4 +22,4 @@ export const createContext = async ( }; }; -export type Context = trpc.inferAsyncReturnType; +export type Context = Awaited>;