fix: helpful error when output: export and next export -o

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

@@ -63,6 +63,7 @@ const nextExport: CliCommand = (argv) => {
     silent: args['--silent'] || false,
     threads: args['--threads'],
     outdir: args['--outdir'] ? resolve(args['--outdir']) : join(dir, 'out'),
+    hasOutdirFromCli: Boolean(args['--outdir']),
     isInvokedFromCli: true,
     hasAppDir: false,
     buildExport: false,

packages/next/src/export/index.ts

@@ -154,6 +154,7 @@ export interface ExportOptions {
   exportAppPageWorker?: typeof import('./worker').default
   endWorker?: () => Promise<void>
   nextConfig?: NextConfigComplete
+  hasOutdirFromCli?: boolean
 }
 
 export default async function exportApp(
@@ -184,6 +185,11 @@ export default async function exportApp(
     // Running 'next export'
     if (options.isInvokedFromCli) {
       if (isExportOutput) {
+        if (options.hasOutdirFromCli) {
+          throw new ExportError(
+            '"next export -o <dir>" cannot be used when "output: export" is configured in next.config.js. Instead add "distDir" in next.config.js https://nextjs.org/docs/advanced-features/static-html-export'
+          )
+        }
         Log.warn(
           '"next export" is no longer needed when "output: export" is configured in next.config.js https://nextjs.org/docs/advanced-features/static-html-export'
         )

test/integration/app-dir-export/test/config.test.ts

@@ -1,5 +1,5 @@
 import fs from 'fs-extra'
-import { nextBuild, nextExport } from 'next-test-utils'
+import { nextBuild, nextExport, nextExportDefault } from 'next-test-utils'
 import { join } from 'path'
 import {
   appDir,
@@ -39,24 +39,50 @@ describe('app dir with output export (next dev / next build)', () => {
     expect(await getFiles()).toEqual(expectedFiles)
     let stdout = ''
     let stderr = ''
-    await nextExport(
-      appDir,
-      { outdir: exportDir },
-      {
-        onStdout(msg) {
-          stdout += msg
-        },
-        onStderr(msg) {
-          stderr += msg
-        },
-      }
-    )
+    await nextExportDefault(appDir, {
+      onStdout(msg) {
+        stdout += msg
+      },
+      onStderr(msg) {
+        stderr += msg
+      },
+    })
     expect(stderr).toContain(
       '- warn "next export" is no longer needed when "output: export" is configured in next.config.js'
     )
     expect(stdout).toContain('Export successful. Files written to')
     expect(await getFiles()).toEqual(expectedFiles)
   })
+  it('should error when "next export -o <dir>" is used with config', async () => {
+    await fs.remove(distDir)
+    await fs.remove(exportDir)
+    await nextBuild(appDir)
+    expect(await getFiles()).toEqual(expectedFiles)
+    let stdout = ''
+    let stderr = ''
+    let error = undefined
+    try {
+      await nextExport(
+        appDir,
+        { outdir: exportDir },
+        {
+          onStdout(msg) {
+            stdout += msg
+          },
+          onStderr(msg) {
+            stderr += msg
+          },
+        }
+      )
+    } catch (e) {
+      error = e
+    }
+    expect(error).toBeDefined()
+    expect(stderr).toContain(
+      '- error "next export -o <dir>" cannot be used when "output: export" is configured in next.config.js. Instead add "distDir" in next.config.js'
+    )
+    expect(stdout).not.toContain('Export successful. Files written to')
+  })
   it('should error when no config.output detected for next export', async () => {
     await fs.remove(distDir)
     await fs.remove(exportDir)