release v0.3.0

feat: use globalThis.$fetch to call API handler directly on server-side

README.md

@@ -15,6 +15,8 @@ End-to-end typesafe APIs with [tRPC.io](https://trpc.io/) in Nuxt applications.
   </figure>
 </p>
 
+**⚠️ Currently works on Node v16 until [this issue](https://github.com/trpc/trpc/issues/2420) gets fixed.**
+
 ## Install
 
 ```bash
@@ -101,7 +103,7 @@ const {
 
 ## useClientHeaders
 
-A composable that lets you add additional properties to pass to the tRPC Client. It uses `useStorage` from [@vueuse/core](https://vueuse.org/core/usestorage).
+A composable that lets you add additional properties to pass to the tRPC Client. It uses `useState` from [nuxt 3](https://v3.nuxtjs.org/api/composables/use-state).
 
 ```ts
 const headers = useClientHeaders()

package.json

@@ -1,8 +1,8 @@
 {
   "name": "trpc-nuxt",
   "type": "module",
-  "version": "0.2.3",
-  "packageManager": "pnpm@7.1.1",
+  "version": "0.3.0",
+  "packageManager": "pnpm@7.5.0",
   "license": "MIT",
   "main": "./dist/module.cjs",
   "types": "./dist/types.d.ts",
@@ -28,31 +28,29 @@
     "build:playground": "nuxi build playground",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag && pnpm publish",
+    "release": "bumpp --commit --push --tag && npm publish",
     "prepare": "nuxi prepare playground"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.4",
-    "@trpc/client": "^9.26.0",
-    "@trpc/server": "^9.26.0",
-    "@vueuse/core": "^8.9.3",
-    "@vueuse/nuxt": "^8.9.3",
+    "@nuxt/kit": "3.0.0-rc.11",
+    "@trpc/client": "^9.27.2",
+    "@trpc/server": "^9.27.2",
     "dedent": "^0.7.0",
     "defu": "^6.0.0",
-    "h3": "^0.7.10",
+    "h3": "^0.7.21",
+    "ohash": "^0.1.5",
     "pathe": "^0.3.0",
     "ufo": "^0.8.5"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.23.1",
     "@antfu/ni": "^0.16.2",
-    "@nuxt/module-builder": "latest",
+    "@nuxt/module-builder": "^0.1.7",
     "@types/dedent": "^0.7.0",
     "bumpp": "^7.2.0",
     "eslint": "^8.14.0",
-    "nuxt": "3.0.0-rc.4",
-    "ohash": "^0.1.0",
-    "pnpm": "^7.1.1",
+    "nuxt": "3.0.0-rc.11",
+    "pnpm": "^7.5.0",
     "trpc-nuxt": "workspace:*",
     "zod": "^3.16.0"
   },

playground/nuxt.config.ts

@@ -5,7 +5,7 @@ import Module from '../src/module'
 export default defineNuxtConfig({
   modules: [Module],
   runtimeConfig: {
-    baseURL: 'http://localhost:3000',
+    baseURL: '',
   },
   typescript: {
     strict: true,

playground/pages/index.vue

@@ -4,7 +4,7 @@ const headers = useClientHeaders()
 const { data: todos, pending, error, refresh } = await useAsyncQuery(['getTodos'])
 
 const addHeader = () => {
-  // headers.value.cookie = 'counter=69'
+  headers.value.authorization = 'Bearer abcdefghijklmnop'
   console.log(headers.value)
 }
 

src/module.ts

@@ -3,7 +3,7 @@ import { join, resolve } from 'pathe'
 import { defu } from 'defu'
 import dedent from 'dedent'
 
-import { addAutoImport, addPlugin, addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit'
+import { addImports, addPlugin, addServerHandler, addTemplate, defineNuxtModule } from '@nuxt/kit'
 
 export interface ModuleOptions {
   baseURL: string
@@ -16,7 +16,7 @@ export default defineNuxtModule<ModuleOptions>({
     configKey: 'trpc',
   },
   defaults: {
-    baseURL: 'http://localhost:3000',
+    baseURL: '',
     endpoint: '/trpc',
   },
   async setup(options, nuxt) {
@@ -26,16 +26,13 @@ export default defineNuxtModule<ModuleOptions>({
     const handlerPath = join(nuxt.options.buildDir, 'trpc-handler.ts')
     const trpcOptionsPath = join(nuxt.options.srcDir, 'server/trpc')
 
-    // Add vueuse
-    nuxt.options.modules.push('@vueuse/nuxt')
-
     // Final resolved configuration
     const finalConfig = nuxt.options.runtimeConfig.public.trpc = defu(nuxt.options.runtimeConfig.public.trpc, {
       baseURL: options.baseURL,
       endpoint: options.endpoint,
     })
 
-    addAutoImport([
+    addImports([
       { name: 'useClient', from: join(runtimeDir, 'client') },
       { name: 'useAsyncQuery', from: join(runtimeDir, 'client') },
       { name: 'useClientHeaders', from: join(runtimeDir, 'client') },

src/runtime/client.ts

@@ -9,7 +9,6 @@ import type { ProcedureRecord, inferHandlerInput, inferProcedureInput, inferProc
 import type { TRPCClient, TRPCClientErrorLike } from '@trpc/client'
 import { objectHash } from 'ohash'
 import type { Ref } from 'vue'
-import { useStorage } from '@vueuse/core'
 import { useAsyncData, useNuxtApp, useState } from '#app'
 import type { router } from '~/server/trpc'
 
@@ -79,5 +78,5 @@ export function useClient(): TRPCClient<AppRouter> {
 }
 
 export function useClientHeaders(initialValue: MaybeRef<Record<string, any>> = {}): Ref<Record<string, any>> {
-  return useStorage('trpc-nuxt-header', initialValue)
+  return useState('trpc-nuxt-header', () => initialValue)
 }

src/runtime/plugin.ts

@@ -1,5 +1,6 @@
 import * as trpc from '@trpc/client'
 import { unref } from 'vue'
+import { FetchError } from 'ohmyfetch'
 import { useClientHeaders } from './client'
 import { defineNuxtPlugin, useRequestHeaders, useRuntimeConfig } from '#app'
 import type { router } from '~/server/trpc'
@@ -10,14 +11,28 @@ export default defineNuxtPlugin((nuxtApp) => {
   const config = useRuntimeConfig().public.trpc
   const headers = useRequestHeaders()
   const otherHeaders = useClientHeaders()
+
+  const baseURL = process.server ? '' : config.baseURL
   const client = trpc.createTRPCClient<AppRouter>({
-    url: `${config.baseURL}${config.endpoint}`,
+    url: `${baseURL}${config.endpoint}`,
     headers: () => {
       return {
         ...unref(otherHeaders),
         ...headers,
       }
     },
+    fetch: (input, options) =>
+      globalThis.$fetch.raw(input.toString(), options)
+        .catch((e) => {
+          if (e instanceof FetchError && e.response)
+            return e.response
+
+          throw e
+        })
+        .then(response => ({
+          ...response,
+          json: () => Promise.resolve(response._data),
+        })),
   })
 
   nuxtApp.provide('client', client)