Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pnpm version upgrade and delete some fixme comments #5638

Open
wants to merge 2 commits into
base: next
Choose a base branch
from
Open

pnpm version upgrade and delete some fixme comments #5638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e4af4
pnpm version upgrade and fixme fixes
necmettindev Apr 18, 2024
fbe88c9
bump pnpm
necmettindev Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
@@ -1,2 +1,2 @@
nodejs 20.10.0
pnpm 8.15.5
pnpm 9.0.2
necmettindev marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
"private": true,
"engines": {
"node": "^20.10.0",
"pnpm": ">=8.15.5"
"pnpm": ">=9.0.0"
},
"packageManager": "pnpm@8.15.5",
"packageManager": "pnpm@9.0.2",
necmettindev marked this conversation as resolved.
Show resolved Hide resolved
"scripts": {
"clean-dev": "pnpm clean && pnpm install && pnpm build && pnpm dev",
"build": "turbo --filter=\"@trpc/*\" --filter=\"!@trpc/tests\" build",
Expand Down
4 changes: 4 additions & 0 deletions packages/server/src/@trpc/server/index.ts
View file
Open in desktop
Expand Up @@ -32,6 +32,10 @@ export {
type RouterRecord as TRPCRouterRecord,
type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
type ProcedureOptions as TRPCProcedureOptions,
type ErrorHandlerOptions as TRPCErrorHandlerOptions,
type CallerOverride as TRPCCallerOverride,
type MaybePromise,
type Simplify,
} from '../../unstable-core-do-not-import';

export type {
Expand Down
25 changes: 10 additions & 15 deletions packages/server/src/adapters/next-app-dir/nextAppDirCaller.ts
View file
Open in desktop
@@ -1,16 +1,11 @@
import { getTRPCErrorFromUnknown, TRPCError } from '../../@trpc/server';
// FIXME: fix lint rule, this is ok
// eslint-disable-next-line no-restricted-imports
import type { ErrorHandlerOptions } from '../../unstable-core-do-not-import/procedure';
// FIXME: fix lint rule, this is ok
// eslint-disable-next-line no-restricted-imports
import type { CallerOverride } from '../../unstable-core-do-not-import/procedureBuilder';
// FIXME: fix lint rule, this is ok
// eslint-disable-next-line no-restricted-imports
import type {
MaybePromise,
Simplify,
} from '../../unstable-core-do-not-import/types';
import {
getTRPCErrorFromUnknown,
TRPCError,
type MaybePromise,
type Simplify,
type TRPCCallerOverride,
type TRPCErrorHandlerOptions,
} from '../../@trpc/server';
import { formDataToObject } from './formDataToObject';
import { TRPCRedirectError } from './redirect';
import { rethrowNextErrors } from './rethrowNextErrors';
Expand All @@ -37,10 +32,10 @@ export function nextAppDirCaller<TContext>(
/**
* Called when an error occurs in the handler
*/
onError?: (opts: ErrorHandlerOptions<TContext>) => void;
onError?: (opts: TRPCErrorHandlerOptions<TContext>) => void;
} & ContextCallback<TContext>
>,
): CallerOverride<TContext> {
): TRPCCallerOverride<TContext> {
const {
normalizeFormData = true,

Expand Down