Compare commits

...

12 Commits
main ... v3

Author SHA1 Message Date
wobsoriano
0bb648bb08 chore: release v0.3.7 2022-12-21 09:15:38 -08:00
wobsoriano
ca2344ad86 add prepublish script 2022-12-21 09:12:53 -08:00
wobsoriano
004e655194 more cleanup 2022-12-20 20:14:58 -08:00
wobsoriano
fca82a027e chore: release v0.3.6 2022-12-20 20:13:53 -08:00
wobsoriano
7995e892db feat: replace ohmyfetch with ofetch 2022-12-20 20:13:48 -08:00
wobsoriano
8168a46985 chore: release v0.3.5 2022-12-20 01:37:21 -08:00
wobsoriano
2a23f4303d import composables from #app to #imports 2022-12-20 01:37:12 -08:00
wobsoriano
ff4bbebb0b chore: release v0.3.4 2022-12-20 01:34:59 -08:00
wobsoriano
354bf5d707 fix: deprecated h3 properties 2022-12-20 01:34:47 -08:00
wobsoriano
e7d160ee48 fix: client auto-imports 2022-12-20 01:32:59 -08:00
wobsoriano
9bf6d57c2c chore: update deps 2022-12-20 01:14:37 -08:00
Robert Soriano
6bca1e621d Update README.md 2022-11-12 21:18:08 -08:00
12 changed files with 1005 additions and 1311 deletions

2
.nuxtrc Normal file
View File

@@ -0,0 +1,2 @@
imports.autoImport=false
typescript.includeWorkspace=true

View File

