Compare commits

...

4 Commits

Author SHA1 Message Date
Robert Soriano
ebb6637238 chore: release v0.4.0-beta.4 2022-10-30 13:02:11 -07:00
Robert Soriano
0c83ade918 update release script 2022-10-30 13:02:01 -07:00
Robert Soriano
97d9b3ddf8 import useAsyncData and useState from #app 2022-10-30 12:57:57 -07:00
Robert Soriano
eaa61f3700 bump local pnpm to 7.14.1 2022-10-30 12:35:30 -07:00
3 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "trpc-nuxt",
"version": "0.4.0-beta.3",
"packageManager": "pnpm@7.5.0",
"version": "0.4.0-beta.4",
"packageManager": "pnpm@7.14.1",
"license": "MIT",
"sideEffects": false,
"exports": {
@@ -27,7 +27,7 @@
"build": "tsup",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"release": "bumpp --commit --push --tag && npm publish"
"release": "bumpp && npm publish"
},
"peerDependencies": {
"@trpc/client": "^10.0.0-proxy-beta.21",
@@ -47,7 +47,7 @@
"bumpp": "^8.2.1",
"eslint": "^8.25.0",
"nuxt": "3.0.0-rc.12",
"pnpm": "^7.5.0",
"pnpm": "^7.14.1",
"tsup": "6.0.1",
"typescript": "^4.7.4"
},

2
pnpm-lock.yaml generated
View File

@@ -13,7 +13,7 @@ importers:
h3: ^0.8.5
nuxt: 3.0.0-rc.12
ohash: ^0.1.5
pnpm: ^7.5.0
pnpm: ^7.14.1
tsup: 6.0.1
typescript: ^4.7.4
ufo: ^0.8.6

View File

@@ -6,6 +6,8 @@ import type {
import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared'
import { hash } from 'ohash'
import type { DecoratedProcedureRecord } from './types'
// @ts-ignore: nuxt internal
import { useAsyncData, useState } from '#app'
/**
* Calculates the key used for `useAsyncData` call
@@ -27,7 +29,7 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter>(name: strin
const pathCopy = [name, ...opts.path]
// The last arg is for instance `.mutate` or `.query()`
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastArg = pathCopy.pop()!
const path = pathCopy.join('.')
@@ -44,9 +46,7 @@ export function createNuxtProxyDecoration<TRouter extends AnyRouter>(name: strin
* Custom useAsyncData to add server error to client
*/
async function useAsyncDataWithError(queryKey: string, cb: any, asyncDataOptions: any) {
// @ts-ignore: nuxt internal
const serverError = useState(`error-${queryKey}`, () => null)
// @ts-ignore: nuxt internal
const { error, data, ...rest } = await useAsyncData(queryKey, cb, asyncDataOptions)
if (error.value && !serverError.value)