From 74818550ea206eb68e0a592e7acc3c0683410e79 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 16 Sep 2022 00:25:39 +0100
Subject: [PATCH 1/2] fix(nuxi): print resolved public directory after generate

---
 packages/nuxi/src/commands/build.ts    | 12 ++++++++++--
 packages/nuxi/src/commands/generate.ts |  2 --
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/nuxi/src/commands/build.ts b/packages/nuxi/src/commands/build.ts
index 3a410ded4b3..fb69e44711a 100644
--- a/packages/nuxi/src/commands/build.ts
+++ b/packages/nuxi/src/commands/build.ts
@@ -1,4 +1,4 @@
-import { resolve } from 'pathe'
+import { relative, resolve } from 'pathe'
 import consola from 'consola'
 import { writeTypes } from '../utils/prepare'
 import { loadKit } from '../utils/kit'
@@ -19,7 +19,7 @@ export default defineNuxtCommand({
     const rootDir = resolve(args._[0] || '.')
     showVersions(rootDir)
 
-    const { loadNuxt, buildNuxt } = await loadKit(rootDir)
+    const { loadNuxt, buildNuxt, useNitro } = await loadKit(rootDir)
 
     const nuxt = await loadNuxt({
       rootDir,
@@ -28,6 +28,8 @@ export default defineNuxtCommand({
       }
     })
 
+    const nitro = useNitro()
+
     await clearDir(nuxt.options.buildDir)
 
     await writeTypes(nuxt)
@@ -38,5 +40,11 @@ export default defineNuxtCommand({
     })
 
     await buildNuxt(nuxt)
+
+    if (args.prerender) {
+      const dir = nitro?.options.output.publicDir
+      const publicDir = dir ? relative(rootDir, dir) : '.output/public'
+      consola.success(`You can now deploy \`${publicDir}\` to any static hosting!`)
+    }
   }
 })
diff --git a/packages/nuxi/src/commands/generate.ts b/packages/nuxi/src/commands/generate.ts
index 7e402665c0f..231103cd3cb 100644
--- a/packages/nuxi/src/commands/generate.ts
+++ b/packages/nuxi/src/commands/generate.ts
@@ -1,4 +1,3 @@
-import consola from 'consola'
 import buildCommand from './build'
 import { defineNuxtCommand } from './index'
 
@@ -11,6 +10,5 @@ export default defineNuxtCommand({
   async invoke (args) {
     args.prerender = true
     await buildCommand.invoke(args)
-    consola.success('You can now deploy `.output/public` to any static hosting!')
   }
 })

From c72701ea5824b1fc1d47859c489899eb83379abf Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 16 Sep 2022 09:53:33 +0100
Subject: [PATCH 2/2] chore: add comment

---
 packages/nuxi/src/commands/build.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nuxi/src/commands/build.ts b/packages/nuxi/src/commands/build.ts
index fb69e44711a..c6e19f396b0 100644
--- a/packages/nuxi/src/commands/build.ts
+++ b/packages/nuxi/src/commands/build.ts
@@ -42,8 +42,9 @@ export default defineNuxtCommand({
     await buildNuxt(nuxt)
 
     if (args.prerender) {
+      // TODO: revisit later if/when nuxt build --prerender will output hybrid
       const dir = nitro?.options.output.publicDir
-      const publicDir = dir ? relative(rootDir, dir) : '.output/public'
+      const publicDir = dir ? relative(process.cwd(), dir) : '.output/public'
       consola.success(`You can now deploy \`${publicDir}\` to any static hosting!`)
     }
   }