Compare commits

...

19 Commits

Author SHA1 Message Date
wobsoriano
a8e5538b05 release v0.3.3 2022-11-04 07:58:20 -07:00
wobsoriano
24ecb41429 eslint fix 2022-11-04 07:58:16 -07:00
wobsoriano
e8bf427d2b fix types 2022-11-04 07:57:38 -07:00
wobsoriano
347d49482f reinstall deps 2022-11-04 07:55:39 -07:00
wobsoriano
2f7a1276ad feat(deps): bump @nuxt/kit to 3.0.0-rc.13 2022-11-04 07:53:42 -07:00
wobsoriano
f6db0c78cd add .vercel to .gitignore 2022-11-04 07:51:44 -07:00
wobsoriano
d3203f0536 remove docs 2022-11-02 09:43:35 -07:00
wobsoriano
83e2b2810d release v0.3.2 2022-11-02 09:42:08 -07:00
wobsoriano
2b4fff9faa feat(deps): bump h3 to 0.8.6 2022-11-02 09:41:39 -07:00
wobsoriano
752fe721a2 feat(deps): lock @trpc/server and @trpc/client to version 9 2022-11-02 09:40:48 -07:00
wobsoriano
808cac4756 eslint fixes 2022-11-02 09:38:14 -07:00
wobsoriano
0c44f73c9f log info about plugin installation 2022-11-02 09:34:16 -07:00
wobsoriano
182875a781 feat: add option to specify if plugin should be installed 2022-11-02 09:30:40 -07:00
wobsoriano
0298f836b8 more eslint fixes 2022-11-02 09:21:15 -07:00
wobsoriano
ea50430945 eslint fixes 2022-11-02 09:18:17 -07:00
wobsoriano
0e240663ca remove local pnpm deps 2022-11-02 09:18:00 -07:00
Robert Soriano
bdeada0e6e Merge pull request #32 from littlejon85/9-server-error-discard
fix: don't discard error in client
2022-10-28 14:53:09 -07:00
Jan Dlouhý
88214185a8 fix: use useAsyncData error in client 2022-10-15 22:36:28 +02:00
Jan Dlouhý
ad03ae7b65 fix: don't discard error in client 2022-10-11 14:35:21 +02:00
7 changed files with 845 additions and 991 deletions

2
.gitignore vendored
View File

@@ -49,3 +49,5 @@ coverage
Network Trash Folder Network Trash Folder
Temporary Items Temporary Items
.apdisk .apdisk
.vercel

View File

