From 82ee2ce672de7ebdd1a25d3fcd7f565d705e6d5e Mon Sep 17 00:00:00 2001 From: Robert Soriano Date: Sun, 12 Jun 2022 23:29:28 -0700 Subject: [PATCH] refactor!: replace trpcURL option with endpoint --- package.json | 5 ++++- src/module.ts | 10 +++++----- src/runtime/plugin.ts | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 0b54ab8..a87a263 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,9 @@ "zod": "^3.16.0" }, "eslintConfig": { - "extends": "@antfu" + "extends": "@antfu", + "rules": { + "no-console": "warn" + } } } diff --git a/src/module.ts b/src/module.ts index 8ff3c41..f2328ff 100644 --- a/src/module.ts +++ b/src/module.ts @@ -8,7 +8,7 @@ import { addAutoImport, addPlugin, addServerHandler, addTemplate, defineNuxtModu export interface ModuleOptions { baseURL: string - trpcURL: string + endpoint: string } export default defineNuxtModule({ @@ -18,7 +18,7 @@ export default defineNuxtModule({ }, defaults: { baseURL: 'http://localhost:3000', - trpcURL: '/api/trpc', + endpoint: '/trpc', }, async setup(options, nuxt) { const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url)) @@ -33,7 +33,7 @@ export default defineNuxtModule({ // Final resolved configuration const finalConfig = nuxt.options.runtimeConfig.public.trpc = defu(nuxt.options.runtimeConfig.public.trpc, { baseURL: options.baseURL, - trpcURL: options.trpcURL, + endpoint: options.endpoint, }) addAutoImport([ @@ -43,7 +43,7 @@ export default defineNuxtModule({ ]) addServerHandler({ - route: `${finalConfig.trpcURL}/*`, + route: `${finalConfig.endpoint}/*`, handler: handlerPath, }) @@ -59,7 +59,7 @@ export default defineNuxtModule({ export default createTRPCHandler({ ...functions, - endpoint: '${finalConfig.trpcURL}' + endpoint: '${finalConfig.endpoint}' }) ` }, diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts index cbc1cfb..04d43c5 100644 --- a/src/runtime/plugin.ts +++ b/src/runtime/plugin.ts @@ -11,7 +11,7 @@ export default defineNuxtPlugin((nuxtApp) => { const headers = useRequestHeaders() const otherHeaders = useClientHeaders() const client = trpc.createTRPCClient({ - url: `${config.baseURL}${config.trpcURL}`, + url: `${config.baseURL}${config.endpoint}`, headers: () => { return { ...unref(otherHeaders),