release v0.1.16

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trpc-nuxt",
   "type": "module",
-  "version": "0.1.8",
+  "version": "0.1.16",
   "packageManager": "pnpm@7.1.1",
   "license": "MIT",
   "main": "./dist/module.cjs",

playground/pages/index.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-const client = useClient()
+const { $client } = useNuxtApp()
 const { data: todos, pending, error, refresh } = await useAsyncQuery(['getTodos'])
 
 const addTodo = async () => {
   const title = Math.random().toString(36).slice(2, 7)
 
   try {
-    const result = await client.mutation('addTodo', {
+    const result = await $client.mutation('addTodo', {
       id: Date.now(),
       userId: 69,
       title,

playground/server/trpc/index.ts

@@ -42,8 +42,8 @@ export async function createContext(event: CompatibilityEvent) {
   // Will be available as `ctx` in all your resolvers
 
   // This is just an example of something you'd might want to do in your ctx fn
-  // const x = useCookies(event)
-  console.log('Headers', event.req.headers)
+  const x = useCookies(event)
+  console.log(x)
 
   return {
 

src/module.ts

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url'
 import { join, resolve } from 'pathe'
 import { defu } from 'defu'
 
-import { addPluginTemplate, addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit'
+import { addPlugin, addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit'
 
 export interface ModuleOptions {
   baseURL: string
@@ -20,7 +20,7 @@ export default defineNuxtModule<ModuleOptions>({
   },
   async setup(options, nuxt) {
     const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
-    nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-client', '#build/trpc-handler')
+    nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-handler')
 
     const handlerPath = join(nuxt.options.buildDir, 'trpc-handler.ts')
     const trpcOptionsPath = join(nuxt.options.rootDir, 'server/trpc')
@@ -33,7 +33,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     nuxt.hook('autoImports:extend', (imports) => {
       imports.push(
-        { name: 'useClient', from: '#build/trpc-client' },
+        { name: 'useClient', from: join(runtimeDir, 'client') },
         { name: 'useAsyncQuery', from: join(runtimeDir, 'client') },
       )
     })
@@ -43,26 +43,7 @@ export default defineNuxtModule<ModuleOptions>({
       handler: handlerPath,
     })
 
-    addTemplate({
-      filename: 'trpc-client.ts',
-      write: true,
-      getContents() {
-        return `
-          export const useClient = () => {
-            const { $client } = useNuxtApp()
-            return $client
-          }
-        `
-      },
-    })
-
-    addPluginTemplate({
-      src: resolve(runtimeDir, 'plugin.ts'),
-      write: true,
-      options: {
-        url: `${finalConfig.baseURL}${finalConfig.trpcURL}`,
-      },
-    })
+    addPlugin(resolve(runtimeDir, 'plugin'))
 
     addTemplate({
       filename: 'trpc-handler.ts',
@@ -70,14 +51,11 @@ export default defineNuxtModule<ModuleOptions>({
       getContents() {
         return `
           import { createTRPCHandler } from 'trpc-nuxt/api'
-          import { useRuntimeConfig } from '#imports'
           import * as functions from '${trpcOptionsPath}'
     
-          const { trpc: { trpcURL } } = useRuntimeConfig().public
-    
           export default createTRPCHandler({
             ...functions,
-            trpcURL 
+            trpcURL: '${finalConfig.trpcURL}'
           })
         `
       },

src/runtime/client.ts

@@ -6,9 +6,9 @@ import type {
   _Transform,
 } from 'nuxt/dist/app/composables/asyncData'
 import type { ProcedureRecord, inferHandlerInput, inferProcedureInput, inferProcedureOutput } from '@trpc/server'
-import type { TRPCClientErrorLike } from '@trpc/client'
+import type { TRPCClient, TRPCClientErrorLike } from '@trpc/client'
 import { objectHash } from 'ohash'
-import { useAsyncData, useState } from '#app'
+import { useAsyncData, useNuxtApp, useState } from '#app'
 // @ts-expect-error: Resolved by Nuxt
 import type { router } from '~/server/trpc'
 
@@ -58,3 +58,8 @@ export async function useAsyncQuery<
     error: serverError,
   } as any
 }
+
+export function useClient(): TRPCClient<AppRouter> {
+  const { $client } = useNuxtApp()
+  return $client
+}

src/runtime/plugin.ts

@@ -1,12 +1,14 @@
 import * as trpc from '@trpc/client'
-import { defineNuxtPlugin, useRequestHeaders } from '#app'
+// @ts-expect-error: Resolved by Nuxt
+import { defineNuxtPlugin, useRequestHeaders, useRuntimeConfig } from '#app'
 import type { router } from '~/server/trpc'
 
-const options = JSON.parse('<%= JSON.stringify(options) %>')
+declare type AppRouter = typeof router
 
 export default defineNuxtPlugin(() => {
-  const client = trpc.createTRPCClient<typeof router>({
-    url: options.url as string,
+  const config = useRuntimeConfig().public.trpc
+  const client = trpc.createTRPCClient<AppRouter>({
+    url: `${config.baseURL}${config.trpcURL}`,
     headers: useRequestHeaders(),
   })
 
@@ -16,3 +18,9 @@ export default defineNuxtPlugin(() => {
     },
   }
 })
+
+declare module '#app' {
+  interface NuxtApp {
+    $client: trpc.TRPCClient<AppRouter>
+  }
+}