fix(app-webpack): build fails with latest cordova-ios #17138

quasarframework · Apr 25, 2024 · 99cffb9 · 99cffb9
1 parent fa6cefe
commit 99cffb9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/app-vite/lib/modes/cordova/cordova-builder.js b/app-vite/lib/modes/cordova/cordova-builder.js
@@ -114,6 +114,7 @@ export class QuasarModeBuilder extends AppBuilder {
         + ' Files have not been copied to /dist. You will need'
         + ' to manually extract the Cordova distributables.'
       )
+      log()
     }
   }
 

diff --git a/app-webpack/lib/modes/cordova/cordova-builder.js b/app-webpack/lib/modes/cordova/cordova-builder.js
@@ -4,13 +4,25 @@ const { join } = require('node:path')
 const { AppBuilder } = require('../../app-builder.js')
 const { quasarCordovaConfig } = require('./cordova-config.js')
 
-const { fatal } = require('../../utils/logger.js')
+const { log, warn, fatal } = require('../../utils/logger.js')
 const { CordovaConfigFile } = require('./config-file.js')
 const { spawn } = require('../../utils/spawn.js')
 const { openIDE } = require('../../utils/open-ide.js')
 const { onShutdown } = require('../../utils/on-shutdown.js')
 const { fixAndroidCleartext } = require('../../utils/fix-android-cleartext.js')
 
+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'
+  ]
+}
+
 module.exports.QuasarModeBuilder = class QuasarModeBuilder extends AppBuilder {
   #cordovaConfigFile = new CordovaConfigFile()
 
@@ -33,14 +45,12 @@ module.exports.QuasarModeBuilder = class QuasarModeBuilder extends AppBuilder {
       fixAndroidCleartext(appPaths, 'cordova')
     }
 
-    const buildPath = appPaths.resolve.cordova(
-      target === 'android'
-        ? 'platforms/android/app/build/outputs'
-        : 'platforms/ios/build/emulator'
-    )
-
     // Remove old build output
-    fse.removeSync(buildPath)
+    cordovaOutputFiles[ target ].forEach(outputFile => {
+      fse.removeSync(
+        appPaths.resolve.cordova(outputFile)
+      )
+    })
 
     onShutdown(() => {
       this.#cleanup()
@@ -68,7 +78,24 @@ module.exports.QuasarModeBuilder = class QuasarModeBuilder extends AppBuilder {
         process.exit(0)
       }
 
-      fse.copySync(buildPath, join(this.quasarConf.build.distDir, this.quasarConf.ctx.targetName))
+      const targetFolder = join(this.quasarConf.build.distDir, this.quasarConf.ctx.targetName)
+
+      for (const folder of cordovaOutputFiles[ 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 "${ target }".`
+        + ' Files have not been copied to /dist. You will need'
+        + ' to manually extract the Cordova distributables.'
+      )
+      log()
     }
   }