From 4de1927489aa2d0cf61313ea1543f85268c0e645 Mon Sep 17 00:00:00 2001 From: Kake <88353972+kakeWasTaken@users.noreply.github.com> Date: Tue, 7 May 2024 14:46:22 -0700 Subject: [PATCH] feat: add option to use Geist Sans instead of Inter (#1821) Co-authored-by: Ethan Zhou Co-authored-by: juliusmarminge --- .changeset/curly-windows-learn.md | 5 +++++ cli/src/installers/index.ts | 4 ++-- cli/template/base/next.config.js | 1 + cli/template/base/package.json | 1 + cli/template/extras/config/tailwind.config.ts | 2 +- cli/template/extras/src/app/layout/base.tsx | 8 ++------ cli/template/extras/src/app/layout/with-trpc-tw.tsx | 11 +++-------- cli/template/extras/src/app/layout/with-trpc.tsx | 8 ++------ cli/template/extras/src/app/layout/with-tw.tsx | 11 +++-------- cli/template/extras/src/pages/_app/base.tsx | 8 ++------ .../extras/src/pages/_app/with-auth-trpc-tw.tsx | 9 ++------- cli/template/extras/src/pages/_app/with-auth-trpc.tsx | 8 ++------ cli/template/extras/src/pages/_app/with-auth-tw.tsx | 9 ++------- cli/template/extras/src/pages/_app/with-auth.tsx | 8 ++------ cli/template/extras/src/pages/_app/with-trpc-tw.tsx | 8 ++------ cli/template/extras/src/pages/_app/with-trpc.tsx | 8 ++------ cli/template/extras/src/pages/_app/with-tw.tsx | 9 ++------- 17 files changed, 36 insertions(+), 82 deletions(-) create mode 100644 .changeset/curly-windows-learn.md diff --git a/.changeset/curly-windows-learn.md b/.changeset/curly-windows-learn.md new file mode 100644 index 0000000000..bbf71590fb --- /dev/null +++ b/.changeset/curly-windows-learn.md @@ -0,0 +1,5 @@ +--- +"create-t3-app": minor +--- + +change default font from Inter to Geist Sans diff --git a/cli/src/installers/index.ts b/cli/src/installers/index.ts index 69c3479145..776a16ba1c 100644 --- a/cli/src/installers/index.ts +++ b/cli/src/installers/index.ts @@ -8,8 +8,8 @@ import { dbContainerInstaller } from "./dbContainer.js"; import { drizzleInstaller } from "./drizzle.js"; import { dynamicEslintInstaller } from "./eslint.js"; -// Turning this into a const allows the list to be iterated over for programatically creating prompt options -// Should increase extensability in the future +// Turning this into a const allows the list to be iterated over for programmatically creating prompt options +// Should increase extensibility in the future export const availablePackages = [ "nextAuth", "prisma", diff --git a/cli/template/base/next.config.js b/cli/template/base/next.config.js index ffbeb9fb43..98b6f90a51 100644 --- a/cli/template/base/next.config.js +++ b/cli/template/base/next.config.js @@ -17,6 +17,7 @@ const config = { locales: ["en"], defaultLocale: "en", }, + transpilePackages: ["geist"], }; export default config; diff --git a/cli/template/base/package.json b/cli/template/base/package.json index e8b707e492..a073dab0a8 100644 --- a/cli/template/base/package.json +++ b/cli/template/base/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@t3-oss/env-nextjs": "^0.10.1", + "geist": "^1.3.0", "next": "^14.2.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/cli/template/extras/config/tailwind.config.ts b/cli/template/extras/config/tailwind.config.ts index f06488f911..5fd44e8f23 100644 --- a/cli/template/extras/config/tailwind.config.ts +++ b/cli/template/extras/config/tailwind.config.ts @@ -6,7 +6,7 @@ export default { theme: { extend: { fontFamily: { - sans: ["var(--font-sans)", ...fontFamily.sans], + sans: ["var(--font-geist-sans)", ...fontFamily.sans], }, }, }, diff --git a/cli/template/extras/src/app/layout/base.tsx b/cli/template/extras/src/app/layout/base.tsx index 000740ecfb..c900aeecdb 100644 --- a/cli/template/extras/src/app/layout/base.tsx +++ b/cli/template/extras/src/app/layout/base.tsx @@ -1,10 +1,6 @@ import "~/styles/globals.css"; -import { Inter } from "next/font/google"; - -const inter = Inter({ - subsets: ["latin"], -}); +import { GeistSans } from "geist/font/sans"; export const metadata = { title: "Create T3 App", @@ -19,7 +15,7 @@ export default function RootLayout({ }) { return ( - {children} + {children} ); } diff --git a/cli/template/extras/src/app/layout/with-trpc-tw.tsx b/cli/template/extras/src/app/layout/with-trpc-tw.tsx index 67f7af0f07..cf71741a46 100644 --- a/cli/template/extras/src/app/layout/with-trpc-tw.tsx +++ b/cli/template/extras/src/app/layout/with-trpc-tw.tsx @@ -1,14 +1,9 @@ import "~/styles/globals.css"; -import { Inter } from "next/font/google"; +import { GeistSans } from "geist/font/sans"; import { TRPCReactProvider } from "~/trpc/react"; -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); - export const metadata = { title: "Create T3 App", description: "Generated by create-t3-app", @@ -21,8 +16,8 @@ export default function RootLayout({ children: React.ReactNode; }) { return ( - - + + {children} diff --git a/cli/template/extras/src/app/layout/with-trpc.tsx b/cli/template/extras/src/app/layout/with-trpc.tsx index 3c9d53def8..36d7265a53 100644 --- a/cli/template/extras/src/app/layout/with-trpc.tsx +++ b/cli/template/extras/src/app/layout/with-trpc.tsx @@ -1,13 +1,9 @@ import "~/styles/globals.css"; -import { Inter } from "next/font/google"; +import { GeistSans } from "geist/font/sans"; import { TRPCReactProvider } from "~/trpc/react"; -const inter = Inter({ - subsets: ["latin"], -}); - export const metadata = { title: "Create T3 App", description: "Generated by create-t3-app", @@ -21,7 +17,7 @@ export default function RootLayout({ }) { return ( - + {children} diff --git a/cli/template/extras/src/app/layout/with-tw.tsx b/cli/template/extras/src/app/layout/with-tw.tsx index 479d559c88..5e6bd75ada 100644 --- a/cli/template/extras/src/app/layout/with-tw.tsx +++ b/cli/template/extras/src/app/layout/with-tw.tsx @@ -1,11 +1,6 @@ import "~/styles/globals.css"; -import { Inter } from "next/font/google"; - -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); +import { GeistSans } from "geist/font/sans"; export const metadata = { title: "Create T3 App", @@ -19,8 +14,8 @@ export default function RootLayout({ children: React.ReactNode; }) { return ( - - {children} + + {children} ); } diff --git a/cli/template/extras/src/pages/_app/base.tsx b/cli/template/extras/src/pages/_app/base.tsx index 7fe473133e..716ddaf4ed 100644 --- a/cli/template/extras/src/pages/_app/base.tsx +++ b/cli/template/extras/src/pages/_app/base.tsx @@ -1,15 +1,11 @@ +import { GeistSans } from "geist/font/sans"; import { type AppType } from "next/dist/shared/lib/utils"; -import { Inter } from "next/font/google"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], -}); - const MyApp: AppType = ({ Component, pageProps }) => { return ( -
+
); diff --git a/cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx b/cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx index f579f30b13..b39099f532 100644 --- a/cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx +++ b/cli/template/extras/src/pages/_app/with-auth-trpc-tw.tsx @@ -1,24 +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 { Inter } from "next/font/google"; import { api } from "~/utils/api"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); - const MyApp: AppType<{ session: Session | null }> = ({ Component, pageProps: { session, ...pageProps }, }) => { return ( -
+
diff --git a/cli/template/extras/src/pages/_app/with-auth-trpc.tsx b/cli/template/extras/src/pages/_app/with-auth-trpc.tsx index dfd6273278..b39099f532 100644 --- a/cli/template/extras/src/pages/_app/with-auth-trpc.tsx +++ b/cli/template/extras/src/pages/_app/with-auth-trpc.tsx @@ -1,23 +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 { Inter } from "next/font/google"; import { api } from "~/utils/api"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], -}); - const MyApp: AppType<{ session: Session | null }> = ({ Component, pageProps: { session, ...pageProps }, }) => { return ( -
+
diff --git a/cli/template/extras/src/pages/_app/with-auth-tw.tsx b/cli/template/extras/src/pages/_app/with-auth-tw.tsx index 8b07ecdb0e..f285fb7958 100644 --- a/cli/template/extras/src/pages/_app/with-auth-tw.tsx +++ b/cli/template/extras/src/pages/_app/with-auth-tw.tsx @@ -1,22 +1,17 @@ +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 { Inter } from "next/font/google"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); - const MyApp: AppType<{ session: Session | null }> = ({ Component, pageProps: { session, ...pageProps }, }) => { return ( -
+
diff --git a/cli/template/extras/src/pages/_app/with-auth.tsx b/cli/template/extras/src/pages/_app/with-auth.tsx index 66d9562d24..f285fb7958 100644 --- a/cli/template/extras/src/pages/_app/with-auth.tsx +++ b/cli/template/extras/src/pages/_app/with-auth.tsx @@ -1,21 +1,17 @@ +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 { Inter } from "next/font/google"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], -}); - const MyApp: AppType<{ session: Session | null }> = ({ Component, pageProps: { session, ...pageProps }, }) => { return ( -
+
diff --git a/cli/template/extras/src/pages/_app/with-trpc-tw.tsx b/cli/template/extras/src/pages/_app/with-trpc-tw.tsx index 6537f30063..31a28d8c48 100644 --- a/cli/template/extras/src/pages/_app/with-trpc-tw.tsx +++ b/cli/template/extras/src/pages/_app/with-trpc-tw.tsx @@ -1,17 +1,13 @@ +import { GeistSans } from "geist/font/sans"; import { type AppType } from "next/app"; -import { Inter } from "next/font/google"; import { api } from "~/utils/api"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); const MyApp: AppType = ({ Component, pageProps }) => { return ( -
+
); diff --git a/cli/template/extras/src/pages/_app/with-trpc.tsx b/cli/template/extras/src/pages/_app/with-trpc.tsx index ad916a6003..31a28d8c48 100644 --- a/cli/template/extras/src/pages/_app/with-trpc.tsx +++ b/cli/template/extras/src/pages/_app/with-trpc.tsx @@ -1,17 +1,13 @@ +import { GeistSans } from "geist/font/sans"; import { type AppType } from "next/app"; -import { Inter } from "next/font/google"; import { api } from "~/utils/api"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], -}); - const MyApp: AppType = ({ Component, pageProps }) => { return ( -
+
); diff --git a/cli/template/extras/src/pages/_app/with-tw.tsx b/cli/template/extras/src/pages/_app/with-tw.tsx index 54fd82a599..e9d159ba29 100644 --- a/cli/template/extras/src/pages/_app/with-tw.tsx +++ b/cli/template/extras/src/pages/_app/with-tw.tsx @@ -1,16 +1,11 @@ +import { GeistSans } from "geist/font/sans"; import { type AppType } from "next/app"; -import { Inter } from "next/font/google"; import "~/styles/globals.css"; -const inter = Inter({ - subsets: ["latin"], - variable: "--font-sans", -}); - const MyApp: AppType = ({ Component, pageProps }) => { return ( -
+
);