mirror of
https://github.com/ArthurDanjou/trpc-nuxt.git
synced 2026-01-24 08:50:32 +01:00
Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f7fbbe108 | ||
|
|
c32fdf7893 | ||
|
|
10bc1d3a4d | ||
|
|
7bd62822d3 | ||
|
|
967271089f | ||
|
|
169c6aa534 | ||
|
|
2d025788ce | ||
|
|
4af2b2ef3f | ||
|
|
ae0b7824f4 | ||
|
|
4339bf5059 | ||
|
|
252e2261e9 | ||
|
|
40eaf44f39 | ||
|
|
ad827bb716 | ||
|
|
08125cbf0c | ||
|
|
fb5723b071 | ||
|
|
8c35279cc2 | ||
|
|
61a5bcd2ee | ||
|
|
eaeab1565d | ||
|
|
e7453bfc70 | ||
|
|
54ef27d524 | ||
|
|
38d83dac34 | ||
|
|
0f7e52248f | ||
|
|
be55641338 | ||
|
|
6ba6e70b92 | ||
|
|
b710f809c7 | ||
|
|
4f647afa36 | ||
|
|
1defbe5954 | ||
|
|
fa6ba65d35 | ||
|
|
d4af221e89 | ||
|
|
6595a1d306 | ||
|
|
b506cd5f14 |
@@ -96,7 +96,7 @@ import { inferAsyncReturnType } from '@trpc/server'
|
|||||||
* Creates context for an incoming request
|
* Creates context for an incoming request
|
||||||
* @link https://trpc.io/docs/context
|
* @link https://trpc.io/docs/context
|
||||||
*/
|
*/
|
||||||
export const createContext = () => {}
|
export const createContext = () => ({})
|
||||||
|
|
||||||
export type Context = inferAsyncReturnType<typeof createContext>;
|
export type Context = inferAsyncReturnType<typeof createContext>;
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -8,10 +8,10 @@
|
|||||||
"preview": "nuxi preview"
|
"preview": "nuxi preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nuxt": "^3.0.0"
|
"nuxt": "3.4.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxt-themes/docus": "^1.1.10",
|
"@nuxt-themes/docus": "^1.11.1",
|
||||||
"@nuxtlabs/github-module": "^1.5.4"
|
"@nuxtlabs/github-module": "^1.6.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
30
package.json
30
package.json
@@ -2,8 +2,8 @@
|
|||||||
"name": "trpc-nuxt",
|
"name": "trpc-nuxt",
|
||||||
"description": "End-to-end typesafe APIs in Nuxt applications.",
|
"description": "End-to-end typesafe APIs in Nuxt applications.",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"packageManager": "pnpm@7.18.2",
|
"packageManager": "pnpm@7.32.4",
|
||||||
"version": "0.7.0",
|
"version": "0.10.2",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"sideEffects": false,
|
"sideEffects": false,
|
||||||
"exports": {
|
"exports": {
|
||||||
@@ -35,24 +35,24 @@
|
|||||||
"update-deps": "taze -w && pnpm i"
|
"update-deps": "taze -w && pnpm i"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@trpc/client": "^10.12.0",
|
"@trpc/client": "^10.26.0",
|
||||||
"@trpc/server": "^10.12.0"
|
"@trpc/server": "^10.26.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"h3": "^1.5.0",
|
"h3": "^1.6.5",
|
||||||
"ofetch": "^1.0.1",
|
"ofetch": "^1.0.1",
|
||||||
"ohash": "^1.0.0",
|
"ohash": "^1.1.2",
|
||||||
"ufo": "^1.1.0"
|
"ufo": "^1.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxt/eslint-config": "^0.1.1",
|
"@nuxt/eslint-config": "^0.1.1",
|
||||||
"@trpc/client": "^10.12.0",
|
"@trpc/client": "^10.26.0",
|
||||||
"@trpc/server": "^10.12.0",
|
"@trpc/server": "^10.26.0",
|
||||||
"bumpp": "^8.2.1",
|
"bumpp": "^9.1.0",
|
||||||
"eslint": "^8.33.0",
|
"eslint": "^8.40.0",
|
||||||
"taze": "^0.8.5",
|
"taze": "^0.10.1",
|
||||||
"tsup": "6.6.3",
|
"tsup": "6.7.0",
|
||||||
"typescript": "^4.9.5"
|
"typescript": "^5.0.4"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": [
|
"extends": [
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
],
|
],
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"nuxt": "3.0.0"
|
"nuxt": "3.4.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
@@ -9,13 +9,14 @@
|
|||||||
"postinstall": "nuxt prepare"
|
"postinstall": "nuxt prepare"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@trpc/client": "^10.8.1",
|
"@trpc/client": "^10.26.0",
|
||||||
"@trpc/server": "^10.8.1",
|
"@trpc/server": "^10.26.0",
|
||||||
"superjson": "^1.12.1",
|
"superjson": "^1.12.3",
|
||||||
"trpc-nuxt": "workspace:*",
|
"trpc-nuxt": "workspace:*",
|
||||||
"zod": "^3.20.2"
|
"zod": "^3.21.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"nuxt": "^3.0.0"
|
"@types/node": "^18.16.8",
|
||||||
|
"nuxt": "3.4.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,13 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { TRPCClientError, TRPCClientErrorLike } from '@trpc/client'
|
||||||
|
import type { inferRouterOutputs } from '@trpc/server'
|
||||||
|
import type { AppRouter } from '@/server/trpc/routers'
|
||||||
|
|
||||||
|
type RouterOutput = inferRouterOutputs<AppRouter>
|
||||||
|
type GetTodosOutput = RouterOutput['todo']['getTodos']
|
||||||
|
|
||||||
|
type ErrorOutput = TRPCClientError<AppRouter>
|
||||||
|
|
||||||
const { $client } = useNuxtApp()
|
const { $client } = useNuxtApp()
|
||||||
|
|
||||||
const addTodo = async () => {
|
const addTodo = async () => {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ const { data: todo, pending, error } = await useAsyncData(() => $client.todo.get
|
|||||||
<div v-if="pending">
|
<div v-if="pending">
|
||||||
Loading...
|
Loading...
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="error?.data?.code">
|
<div v-else-if="error">
|
||||||
{{ error.data.code }}
|
{{ error.message }} - {{ error.cause }}
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
ID: {{ todo?.id }} <br>
|
ID: {{ todo?.id }} <br>
|
||||||
|
|||||||
6330
pnpm-lock.yaml
generated
6330
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -61,7 +61,7 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
|
|||||||
}), asyncDataOptions)
|
}), asyncDataOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (client as any)[path][lastArg](input)
|
return (client as any)[path][lastArg](...args)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ import { type AnyRouter } from '@trpc/server'
|
|||||||
import { FetchError } from 'ofetch'
|
import { FetchError } from 'ofetch'
|
||||||
// @ts-expect-error: Nuxt auto-imports
|
// @ts-expect-error: Nuxt auto-imports
|
||||||
import { useRequestHeaders } from '#imports'
|
import { useRequestHeaders } from '#imports'
|
||||||
import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/internals/httpUtils'
|
import { type HTTPLinkOptions as _HTTPLinkOptions } from '@trpc/client/dist/links/httpLink'
|
||||||
import { type FetchEsque } from '@trpc/client/dist/internals/types'
|
import { type FetchEsque } from '@trpc/client/dist/internals/types'
|
||||||
|
|
||||||
function customFetch(input: RequestInfo | URL, init?: RequestInit) {
|
function customFetch(input: RequestInfo | URL, init?: RequestInit & { method: 'GET' }) {
|
||||||
return globalThis.$fetch.raw(input.toString(), init)
|
return globalThis.$fetch.raw(input.toString(), init)
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
if (e instanceof FetchError && e.response) { return e.response }
|
if (e instanceof FetchError && e.response) { return e.response }
|
||||||
@@ -70,6 +70,7 @@ export function httpBatchLink<TRouter extends AnyRouter>(opts?: HttpBatchLinkOpt
|
|||||||
|
|
||||||
return _httpBatchLink<TRouter>({
|
return _httpBatchLink<TRouter>({
|
||||||
url: '/api/trpc',
|
url: '/api/trpc',
|
||||||
|
// @ts-expect-error: Missing property from batchLink. Fix this later.
|
||||||
headers () {
|
headers () {
|
||||||
return headers
|
return headers
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,9 +16,8 @@ import { inferTransformedProcedureOutput } from '@trpc/server/shared'
|
|||||||
import type {
|
import type {
|
||||||
AsyncData,
|
AsyncData,
|
||||||
AsyncDataOptions,
|
AsyncDataOptions,
|
||||||
KeyOfRes,
|
KeysOf,
|
||||||
PickFrom,
|
PickFrom,
|
||||||
_Transform
|
|
||||||
} from 'nuxt/dist/app/composables/asyncData'
|
} from 'nuxt/dist/app/composables/asyncData'
|
||||||
|
|
||||||
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
||||||
@@ -51,13 +50,14 @@ type DecorateProcedure<
|
|||||||
> = TProcedure extends AnyQueryProcedure
|
> = TProcedure extends AnyQueryProcedure
|
||||||
? {
|
? {
|
||||||
useQuery: <
|
useQuery: <
|
||||||
TData = inferTransformedProcedureOutput<TProcedure>,
|
ResT = inferTransformedProcedureOutput<TProcedure>,
|
||||||
Transform extends _Transform<TData> = _Transform<TData, TData>,
|
DataE = TRPCClientErrorLike<TProcedure>,
|
||||||
PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
|
DataT = ResT,
|
||||||
|
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
|
||||||
>(
|
>(
|
||||||
input: inferProcedureInput<TProcedure>,
|
input: inferProcedureInput<TProcedure>,
|
||||||
opts?: AsyncDataOptions<TData, Transform, PickKeys> & { trpc?: TRPCRequestOptions },
|
opts?: AsyncDataOptions<ResT, DataT, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||||
) => AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TRPCClientErrorLike<TProcedure>>,
|
) => AsyncData<PickFrom<DataT, PickKeys>, DataE>,
|
||||||
query: Resolver<TProcedure>
|
query: Resolver<TProcedure>
|
||||||
} : TProcedure extends AnyMutationProcedure ? {
|
} : TProcedure extends AnyMutationProcedure ? {
|
||||||
mutate: Resolver<TProcedure>
|
mutate: Resolver<TProcedure>
|
||||||
|
|||||||
Reference in New Issue
Block a user