@@ -18,7 +18,7 @@ End-to-end typesafe APIs with [tRPC.io](https://trpc.io/) in Nuxt applications.
## Install ## Install
```bash ```bash
npm i trpc-nuxt npm i trpc-nuxt@0.3
``` ```
```ts ```ts

View File

@@ -1,10 +1,8 @@
{ {
"name": "trpc-nuxt", "name": "trpc-nuxt",
"type": "module", "type": "module",
"version": "0.3.3", "version": "0.3.7",
"license": "MIT", "license": "MIT",
"main": "./dist/module.cjs",
"types": "./dist/types.d.ts",
"exports": { "exports": {
"./package.json": "./package.json", "./package.json": "./package.json",
".": { ".": {
@@ -16,44 +14,48 @@
"import": "./dist/runtime/api.mjs" "import": "./dist/runtime/api.mjs"
} }
}, },
"main": "./dist/module.cjs",
"types": "./dist/types.d.ts",
"files": [ "files": [
"dist", "dist",
"*.d.ts" "*.d.ts"
], ],
"scripts": { "scripts": {
"prepublishOnly": "pnpm build",
"build": "nuxt-module-build", "build": "nuxt-module-build",
"play": "pnpm build && nuxi dev playground", "dev": "nuxi dev playground",
"build:playground": "nuxi build playground", "dev:build": "nuxi build playground",
"dev:preview": "nuxi preview playground",
"dev:prepare": "nuxt-module-build --stub && nuxi prepare 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",
"prepublishOnly": "pnpm build"
}, },
"peerDependencies": { "peerDependencies": {
"@trpc/client": "<10.0.0", "@trpc/client": "<10.0.0",
"@trpc/server": "<10.0.0" "@trpc/server": "<10.0.0"
}, },
"dependencies": { "dependencies": {
"@nuxt/kit": "3.0.0-rc.13", "@nuxt/kit": "3.0.0",
"@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.1",
"h3": "^0.8.6", "h3": "^1.0.2",
"ohash": "^0.1.5", "ofetch": "^1.0.0",
"pathe": "^0.3.9", "ohash": "^1.0.0",
"ufo": "^0.8.6" "pathe": "^1.0.0",
"ufo": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^0.23.1", "@antfu/eslint-config": "^0.34.0",
"@nuxt/module-builder": "^0.2.0", "@nuxt/module-builder": "^0.2.1",
"@types/dedent": "^0.7.0", "@types/dedent": "^0.7.0",
"bumpp": "^7.2.0", "bumpp": "^8.2.1",
"eslint": "^8.25.0", "eslint": "^8.25.0",
"nuxt": "3.0.0-rc.13", "nuxt": "3.0.0",
"trpc-nuxt": "workspace:*", "zod": "^3.20.2"
"zod": "^3.19.1"
}, },
"eslintConfig": { "eslintConfig": {
"extends": "@antfu", "extends": "@antfu",

View File

@@ -1,19 +0,0 @@
<script setup lang="ts">
const counter = useCookie('counter')
counter.value = counter.value || Math.round(Math.random() * 1000)
</script>
<template>
<div>
<h1> Counter: {{ counter || '-' }}</h1>
<button @click="counter = null">
reset
</button>
<button @click="counter--">
-
</button>
<button @click="counter++">
+
</button>
</div>
</template>

View File

@@ -1,4 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { useAsyncQuery, useClient, useClientHeaders } from '#imports'
const client = useClient() const client = useClient()
const headers = useClientHeaders() const headers = useClientHeaders()
const { data: todos, pending, error, refresh } = await useAsyncQuery(['getTodos']) const { data: todos, pending, error, refresh } = await useAsyncQuery(['getTodos'])

View File

@@ -1,4 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { useAsyncQuery, useRoute } from '#imports'
const route = useRoute() const route = useRoute()
const { data: todo, pending, error } = await useAsyncQuery(['getTodo', Number(route.params.id)]) const { data: todo, pending, error } = await useAsyncQuery(['getTodo', Number(route.params.id)])
</script> </script>
@@ -11,8 +12,8 @@ const { data: todo, pending, error } = await useAsyncQuery(['getTodo', Number(ro
{{ error.data.code }} {{ error.data.code }}
</div> </div>
<div v-else> <div v-else>
ID: {{ todo.id }} <br> ID: {{ todo?.id }} <br>
Title: {{ todo.title }} <br> Title: {{ todo?.title }} <br>
Completed: {{ todo.completed }} Completed: {{ todo?.completed }}
</div> </div>
</template> </template>

View File

@@ -29,7 +29,6 @@ export const router = trpc.router<Context>()
.mutation('addTodo', { .mutation('addTodo', {
input: TodoShape, input: TodoShape,
async resolve(req) { async resolve(req) {
console.log(req.input)
return await $fetch<Todo>(`${baseURL}/todos`, { return await $fetch<Todo>(`${baseURL}/todos`, {
method: 'POST', method: 'POST',
body: req.input, body: req.input,
@@ -43,7 +42,7 @@ export async function createContext(event: H3Event) {
// This is just an example of something you'd might want to do in your ctx fn // This is just an example of something you'd might want to do in your ctx fn
// const x = useCookies(event) // const x = useCookies(event)
console.log(event.req.headers) console.log(event.node.req.headers)
return { return {

2221
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -26,12 +26,12 @@ export default defineNuxtModule<ModuleOptions>({
async setup(options, nuxt) { async setup(options, nuxt) {
const logger = useLogger(metaName) const logger = useLogger(metaName)
const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
nuxt.options.build.transpile.push(runtimeDir, '#build/trpc-handler')
const handlerPath = join(nuxt.options.buildDir, 'trpc-handler.ts') const handlerPath = join(nuxt.options.buildDir, 'trpc-handler.ts')
const trpcOptionsPath = join(nuxt.options.srcDir, 'server/trpc') const trpcOptionsPath = join(nuxt.options.srcDir, 'server/trpc')
const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
nuxt.options.build.transpile.push(runtimeDir, handlerPath)
// Final resolved configuration // Final resolved configuration
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,
@@ -49,8 +49,8 @@ export default defineNuxtModule<ModuleOptions>({
write: true, write: true,
getContents() { getContents() {
return dedent` return dedent`
import { createTRPCHandler } from 'trpc-nuxt/api' import { createTRPCHandler } from ${JSON.stringify(join(runtimeDir, 'api'))};
import * as functions from '${trpcOptionsPath}' import * as functions from ${JSON.stringify(trpcOptionsPath)};
export default createTRPCHandler({ export default createTRPCHandler({
...functions, ...functions,
@@ -77,4 +77,3 @@ export default defineNuxtModule<ModuleOptions>({
} }
}, },
}) })

View File

@@ -30,7 +30,7 @@ export interface OnErrorPayload<TRouter extends AnyRouter> {
error: TRPCError error: TRPCError
type: ProcedureType | 'unknown' type: ProcedureType | 'unknown'
path: string | undefined path: string | undefined
req: H3Event['req'] req: H3Event['node']['req']
input: unknown input: unknown
ctx: undefined | inferRouterContext<TRouter> ctx: undefined | inferRouterContext<TRouter>
} }
@@ -54,7 +54,7 @@ export function createTRPCHandler<Router extends AnyRouter>({
const { const {
req, req,
res, res,
} = event } = event.node
const $url = createURL(req.url!) const $url = createURL(req.url!)

View File

@@ -9,7 +9,7 @@ import type { ProcedureRecord, inferHandlerInput, inferProcedureInput, inferProc
import type { TRPCClient, TRPCClientErrorLike } from '@trpc/client' import type { TRPCClient, TRPCClientErrorLike } from '@trpc/client'
import { objectHash } from 'ohash' import { objectHash } from 'ohash'
import type { Ref } from 'vue' import type { Ref } from 'vue'
import { useAsyncData, useNuxtApp, useState } from '#app' import { useAsyncData, useNuxtApp, useState } from '#imports'
import type { router } from '~/server/trpc' import type { router } from '~/server/trpc'
type MaybeRef<T> = T | Ref<T> type MaybeRef<T> = T | Ref<T>

View File

@@ -1,8 +1,8 @@
import * as trpc from '@trpc/client' import * as trpc from '@trpc/client'
import { unref } from 'vue' import { unref } from 'vue'
import { FetchError } from 'ohmyfetch' import { FetchError } from 'ofetch'
import { useClientHeaders } from './client' import { useClientHeaders } from './client'
import { defineNuxtPlugin, useRequestHeaders, useRuntimeConfig } from '#app' import { defineNuxtPlugin, useRequestHeaders, useRuntimeConfig } from '#imports'
import type { router } from '~/server/trpc' import type { router } from '~/server/trpc'
declare type AppRouter = typeof router declare type AppRouter = typeof router