fix(app-webpack): (backport from q/app-webpack v4 beta) build fails w…

…ith latest cordova-ios #17138

app-webpack/lib/cordova/index.js

@@ -1,12 +1,24 @@
 const fse = require('fs-extra')
 
-const { log, fatal } = require('../helpers/logger')
+const { log, warn, fatal } = require('../helpers/logger')
 const CordovaConfig = require('./cordova-config')
 const { spawn } = require('../helpers/spawn')
 const onShutdown = require('../helpers/on-shutdown')
 const appPaths = require('../app-paths')
 const openIde = require('../helpers/open-ide')
 
+const cordovaOutputFiles = {
+  ios: [
+    'platforms/ios/build/Release-iphoneos', // ios-cordova 7+
+    'platforms/ios/build/device', // ios-cordova 6
+    'platforms/ios/build/emulator' // ios-cordova 6
+  ],
+
+  android: [
+    'platforms/android/app/build/outputs'
+  ]
+}
+
 class CordovaRunner {
   constructor () {
     this.pid = 0
@@ -64,18 +76,17 @@ class CordovaRunner {
 
   async build (quasarConfFile, argv) {
     const cfg = quasarConfFile.quasarConf
-    const buildPath = appPaths.resolve.cordova(
-      this.target === 'android'
-        ? 'platforms/android/app/build/outputs'
-        : 'platforms/ios/build/emulator'
-    )
 
     // Remove old build output
-    fse.removeSync(buildPath)
+    cordovaOutputFiles[ this.target ].forEach(outputFile => {
+      fse.removeSync(
+        appPaths.resolve.cordova(outputFile)
+      )
+    })
 
     const args = argv[ 'skip-pkg' ] || argv.ide
       ? [ 'prepare', this.target ]
-      : [ 'build', this.ctx.debug ? '--debug' : '--release', this.target ]
+      : [ 'build', this.ctx.debug ? '--debug' : '--release', '--device', this.target ]
 
     await this.__runCordovaCommand(
       cfg,
@@ -91,7 +102,24 @@ class CordovaRunner {
       process.exit(0)
     }
 
-    fse.copySync(buildPath, cfg.build.packagedDistDir)
+    const targetFolder = cfg.build.packagedDistDir
+
+    for (const folder of cordovaOutputFiles[ this.target ]) {
+      const outputFolder = appPaths.resolve.cordova(folder)
+      if (fse.existsSync(outputFolder)) {
+        log(`Copying Cordova distributables from ${ outputFolder } to ${ targetFolder }`)
+        log()
+        fse.copySync(outputFolder, targetFolder)
+        return
+      }
+    }
+
+    warn(
+      `No output folder found for target "${ this.target }".`
+      + ' Files have not been copied to /dist. You will need'
+      + ' to manually extract the Cordova distributables.'
+    )
+    log()
   }
 
   stop () {