Merge branch 'canary' into sokra/non-enumerable-exports

docs/api-reference/create-next-app.md

@@ -57,9 +57,9 @@ Options:
 
     Initialize with ESLint config.
 
-  --app-dir
+  --app
 
-    Initialize as an `app/` directory project.
+    Initialize as an App Router project.
 
   --src-dir
 

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.3.5-canary.3"
+  "version": "13.3.5-canary.4"
 }

packages/create-next-app/create-app.ts

@@ -36,7 +36,7 @@ export async function createApp({
   typescript,
   tailwind,
   eslint,
-  appDir,
+  appRouter,
   srcDir,
   importAlias,
 }: {
@@ -47,13 +47,13 @@ export async function createApp({
   typescript: boolean
   tailwind: boolean
   eslint: boolean
-  appDir: boolean
+  appRouter: boolean
   srcDir: boolean
   importAlias: string
 }): Promise<void> {
   let repoInfo: RepoInfo | undefined
   const mode: TemplateMode = typescript ? 'ts' : 'js'
-  const template: TemplateType = appDir
+  const template: TemplateType = appRouter
     ? tailwind
       ? 'app-tw'
       : 'app'

packages/create-next-app/index.ts

@@ -67,10 +67,10 @@ const program = new Commander.Command(packageJson.name)
 `
   )
   .option(
-    '--app-dir',
+    '--app',
     `
 
-  Initialize as an \`app/\` directory project.
+  Initialize as an App Router project.
 `
   )
   .option(
@@ -91,14 +91,14 @@ const program = new Commander.Command(packageJson.name)
     '--use-npm',
     `
 
-  Explicitly tell the CLI to bootstrap the app using npm
+  Explicitly tell the CLI to bootstrap the application using npm
 `
   )
   .option(
     '--use-pnpm',
     `
 
-  Explicitly tell the CLI to bootstrap the app using pnpm
+  Explicitly tell the CLI to bootstrap the application using pnpm
 `
   )
   .option(
@@ -340,24 +340,21 @@ async function run(): Promise<void> {
       }
     }
 
-    if (
-      !process.argv.includes('--app-dir') &&
-      !process.argv.includes('--no-app-dir')
-    ) {
+    if (!process.argv.includes('--app') && !process.argv.includes('--no-app')) {
       if (ciInfo.isCI) {
-        program.appDir = false
+        program.app = true
       } else {
-        const styledAppDir = chalk.hex('#007acc')('`app/` directory')
-        const { appDir } = await prompts({
+        const styledAppDir = chalk.hex('#007acc')('App Router')
+        const { appRouter } = await prompts({
           onState: onPromptState,
           type: 'toggle',
-          name: 'appDir',
-          message: `Would you like to use ${styledAppDir} with this project?`,
-          initial: false,
+          name: 'appRouter',
+          message: `Use ${styledAppDir} (recommended)?`,
+          initial: true,
           active: 'Yes',
           inactive: 'No',
         })
-        program.appDir = Boolean(appDir)
+        program.app = Boolean(appRouter)
       }
     }
 
@@ -410,7 +407,7 @@ async function run(): Promise<void> {
       typescript: program.typescript,
       tailwind: program.tailwind,
       eslint: program.eslint,
-      appDir: program.appDir,
+      appRouter: program.app,
       srcDir: program.srcDir,
       importAlias: program.importAlias,
     })
@@ -438,7 +435,7 @@ async function run(): Promise<void> {
       typescript: program.typescript,
       eslint: program.eslint,
       tailwind: program.tailwind,
-      appDir: program.appDir,
+      appRouter: program.app,
       srcDir: program.srcDir,
       importAlias: program.importAlias,
     })

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.3.5-canary.3",
+    "@next/eslint-plugin-next": "13.3.5-canary.4",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "private": true,
   "scripts": {
     "clean": "rm -rf ./native/*",

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.3.5-canary.3",
+  "version": "13.3.5-canary.4",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.3.5-canary.3",
+    "@next/env": "13.3.5-canary.4",
     "@swc/helpers": "0.5.1",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -142,11 +142,11 @@
     "@jest/types": "29.5.0",
     "@napi-rs/cli": "2.14.7",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.3.5-canary.3",
-    "@next/polyfill-nomodule": "13.3.5-canary.3",
-    "@next/react-dev-overlay": "13.3.5-canary.3",
-    "@next/react-refresh-utils": "13.3.5-canary.3",
-    "@next/swc": "13.3.5-canary.3",
+    "@next/polyfill-module": "13.3.5-canary.4",
+    "@next/polyfill-nomodule": "13.3.5-canary.4",
+    "@next/react-dev-overlay": "13.3.5-canary.4",
+    "@next/react-refresh-utils": "13.3.5-canary.4",
+    "@next/swc": "13.3.5-canary.4",
     "@opentelemetry/api": "1.4.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",

packages/next/src/build/analysis/get-page-static-info.ts

@@ -83,13 +83,23 @@ function checkExports(swcAST: any): {
   ssg: boolean
   runtime?: string
   preferredRegion?: string | string[]
+  generateImageMetadata?: boolean
+  generateSitemaps?: boolean
 } {
+  const exportsSet = new Set<string>([
+    'getStaticProps',
+    'getServerSideProps',
+    'generateImageMetadata',
+    'generateSitemaps',
+  ])
   if (Array.isArray(swcAST?.body)) {
     try {
       let runtime: string | undefined
       let preferredRegion: string | string[] | undefined
       let ssr: boolean = false
       let ssg: boolean = false
+      let generateImageMetadata: boolean = false
+      let generateSitemaps: boolean = false
 
       for (const node of swcAST.body) {
         if (
@@ -122,22 +132,25 @@ function checkExports(swcAST: any): {
         if (
           node.type === 'ExportDeclaration' &&
           node.declaration?.type === 'FunctionDeclaration' &&
-          ['getStaticProps', 'getServerSideProps'].includes(
-            node.declaration.identifier?.value
-          )
+          exportsSet.has(node.declaration.identifier?.value)
         ) {
-          ssg = node.declaration.identifier.value === 'getStaticProps'
-          ssr = node.declaration.identifier.value === 'getServerSideProps'
+          const id = node.declaration.identifier.value
+          ssg = id === 'getStaticProps'
+          ssr = id === 'getServerSideProps'
+          generateImageMetadata = id === 'generateImageMetadata'
+          generateSitemaps = id === 'generateSitemaps'
         }
 
         if (
           node.type === 'ExportDeclaration' &&
           node.declaration?.type === 'VariableDeclaration'
         ) {
           const id = node.declaration?.declarations[0]?.id.value
-          if (['getStaticProps', 'getServerSideProps'].includes(id)) {
+          if (exportsSet.has(id)) {
             ssg = id === 'getStaticProps'
             ssr = id === 'getServerSideProps'
+            generateImageMetadata = id === 'generateImageMetadata'
+            generateSitemaps = id === 'generateSitemaps'
           }
         }
 
@@ -149,18 +162,36 @@ function checkExports(swcAST: any): {
               specifier.orig?.value
           )
 
-          ssg = values.some((value: any) => ['getStaticProps'].includes(value))
-          ssr = values.some((value: any) =>
-            ['getServerSideProps'].includes(value)
-          )
+          for (const value of values) {
+            if (!ssg && value === 'getStaticProps') ssg = true
+            if (!ssr && value === 'getServerSideProps') ssr = true
+            if (!generateImageMetadata && value === 'generateImageMetadata')
+              generateImageMetadata = true
+            if (!generateSitemaps && value === 'generateSitemaps')
+              generateSitemaps = true
+          }
         }
       }
 
-      return { ssr, ssg, runtime, preferredRegion }
+      return {
+        ssr,
+        ssg,
+        runtime,
+        preferredRegion,
+        generateImageMetadata,
+        generateSitemaps,
+      }
     } catch (err) {}
   }
 
-  return { ssg: false, ssr: false }
+  return {
+    ssg: false,
+    ssr: false,
+    runtime: undefined,
+    preferredRegion: undefined,
+    generateImageMetadata: false,
+    generateSitemaps: false,
+  }
 }
 
 async function tryToReadFile(filePath: string, shouldThrow: boolean) {
@@ -329,6 +360,20 @@ function warnAboutUnsupportedValue(
   warnedUnsupportedValueMap.set(pageFilePath, true)
 }
 
+// Detect if metadata routes is a dynamic route, which containing
+// generateImageMetadata or generateSitemaps as export
+export async function isDynamicMetadataRoute(
+  pageFilePath: string
+): Promise<boolean> {
+  const fileContent = (await tryToReadFile(pageFilePath, true)) || ''
+  if (!/generateImageMetadata|generateSitemaps/.test(fileContent)) return false
+
+  const swcAST = await parseModule(pageFilePath, fileContent)
+  const exportsInfo = checkExports(swcAST)
+
+  return !exportsInfo.generateImageMetadata || !exportsInfo.generateSitemaps
+}
+
 /**
  * For a given pageFilePath and nextConfig, if the config supports it, this
  * function will read the file and return the runtime that should be used.