From ea40492b5bf3aeb253a5734640fa49f820b1b84b Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Thu, 13 Apr 2023 16:50:33 -0700 Subject: [PATCH] Update font handling in CNA templates --- .../templates/app-tw/js/app/layout.js | 5 +++- .../templates/app-tw/js/app/page.js | 27 ++++++------------ .../templates/app-tw/ts/app/layout.tsx | 5 +++- .../templates/app-tw/ts/app/page.tsx | 24 ++++++---------- .../templates/app/js/app/layout.js | 5 +++- .../templates/app/js/app/page.js | 23 ++++++--------- .../templates/app/ts/app/layout.tsx | 5 +++- .../templates/app/ts/app/page.tsx | 23 ++++++--------- .../templates/default-tw/js/pages/index.js | 28 ++++++++----------- .../templates/default-tw/ts/pages/index.tsx | 28 ++++++++----------- .../templates/default/js/pages/index.js | 18 ++++++------ .../templates/default/ts/pages/index.tsx | 18 ++++++------ 12 files changed, 88 insertions(+), 121 deletions(-) diff --git a/packages/create-next-app/templates/app-tw/js/app/layout.js b/packages/create-next-app/templates/app-tw/js/app/layout.js index 3e3a9a26dfb6..c93f80617d1d 100644 --- a/packages/create-next-app/templates/app-tw/js/app/layout.js +++ b/packages/create-next-app/templates/app-tw/js/app/layout.js @@ -1,4 +1,7 @@ import './globals.css' +import { Inter } from 'next/font/google' + +const inter = Inter({ subsets: ['latin'] }) export const metadata = { title: 'Create Next App', @@ -8,7 +11,7 @@ export const metadata = { export default function RootLayout({ children }) { return ( - {children} + {children} ) } diff --git a/packages/create-next-app/templates/app-tw/js/app/page.js b/packages/create-next-app/templates/app-tw/js/app/page.js index b66378bdfacc..e7a6bb48abf7 100644 --- a/packages/create-next-app/templates/app-tw/js/app/page.js +++ b/packages/create-next-app/templates/app-tw/js/app/page.js @@ -1,7 +1,4 @@ import Image from 'next/image' -import { Inter } from 'next/font/google' - -const inter = Inter({ subsets: ['latin'] }) export default function Home() { return ( @@ -49,15 +46,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs{' '} ->

-

+

Find in-depth information about Next.js features and API.

@@ -68,15 +63,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn{' '} ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -87,15 +80,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates{' '} ->

-

+

Explore the Next.js 13 playground.

@@ -106,15 +97,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy{' '} ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/app-tw/ts/app/layout.tsx b/packages/create-next-app/templates/app-tw/ts/app/layout.tsx index 3d9d72318cec..71b3fbf0545a 100644 --- a/packages/create-next-app/templates/app-tw/ts/app/layout.tsx +++ b/packages/create-next-app/templates/app-tw/ts/app/layout.tsx @@ -1,4 +1,7 @@ import './globals.css' +import { Inter } from 'next/font/google' + +const inter = Inter({ subsets: ['latin'] }) export const metadata = { title: 'Create Next App', @@ -12,7 +15,7 @@ export default function RootLayout({ }) { return ( - {children} + {children} ) } diff --git a/packages/create-next-app/templates/app-tw/ts/app/page.tsx b/packages/create-next-app/templates/app-tw/ts/app/page.tsx index bb96e07bde4e..3cc1b4b31d8a 100644 --- a/packages/create-next-app/templates/app-tw/ts/app/page.tsx +++ b/packages/create-next-app/templates/app-tw/ts/app/page.tsx @@ -49,15 +49,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs{' '} ->

-

+

Find in-depth information about Next.js features and API.

@@ -68,15 +66,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn{' '} ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -87,15 +83,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates{' '} ->

-

+

Explore the Next.js 13 playground.

@@ -106,15 +100,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy{' '} ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/app/js/app/layout.js b/packages/create-next-app/templates/app/js/app/layout.js index 3e3a9a26dfb6..c93f80617d1d 100644 --- a/packages/create-next-app/templates/app/js/app/layout.js +++ b/packages/create-next-app/templates/app/js/app/layout.js @@ -1,4 +1,7 @@ import './globals.css' +import { Inter } from 'next/font/google' + +const inter = Inter({ subsets: ['latin'] }) export const metadata = { title: 'Create Next App', @@ -8,7 +11,7 @@ export const metadata = { export default function RootLayout({ children }) { return ( - {children} + {children} ) } diff --git a/packages/create-next-app/templates/app/js/app/page.js b/packages/create-next-app/templates/app/js/app/page.js index dff89aaea026..6b25d82fa60a 100644 --- a/packages/create-next-app/templates/app/js/app/page.js +++ b/packages/create-next-app/templates/app/js/app/page.js @@ -1,9 +1,6 @@ import Image from 'next/image' -import { Inter } from 'next/font/google' import styles from './page.module.css' -const inter = Inter({ subsets: ['latin'] }) - export default function Home() { return (
@@ -49,12 +46,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs ->

-

- Find in-depth information about Next.js features and API. -

+

Find in-depth information about Next.js features and API.

-

+

Learn ->

-

- Learn about Next.js in an interactive course with quizzes! -

+

Learn about Next.js in an interactive course with quizzes!

 -

+

Templates ->

-

Explore the Next.js 13 playground.

+

Explore the Next.js 13 playground.

 -

+

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/app/ts/app/layout.tsx b/packages/create-next-app/templates/app/ts/app/layout.tsx index 3d9d72318cec..71b3fbf0545a 100644 --- a/packages/create-next-app/templates/app/ts/app/layout.tsx +++ b/packages/create-next-app/templates/app/ts/app/layout.tsx @@ -1,4 +1,7 @@ import './globals.css' +import { Inter } from 'next/font/google' + +const inter = Inter({ subsets: ['latin'] }) export const metadata = { title: 'Create Next App', @@ -12,7 +15,7 @@ export default function RootLayout({ }) { return ( - {children} + {children} ) } diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 01946f7979e1..eec39a2dcaa4 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -1,9 +1,6 @@ import Image from 'next/image' -import { Inter } from 'next/font/google' import styles from './page.module.css' -const inter = Inter({ subsets: ['latin'] }) - export default function Home() { return (
@@ -49,12 +46,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs ->

-

- Find in-depth information about Next.js features and API. -

+

Find in-depth information about Next.js features and API.

-

+

Learn ->

-

- Learn about Next.js in an interactive course with quizzes! -

+

Learn about Next.js in an interactive course with quizzes!

 -

+

Templates ->

-

Explore the Next.js 13 playground.

+

Explore the Next.js 13 playground.

 -

+

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default-tw/js/pages/index.js b/packages/create-next-app/templates/default-tw/js/pages/index.js index 9cf713bee5d1..6c16ebe9feb1 100644 --- a/packages/create-next-app/templates/default-tw/js/pages/index.js +++ b/packages/create-next-app/templates/default-tw/js/pages/index.js @@ -5,7 +5,9 @@ const inter = Inter({ subsets: ['latin'] }) export default function Home() { return ( -
+

Get started by editing  @@ -49,15 +51,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs{' '} ->

-

+

Find in-depth information about Next.js features and API.

@@ -68,15 +68,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn{' '} ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -87,15 +85,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates{' '} ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -106,15 +102,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy{' '} ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default-tw/ts/pages/index.tsx b/packages/create-next-app/templates/default-tw/ts/pages/index.tsx index eca9da7b1e4a..14f2678f14fe 100644 --- a/packages/create-next-app/templates/default-tw/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default-tw/ts/pages/index.tsx @@ -5,7 +5,9 @@ const inter = Inter({ subsets: ['latin'] }) export default function Home() { return ( -
+

Get started by editing  @@ -49,15 +51,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs{' '} ->

-

+

Find in-depth information about Next.js features and API.

@@ -68,15 +68,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn{' '} ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -87,15 +85,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates{' '} ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -106,15 +102,13 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy{' '} ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 54bc281694f0..b76a1de0a092 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -14,7 +14,7 @@ export default function Home() { -
+

Get started by editing  @@ -57,10 +57,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs ->

-

+

Find in-depth information about Next.js features and API.

@@ -71,10 +71,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -85,10 +85,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -99,10 +99,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index 8c2467c810f5..02c4dee04910 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -14,7 +14,7 @@ export default function Home() { -
+

Get started by editing  @@ -57,10 +57,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Docs ->

-

+

Find in-depth information about Next.js features and API.

@@ -71,10 +71,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Learn ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -85,10 +85,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Templates ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -99,10 +99,10 @@ export default function Home() { target="_blank" rel="noopener noreferrer" > -

+

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.