fix(cli): add all available options to cli commands, format them consistently

errors/invalid-i18n-config.md

@@ -1,6 +1,6 @@
 # Invalid i18n config
 
-#### Why This Error
+#### Why This Error Occurred
 
 In your `next.config.js` file you provided an invalid config for the `i18n` field. This could mean the limit for 100 locale items was exceeded.
 

packages/next/src/cli/next-build.ts

@@ -45,10 +45,12 @@ const nextBuild: CliCommand = (argv) => {
       If no directory is provided, the current directory will be used.
 
       Options
-      --profile                 Can be used to enable React Production Profiling
-      --no-lint                 Disable linting
-      --no-mangling             Disable mangling
-      --experimental-app-only   Only build 'app' routes
+      --profile                Can be used to enable React Production Profiling
+      --no-lint                Disable linting
+      --no-mangling            Disable mangling
+      --experimental-app-only  Only build 'app' routes
+      --experimental-turbo     Enable experimental turbo mode
+      --help, -h               Displays this message
     `,
       0
     )

packages/next/src/cli/next-export.ts

@@ -2,6 +2,7 @@
 import { resolve, join } from 'path'
 import { existsSync } from 'fs'
 import arg from 'next/dist/compiled/arg/index.js'
+import chalk from 'next/dist/compiled/chalk'
 import exportApp, { ExportError } from '../export'
 import * as Log from '../build/output/log'
 import { printAndExit } from '../server/lib/utils'
@@ -21,8 +22,8 @@ const nextExport: CliCommand = (argv) => {
 
     // Aliases
     '-h': '--help',
-    '-s': '--silent',
     '-o': '--outdir',
+    '-s': '--silent',
   }
   let args: arg.Result<arg.Spec>
   try {
@@ -36,7 +37,7 @@ const nextExport: CliCommand = (argv) => {
   if (args['--help']) {
     console.log(`
       Description
-        Exports the application for production deployment
+        [DEPRECATED] Exports a static version of the application for production deployment
 
       Usage
         $ next export [options] <dir>
@@ -45,9 +46,15 @@ const nextExport: CliCommand = (argv) => {
       If no directory is provided, the current directory will be used.
 
       Options
-        -h - list this help
-        -o - set the output dir (defaults to 'out')
-        -s - do not print any messages to console
+       --outdir, -o  Set the output dir (defaults to 'out')
+       --silent, -s  Do not print any messages to console
+       --threads     Max number of threads to use
+       --help, -h    List this help
+
+      The "next export" command is deprecated in favor of "output: export" in next.config.js
+      Learn more: ${chalk.cyan(
+        'https://nextjs.org/docs/advanced-features/static-html-export'
+      )}
     `)
     process.exit(0)
   }

packages/next/src/cli/next-info.ts

@@ -56,6 +56,9 @@ const nextInfo: CliCommand = async (argv) => {
       Usage
         $ next info
 
+      Options
+        --help, -h  Displays this message
+
       Learn more: ${chalk.cyan(
         'https://nextjs.org/docs/api-reference/cli#info'
       )}`

packages/next/src/cli/next-start.ts

@@ -45,10 +45,10 @@ const nextStart: CliCommand = async (argv) => {
       If no directory is provided, the current directory will be used.
 
       Options
-        --port, -p      A port number on which to start the application
-        --hostname, -H  Hostname on which to start the application (default: 0.0.0.0)
+        --port, -p          A port number on which to start the application
+        --hostname, -H      Hostname on which to start the application (default: 0.0.0.0)
         --keepAliveTimeout  Max milliseconds to wait before closing inactive connections
-        --help, -h      Displays this message
+        --help, -h          Displays this message
     `)
     process.exit(0)
   }

packages/next/src/cli/next-telemetry.ts

@@ -9,9 +9,9 @@ import isError from '../lib/is-error'
 const nextTelemetry: CliCommand = (argv) => {
   const validArgs: arg.Spec = {
     // Types
-    '--help': Boolean,
     '--enable': Boolean,
     '--disable': Boolean,
+    '--help': Boolean,
     // Aliases
     '-h': '--help',
   }
@@ -36,6 +36,11 @@ const nextTelemetry: CliCommand = (argv) => {
 
       You may pass the 'enable' or 'disable' argument to turn Next.js' telemetry collection on or off.
 
+      Options
+       --enable    Enables Next.js' telemetry collection
+       --disable   Disables Next.js' telemetry collection
+       --help, -h  Displays this message
+
       Learn more: ${chalk.cyan('https://nextjs.org/telemetry')}
     `
     )

test/integration/cli/test/index.test.js

@@ -580,14 +580,14 @@ describe('CLI Usage', () => {
       const help = await runNextCommand(['export', '--help'], {
         stdout: true,
       })
-      expect(help.stdout).toMatch(/Exports the application/)
+      expect(help.stdout).toMatch(/Exports a static version of the application/)
     })
 
     test('-h', async () => {
       const help = await runNextCommand(['export', '-h'], {
         stdout: true,
       })
-      expect(help.stdout).toMatch(/Exports the application/)
+      expect(help.stdout).toMatch(/Exports a static version of the application/)
     })
 
     test('should warn when unknown argument provided', async () => {