@@ -30,6 +30,7 @@ export default defineNuxtConfig({
trpc: { trpc: {
baseURL: '', // Set empty string (default) to make requests by relative address baseURL: '', // Set empty string (default) to make requests by relative address
endpoint: '/trpc', // defaults to /trpc endpoint: '/trpc', // defaults to /trpc
installPlugin: true, // defaults to true. Add @trpc/client plugin and composables
}, },
typescript: { typescript: {
strict: true // required to make input/output types work strict: true // required to make input/output types work
@@ -113,6 +114,8 @@ headers.value.Authorization = `Bearer ${token}`
// All client calls will now include the Authorization header. // All client calls will now include the Authorization header.
``` ```
If your app needs transformers and other option that needs to be passed in `@trpc/client`, you will need to opt-out of the plugin by setting `installPlugin` to false in your `nuxt.config.ts` file and create your own. You can just copy the contents of the client plugin [here](https://github.com/wobsoriano/trpc-nuxt/blob/master/src/runtime/client.ts).
## Options ## Options
trpc-nuxt accepts the following options exposed under `~/server/trpc/index.ts`: trpc-nuxt accepts the following options exposed under `~/server/trpc/index.ts`:

View File

@@ -1,20 +1,19 @@
{ {
"name": "trpc-nuxt", "name": "trpc-nuxt",
"type": "module", "type": "module",
"version": "0.3.1", "version": "0.3.3",
"packageManager": "pnpm@7.5.0",
"license": "MIT", "license": "MIT",
"main": "./dist/module.cjs", "main": "./dist/module.cjs",
"types": "./dist/types.d.ts", "types": "./dist/types.d.ts",
"exports": { "exports": {
"./package.json": "./package.json", "./package.json": "./package.json",
".": { ".": {
"import": "./dist/module.mjs", "require": "./dist/module.cjs",
"require": "./dist/module.cjs" "import": "./dist/module.mjs"
}, },
"./api": { "./api": {
"import": "./dist/runtime/api.mjs", "types": "./dist/runtime/api.d.ts",
"types": "./dist/runtime/api.d.ts" "import": "./dist/runtime/api.mjs"
} }
}, },
"files": [ "files": [
@@ -22,35 +21,37 @@
"*.d.ts" "*.d.ts"
], ],
"scripts": { "scripts": {
"prepublishOnly": "nr build", "prepublishOnly": "pnpm build",
"build": "nuxt-module-build", "build": "nuxt-module-build",
"play": "nr build && nuxi dev playground", "play": "pnpm build && nuxi dev playground",
"build:playground": "nuxi build playground", "build:playground": "nuxi build playground",
"lint": "eslint .", "lint": "eslint .",
"lint:fix": "eslint . --fix", "lint:fix": "eslint . --fix",
"release": "bumpp --commit --push --tag && npm publish", "release": "bumpp --commit --push --tag && npm publish",
"prepare": "nuxi prepare playground" "prepare": "nuxi prepare playground"
}, },
"peerDependencies": {
"@trpc/client": "<10.0.0",
"@trpc/server": "<10.0.0"
},
"dependencies": { "dependencies": {
"@nuxt/kit": "3.0.0-rc.12", "@nuxt/kit": "3.0.0-rc.13",
"@trpc/client": "^9.27.4", "@trpc/client": "^9.27.4",
"@trpc/server": "^9.27.4", "@trpc/server": "^9.27.4",
"dedent": "^0.7.0", "dedent": "^0.7.0",
"defu": "^6.1.0", "defu": "^6.1.0",
"h3": "^0.8.5", "h3": "^0.8.6",
"ohash": "^0.1.5", "ohash": "^0.1.5",
"pathe": "^0.3.9", "pathe": "^0.3.9",
"ufo": "^0.8.6" "ufo": "^0.8.6"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^0.23.1", "@antfu/eslint-config": "^0.23.1",
"@antfu/ni": "^0.16.2",
"@nuxt/module-builder": "^0.2.0", "@nuxt/module-builder": "^0.2.0",
"@types/dedent": "^0.7.0", "@types/dedent": "^0.7.0",
"bumpp": "^7.2.0", "bumpp": "^7.2.0",
"eslint": "^8.25.0", "eslint": "^8.25.0",
"nuxt": "3.0.0-rc.12", "nuxt": "3.0.0-rc.13",
"pnpm": "^7.5.0",
"trpc-nuxt": "workspace:*", "trpc-nuxt": "workspace:*",
"zod": "^3.19.1" "zod": "^3.19.1"
}, },

View File

@@ -6,7 +6,4 @@ export default defineNuxtConfig({
runtimeConfig: { runtimeConfig: {
baseURL: '', baseURL: '',
}, },
typescript: {
strict: true,
},
}) })

1748
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -3,23 +3,29 @@ import { join, resolve } from 'pathe'
import { defu } from 'defu' import { defu } from 'defu'
import dedent from 'dedent' import dedent from 'dedent'
import { addImports, addPlugin, addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit' import { addImports, addPlugin, addServerHandler, addTemplate, defineNuxtModule, useLogger } from '@nuxt/kit'
export interface ModuleOptions { export interface ModuleOptions {
baseURL: string baseURL: string
endpoint: string endpoint: string
installPlugin?: boolean
} }
const metaName = 'trpc-nuxt'
export default defineNuxtModule<ModuleOptions>({ export default defineNuxtModule<ModuleOptions>({
meta: { meta: {
name: 'trpc-nuxt', name: metaName,
configKey: 'trpc', configKey: 'trpc',
}, },
defaults: { defaults: {
baseURL: '', baseURL: '',
endpoint: '/trpc', endpoint: '/trpc',
installPlugin: true,
}, },
async setup(options, nuxt) { async setup(options, nuxt) {
const logger = useLogger(metaName)
const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url)) const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-handler') nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-handler')
@@ -30,22 +36,14 @@ export default defineNuxtModule<ModuleOptions>({
const finalConfig = nuxt.options.runtimeConfig.public.trpc = defu(nuxt.options.runtimeConfig.public.trpc, { const finalConfig = nuxt.options.runtimeConfig.public.trpc = defu(nuxt.options.runtimeConfig.public.trpc, {
baseURL: options.baseURL, baseURL: options.baseURL,
endpoint: options.endpoint, endpoint: options.endpoint,
installPlugin: options.installPlugin,
}) })
addImports([
{ name: 'useClient', from: join(runtimeDir, 'client') },
{ name: 'useAsyncQuery', from: join(runtimeDir, 'client') },
{ name: 'useClientHeaders', from: join(runtimeDir, 'client') },
{ name: 'getQueryKey', from: join(runtimeDir, 'client') },
])
addServerHandler({ addServerHandler({
route: `${finalConfig.endpoint}/*`, route: `${finalConfig.endpoint}/*`,
handler: handlerPath, handler: handlerPath,
}) })
addPlugin(resolve(runtimeDir, 'plugin'))
addTemplate({ addTemplate({
filename: 'trpc-handler.ts', filename: 'trpc-handler.ts',
write: true, write: true,
@@ -61,6 +59,22 @@ export default defineNuxtModule<ModuleOptions>({
` `
}, },
}) })
if (finalConfig.installPlugin) {
addImports([
{ name: 'useClient', from: join(runtimeDir, 'client') },
{ name: 'useAsyncQuery', from: join(runtimeDir, 'client') },
{ name: 'useClientHeaders', from: join(runtimeDir, 'client') },
{ name: 'getQueryKey', from: join(runtimeDir, 'client') },
])
addPlugin(resolve(runtimeDir, 'plugin'))
logger.success('Plugin successfully installed.')
}
else {
logger.info('Plugin not installed. Create your own @trpc/client client plugin and composables.')
}
}, },
}) })

View File

@@ -51,25 +51,14 @@ export async function useAsyncQuery<
): Promise<AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TError>> { ): Promise<AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, TError>> {
const { $client } = useNuxtApp() const { $client } = useNuxtApp()
const key = getQueryKey(pathAndInput) const key = getQueryKey(pathAndInput)
const serverError = useState<TError | null>(`error-${key}`, () => null) const result = await useAsyncData(
const { error, data, ...rest } = await useAsyncData(
key, key,
() => $client.query(...pathAndInput), () => $client.query(...pathAndInput),
// @ts-expect-error: Internal // @ts-expect-error: Internal
options, options,
) )
if (process.server && error.value && !serverError.value) return result as any
serverError.value = error.value as any
if (data.value)
serverError.value = null
return {
...rest,
data,
error: serverError,
} as any
} }
export function useClient(): TRPCClient<AppRouter> { export function useClient(): TRPCClient<AppRouter> {