From c2c37b701ee7eded3a3d90c6c59260997636698d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20L=C3=B3pez?= Date: Thu, 14 Oct 2021 13:22:01 -0600 Subject: [PATCH] Zomars/fixes trpc typo (#957) --- .prettierrc.js | 2 +- components/ui/Avatar.tsx | 3 ++- ee/lib/stripe/client.ts | 3 ++- lib/core/i18n/i18n.utils.ts | 3 ++- lib/hooks/useTheme.tsx | 3 ++- lib/trpc.ts | 4 ++-- pages/_app.tsx | 10 +++++----- pages/api/trpc/[trpc].ts | 3 +-- server/createContext.ts | 7 ++++--- server/routers/viewer.tsx | 3 ++- server/ssg.ts | 4 ++-- 11 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index 132044b0ed..bd891544e4 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -7,6 +7,6 @@ module.exports = { semi: true, printWidth: 110, arrowParens: "always", - importOrder: ["^@ee/(.*)$", "^@lib/(.*)$", "^@components/(.*)$", "^@(server|trcp)/(.*)$", "^[./]"], + importOrder: ["^@ee/(.*)$", "^@lib/(.*)$", "^@components/(.*)$", "^@(server|trpc)/(.*)$", "^[./]"], importOrderSeparation: true, }; diff --git a/components/ui/Avatar.tsx b/components/ui/Avatar.tsx index 8ace683809..cbaf5f0f19 100644 --- a/components/ui/Avatar.tsx +++ b/components/ui/Avatar.tsx @@ -1,10 +1,11 @@ import * as AvatarPrimitive from "@radix-ui/react-avatar"; import * as Tooltip from "@radix-ui/react-tooltip"; -import { Maybe } from "@trpc/server"; import classNames from "@lib/classNames"; import { defaultAvatarSrc } from "@lib/profile"; +import { Maybe } from "@trpc/server"; + export type AvatarProps = { className?: string; size?: number; diff --git a/ee/lib/stripe/client.ts b/ee/lib/stripe/client.ts index f56e690007..f326e54fb2 100644 --- a/ee/lib/stripe/client.ts +++ b/ee/lib/stripe/client.ts @@ -1,7 +1,8 @@ import { loadStripe, Stripe } from "@stripe/stripe-js"; -import { Maybe } from "@trpc/server"; import { stringify } from "querystring"; +import { Maybe } from "@trpc/server"; + const stripePublicKey = process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY!; let stripePromise: Promise; diff --git a/lib/core/i18n/i18n.utils.ts b/lib/core/i18n/i18n.utils.ts index 61b00a5725..1d9885eabc 100644 --- a/lib/core/i18n/i18n.utils.ts +++ b/lib/core/i18n/i18n.utils.ts @@ -1,10 +1,11 @@ -import { Maybe } from "@trpc/server"; import parser from "accept-language-parser"; import { IncomingMessage } from "http"; import { getSession } from "@lib/auth"; import prisma from "@lib/prisma"; +import { Maybe } from "@trpc/server"; + import { i18n } from "../../../next-i18next.config"; export function getLocaleFromHeaders(req: IncomingMessage): string { diff --git a/lib/hooks/useTheme.tsx b/lib/hooks/useTheme.tsx index bbea7805ef..12956453d4 100644 --- a/lib/hooks/useTheme.tsx +++ b/lib/hooks/useTheme.tsx @@ -1,6 +1,7 @@ -import { Maybe } from "@trpc/server"; import { useEffect, useState } from "react"; +import { Maybe } from "@trpc/server"; + // makes sure the ui doesn't flash export default function useTheme(theme?: Maybe) { const [isReady, setIsReady] = useState(false); diff --git a/lib/trpc.ts b/lib/trpc.ts index 99caec41ff..bf15bef5b1 100644 --- a/lib/trpc.ts +++ b/lib/trpc.ts @@ -1,10 +1,10 @@ // ℹ️ Type-only import: // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export -import { createReactQueryHooks } from "@trpc/react"; -import type { inferProcedureOutput, inferProcedureInput } from "@trpc/server"; import superjson from "superjson"; import type { AppRouter } from "@server/routers/_app"; +import { createReactQueryHooks } from "@trpc/react"; +import type { inferProcedureOutput, inferProcedureInput } from "@trpc/server"; /** * A set of strongly-typed React hooks from your `AppRouter` type signature with `createReactQueryHooks`. diff --git a/pages/_app.tsx b/pages/_app.tsx index 11e3412953..3f412e5c46 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,8 +1,3 @@ -import { httpBatchLink } from "@trpc/client/links/httpBatchLink"; -import { loggerLink } from "@trpc/client/links/loggerLink"; -import { withTRPC } from "@trpc/next"; -import type { TRPCClientErrorLike } from "@trpc/react"; -import { Maybe } from "@trpc/server"; import { DefaultSeo } from "next-seo"; import type { AppProps as NextAppProps } from "next/app"; import superjson from "superjson"; @@ -13,6 +8,11 @@ import { seoConfig } from "@lib/config/next-seo.config"; import I18nLanguageHandler from "@components/I18nLanguageHandler"; import type { AppRouter } from "@server/routers/_app"; +import { httpBatchLink } from "@trpc/client/links/httpBatchLink"; +import { loggerLink } from "@trpc/client/links/loggerLink"; +import { withTRPC } from "@trpc/next"; +import type { TRPCClientErrorLike } from "@trpc/react"; +import { Maybe } from "@trpc/server"; import "../styles/globals.css"; diff --git a/pages/api/trpc/[trpc].ts b/pages/api/trpc/[trpc].ts index 588e112a0a..e0b9531d0e 100644 --- a/pages/api/trpc/[trpc].ts +++ b/pages/api/trpc/[trpc].ts @@ -1,10 +1,9 @@ /** * This file contains tRPC's HTTP response handler */ -import * as trpcNext from "@trpc/server/adapters/next"; - import { createContext } from "@server/createContext"; import { appRouter } from "@server/routers/_app"; +import * as trpcNext from "@trpc/server/adapters/next"; export default trpcNext.createNextApiHandler({ router: appRouter, diff --git a/server/createContext.ts b/server/createContext.ts index bf89240896..e07fd6a80e 100644 --- a/server/createContext.ts +++ b/server/createContext.ts @@ -1,7 +1,4 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import * as trpc from "@trpc/server"; -import { Maybe } from "@trpc/server"; -import * as trpcNext from "@trpc/server/adapters/next"; import { NextApiRequest } from "next"; import { serverSideTranslations } from "next-i18next/serverSideTranslations"; @@ -10,6 +7,10 @@ import { getLocaleFromHeaders } from "@lib/core/i18n/i18n.utils"; import prisma from "@lib/prisma"; import { defaultAvatarSrc } from "@lib/profile"; +import * as trpc from "@trpc/server"; +import { Maybe } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; + async function getUserFromSession({ session, req }: { session: Maybe; req: NextApiRequest }) { if (!session?.user?.id) { return null; diff --git a/server/routers/viewer.tsx b/server/routers/viewer.tsx index 8aff73029f..3209286de8 100644 --- a/server/routers/viewer.tsx +++ b/server/routers/viewer.tsx @@ -1,5 +1,4 @@ import { BookingStatus, Prisma } from "@prisma/client"; -import { TRPCError } from "@trpc/server"; import _ from "lodash"; import { getErrorFromUnknown } from "pages/_error"; import { z } from "zod"; @@ -10,6 +9,8 @@ import { checkRegularUsername } from "@lib/core/checkRegularUsername"; import { ALL_INTEGRATIONS } from "@lib/integrations/getIntegrations"; import slugify from "@lib/slugify"; +import { TRPCError } from "@trpc/server"; + import { getCalendarAdapterOrNull } from "../../lib/calendarClient"; import { createProtectedRouter, createRouter } from "../createRouter"; import { resizeBase64Image } from "../lib/resizeBase64Image"; diff --git a/server/ssg.ts b/server/ssg.ts index 3c1025d260..075dfc9e23 100644 --- a/server/ssg.ts +++ b/server/ssg.ts @@ -1,7 +1,7 @@ -import { createSSGHelpers } from "@trpc/react/ssg"; - import prisma from "@lib/prisma"; +import { createSSGHelpers } from "@trpc/react/ssg"; + import { appRouter } from "./routers/_app"; export const ssg = createSSGHelpers({