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

Removed duplicated cn function declaration from lib dir #74065

Merged
merged 6 commits into from
Dec 18, 2024
+26 −25
Merged

Removed duplicated cn function declaration from lib dir #74065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc16cfb
Removed duplicated cn function declaration from lib dir
damiensedgwick Dec 18, 2024
1a522a1
fixed issue with cn import for components
damiensedgwick Dec 18, 2024
285aa5b
chore(examples): switch to next.config.ts
samcx Dec 18, 2024
05ee48a
chore(examples): bump packages
samcx Dec 18, 2024
da10548
chore(examples): update layout & page
samcx Dec 18, 2024
346208d
Merge branch 'canary' into damien/update-with-supabase-example
samcx Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions examples/with-supabase/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { EnvVarWarning } from "@/components/env-var-warning";
import HeaderAuth from "@/components/header-auth";
import { ThemeSwitcher } from "@/components/theme-switcher";
import { hasEnvVars } from "@/utils/supabase/check-env-vars";
import { GeistSans } from "geist/font/sans";
import { Geist } from "next/font/google";
import { ThemeProvider } from "next-themes";
import Link from "next/link";
import "./globals.css";
Expand All @@ -18,13 +18,18 @@ export const metadata = {
description: "The fastest way to build apps with Next.js and Supabase",
};

const geistSans = Geist({
display: "swap",
subsets: ["latin"],
});

export default function RootLayout({
children,
}: {
}: Readonly<{
children: React.ReactNode;
}) {
}>) {
return (
<html lang="en" className={GeistSans.className} suppressHydrationWarning>
<html lang="en" className={geistSans.className} suppressHydrationWarning>
<body className="bg-background text-foreground">
<ThemeProvider
attribute="class"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-supabase/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ConnectSupabaseSteps from "@/components/tutorial/connect-supabase-steps";
import SignUpUserSteps from "@/components/tutorial/sign-up-user-steps";
import { hasEnvVars } from "@/utils/supabase/check-env-vars";

export default async function Index() {
export default async function Home() {
return (
<>
<Hero />
Expand Down
2 changes: 1 addition & 1 deletion examples/with-supabase/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type ClassValue, clsx } from "clsx";
import { clsx, type ClassValue } from "clsx";
import { twMerge } from "tailwind-merge";

export function cn(...inputs: ClassValue[]) {
Expand Down
4 changes: 0 additions & 4 deletions examples/with-supabase/next.config.js
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions examples/with-supabase/next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { NextConfig } from "next";

const nextConfig: NextConfig = {
/* config options here */
};

export default nextConfig;
17 changes: 8 additions & 9 deletions examples/with-supabase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,21 @@
"autoprefixer": "10.4.20",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"geist": "^1.2.1",
"lucide-react": "^0.456.0",
"lucide-react": "^0.468.0",
"next": "latest",
"next-themes": "^0.4.3",
"prettier": "^3.3.3",
"react": "18.3.1",
"react-dom": "18.3.1"
"react": "19.0.0",
"react-dom": "19.0.0"
},
"devDependencies": {
"@types/node": "22.9.0",
"@types/react": "^18.3.12",
"@types/react-dom": "18.3.1",
"@types/node": "22.10.2",
"@types/react": "^19.0.2",
"@types/react-dom": "19.0.2",
"postcss": "8.4.49",
"tailwind-merge": "^2.5.2",
"tailwindcss": "3.4.14",
"tailwindcss": "3.4.17",
"tailwindcss-animate": "^1.0.7",
"typescript": "5.6.3"
"typescript": "5.7.2"
}
}
6 changes: 0 additions & 6 deletions examples/with-supabase/utils/cn.ts
View file
Open in desktop

This file was deleted.

Loading