fix: handle Ctrl-C more consistently

Author: danielroe

packages/nuxi/src/commands/init.ts

@@ -97,7 +97,8 @@ export default defineCommand({
         placeholder: './nuxt-app',
         type: 'text',
         default: 'nuxt-app',
-      })
+        cancel: 'reject',
+      }).catch(() => process.exit(1))
     }
 
     const cwd = resolve(ctx.args.cwd)
@@ -132,18 +133,15 @@ export default defineCommand({
           break
 
         case 'Select different directory': {
-          const dir = await logger.prompt('Please specify a different directory:', {
+          templateDownloadPath = resolve(cwd, await logger.prompt('Please specify a different directory:', {
             type: 'text',
-          })
-          if (dir && typeof dir === 'string') {
-            templateDownloadPath = resolve(cwd, dir)
-          }
+            cancel: 'reject',
+          }).catch(() => process.exit(1)))
           break
         }
 
         // 'Abort' or Ctrl+C
         default:
-          logger.info('Initialization aborted.')
           process.exit(1)
       }
     }
@@ -175,12 +173,8 @@ export default defineCommand({
       : await logger.prompt('Which package manager would you like to use?', {
         type: 'select',
         options: packageManagerOptions,
-      })
-
-    if (!packageManagerOptions.includes(selectedPackageManager)) {
-      logger.error('Invalid package manager selected.')
-      process.exit(1)
-    }
+        cancel: 'reject',
+      }).catch(() => process.exit(1))
 
     // Install project dependencies
     // or skip installation based on the '--no-install' flag
@@ -213,7 +207,8 @@ export default defineCommand({
     if (ctx.args.gitInit === undefined) {
       ctx.args.gitInit = await logger.prompt('Initialize git repository?', {
         type: 'confirm',
-      }) === true
+        cancel: 'reject',
+      }).catch(() => process.exit(1))
     }
     if (ctx.args.gitInit) {
       logger.info('Initializing git repository...\n')

packages/nuxi/src/commands/module/add.ts

@@ -73,6 +73,7 @@ export default defineCommand({
         {
           type: 'confirm',
           initial: false,
+          cancel: 'default',
         },
       )
       if (shouldContinue !== true) {
@@ -141,6 +142,7 @@ async function addModules(modules: ResolvedModule[], { skipInstall, skipConfig,
           return logger.prompt(`Install failed for \`${failedModulesList}\`. Do you want to continue adding the module${s} to ${colors.cyan('nuxt.config')}?`, {
             type: 'confirm',
             initial: false,
+            cancel: 'default',
           })
         },
       )
@@ -246,9 +248,10 @@ async function resolveModule(moduleName: string, cwd: string): Promise<ModuleRes
         {
           type: 'confirm',
           initial: false,
+          cancel: 'default',
         },
       )
-      if (shouldContinue !== true) {
+      if (!shouldContinue) {
         return false
       }
     }
@@ -268,8 +271,9 @@ async function resolveModule(moduleName: string, cwd: string): Promise<ModuleRes
             pkgVersion = await logger.prompt('Choose a version:', {
               type: 'select',
               options: [_moduleVersion, pkgVersion],
+              cancel: 'undefined',
             })
-            if (typeof pkgVersion !== 'string') {
+            if (!pkgVersion) {
               return false
             }
           }
@@ -313,9 +317,10 @@ async function resolveModule(moduleName: string, cwd: string): Promise<ModuleRes
       {
         type: 'confirm',
         initial: false,
+        cancel: 'default',
       },
     )
-    if (shouldContinue !== true) {
+    if (!shouldContinue) {
       return false
     }
   }

packages/nuxi/src/commands/upgrade.ts

@@ -44,16 +44,15 @@ const nuxtVersionTags = {
 }
 
 async function getNightlyVersion(packageNames: string[]): Promise<{ npmPackages: string[], nuxtVersion: string }> {
-  const result = await logger.prompt(
+  const nuxtVersion = await logger.prompt(
     'Which nightly Nuxt release channel do you want to install? (3.x or 4.x)',
     {
       type: 'select',
       options: ['3.x', '4.x'] as const,
       default: '3.x',
+      cancel: 'reject',
     },
-  )
-
-  const nuxtVersion = typeof result === 'string' ? result : '3.x'
+  ).catch(() => process.exit(1))
 
   const npmPackages = packageNames.map(p => `${p}@npm:${p}-nightly@${nuxtVersionTags[nuxtVersion]}`)
 
@@ -142,6 +141,7 @@ export default defineCommand({
       {
         type: 'select',
         initial: 'dedupe',
+        cancel: 'reject',
         options: [
           {
             label: 'dedupe lockfile',
@@ -158,12 +158,7 @@ export default defineCommand({
           },
         ],
       },
-    )
-
-    // user bails on the question with Ctrl+C
-    if (typeof method !== 'string') {
-      process.exit(1)
-    }
+    ).catch(() => process.exit(1))
 
     if (method === 'force') {
       logger.info(