fix(app-vite): (backport from q/app-vite v2 beta) Capacitor/Cordova o…

…n Windows host -> Android Studio not being launched when running "quasar build -m capacitor -T android --ide" #17420

app-vite/lib/cmd/build.js

@@ -163,9 +163,14 @@ async function build () {
       console.error(err)
       fatal('App build failed (check the log above)', 'FAIL')
     })
-    .then(async () => {
+    .then(async signal => {
       artifacts.add(outputFolder)
 
+      if (signal !== void 0) {
+        const { SIGNAL__BUILD_SHOULD_EXIT } = await import('../helpers/signals.js')
+        if (signal === SIGNAL__BUILD_SHOULD_EXIT) return
+      }
+
       outputFolder = argv.mode === 'cordova'
         ? path.join(outputFolder, '..')
         : outputFolder

app-vite/lib/helpers/open-ide.js

@@ -24,20 +24,19 @@ function runMacOS (mode, target) {
       ? appPaths.resolve.cordova('platforms/ios')
       : appPaths.resolve.capacitor('ios/App')
 
-    open(findXcodeWorkspace(folder), {
+    return open(findXcodeWorkspace(folder), {
       wait: false
     })
   }
-  else {
-    const folder = mode === 'cordova'
-      ? appPaths.resolve.cordova('platforms/android')
-      : appPaths.resolve.capacitor('android')
 
-    open(folder, {
-      app: { name: 'android studio' },
-      wait: false
-    })
-  }
+  const folder = mode === 'cordova'
+    ? appPaths.resolve.cordova('platforms/android')
+    : appPaths.resolve.capacitor('android')
+
+  return open(folder, {
+    app: { name: 'android studio' },
+    wait: false
+  })
 }
 
 function getLinuxPath (bin) {
@@ -69,12 +68,10 @@ function runLinux (mode, bin, target) {
         ? appPaths.resolve.cordova('platforms/android')
         : appPaths.resolve.capacitor('android')
 
-      open(folder, {
+      return open(folder, {
         app: { name: studioPath },
         wait: false
       })
-
-      return
     }
   }
   else if (target === 'ios') {
@@ -122,16 +119,10 @@ function runWindows (mode, bin, target) {
         ? appPaths.resolve.cordova('platforms/android')
         : appPaths.resolve.capacitor('android')
 
-      open(folder, {
+      return open(folder, {
         app: { name: studioPath },
         wait: false
       })
-
-      // pause required, otherwise Windows fails
-      // to open the process
-      return new Promise(resolve => {
-        setTimeout(resolve, 300)
-      })
     }
   }
   else if (target === 'ios') {
@@ -144,10 +135,12 @@ function runWindows (mode, bin, target) {
   process.exit(1)
 }
 
-module.exports = function (mode, bin, target, dev) {
+// openIde() returns the result of an open() call (which is a Promise)
+// so this function should be treated as async
+module.exports = function openIde (mode, bin, target, dev) {
   console.log()
   console.log(' ⚠️  ')
-  console.log(` ⚠️  Opening ${ target === 'ios' ? 'XCode' : 'Android Studio' } IDE...`)
+  console.log(` ⚠️  Opening ${ target === 'ios' ? 'XCode' : 'Android Studio' } IDE. It might take a few seconds...`)
 
   if (dev) {
     console.log(' ⚠️  From there, use the IDE to run the app.')

app-vite/lib/helpers/signals.js

@@ -0,0 +1 @@
+module.exports.SIGNAL__BUILD_SHOULD_EXIT = 'SIGNAL__BUILD_SHOULD_EXIT'

app-vite/lib/modes/capacitor/capacitor-builder.js

@@ -10,6 +10,7 @@ const CapacitorConfigFile = require('./config-file')
 const { spawn, spawnSync } = require('../../helpers/spawn')
 const openIde = require('../../helpers/open-ide')
 const onShutdown = require('../../helpers/on-shutdown')
+const { SIGNAL__BUILD_SHOULD_EXIT } = require('../../helpers/signals.js')
 
 const { capBin } = require('./cap-cli')
 
@@ -21,7 +22,7 @@ class CapacitorBuilder extends AppBuilder {
     this.#packagedDir = join(this.quasarConf.build.distDir, this.quasarConf.ctx.targetName)
 
     await this.#buildFiles()
-    await this.#packageFiles()
+    return this.#packageFiles()
   }
 
   async #buildFiles () {
@@ -48,7 +49,7 @@ class CapacitorBuilder extends AppBuilder {
     if (this.argv[ 'skip-pkg' ] !== true) {
       if (this.argv.ide === true) {
         await openIde('capacitor', this.quasarConf.bin, target)
-        process.exit(0)
+        return SIGNAL__BUILD_SHOULD_EXIT
       }
 
       if (target === 'ios') {

app-vite/lib/modes/cordova/cordova-builder.js

@@ -11,6 +11,7 @@ const CordovaConfigFile = require('./config-file')
 const { spawn } = require('../../helpers/spawn')
 const openIde = require('../../helpers/open-ide')
 const onShutdown = require('../../helpers/on-shutdown')
+const { SIGNAL__BUILD_SHOULD_EXIT } = require('../../helpers/signals.js')
 
 const cordovaOutputFolders = {
   ios: [
@@ -36,7 +37,7 @@ class CapacitorBuilder extends AppBuilder {
 
   async build () {
     await this.#buildFiles()
-    await this.#packageFiles()
+    return this.#packageFiles()
   }
 
   async #buildFiles () {
@@ -109,7 +110,7 @@ class CapacitorBuilder extends AppBuilder {
     if (this.argv[ 'skip-pkg' ] !== true) {
       if (this.argv.ide) {
         await openIde('cordova', this.quasarConf.bin, target)
-        process.exit(0)
+        return SIGNAL__BUILD_SHOULD_EXIT
       }
 
       const targetFolder = join(this.quasarConf.build.distDir, this.quasarConf.ctx.targetName)