mirror of
https://github.com/ArthurDanjou/trpc-nuxt.git
synced 2026-01-24 17:00:32 +01:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e15ea6b5a3 | ||
|
|
054fad952a | ||
|
|
e15a62a5b2 | ||
|
|
3f399f0c58 | ||
|
|
247a6448cb | ||
|
|
5301221148 | ||
|
|
7683499953 | ||
|
|
2c28424ecd | ||
|
|
18cd492ffd | ||
|
|
c2ae94b4a7 | ||
|
|
94eb3c6257 | ||
|
|
e55670169e |
37
CHANGELOG.md
Normal file
37
CHANGELOG.md
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
|
||||||
|
## v0.10.4
|
||||||
|
|
||||||
|
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.3...v0.10.4)
|
||||||
|
|
||||||
|
|
||||||
|
### 🚀 Enhancements
|
||||||
|
|
||||||
|
- Add reactive inputs ([054fad9](https://github.com/wobsoriano/trpc-nuxt/commit/054fad9))
|
||||||
|
|
||||||
|
### 📖 Documentation
|
||||||
|
|
||||||
|
- Update local deps ([7683499](https://github.com/wobsoriano/trpc-nuxt/commit/7683499))
|
||||||
|
|
||||||
|
### 🏡 Chore
|
||||||
|
|
||||||
|
- Remove engines property ([e15a62a](https://github.com/wobsoriano/trpc-nuxt/commit/e15a62a))
|
||||||
|
|
||||||
|
### ❤️ Contributors
|
||||||
|
|
||||||
|
- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
|
||||||
|
|
||||||
|
## v0.10.3
|
||||||
|
|
||||||
|
[compare changes](https://github.com/wobsoriano/trpc-nuxt/compare/v0.10.2...v0.10.3)
|
||||||
|
|
||||||
|
|
||||||
|
### 🚀 Enhancements
|
||||||
|
|
||||||
|
- Export createH3ApiHandler for h3 apps ([18cd492](https://github.com/wobsoriano/trpc-nuxt/commit/18cd492))
|
||||||
|
|
||||||
|
### ❤️ Contributors
|
||||||
|
|
||||||
|
- Wobsoriano ([@wobsoriano](http://github.com/wobsoriano))
|
||||||
|
|
||||||
@@ -7,11 +7,9 @@
|
|||||||
"generate": "nuxi build",
|
"generate": "nuxi build",
|
||||||
"preview": "nuxi preview"
|
"preview": "nuxi preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
|
||||||
"nuxt": "3.4.3"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxt-themes/docus": "^1.11.1",
|
"@nuxt-themes/docus": "^1.12.0",
|
||||||
"@nuxtlabs/github-module": "^1.6.3"
|
"@nuxtlabs/github-module": "^1.6.3",
|
||||||
|
"nuxt": "3.4.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
19
package.json
19
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.32.4",
|
"packageManager": "pnpm@8.5.1",
|
||||||
"version": "0.10.2",
|
"version": "0.10.4",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"sideEffects": false,
|
"sideEffects": false,
|
||||||
"exports": {
|
"exports": {
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
"build": "tsup",
|
"build": "tsup",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"lint:fix": "eslint . --fix",
|
"lint:fix": "eslint . --fix",
|
||||||
"release": "bumpp && npm publish",
|
"release": "changelogen --release && npm publish && git push --follow-tags",
|
||||||
"update-deps": "taze -w && pnpm i"
|
"update-deps": "taze -w && pnpm i"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
@@ -39,17 +39,17 @@
|
|||||||
"@trpc/server": "^10.26.0"
|
"@trpc/server": "^10.26.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"h3": "^1.6.5",
|
"h3": "^1.6.6",
|
||||||
"ofetch": "^1.0.1",
|
"ofetch": "^1.0.1",
|
||||||
"ohash": "^1.1.2",
|
"ohash": "^1.1.2",
|
||||||
"ufo": "^1.1.2"
|
"ufo": "^1.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nuxt/eslint-config": "^0.1.1",
|
"@nuxt/eslint-config": "^0.1.1",
|
||||||
"@trpc/client": "^10.26.0",
|
"@trpc/client": "^10.28.0",
|
||||||
"@trpc/server": "^10.26.0",
|
"@trpc/server": "^10.28.0",
|
||||||
"bumpp": "^9.1.0",
|
"changelogen": "^0.5.3",
|
||||||
"eslint": "^8.40.0",
|
"eslint": "^8.41.0",
|
||||||
"taze": "^0.10.1",
|
"taze": "^0.10.1",
|
||||||
"tsup": "6.7.0",
|
"tsup": "6.7.0",
|
||||||
"typescript": "^5.0.4"
|
"typescript": "^5.0.4"
|
||||||
@@ -77,8 +77,5 @@
|
|||||||
"overrides": {
|
"overrides": {
|
||||||
"nuxt": "3.4.3"
|
"nuxt": "3.4.3"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^16.13.0 || ^18.12.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,14 +9,14 @@
|
|||||||
"postinstall": "nuxt prepare"
|
"postinstall": "nuxt prepare"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@trpc/client": "^10.26.0",
|
"@trpc/client": "^10.28.0",
|
||||||
"@trpc/server": "^10.26.0",
|
"@trpc/server": "^10.28.0",
|
||||||
"superjson": "^1.12.3",
|
"superjson": "^1.12.3",
|
||||||
"trpc-nuxt": "workspace:*",
|
"trpc-nuxt": "workspace:*",
|
||||||
"zod": "^3.21.4"
|
"zod": "^3.21.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^18.16.8",
|
"@types/node": "^18.16.15",
|
||||||
"nuxt": "3.4.3"
|
"nuxt": "3.4.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,4 @@
|
|||||||
<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 () => {
|
||||||
|
|||||||
29
playground/pages/reactive.vue
Normal file
29
playground/pages/reactive.vue
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
const route = useRoute()
|
||||||
|
const { $client } = useNuxtApp()
|
||||||
|
const id = ref(1)
|
||||||
|
// const { data: todo, pending, error } = await useAsyncData(() => $client.todo.getTodo.query(id.value), {
|
||||||
|
// watch: [id]
|
||||||
|
// })
|
||||||
|
|
||||||
|
const { data: todo, pending, error, refresh } = await $client.todo.getTodo.useQuery(id, {
|
||||||
|
watch: [id],
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div v-if="pending">
|
||||||
|
Loading...
|
||||||
|
</div>
|
||||||
|
<div v-else-if="error?.data?.code">
|
||||||
|
Error: {{ error.data.code }}
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
ID: {{ todo?.id }} <br>
|
||||||
|
Title: {{ todo?.title }} <br>
|
||||||
|
Completed: {{ todo?.completed }}
|
||||||
|
</div>
|
||||||
|
<button @click="id++">
|
||||||
|
Next Todo
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
2166
pnpm-lock.yaml
generated
2166
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@ import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared'
|
|||||||
import { hash } from 'ohash'
|
import { hash } from 'ohash'
|
||||||
import { type DecoratedProcedureRecord } from './types'
|
import { type DecoratedProcedureRecord } from './types'
|
||||||
// @ts-expect-error: Nuxt auto-imports
|
// @ts-expect-error: Nuxt auto-imports
|
||||||
import { getCurrentInstance, onScopeDispose, useAsyncData } from '#imports'
|
import { getCurrentInstance, onScopeDispose, useAsyncData, unref } from '#imports'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates the key used for `useAsyncData` call.
|
* Calculates the key used for `useAsyncData` call.
|
||||||
@@ -54,8 +54,8 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter> (name: stri
|
|||||||
controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
|
controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
|
||||||
}
|
}
|
||||||
|
|
||||||
const queryKey = getQueryKey(path, input)
|
const queryKey = getQueryKey(path, unref(input))
|
||||||
return useAsyncData(queryKey, () => (client as any)[path].query(input, {
|
return useAsyncData(queryKey, () => (client as any)[path].query(unref(input), {
|
||||||
signal: controller?.signal,
|
signal: controller?.signal,
|
||||||
...trpc
|
...trpc
|
||||||
}), asyncDataOptions)
|
}), asyncDataOptions)
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import type {
|
|||||||
KeysOf,
|
KeysOf,
|
||||||
PickFrom,
|
PickFrom,
|
||||||
} from 'nuxt/dist/app/composables/asyncData'
|
} from 'nuxt/dist/app/composables/asyncData'
|
||||||
|
import type { Ref } from 'vue'
|
||||||
|
|
||||||
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
interface TRPCRequestOptions extends _TRPCRequestOptions {
|
||||||
abortOnUnmount?: boolean
|
abortOnUnmount?: boolean
|
||||||
@@ -44,6 +45,8 @@ type SubscriptionResolver<
|
|||||||
]
|
]
|
||||||
) => Unsubscribable
|
) => Unsubscribable
|
||||||
|
|
||||||
|
type MaybeRef<T> = T | Ref<T>
|
||||||
|
|
||||||
type DecorateProcedure<
|
type DecorateProcedure<
|
||||||
TProcedure extends AnyProcedure,
|
TProcedure extends AnyProcedure,
|
||||||
TRouter extends AnyRouter,
|
TRouter extends AnyRouter,
|
||||||
@@ -55,7 +58,7 @@ type DecorateProcedure<
|
|||||||
DataT = ResT,
|
DataT = ResT,
|
||||||
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
|
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
|
||||||
>(
|
>(
|
||||||
input: inferProcedureInput<TProcedure>,
|
input: MaybeRef<inferProcedureInput<TProcedure>>,
|
||||||
opts?: AsyncDataOptions<ResT, DataT, PickKeys> & { trpc?: TRPCRequestOptions },
|
opts?: AsyncDataOptions<ResT, DataT, PickKeys> & { trpc?: TRPCRequestOptions },
|
||||||
) => AsyncData<PickFrom<DataT, PickKeys>, DataE>,
|
) => AsyncData<PickFrom<DataT, PickKeys>, DataE>,
|
||||||
query: Resolver<TProcedure>
|
query: Resolver<TProcedure>
|
||||||
|
|||||||
@@ -128,3 +128,5 @@ export function createNuxtApiHandler<TRouter extends AnyRouter> ({
|
|||||||
return body
|
return body
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const createH3ApiHandler = createNuxtApiHandler
|
||||||
|
|||||||
Reference in New Issue
Block a user