@capacitor/cli 5.7.6 → 5.7.8

package/dist/cordova.js

@@ -556,7 +556,7 @@ async function getCordovaPreferences(config) {
     return cordova;
 }
 exports.getCordovaPreferences = getCordovaPreferences;
-async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
+async function writeCordovaAndroidManifest(cordovaPlugins, config, platform, cleartext) {
     var _a;
     const manifestPath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main', 'AndroidManifest.xml');
     const rootXMLEntries = [];
@@ -781,14 +781,14 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
         });
     });
     const cleartextString = 'android:usesCleartextTraffic="true"';
-    const cleartext = ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext) &&
+    const cleartextValue = (cleartext || ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext)) &&
         !applicationXMLAttributes.includes(cleartextString)
         ? cleartextString
         : '';
     let content = `<?xml version='1.0' encoding='utf-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:amazon="http://schemas.amazon.com/apk/res/android">
-<application ${applicationXMLAttributes.join('\n')} ${cleartext}>
+<application ${applicationXMLAttributes.join('\n')} ${cleartextValue}>
 ${applicationXMLEntries.join('\n')}
 </application>
 ${rootXMLEntries.join('\n')}

package/dist/tasks/run.js

@@ -7,6 +7,7 @@ const utils_terminal_1 = require("@ionic/utils-terminal");
 const run_1 = require("../android/run");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
+const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
 const run_2 = require("../ios/run");
 const log_1 = require("../log");
@@ -61,32 +62,26 @@ async function runCommand(config, selectedPlatformName, options) {
         }
         try {
             if (options.sync) {
-                if (options.liveReload) {
-                    const newExtConfig = await livereload_1.CapLiveReloadHelper.editExtConfigForLiveReload(config, platformName, options);
-                    const cfg = config;
-                    const cfgapp = config.app;
-                    cfgapp.extConfig = newExtConfig;
-                    cfg.app = cfgapp;
-                    await (0, sync_1.sync)(cfg, platformName, false, true);
-                }
-                else {
-                    await (0, sync_1.sync)(config, platformName, false, true);
-                }
+                await (0, sync_1.sync)(config, platformName, false, true);
             }
-            else {
-                if (options.liveReload) {
-                    await livereload_1.CapLiveReloadHelper.editCapConfigForLiveReload(config, platformName, options);
+            const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
+            if (options.liveReload) {
+                await livereload_1.CapLiveReloadHelper.editCapConfigForLiveReload(config, platformName, options);
+                if (platformName === config.android.name) {
+                    await await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, true);
                 }
             }
             await run(config, platformName, options);
             if (options.liveReload) {
-                process.on('SIGINT', async () => {
-                    if (options.liveReload) {
-                        await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
+                new Promise(resolve => process.on('SIGINT', resolve))
+                    .then(async () => {
+                    await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
+                    if (platformName === config.android.name) {
+                        await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, false);
                     }
-                    process.exit();
-                });
-                console.log(`\nApp running with live reload listing for: http://${options.host}:${options.port}. Press Ctrl+C to quit.`);
+                })
+                    .then(() => process.exit());
+                log_1.logger.info(`App running with live reload listing for: http://${options.host}:${options.port}. Press Ctrl+C to quit.`);
                 await (0, utils_process_1.sleepForever)();
             }
         }

package/dist/util/livereload.js

@@ -95,6 +95,7 @@ class CapLiveReload {
             .filter(Boolean);
         return !all.length ? loopback(family) : all[0];
     }
+    // TODO remove on next major as it's unused
     async editExtConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
         const platformAbsPath = platformName == config.ios.name
             ? config.ios.nativeTargetDirAbs
@@ -115,6 +116,7 @@ class CapLiveReload {
         };
         return configJson;
     }
+    // TODO remove rootConfigChange param on next major as it's unused
     async editCapConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
         const platformAbsPath = platformName == config.ios.name
             ? config.ios.nativeTargetDirAbs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.7.6",
+  "version": "5.7.8",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",