From d3b86b1313decd4b3735f850d7746a4c9c29e76a Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Fri, 2 Feb 2024 20:20:21 +0000 Subject: [PATCH] Fix env imports --- drizzle.config.ts | 2 +- next.config.js | 2 +- src/app/api/trpc/[trpc]/route.ts | 2 +- src/components/ui/toggle-group.tsx | 34 ++++++++++++++-------------- src/components/widgets/print-env.tsx | 2 +- src/lib/auth/utils.ts | 2 +- src/server/auth.ts | 2 +- src/server/db/index.ts | 2 +- src/server/db/migrate.ts | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drizzle.config.ts b/drizzle.config.ts index a1692ff..7e47e41 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -1,7 +1,7 @@ import "dotenv/config"; import type { Config } from "drizzle-kit"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; export default { schema: "./src/server/db/schema", diff --git a/next.config.js b/next.config.js index 9bfe4a0..f77ef58 100644 --- a/next.config.js +++ b/next.config.js @@ -2,7 +2,7 @@ * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful * for Docker builds. */ -await import("./src/env.js"); +await import("./src/env.cjs"); /** @type {import("next").NextConfig} */ const config = {}; diff --git a/src/app/api/trpc/[trpc]/route.ts b/src/app/api/trpc/[trpc]/route.ts index c397112..e817de0 100644 --- a/src/app/api/trpc/[trpc]/route.ts +++ b/src/app/api/trpc/[trpc]/route.ts @@ -1,7 +1,7 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch"; import { type NextRequest } from "next/server"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; import { appRouter } from "@/server/api/root"; import { createTRPCContext } from "@/server/api/trpc"; diff --git a/src/components/ui/toggle-group.tsx b/src/components/ui/toggle-group.tsx index e1c5020..1c876bb 100644 --- a/src/components/ui/toggle-group.tsx +++ b/src/components/ui/toggle-group.tsx @@ -1,18 +1,18 @@ -"use client"; +"use client" -import * as React from "react"; -import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"; -import { type VariantProps } from "class-variance-authority"; +import * as React from "react" +import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group" +import { type VariantProps } from "class-variance-authority" -import { cn } from "@/lib/utils"; -import { toggleVariants } from "@/components/ui/toggle"; +import { cn } from "@/lib/utils" +import { toggleVariants } from "@/components/ui/toggle" const ToggleGroupContext = React.createContext< VariantProps >({ size: "default", variant: "default", -}); +}) const ToggleGroup = React.forwardRef< React.ElementRef, @@ -28,34 +28,34 @@ const ToggleGroup = React.forwardRef< {children} -)); +)) -ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName; +ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName const ToggleGroupItem = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef & VariantProps >(({ className, children, variant, size, ...props }, ref) => { - const context = React.useContext(ToggleGroupContext); + const context = React.useContext(ToggleGroupContext) return ( {children} - ); -}); + ) +}) -ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName; +ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName -export { ToggleGroup, ToggleGroupItem }; +export { ToggleGroup, ToggleGroupItem } diff --git a/src/components/widgets/print-env.tsx b/src/components/widgets/print-env.tsx index 21b9023..5bcdabe 100644 --- a/src/components/widgets/print-env.tsx +++ b/src/components/widgets/print-env.tsx @@ -2,7 +2,7 @@ import { type Session } from "next-auth"; import { type ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers"; import React from "react"; import { Card, CardContent, CardHeader } from "@/components/ui/card"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; type PrintEnvProps = { session: Session | null; diff --git a/src/lib/auth/utils.ts b/src/lib/auth/utils.ts index d9a44fc..09d54f6 100644 --- a/src/lib/auth/utils.ts +++ b/src/lib/auth/utils.ts @@ -4,7 +4,7 @@ import { type DefaultSession, getServerSession, type NextAuthOptions } from "nex import { redirect } from "next/navigation"; import GoogleProvider from "next-auth/providers/google"; import { type Adapter } from "next-auth/adapters"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; declare module "next-auth" { interface Session { diff --git a/src/server/auth.ts b/src/server/auth.ts index 6047a6d..cfe8c66 100644 --- a/src/server/auth.ts +++ b/src/server/auth.ts @@ -7,7 +7,7 @@ import { import { type Adapter } from "next-auth/adapters"; import DiscordProvider from "next-auth/providers/discord"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; import { db } from "@/server/db"; /** diff --git a/src/server/db/index.ts b/src/server/db/index.ts index e0bef4d..a04bd54 100644 --- a/src/server/db/index.ts +++ b/src/server/db/index.ts @@ -1,6 +1,6 @@ import { drizzle } from "drizzle-orm/postgres-js"; import postgres from "postgres"; -import { env } from "@/env"; +import { env } from "@/env.cjs"; import { users, accounts, diff --git a/src/server/db/migrate.ts b/src/server/db/migrate.ts index fd456d7..10d0ce4 100644 --- a/src/server/db/migrate.ts +++ b/src/server/db/migrate.ts @@ -1,4 +1,4 @@ -import { env } from "@/env"; +import { env } from "@/env.cjs"; import { drizzle } from "drizzle-orm/postgres-js"; import { migrate } from "drizzle-orm/postgres-js/migrator";