@capacitor/cli - npm Package Compare versions

Comparing version 5.7.7 to 5.7.8

dist/cordova.js

@@ -559,3 +559,3 @@ "use strict";
 exports.getCordovaPreferences = getCordovaPreferences;
-async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
+async function writeCordovaAndroidManifest(cordovaPlugins, config, platform, cleartext) {
     var _a;
@@ -785,3 +785,3 @@ const manifestPath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main', 'AndroidManifest.xml');
     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)
@@ -793,3 +793,3 @@ ? cleartextString
 xmlns:amazon="http://schemas.amazon.com/apk/res/android">
-<application ${applicationXMLAttributes.join('\n')} ${cleartext}>
+<application ${applicationXMLAttributes.join('\n')} ${cleartextValue}>
 ${applicationXMLEntries.join('\n')}
@@ -796,0 +796,0 @@ </application>

dist/tasks/run.js

@@ -10,2 +10,3 @@ "use strict";
 const common_1 = require("../common");
+const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
@@ -65,17 +66,9 @@ const run_2 = require("../ios/run");
             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);
                 }
@@ -85,9 +78,11 @@ }
             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)();
@@ -94,0 +89,0 @@ }

dist/util/livereload.js

@@ -98,2 +98,3 @@ "use strict";
     }
+    // TODO remove on next major as it's unused
     async editExtConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
@@ -119,2 +120,3 @@ const platformAbsPath = platformName == config.ios.name
     }
+    // TODO remove rootConfigChange param on next major as it's unused
     async editCapConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
@@ -121,0 +123,0 @@ const platformAbsPath = platformName == config.ios.name

package.json

 {
   "name": "@capacitor/cli",
-  "version": "5.7.7",
+  "version": "5.7.8",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
@@ -5,0 +5,0 @@ "homepage": "https://capacitorjs.com",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

707502

increased by0.02%

Worsened metrics

Lines of code

6941

decreased by-0.04%

No dependency changes