chore(app-vite/app-webpack): simplify cleartext call for Cordova

quasarframework · Sep 19, 2024 · b3ce52c · b3ce52c
1 parent 8aed7b0
commit b3ce52c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/app-vite/lib/modes/cordova/android-cleartext.js b/app-vite/lib/modes/cordova/android-cleartext.js
@@ -4,11 +4,9 @@ import fs from 'node:fs'
  * To be used for Capacitor v1 & v2 only
  */
 
-export function fixAndroidCleartext (appPaths, mode, action) {
-  const androidManifestPath = appPaths.resolve[ mode ](
-    mode === 'cordova'
-      ? 'platforms/android/app/src/main/AndroidManifest.xml'
-      : 'android/app/src/main/AndroidManifest.xml'
+export function fixAndroidCleartext (appPaths, action) {
+  const androidManifestPath = appPaths.resolve.cordova(
+    'platforms/android/app/src/main/AndroidManifest.xml'
   )
 
   if (fs.existsSync(androidManifestPath) === false) return

diff --git a/app-vite/lib/modes/cordova/cordova-builder.js b/app-vite/lib/modes/cordova/cordova-builder.js
@@ -69,7 +69,7 @@ export class QuasarModeBuilder extends AppBuilder {
     const { appPaths } = this.ctx
 
     if (target === 'android') {
-      fixAndroidCleartext(appPaths, 'cordova', 'remove')
+      fixAndroidCleartext(appPaths, 'remove')
     }
 
     const cordovaContext = {

diff --git a/app-vite/lib/modes/cordova/cordova-devserver.js b/app-vite/lib/modes/cordova/cordova-devserver.js
@@ -26,7 +26,7 @@ export class QuasarModeDevserver extends AppDevserver {
     this.#target = this.ctx.targetName
 
     if (this.#target === 'android') {
-      fixAndroidCleartext(this.ctx.appPaths, 'cordova', 'add')
+      fixAndroidCleartext(this.ctx.appPaths, 'add')
     }
 
     onShutdown(() => {

diff --git a/app-webpack/lib/modes/cordova/android-cleartext.js b/app-webpack/lib/modes/cordova/android-cleartext.js
@@ -1,10 +1,8 @@
 const fs = require('node:fs')
 
-module.exports.fixAndroidCleartext = function fixAndroidCleartext (appPaths, mode, action) {
-  const androidManifestPath = appPaths.resolve[ mode ](
-    mode === 'cordova'
-      ? 'platforms/android/app/src/main/AndroidManifest.xml'
-      : 'android/app/src/main/AndroidManifest.xml'
+module.exports.fixAndroidCleartext = function fixAndroidCleartext (appPaths, action) {
+  const androidManifestPath = appPaths.resolve.cordova(
+    'platforms/android/app/src/main/AndroidManifest.xml'
   )
 
   if (fs.existsSync(androidManifestPath) === false) return

diff --git a/app-webpack/lib/modes/cordova/cordova-builder.js b/app-webpack/lib/modes/cordova/cordova-builder.js
@@ -50,7 +50,7 @@ module.exports.QuasarModeBuilder = class QuasarModeBuilder extends AppBuilder {
     const { appPaths } = this.ctx
 
     if (target === 'android') {
-      fixAndroidCleartext(appPaths, 'cordova', 'remove')
+      fixAndroidCleartext(appPaths, 'remove')
     }
 
     const cordovaContext = {

diff --git a/app-webpack/lib/modes/cordova/cordova-devserver.js b/app-webpack/lib/modes/cordova/cordova-devserver.js
@@ -27,7 +27,7 @@ module.exports.QuasarModeDevserver = class QuasarModeDevserver extends AppDevser
     this.#target = this.ctx.targetName
 
     if (this.#target === 'android') {
-      fixAndroidCleartext(this.ctx.appPaths, 'cordova', 'add')
+      fixAndroidCleartext(this.ctx.appPaths, 'add')
     }
 
     onShutdown(() => {