vercel · balazsorban44 · Feb 23, 2023 · Feb 11, 2023 · Feb 12, 2023 · Feb 16, 2023
diff --git a/packages/create-next-app/templates/app/js/app/api/hello/route.js b/packages/create-next-app/templates/app/js/app/api/hello/route.js
@@ -0,0 +1,3 @@
+export async function GET(request) {
+ return new Response('Hello, Next.js!')
+}
diff --git a/...t-app/templates/app/js/public/favicon.ico → ...next-app/templates/app/js/app/favicon.ico b/...t-app/templates/app/js/public/favicon.ico → ...next-app/templates/app/js/app/favicon.ico
diff --git a/packages/create-next-app/templates/app/js/app/head.js b/packages/create-next-app/templates/app/js/app/head.js
diff --git a/packages/create-next-app/templates/app/js/app/layout.js b/packages/create-next-app/templates/app/js/app/layout.js
@@ -1,13 +1,13 @@
 import './globals.css'
 
+export const metadata = {
+ title: 'Create Next App',
+ description: 'Generated by create next app',
+}
+
 export default function RootLayout({ children }) {
  return (
  <html lang="en">
- {/*
- <head /> will contain the components returned by the nearest parent
- head.js. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
- */}
- <head />
  <body>{children}</body>
  </html>
  )

diff --git a/packages/create-next-app/templates/app/js/pages/api/hello.js b/packages/create-next-app/templates/app/js/pages/api/hello.js
diff --git a/packages/create-next-app/templates/app/ts/app/api/hello/route.ts b/packages/create-next-app/templates/app/ts/app/api/hello/route.ts
@@ -0,0 +1,3 @@
+export async function GET(request: Request) {
+ return new Response('Hello, Next.js!')
+}
diff --git a/...t-app/templates/app/ts/public/favicon.ico → ...next-app/templates/app/ts/app/favicon.ico b/...t-app/templates/app/ts/public/favicon.ico → ...next-app/templates/app/ts/app/favicon.ico
diff --git a/packages/create-next-app/templates/app/ts/app/head.tsx b/packages/create-next-app/templates/app/ts/app/head.tsx
diff --git a/packages/create-next-app/templates/app/ts/app/layout.tsx b/packages/create-next-app/templates/app/ts/app/layout.tsx
@@ -1,17 +1,17 @@
 import './globals.css'
 
+export const metadata = {
+ title: 'Create Next App',
+ description: 'Generated by create next app',
+}
+
 export default function RootLayout({
  children,
 }: {
  children: React.ReactNode
 }) {
  return (
  <html lang="en">
- {/*
- <head /> will contain the components returned by the nearest parent
- head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
- */}
- <head />
  <body>{children}</body>
  </html>
  )

diff --git a/packages/create-next-app/templates/app/ts/next-env.d.ts b/packages/create-next-app/templates/app/ts/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
+/// <reference types="next/navigation-types/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/packages/create-next-app/templates/app/ts/pages/api/hello.ts b/packages/create-next-app/templates/app/ts/pages/api/hello.ts
diff --git a/test/e2e/app-dir/create-next-app-template/app/layout.tsx b/test/e2e/app-dir/create-next-app-template/app/layout.tsx
@@ -1,17 +1,17 @@
 import './globals.css'
 
+export const metadata = {
+ title: 'Create Next App',
+ description: 'Generated by create next app',
+}
+
 export default function RootLayout({
  children,
 }: {
  children: React.ReactNode
 }) {
  return (
  <html lang="en">
- <head>
- <title>Create Next App</title>
- <meta name="description" content="Generated by create next app" />
- <link rel="icon" href="/favicon.ico" />
- </head>
  <body>{children}</body>
  </html>
  )

diff --git a/test/e2e/app-dir/create-root-layout/app-find-available-dir/(group)/route/first/head.js b/test/e2e/app-dir/create-root-layout/app-find-available-dir/(group)/route/first/head.js
diff --git a/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
@@ -102,7 +102,7 @@ describe('app dir - rsc basics', () => {
 
  // should have only 1 DOCTYPE
  expect(homeHTML).toMatch(/^<!DOCTYPE html><html/)
- // should have default head when there's no head.js provided
+ // should have default metadata when there's nothing additional provided
  expect(homeHTML).toContain('<meta charSet="utf-8"/>')
  expect(homeHTML).toContain(
  '<meta name="viewport" content="width=device-width, initial-scale=1"/>'

diff --git a/test/integration/create-next-app/lib/specification.ts b/test/integration/create-next-app/lib/specification.ts
@@ -62,9 +62,8 @@ export const projectSpecification: ProjectSpecification = {
  devDeps: [],
  files: [
  'app/page.js',
- 'app/head.js',
  'app/layout.js',
- 'pages/api/hello.js',
+ 'app/api/hello/route.js',
  'jsconfig.json',
  ],
  },
@@ -73,9 +72,8 @@ export const projectSpecification: ProjectSpecification = {
  devDeps: [],
  files: [
  'app/page.tsx',
- 'app/head.tsx',
  'app/layout.tsx',
- 'pages/api/hello.ts',
+ 'app/api/hello/route.ts',
  'tsconfig.json',
  'next-env.d.ts',
  ],

diff --git a/test/integration/create-next-app/templates.test.ts b/test/integration/create-next-app/templates.test.ts
@@ -24,7 +24,8 @@ import { getPkgPaths } from '../../../test/lib/create-next-install'
 
 const startsWithoutError = async (
  appDir: string,
- modes = ['default', 'turbo']
+ modes = ['default', 'turbo'],
+ usingAppDirectory: boolean = false
 ) => {
  for (const mode of modes) {
  appDir = await fs.realpath(appDir)
@@ -42,7 +43,11 @@ const startsWithoutError = async (
 
  const apiRes = await fetchViaHTTP(appPort, '/api/hello')
  expect(apiRes.status).toBe(200)
- expect(await apiRes.json()).toEqual({ name: 'John Doe' })
+ if (usingAppDirectory) {
+ expect(await apiRes.text()).toEqual('Hello, Next.js!')
+ } else {
+ expect(await apiRes.json()).toEqual({ name: 'John Doe' })
+ }
  } finally {
  await killApp(app)
  }
@@ -336,7 +341,11 @@ describe('create-next-app --experimental-app-dir', () => {
  const exitCode = await spawnExitPromise(childProcess)
  expect(exitCode).toBe(0)
  shouldBeTemplateProject({ cwd, projectName, template: 'app', mode: 'ts' })
- await startsWithoutError(path.join(cwd, projectName))
+ await startsWithoutError(
+ path.join(cwd, projectName),
+ ['default', 'turbo'],
+ true
+ )
  })
  })
 
@@ -362,10 +371,11 @@ describe('create-next-app --experimental-app-dir', () => {
  expect(exitCode).toBe(0)
  shouldBeTemplateProject({ cwd, projectName, template: 'app', mode: 'js' })
  // is landed
- await startsWithoutError(path.join(cwd, projectName), [
- 'default',
- 'turbo',
- ])
+ await startsWithoutError(
+ path.join(cwd, projectName),
+ ['default', 'turbo'],
+ true
+ )
  })
  })
 
@@ -397,10 +407,11 @@ describe('create-next-app --experimental-app-dir', () => {
  mode: 'js',
  srcDir: true,
  })
- await startsWithoutError(path.join(cwd, projectName), [
- 'default',
- 'turbo',
- ])
+ await startsWithoutError(
+ path.join(cwd, projectName),
+ ['default', 'turbo'],
+ true
+ )
  })
  })
 })