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

feat!: upgrade to next15 & replace geist with next font #2041

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat!: upgrade to next15 & replace geist with next font #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b07d422
feat: replace geist package with next/font/google Geist
devin-ai-integration[bot] Dec 9, 2024
41d1c34
feat: remove React imports and update Geist font configuration
devin-ai-integration[bot] Dec 9, 2024
37c2c61
fix: run format
Mokshit06 Dec 9, 2024
8f3c5c1
chore: upgrade entirely to next15
Mokshit06 Dec 9, 2024
96f0e7a
chore: add changeset
Mokshit06 Dec 9, 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
5 changes: 5 additions & 0 deletions .changeset/modern-boats-breathe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-t3-app": major
---

Upgrades to next v15. Replaces the geist package with Geist from next/font.
2 changes: 1 addition & 1 deletion cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"drizzle-kit": "^0.24.0",
"drizzle-orm": "^0.33.0",
"mysql2": "^3.11.0",
"next": "^14.2.4",
"next": "^15.0.4",
"next-auth": "^4.24.7",
"postgres": "^3.4.4",
"prettier": "^3.3.2",
Expand Down
3 changes: 1 addition & 2 deletions cli/template/base/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const config = {
i18n: {
locales: ["en"],
defaultLocale: "en",
},
transpilePackages: ["geist"],
}
};

export default config;
1 change: 0 additions & 1 deletion cli/template/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
},
"dependencies": {
"@t3-oss/env-nextjs": "^0.10.1",
"geist": "^1.3.0",
"next": "^15.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion cli/template/extras/config/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default {
theme: {
extend: {
fontFamily: {
sans: ["var(--font-geist-sans)", ...fontFamily.sans],
sans: ["var(--font-geist)", ...fontFamily.sans],
},
},
},
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/app/layout/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import "~/styles/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
import { Geist } from "next/font/google";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

export const metadata: Metadata = {
title: "Create T3 App",
Expand All @@ -14,7 +16,7 @@ export default function RootLayout({
}: Readonly<{ children: React.ReactNode }>) {
return (
<html lang="en">
<body className={GeistSans.className}>{children}</body>
<body className={`${geist.className} ${geist.variable}`}>{children}</body>
</html>
);
}
6 changes: 4 additions & 2 deletions cli/template/extras/src/app/layout/with-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import "~/styles/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
import { Geist } from "next/font/google";

import { TRPCReactProvider } from "~/trpc/react";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

export const metadata: Metadata = {
title: "Create T3 App",
description: "Generated by create-t3-app",
Expand All @@ -15,7 +17,7 @@ export default function RootLayout({
children,
}: Readonly<{ children: React.ReactNode }>) {
return (
<html lang="en" className={`${GeistSans.variable}`}>
<html lang="en" className={`${geist.className} ${geist.variable}`}>
<body>
<TRPCReactProvider>{children}</TRPCReactProvider>
</body>
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/app/layout/with-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import "~/styles/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
import { Geist } from "next/font/google";

import { TRPCReactProvider } from "~/trpc/react";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

export const metadata: Metadata = {
title: "Create T3 App",
description: "Generated by create-t3-app",
Expand All @@ -16,7 +18,7 @@ export default function RootLayout({
}: Readonly<{ children: React.ReactNode }>) {
return (
<html lang="en">
<body className={GeistSans.className}>
<body className={`${geist.className} ${geist.variable}`}>
<TRPCReactProvider>{children}</TRPCReactProvider>
</body>
</html>
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/app/layout/with-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import "~/styles/globals.css";

import { GeistSans } from "geist/font/sans";
import { type Metadata } from "next";
import { Geist } from "next/font/google";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

export const metadata: Metadata = {
title: "Create T3 App",
Expand All @@ -13,7 +15,7 @@ export default function RootLayout({
children,
}: Readonly<{ children: React.ReactNode }>) {
return (
<html lang="en" className={`${GeistSans.variable}`}>
<html lang="en" className={`${geist.className} ${geist.variable}`}>
<body>{children}</body>
</html>
);
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/dist/shared/lib/utils";
import { Geist } from "next/font/google";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType = ({ Component, pageProps }) => {
return (
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
);
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { GeistSans } from "geist/font/sans";
import { type Session } from "next-auth";
import { SessionProvider } from "next-auth/react";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import { api } from "~/utils/api";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType<{ session: Session | null }> = ({
Component,
pageProps: { session, ...pageProps },
}) => {
return (
<SessionProvider session={session}>
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
</SessionProvider>
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-auth-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { GeistSans } from "geist/font/sans";
import { type Session } from "next-auth";
import { SessionProvider } from "next-auth/react";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import { api } from "~/utils/api";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType<{ session: Session | null }> = ({
Component,
pageProps: { session, ...pageProps },
}) => {
return (
<SessionProvider session={session}>
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
</SessionProvider>
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { GeistSans } from "geist/font/sans";
import { type Session } from "next-auth";
import { SessionProvider } from "next-auth/react";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType<{ session: Session | null }> = ({
Component,
pageProps: { session, ...pageProps },
}) => {
return (
<SessionProvider session={session}>
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
</SessionProvider>
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-trpc-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import { api } from "~/utils/api";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType = ({ Component, pageProps }) => {
return (
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
);
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-trpc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import { api } from "~/utils/api";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType = ({ Component, pageProps }) => {
return (
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
);
Expand Down
6 changes: 4 additions & 2 deletions cli/template/extras/src/pages/_app/with-tw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { GeistSans } from "geist/font/sans";
import { type AppType } from "next/app";
import { Geist } from "next/font/google";

import "~/styles/globals.css";

const geist = Geist({ subsets: ["latin"], variable: "--font-geist" });

const MyApp: AppType = ({ Component, pageProps }) => {
return (
<div className={GeistSans.className}>
<div className={`${geist.className} ${geist.variable}`}>
<Component {...pageProps} />
</div>
);
Expand Down
Loading
Loading