fix(deps): update dependency @ianvs/prettier-plugin-sort-imports to v4 (

trpc#4432) * fix(deps): update dependency @ianvs/prettier-plugin-sort-imports to v4 * fix(deps): update dependency @ianvs/prettier-plugin-sort-imports to v4 * rm * run prettier --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: KATT <[email protected]>
argentlabs · May 29, 2023 · ab27bf9 · ab27bf9
1 parent ea70b1c
commit ab27bf9
Show file tree

Hide file tree

Showing 141 changed files with 4,608 additions and 12,947 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -9,7 +9,6 @@ const config = {
   endOfLine: 'auto',
   singleQuote: true,
   importOrder: ['___', '__', '<THIRD_PARTY_MODULES>', '^[./]'],
-  importOrderSortSpecifiers: true,
   tailwindConfig: './www/tailwind.config.ts',
   plugins: [
     require.resolve('@ianvs/prettier-plugin-sort-imports'),

diff --git a/examples/.experimental/next-app-dir/src/app/server-action/ReactHookFormExample.action.tsx b/examples/.experimental/next-app-dir/src/app/server-action/ReactHookFormExample.action.tsx
@@ -1,7 +1,7 @@
 'use server';
 
-import { z } from 'zod';
 import { createAction, publicProcedure } from '~/server/trpc';
+import { z } from 'zod';
 import { rhfActionSchema } from './ReactHookFormExample.schema';
 
 /**

diff --git a/examples/.experimental/next-app-dir/src/app/server-action/ReactHookFormExample.tsx b/examples/.experimental/next-app-dir/src/app/server-action/ReactHookFormExample.tsx
@@ -2,7 +2,7 @@
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useRef } from 'react';
-import { FormProvider, UseFormProps, useForm } from 'react-hook-form';
+import { FormProvider, useForm, UseFormProps } from 'react-hook-form';
 import { useAction } from 'trpc-api';
 import { z } from 'zod';
 import { rhfAction } from './ReactHookFormExample.action';

diff --git a/...ples/.experimental/next-app-dir/src/app/server-action/ReactHookFormFactoryExample.lib.tsx b/...ples/.experimental/next-app-dir/src/app/server-action/ReactHookFormFactoryExample.lib.tsx
@@ -7,23 +7,23 @@
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import {
-  UseTRPCActionResult,
   inferActionResultProps,
+  UseTRPCActionResult,
 } from '@trpc/next/app-dir/client';
 import { TRPCActionHandler } from '@trpc/next/app-dir/server';
 import { ActionHandlerDef } from '@trpc/next/dist/app-dir/shared';
 import { AnyProcedure, Simplify } from '@trpc/server';
+import { useAction } from '~/trpc/client';
 import { useRef } from 'react';
 import {
   FormProvider,
-  UseFormProps,
-  UseFormReturn,
   useForm,
   useFormContext,
+  UseFormProps,
+  UseFormReturn,
   useWatch,
 } from 'react-hook-form';
 import { z } from 'zod';
-import { useAction } from '~/trpc/client';
 
 export function createForm<TDef extends ActionHandlerDef>(opts: {
   action: TRPCActionHandler<TDef>;

diff --git a/examples/.experimental/next-app-dir/src/app/server-action/_actions.tsx b/examples/.experimental/next-app-dir/src/app/server-action/_actions.tsx
@@ -1,7 +1,7 @@
 'use server';
 
-import { z } from 'zod';
 import { createAction, publicProcedure } from '~/server/trpc';
+import { z } from 'zod';
 
 /**
  * Either inline procedures using trpc's flexible

diff --git a/examples/.experimental/next-app-dir/src/trpc/client.ts b/examples/.experimental/next-app-dir/src/trpc/client.ts
@@ -6,8 +6,8 @@ import {
   experimental_createTRPCNextAppDirClient,
   experimental_serverActionLink,
 } from '@trpc/next/app-dir/client';
-import superjson from 'superjson';
 import { AppRouter } from '~/server/routers/_app';
+import superjson from 'superjson';
 import { getUrl } from './shared';
 
 export const api = experimental_createTRPCNextAppDirClient<AppRouter>({

diff --git a/examples/.experimental/next-app-dir/src/trpc/server.ts b/examples/.experimental/next-app-dir/src/trpc/server.ts
@@ -2,9 +2,9 @@
 
 import { httpBatchLink, loggerLink } from '@trpc/client';
 import { experimental_createTRPCNextAppDirServer } from '@trpc/next/app-dir/server';
+import { AppRouter } from '~/server/routers/_app';
 import { headers } from 'next/headers';
 import superjson from 'superjson';
-import { AppRouter } from '~/server/routers/_app';
 import { getUrl } from './shared';
 
 export const api = experimental_createTRPCNextAppDirServer<AppRouter>({

diff --git a/examples/.experimental/next-formdata/src/pages/api/trpc/[trpc].ts b/examples/.experimental/next-formdata/src/pages/api/trpc/[trpc].ts
@@ -5,10 +5,10 @@
 import * as trpcNext from '@trpc/server/adapters/next';
 import { nodeHTTPFormDataContentTypeHandler } from '@trpc/server/adapters/node-http/content-type/form-data';
 import { nodeHTTPJSONContentTypeHandler } from '@trpc/server/adapters/node-http/content-type/json';
-import { NextApiRequest, NextApiResponse } from 'next';
-import * as undici from 'undici';
 import { roomRouter } from '~/server/routers/room';
 import { createContext, router } from '~/server/trpc';
+import { NextApiRequest, NextApiResponse } from 'next';
+import * as undici from 'undici';
 
 const appRouter = router({
   room: roomRouter,

diff --git a/examples/.experimental/next-formdata/src/pages/react-hook-form.tsx b/examples/.experimental/next-formdata/src/pages/react-hook-form.tsx
@@ -1,9 +1,9 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useRef, useState } from 'react';
-import { FormProvider, UseFormProps, useForm } from 'react-hook-form';
-import { z } from 'zod';
 import { uploadFileSchema } from '~/utils/schemas';
 import { trpc } from '~/utils/trpc';
+import { useRef, useState } from 'react';
+import { FormProvider, useForm, UseFormProps } from 'react-hook-form';
+import { z } from 'zod';
 
 /**
  * zod-form-data wraps zod in an effect where the original type is a `FormData`

diff --git a/examples/.experimental/next-formdata/src/server/routers/viewer.ts b/examples/.experimental/next-formdata/src/server/routers/viewer.ts
@@ -2,9 +2,9 @@ import {
   experimental_createMemoryUploadHandler,
   experimental_parseMultipartFormData,
 } from '@trpc/server/adapters/node-http/content-type/form-data';
-import { z } from 'zod';
 import { uploadFileSchema } from '~/utils/schemas';
 import { writeFileToDisk } from '~/utils/writeFileToDisk';
+import { z } from 'zod';
 import { publicProcedure, router } from '../trpc';
 
 export const viewer = router({

diff --git a/examples/express-server/src/server.ts b/examples/express-server/src/server.ts
@@ -1,6 +1,6 @@
-import { TRPCError, inferAsyncReturnType, initTRPC } from '@trpc/server';
-import * as trpcExpress from '@trpc/server/adapters/express';
 import { EventEmitter } from 'events';
+import { inferAsyncReturnType, initTRPC, TRPCError } from '@trpc/server';
+import * as trpcExpress from '@trpc/server/adapters/express';
 import express from 'express';
 import { z } from 'zod';
 

diff --git a/examples/minimal-react/playwright.config.ts b/examples/minimal-react/playwright.config.ts
@@ -1,4 +1,4 @@
-import { PlaywrightTestConfig, devices } from '@playwright/test';
+import { devices, PlaywrightTestConfig } from '@playwright/test';
 
 const baseUrl = process.env.PLAYWRIGHT_TEST_BASE_URL || 'http://localhost:3000';
 console.log(`ℹ️ Using base URL "${baseUrl}"`);

diff --git a/examples/next-edge-runtime/src/pages/api/trpc/[trpc].ts b/examples/next-edge-runtime/src/pages/api/trpc/[trpc].ts
@@ -3,9 +3,9 @@
  * On a bigger app, you will probably want to split this file up into multiple files.
  */
 import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
+import { publicProcedure, router } from '~/server/trpc';
 import { NextRequest } from 'next/server';
 import { z } from 'zod';
-import { publicProcedure, router } from '~/server/trpc';
 
 const appRouter = router({
   greeting: publicProcedure

diff --git a/examples/next-minimal-starter/src/pages/api/trpc/[trpc].ts b/examples/next-minimal-starter/src/pages/api/trpc/[trpc].ts
@@ -3,8 +3,8 @@
  * On a bigger app, you will probably want to split this file up into multiple files.
  */
 import * as trpcNext from '@trpc/server/adapters/next';
-import { z } from 'zod';
 import { publicProcedure, router } from '~/server/trpc';
+import { z } from 'zod';
 
 const appRouter = router({
   greeting: publicProcedure

diff --git a/examples/next-prisma-todomvc/playwright.config.ts b/examples/next-prisma-todomvc/playwright.config.ts
@@ -1,4 +1,4 @@
-import { PlaywrightTestConfig, devices } from '@playwright/test';
+import { devices, PlaywrightTestConfig } from '@playwright/test';
 
 const baseUrl = process.env.PLAYWRIGHT_TEST_BASE_URL || 'http://localhost:3000';
 console.log(`ℹ️ Using base URL "${baseUrl}"`);

diff --git a/examples/next-prisma-todomvc/src/components/footer.tsx b/examples/next-prisma-todomvc/src/components/footer.tsx
@@ -1,5 +1,5 @@
-import Link from 'next/link';
 import { useLocale } from '~/utils/use-locale';
+import Link from 'next/link';
 
 export function InfoFooter(props: { filter: string; locales: string[] }) {
   const { t, i18n } = useLocale();

diff --git a/examples/next-prisma-todomvc/src/pages/_app.tsx b/examples/next-prisma-todomvc/src/pages/_app.tsx
@@ -1,5 +1,5 @@
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import { SSRConfig, appWithTranslation } from 'next-i18next';
+import { appWithTranslation, SSRConfig } from 'next-i18next';
 import { AppProps } from 'next/app';
 import { ComponentProps } from 'react';
 import { trpc } from '../utils/trpc';

diff --git a/examples/standalone-server/src/server.ts b/examples/standalone-server/src/server.ts
@@ -4,8 +4,8 @@ import {
   createHTTPServer,
 } from '@trpc/server/adapters/standalone';
 import {
-  CreateWSSContextFnOptions,
   applyWSSHandler,
+  CreateWSSContextFnOptions,
 } from '@trpc/server/adapters/ws';
 import { observable } from '@trpc/server/observable';
 import { WebSocketServer } from 'ws';

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.1",
-    "@ianvs/prettier-plugin-sort-imports": "^3.7.2",
+    "@ianvs/prettier-plugin-sort-imports": "^4.0.0",
     "@manypkg/cli": "^0.20.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@swc/core": "1.3.3",

diff --git a/packages/client/src/TRPCClientError.ts b/packages/client/src/TRPCClientError.ts
@@ -2,8 +2,8 @@ import {
   AnyProcedure,
   AnyRouter,
   DefaultErrorShape,
-  Maybe,
   inferRouterError,
+  Maybe,
 } from '@trpc/server';
 import { TRPCErrorResponse, TRPCErrorShape } from '@trpc/server/rpc';
 

diff --git a/packages/client/src/createTRPCClient.ts b/packages/client/src/createTRPCClient.ts
@@ -6,14 +6,14 @@ import type {
 } from '@trpc/server';
 import { Unsubscribable } from '@trpc/server/observable';
 import { inferTransformedProcedureOutput } from '@trpc/server/shared';
-import { TRPCClientError } from './TRPCClientError';
 import {
   CreateTRPCClientOptions,
   TRPCRequestOptions,
   TRPCSubscriptionObserver,
   TRPCUntypedClient,
 } from './internals/TRPCUntypedClient';
 import { TRPCClientRuntime } from './links';
+import { TRPCClientError } from './TRPCClientError';
 
 /**
  * @deprecated

diff --git a/packages/client/src/createTRPCClientProxy.ts b/packages/client/src/createTRPCClientProxy.ts
@@ -17,14 +17,14 @@ import {
   inferTransformedProcedureOutput,
   inferTransformedSubscriptionOutput,
 } from '@trpc/server/shared';
-import { TRPCClientError } from './TRPCClientError';
 import { TRPCClient } from './createTRPCClient';
 import { CreateTRPCClientOptions } from './createTRPCUntypedClient';
 import {
   TRPCSubscriptionObserver,
   TRPCUntypedClient,
   UntypedClientProperties,
 } from './internals/TRPCUntypedClient';
+import { TRPCClientError } from './TRPCClientError';
 
 /** @public */
 export type inferRouterProxyClient<TRouter extends AnyRouter> =

diff --git a/packages/client/src/internals/TRPCUntypedClient.ts b/packages/client/src/internals/TRPCUntypedClient.ts
@@ -6,19 +6,19 @@ import {
   DefaultDataTransformer,
 } from '@trpc/server';
 import {
-  Unsubscribable,
   inferObservableValue,
   observableToPromise,
   share,
+  Unsubscribable,
 } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { createChain } from '../links/internals/createChain';
 import {
   OperationContext,
   OperationLink,
   TRPCClientRuntime,
   TRPCLink,
 } from '../links/types';
+import { TRPCClientError } from '../TRPCClientError';
 
 type CreateTRPCClientBaseOptions<TRouter extends AnyRouter> =
   TRouter['_def']['_config']['transformer'] extends DefaultDataTransformer

diff --git a/packages/client/src/links/httpBatchLink.ts b/packages/client/src/links/httpBatchLink.ts
@@ -1,13 +1,13 @@
 import { AnyRouter, ProcedureType } from '@trpc/server';
 import { observable } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { dataLoader } from '../internals/dataLoader';
 import { NonEmptyArray } from '../internals/types';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import {
+  getUrl,
   HTTPLinkBaseOptions,
   HTTPResult,
-  getUrl,
   jsonHttpRequester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';

diff --git a/packages/client/src/links/httpFormDataLink.ts b/packages/client/src/links/httpFormDataLink.ts
@@ -1,5 +1,5 @@
 import { httpLinkFactory } from './httpLink';
-import { GetBody, Requester, httpRequest } from './internals/httpUtils';
+import { GetBody, httpRequest, Requester } from './internals/httpUtils';
 
 const getBody: GetBody = (opts) => {
   if (!('input' in opts)) {

diff --git a/packages/client/src/links/httpLink.ts b/packages/client/src/links/httpLink.ts
@@ -1,11 +1,11 @@
 import { AnyRouter } from '@trpc/server';
 import { observable } from '@trpc/server/observable';
-import { TRPCClientError } from '../TRPCClientError';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import {
   HTTPLinkBaseOptions,
-  Requester,
   jsonHttpRequester,
+  Requester,
   resolveHTTPLinkOptions,
 } from './internals/httpUtils';
 import { HTTPHeaders, Operation, TRPCLink } from './types';

diff --git a/packages/client/src/links/retryLink.ts b/packages/client/src/links/retryLink.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file -- @preserve */
 // We're not actually exporting this link
 import { AnyRouter } from '@trpc/server';
-import { Unsubscribable, observable } from '@trpc/server/observable';
+import { observable, Unsubscribable } from '@trpc/server/observable';
 import { TRPCLink } from './types';
 
 export function retryLink<TRouter extends AnyRouter = AnyRouter>(opts: {

diff --git a/packages/client/src/links/splitLink.test.ts b/packages/client/src/links/splitLink.test.ts
@@ -1,6 +1,5 @@
 import { observable } from '@trpc/server/observable';
-import { splitLink } from '../';
-import { OperationLink, TRPCLink } from '../';
+import { OperationLink, splitLink, TRPCLink } from '../';
 import { AnyRouter } from '../../../server/src';
 import { createChain } from '../links/internals/createChain';
 

diff --git a/packages/client/src/links/types.ts b/packages/client/src/links/types.ts
@@ -5,8 +5,8 @@ import {
 } from '@trpc/server';
 import { Observable, Observer } from '@trpc/server/observable';
 import { TRPCResultMessage, TRPCSuccessResponse } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import { ResponseEsque } from '../internals/types';
+import { TRPCClientError } from '../TRPCClientError';
 
 /**
  * @internal

diff --git a/packages/client/src/links/wsLink.ts b/packages/client/src/links/wsLink.ts
@@ -1,15 +1,15 @@
-import { AnyRouter, ProcedureType, inferRouterError } from '@trpc/server';
-import { Observer, UnsubscribeFn, observable } from '@trpc/server/observable';
+import { AnyRouter, inferRouterError, ProcedureType } from '@trpc/server';
+import { observable, Observer, UnsubscribeFn } from '@trpc/server/observable';
 import {
   TRPCClientIncomingMessage,
   TRPCClientIncomingRequest,
   TRPCClientOutgoingMessage,
   TRPCRequestMessage,
   TRPCResponseMessage,
 } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import { retryDelay } from '../internals/retryDelay';
 import { transformResult } from '../shared/transformResult';
+import { TRPCClientError } from '../TRPCClientError';
 import { Operation, TRPCLink } from './types';
 
 type WSCallbackResult<TRouter extends AnyRouter, TOutput> = TRPCResponseMessage<

diff --git a/packages/client/src/shared/transformResult.ts b/packages/client/src/shared/transformResult.ts
@@ -4,9 +4,9 @@ import type {
   TRPCResponseMessage,
   TRPCResultMessage,
 } from '@trpc/server/rpc';
-import { TRPCClientError } from '../TRPCClientError';
 import type { TRPCClientRuntime } from '../links';
 import { isObject } from '../links/internals/isObject';
+import { TRPCClientError } from '../TRPCClientError';
 
 // FIXME:
 // - the generics here are probably unnecessary

diff --git a/packages/next/src/app-dir/client.test.tsx b/packages/next/src/app-dir/client.test.tsx
@@ -5,9 +5,9 @@ import React from 'react';
 import superjson from 'superjson';
 import { z } from 'zod';
 import {
-  UseTRPCActionResult,
   experimental_createActionHook,
   experimental_serverActionLink,
+  UseTRPCActionResult,
 } from './create-action-hook';
 import { experimental_createServerActionHandler } from './server';
 

diff --git a/packages/next/src/app-dir/client.ts b/packages/next/src/app-dir/client.ts
@@ -1,6 +1,6 @@
 import {
-  CreateTRPCProxyClient,
   clientCallTypeToProcedureType,
+  CreateTRPCProxyClient,
   createTRPCUntypedClient,
 } from '@trpc/client';
 import { AnyRouter } from '@trpc/server';

diff --git a/packages/next/src/app-dir/create-action-hook.tsx b/packages/next/src/app-dir/create-action-hook.tsx
@@ -1,18 +1,18 @@
 import {
   CreateTRPCClientOptions,
+  createTRPCUntypedClient,
   TRPCClientError,
   TRPCLink,
   TRPCRequestOptions,
-  createTRPCUntypedClient,
 } from '@trpc/client';
 import { transformResult } from '@trpc/client/shared';
 import {
   AnyProcedure,
   AnyRouter,
+  inferHandlerInput,
   MaybePromise,
   ProcedureOptions,
   Simplify,
-  inferHandlerInput,
 } from '@trpc/server';
 import { observable } from '@trpc/server/observable';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';