chore: pnpm version upgrade and fix some fixme comments

.tool-versions

@@ -1,2 +1,2 @@
 nodejs 20.10.0
-pnpm 8.15.5
+pnpm 9.0.4

package.json

@@ -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.4",
   "scripts": {
     "clean-dev": "pnpm clean && pnpm install && pnpm build && pnpm dev",
     "build": "turbo --filter=\"@trpc/*\" --filter=\"!@trpc/tests\" build",

packages/server/src/@trpc/server/index.ts

@@ -32,6 +32,8 @@ export {
   type RouterRecord as TRPCRouterRecord,
   type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure,
   type ProcedureOptions as TRPCProcedureOptions,
+  type ErrorHandlerOptions as TRPCErrorHandlerOptions,
+  type CallerOverride as TRPCCallerOverride,
   type MutationProcedure as TRPCMutationProcedure,
   type QueryProcedure as TRPCQueryProcedure,
   type SubscriptionProcedure as TRPCSubscriptionProcedure,

packages/server/src/adapters/next-app-dir/nextAppDirCaller.ts

@@ -1,16 +1,10 @@
+import type {
+  TRPCCallerOverride,
+  TRPCErrorHandlerOptions,
+} from '../../@trpc/server';
 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 type { MaybePromise, Simplify } from '../../unstable-core-do-not-import';
 import { formDataToObject } from './formDataToObject';
 import { TRPCRedirectError } from './redirect';
 import { rethrowNextErrors } from './rethrowNextErrors';
@@ -37,10 +31,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,