@capacitor/cli 9.0.0-alpha.7 → 9.0.0-beta.0

package/dist/android/network-security-config.js

@@ -0,0 +1,230 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__testables = exports.removeLegacyCordovaPluginsConfig = exports.setAndroidCleartext = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const log_1 = require("../log");
+/**
+ * Handles opting in to cleartext (HTTP) traffic through the app module's `network-security-config.xml`.
+ *
+ * Whatever the CLI changes is tracked by a marker comment inside the config file itself, so it can be
+ * reverted later without touching anything the app owned before:
+ *
+ *   <!-- capacitor:cleartext created ref orig=false -->
+ *
+ *   created   the CLI created the file (the revert deletes it)
+ *   ref       the CLI added android:networkSecurityConfig to the app manifest (the revert removes it)
+ *   orig=...  state of <base-config cleartextTrafficPermitted> before the CLI changed it:
+ *             true | false | absent (attribute not set) | added (the CLI added the whole <base-config>)
+ */
+const DEFAULT_CONFIG_NAME = 'network_security_config';
+const MARKER_NAME = 'capacitor:cleartext';
+const MARKER_REGEX = new RegExp(`[ \\t]*<!--\\s*${MARKER_NAME}([^>]*?)-->[ \\t]*\\r?\\n?`);
+const BASE_CONFIG_REGEX = /<base-config\b[^>]*>/;
+const CLEARTEXT_ATTR_REGEX = /(\bcleartextTrafficPermitted\s*=\s*)(["'])(.*?)\2/;
+const ROOT_REGEX = /<network-security-config\b[^>]*?(\/?)>/;
+const APPLICATION_REGEX = /<application\b/;
+const CONFIG_REF_REGEX = /android:networkSecurityConfig\s*=\s*"@xml\/([^"]+)"/;
+const LEGACY_CORDOVA_PLUGINS_CONFIG = `<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
+`;
+function parseMarker(xml) {
+    var _a;
+    const match = MARKER_REGEX.exec(xml);
+    if (!match) {
+        return undefined;
+    }
+    const tokens = match[1].trim().split(/\s+/);
+    const orig = (_a = tokens.find((t) => t.startsWith('orig='))) === null || _a === void 0 ? void 0 : _a.slice('orig='.length);
+    return { created: tokens.includes('created'), ref: tokens.includes('ref'), orig };
+}
+function buildMarker(marker) {
+    const parts = [MARKER_NAME];
+    if (marker.created) {
+        parts.push('created');
+    }
+    if (marker.ref) {
+        parts.push('ref');
+    }
+    if (marker.orig) {
+        parts.push(`orig=${marker.orig}`);
+    }
+    return `<!-- ${parts.join(' ')} -->`;
+}
+function getCleartextValue(tag) {
+    var _a;
+    return (_a = CLEARTEXT_ATTR_REGEX.exec(tag)) === null || _a === void 0 ? void 0 : _a[3];
+}
+function setCleartextValue(tag, value) {
+    const hasAttr = CLEARTEXT_ATTR_REGEX.test(tag);
+    if (value === undefined) {
+        return hasAttr ? tag.replace(new RegExp(`\\s*${CLEARTEXT_ATTR_REGEX.source}`), '') : tag;
+    }
+    if (hasAttr) {
+        return tag.replace(CLEARTEXT_ATTR_REGEX, `$1$2${value}$2`);
+    }
+    return tag.replace(/\s*(\/?)>$/, (_, slash) => ` cleartextTrafficPermitted="${value}"${slash ? ' />' : '>'}`);
+}
+function indentOf(xml, index) {
+    var _a, _b;
+    const lineStart = xml.lastIndexOf('\n', index - 1) + 1;
+    return (_b = (_a = /^[ \t]*/.exec(xml.slice(lineStart, index))) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
+}
+/**
+ * Returns the config XML with `cleartextTrafficPermitted="true"` on its `<base-config>`.
+ * When `xml` is undefined a minimal config is generated. Nothing else in the file is touched.
+ */
+function enableCleartext(xml, flags) {
+    var _a;
+    if (xml === undefined) {
+        return `<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    ${buildMarker({ created: true, ref: flags.ref })}
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
+`;
+    }
+    const existing = parseMarker(xml);
+    const baseConfig = BASE_CONFIG_REGEX.exec(xml);
+    if (existing) {
+        // Already enabled by the CLI: only make sure the value is still true.
+        return baseConfig ? xml.replace(baseConfig[0], setCleartextValue(baseConfig[0], 'true')) : xml;
+    }
+    if (baseConfig) {
+        const original = (_a = getCleartextValue(baseConfig[0])) !== null && _a !== void 0 ? _a : 'absent';
+        const indent = indentOf(xml, baseConfig.index);
+        const marker = `${buildMarker({ created: false, ref: flags.ref, orig: original })}\n${indent}`;
+        return (xml.slice(0, baseConfig.index) +
+            marker +
+            setCleartextValue(baseConfig[0], 'true') +
+            xml.slice(baseConfig.index + baseConfig[0].length));
+    }
+    const root = ROOT_REGEX.exec(xml);
+    if (!root) {
+        throw new Error('missing <network-security-config> root element');
+    }
+    const marker = buildMarker({ created: false, ref: flags.ref, orig: 'added' });
+    const addition = `\n    ${marker}\n    <base-config cleartextTrafficPermitted="true" />`;
+    if (root[1] === '/') {
+        const open = root[0].replace(/\s*\/>$/, '>');
+        return xml.replace(root[0], `${open}${addition}\n</network-security-config>`);
+    }
+    const end = root.index + root[0].length;
+    return xml.slice(0, end) + addition + (/^\s/.test(xml.slice(end)) ? '' : '\n') + xml.slice(end);
+}
+/**
+ * Undoes `enableCleartext`. Returns `null` when the file should be deleted, `undefined` when the CLI
+ * never touched it, and the restored XML otherwise.
+ */
+function revertCleartext(xml) {
+    const marker = parseMarker(xml);
+    if (!marker) {
+        return undefined;
+    }
+    if (marker.created) {
+        return null;
+    }
+    const withoutMarker = xml.replace(MARKER_REGEX, '');
+    const baseConfig = BASE_CONFIG_REGEX.exec(withoutMarker);
+    if (!baseConfig) {
+        return withoutMarker;
+    }
+    if (marker.orig === 'added') {
+        const isSelfClosing = baseConfig[0].endsWith('/>');
+        if (isSelfClosing) {
+            const indent = indentOf(withoutMarker, baseConfig.index);
+            return withoutMarker.replace(new RegExp(`${indent}${escapeRegex(baseConfig[0])}[ \\t]*\\r?\\n?`), '');
+        }
+        return withoutMarker.replace(baseConfig[0], setCleartextValue(baseConfig[0], 'false'));
+    }
+    const original = marker.orig === 'absent' || marker.orig === undefined ? undefined : marker.orig;
+    return withoutMarker.replace(baseConfig[0], setCleartextValue(baseConfig[0], original));
+}
+function escapeRegex(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function addManifestRef(manifest) {
+    return manifest.replace(APPLICATION_REGEX, `<application android:networkSecurityConfig="@xml/${DEFAULT_CONFIG_NAME}"`);
+}
+function removeManifestRef(manifest) {
+    return manifest.replace(new RegExp(`\\s+android:networkSecurityConfig\\s*=\\s*"@xml/${DEFAULT_CONFIG_NAME}"`), '');
+}
+/**
+ * Enables or disables cleartext traffic on the app module (`android/app`), leaving any
+ * network-security-config the app already has intact besides `cleartextTrafficPermitted`.
+ */
+async function setAndroidCleartext(config, enabled) {
+    var _a;
+    const manifestPath = (0, path_1.join)(config.android.srcMainDirAbs, 'AndroidManifest.xml');
+    if (!(await (0, fs_extra_1.pathExists)(manifestPath))) {
+        return;
+    }
+    const manifest = await (0, fs_extra_1.readFile)(manifestPath, 'utf-8');
+    const referencedName = (_a = CONFIG_REF_REGEX.exec(manifest)) === null || _a === void 0 ? void 0 : _a[1];
+    const configPath = (0, path_1.join)(config.android.resDirAbs, 'xml', `${referencedName !== null && referencedName !== void 0 ? referencedName : DEFAULT_CONFIG_NAME}.xml`);
+    const configExists = await (0, fs_extra_1.pathExists)(configPath);
+    if (enabled) {
+        if (referencedName && !configExists) {
+            log_1.logger.warn(`Could not enable cleartext traffic: ${manifestPath} references @xml/${referencedName}, but ${configPath} does not exist.`);
+            return;
+        }
+        const current = configExists ? await (0, fs_extra_1.readFile)(configPath, 'utf-8') : undefined;
+        const addRef = !referencedName;
+        let updated;
+        try {
+            updated = enableCleartext(current, { ref: addRef });
+        }
+        catch (e) {
+            log_1.logger.warn(`Could not enable cleartext traffic: ${configPath} is not a valid network security config (${e.message}).`);
+            return;
+        }
+        await (0, fs_extra_1.ensureDir)((0, path_1.dirname)(configPath));
+        await (0, fs_extra_1.writeFile)(configPath, updated);
+        if (addRef) {
+            await (0, fs_extra_1.writeFile)(manifestPath, addManifestRef(manifest));
+        }
+        return;
+    }
+    if (!configExists) {
+        return;
+    }
+    const current = await (0, fs_extra_1.readFile)(configPath, 'utf-8');
+    const marker = parseMarker(current);
+    const reverted = revertCleartext(current);
+    if (reverted === undefined) {
+        return;
+    }
+    if (reverted === null) {
+        await (0, fs_extra_1.remove)(configPath);
+    }
+    else {
+        await (0, fs_extra_1.writeFile)(configPath, reverted);
+    }
+    if ((marker === null || marker === void 0 ? void 0 : marker.ref) && referencedName === DEFAULT_CONFIG_NAME) {
+        await (0, fs_extra_1.writeFile)(manifestPath, removeManifestRef(manifest));
+    }
+}
+exports.setAndroidCleartext = setAndroidCleartext;
+/**
+ * Cleartext used to be written to the generated `capacitor-cordova-android-plugins` module, where it never
+ * reached Capacitor-only apps. Removes the file generated by older CLI versions.
+ */
+async function removeLegacyCordovaPluginsConfig(config) {
+    const legacyPath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main', 'res', 'xml', `${DEFAULT_CONFIG_NAME}.xml`);
+    if (!(await (0, fs_extra_1.pathExists)(legacyPath))) {
+        return;
+    }
+    if ((await (0, fs_extra_1.readFile)(legacyPath, 'utf-8')).trim() === LEGACY_CORDOVA_PLUGINS_CONFIG.trim()) {
+        await (0, fs_extra_1.remove)(legacyPath);
+    }
+}
+exports.removeLegacyCordovaPluginsConfig = removeLegacyCordovaPluginsConfig;
+exports.__testables = {
+    enableCleartext,
+    revertCleartext,
+    addManifestRef,
+    removeManifestRef,
+    parseMarker,
+};

package/dist/android/update.js

@@ -16,10 +16,11 @@ const fs_1 = require("../util/fs");
 const node_1 = require("../util/node");
 const template_1 = require("../util/template");
 const common_2 = require("./common");
+const network_security_config_1 = require("./network-security-config");
 const platform = 'android';
 const debug = (0, debug_1.default)('capacitor:android:update');
 async function updateAndroid(config) {
-    var _a;
+    var _a, _b;
     const plugins = await getPluginsTask(config);
     const capacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'android');
@@ -44,6 +45,9 @@ async function updateAndroid(config) {
         await handleCordovaPluginsGradle(config, cordovaPlugins);
         await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platform);
     }
+    else {
+        await (0, network_security_config_1.setAndroidCleartext)(config, !!((_b = config.app.extConfig.server) === null || _b === void 0 ? void 0 : _b.cleartext));
+    }
     const incompatibleCordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
     (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
     await (0, common_1.checkPlatformVersions)(config, platform);

package/dist/common.js

@@ -423,7 +423,7 @@ async function checkJDKMajorVersion() {
             return -1;
         }
     }
-    catch (e) {
+    catch {
         return -1;
     }
 }

package/dist/config.js

@@ -88,7 +88,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
             (0, errors_1.fatal)('Could not find installation of TypeScript.\n' +
                 `To use ${colors_1.default.strong(extConfigName)} files, you must install TypeScript in your project, e.g. w/ ${colors_1.default.input('npm install -D typescript')}`);
         }
-        const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
+        const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-require-imports
         const extConfigObject = (await (0, node_1.requireTS)(ts, extConfigFilePath));
         const extConfig = extConfigObject.default ? await extConfigObject.default : extConfigObject;
         return {
@@ -112,6 +112,7 @@ async function loadExtConfigJS(rootDir, extConfigName, extConfigFilePath) {
             extConfigType: 'js',
             extConfigName,
             extConfigFilePath: extConfigFilePath,
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
             extConfig: await require(extConfigFilePath),
         };
     }
@@ -302,7 +303,7 @@ async function determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, na
             return (0, path_1.resolve)(nativeProjectDirAbs, 'public');
         }
     }
-    catch (e) {
+    catch {
         // ignore
     }
     return (0, path_1.resolve)(nativeTargetDirAbs, 'public');
@@ -386,7 +387,7 @@ async function determinePackageManager(rootDir, platformDir, nativeProjectDirAbs
                 gemfilePath = (0, path_1.resolve)(output, 'Gemfile');
             }
         }
-        catch (e) {
+        catch {
             // Nothing
         }
     }

package/dist/cordova.js

@@ -7,6 +7,7 @@ const path_1 = require("path");
 const plist_1 = tslib_1.__importDefault(require("plist"));
 const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const common_1 = require("./android/common");
+const network_security_config_1 = require("./android/network-security-config");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const errors_1 = require("./errors");
 const common_2 = require("./ios/common");
@@ -754,26 +755,16 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform, cle
         });
     });
     const cleartextString = 'android:usesCleartextTraffic="true"';
-    const networkSecurityConfigValue = cleartext || ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext) || applicationXMLAttributes.includes(cleartextString)
-        ? 'android:networkSecurityConfig="@xml/network_security_config"'
-        : '';
-    const networkSecurityConfigDir = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main', 'res', 'xml');
-    const networkSecurityConfigPath = (0, path_1.join)(networkSecurityConfigDir, 'network_security_config.xml');
-    if (networkSecurityConfigValue) {
-        await (0, fs_extra_1.ensureDir)(networkSecurityConfigDir);
-        await (0, fs_extra_1.writeFile)(networkSecurityConfigPath, `<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config cleartextTrafficPermitted="true" />
-</network-security-config>
-`);
-    }
-    else if (await (0, fs_extra_1.pathExists)(networkSecurityConfigPath)) {
-        await (0, fs_extra_1.remove)(networkSecurityConfigPath);
-    }
+    const cleartextEnabled = !!(cleartext ||
+        ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext) ||
+        applicationXMLAttributes.includes(cleartextString));
+    // Cleartext is applied to the app module, since the Cordova plugins module is not linked into Capacitor-only apps
+    await (0, network_security_config_1.removeLegacyCordovaPluginsConfig)(config);
+    await (0, network_security_config_1.setAndroidCleartext)(config, cleartextEnabled);
     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.filter((attr) => !attr.includes('android:usesCleartextTraffic')).join('\n')} ${networkSecurityConfigValue}>
+<application ${applicationXMLAttributes.filter((attr) => !attr.includes('android:usesCleartextTraffic')).join('\n')}>
 ${applicationXMLEntries.join('\n')}
 </application>
 ${rootXMLEntries.join('\n')}

package/dist/declarations.d.ts

@@ -528,46 +528,6 @@ export interface CapacitorConfig {
                 packageOptions?: {
                     [pluginId: string]: PackageOptions;
                 };
-                /**
-                 * Override which Capacitor Swift package the generated `Package.swift` depends on.
-                 *
-                 * By default the generated package pins the git tag matching the installed
-                 * `@capacitor/ios` version, which is correct for both stable and pre-release versions
-                 * and matches what CocoaPods resolves.
-                 *
-                 * Set this only when developing against an unreleased Capacitor, such as a local
-                 * checkout or a feature branch. Exactly one of `path`, `branch`, `revision`, `exact`,
-                 * or `from` must be set. `path` points at the repository root (the directory containing
-                 * `Package.swift`) and may be relative to the app.
-                 *
-                 * The `CAPACITOR_IOS_PACKAGE` environment variable takes precedence over this setting,
-                 * so a checkout can be redirected without editing committed configuration.
-                 *
-                 * Note that `branch` and `revision` builds are not reproducible and decouple the native
-                 * code from the `@capacitor/core` JavaScript bridge it is versioned against.
-                 *
-                 * @since 9.0.0
-                 * @example { "path": "../capacitor" }
-                 * @example { "branch": "next" }
-                 */
-                capacitorPackage?: {
-                    /**
-                     * Repository to fetch from. Ignored when `path` is set.
-                     *
-                     * @default 'https://github.com/ionic-team/capacitor'
-                     */
-                    url?: string;
-                    /** Path to a local Capacitor repository root. */
-                    path?: string;
-                    /** Branch to track. */
-                    branch?: string;
-                    /** Exact commit to pin. */
-                    revision?: string;
-                    /** Exact version tag to pin. */
-                    exact?: string;
-                    /** Minimum version tag, allowing compatible upgrades. */
-                    from?: string;
-                };
             };
         };
     };
@@ -626,6 +586,13 @@ export interface CapacitorConfig {
          *
          * On Android, all cleartext traffic is disabled by default as of API 28.
          *
+         * When enabled, the CLI sets `cleartextTrafficPermitted="true"` on the `<base-config>` of the app's
+         * `network-security-config.xml` (`android/app/src/main/res/xml/`), creating the file and the
+         * `android:networkSecurityConfig` manifest reference if the app has none. If the app already has its own
+         * network security config, only that attribute is changed. Other settings, such as a `<domain-config>`
+         * that disallows cleartext for specific domains, are left as they are and still apply.
+         * The change is reverted when the option is disabled.
+         *
          * This is intended for use with live-reload servers where unencrypted HTTP
          * traffic is often used.
          *
@@ -757,7 +724,7 @@ export interface PluginsConfig {
          *
          * This option is only supported on Android.
          *
-         * `native` = (recommended) For older Chromium versions (< v140) this embeds the webview with padding and sets the `env(safe-area-inset-*)` variables to `0px`. For newer Chromium versions (>= v140) this makes sure the webview adheres to the `viewport-fit` meta tag. If set to `viewport-fit="cover"` this will make the webview edge-to-edge and the `env(safe-area-inset-*)` variables will contain the correct values. With those values you could set padding for example so make sure the webview is shown correctly.
+         * `native` = (recommended) For older Chromium versions (< v140) this embeds the webview with padding and sets the `env(safe-area-inset-*)` variables to `0px`. For newer Chromium versions (>= v140) this makes sure the webview adheres to the `viewport-fit` meta tag. If set to `viewport-fit="cover"` this will make the webview edge-to-edge and the `env(safe-area-inset-*)` variables will contain the correct values. With those values you could set padding for example to make sure the webview is shown correctly.
          *
          * `css` = This is the same as `native`, but it also injects CSS variables (`--safe-area-inset-*`) containing correct safe area inset values into the webview.
          *

package/dist/index.js

@@ -105,24 +105,14 @@ function runProgram(config) {
         .option('--configuration <name>', 'Configuration name of the iOS Scheme')
         .option('--keystorealiaspass <keystoreAliasPass>', 'Password for the Key Alias')
         .addOption(new commander_1.Option('--androidreleasetype <androidreleasetype>', 'Android release type; APK or AAB').choices([
-        'AAB',
-        'APK',
+        ...telemetry_1.TELEMETRY_SAFE_CHOICES.androidreleasetype,
     ]))
         .addOption(new commander_1.Option('--signing-type <signingtype>', 'Program used to sign apps (default: jarsigner)').choices([
-        'apksigner',
-        'jarsigner',
+        ...telemetry_1.TELEMETRY_SAFE_CHOICES.signingType,
     ]))
         .addOption(new commander_1.Option('--xcode-team-id <xcodeTeamID>', 'The Developer team to use for building and exporting the archive'))
-        .addOption(new commander_1.Option('--xcode-export-method <xcodeExportMethod>', 'Describes how xcodebuild should export the archive (default:  app-store-connect)').choices([
-        'app-store-connect',
-        'release-testing',
-        'enterprise',
-        'debugging',
-        'developer-id',
-        'mac-application',
-        'validation',
-    ]))
-        .addOption(new commander_1.Option('--xcode-signing-style <xcodeSigningStyle>', 'The iOS signing style to use when building the app for distribution (default: automatic)').choices(['automatic', 'manual']))
+        .addOption(new commander_1.Option('--xcode-export-method <xcodeExportMethod>', 'Describes how xcodebuild should export the archive (default:  app-store-connect)').choices([...telemetry_1.TELEMETRY_SAFE_CHOICES.xcodeExportMethod]))
+        .addOption(new commander_1.Option('--xcode-signing-style <xcodeSigningStyle>', 'The iOS signing style to use when building the app for distribution (default: automatic)').choices([...telemetry_1.TELEMETRY_SAFE_CHOICES.xcodeSigningStyle]))
         .addOption(new commander_1.Option('--xcode-signing-certificate <xcodeSigningCertificate>', 'A certificate name, SHA-1 hash, or automatic selector to use for signing for iOS builds'))
         .addOption(new commander_1.Option('--xcode-provisioning-profile <xcodeProvisioningProfile>', 'A provisioning profile name or UUID for iOS builds'))
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, configuration, xcodeTeamId, xcodeExportMethod, xcodeSigningStyle, xcodeSigningCertificate, xcodeProvisioningProfile, }) => {

package/dist/ios/common.js

@@ -21,7 +21,7 @@ function execBundler() {
         const bundleOutput = (0, child_process_1.execSync)('bundle &> /dev/null ; echo $?');
         return parseInt(bundleOutput.toString());
     }
-    catch (e) {
+    catch {
         return -1;
     }
 }

package/dist/ios/update.js

@@ -12,7 +12,6 @@ const errors_1 = require("../errors");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
-const migrate_1 = require("../tasks/migrate");
 const capacitor_package_1 = require("../util/capacitor-package");
 const cordova_ios_1 = require("../util/cordova-ios");
 const fs_1 = require("../util/fs");
@@ -55,28 +54,21 @@ async function updatePluginFiles(config, plugins, deployment) {
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
         const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
         const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
-        const capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config, 'from');
+        const capacitorPackagePath = await (0, capacitor_package_1.resolveCapacitorPackagePath)(config);
+        const iosVersion = (0, common_2.getMajoriOSVersion)(config);
         await Promise.all(validSPMPackages.map(async (plugin) => {
             const packageSwiftPath = (0, path_1.join)(plugin.rootPath, 'Package.swift');
-            let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+            const content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
             const version = (0, capacitor_package_1.findCapacitorDependencyVersion)(content);
             if (version && (0, semver_1.major)(version) != majorCapVersion) {
                 log_1.logger.warn(`${plugin.id} is built for Capacitor ${(0, semver_1.major)(version)}, it might cause issues`);
             }
-            if (capacitorPackage.sourceBased) {
-                // The plugin has to resolve to the same package identity as the app, or SPM ends up with
-                // two packages that both vend a Capacitor product.
-                const rewritten = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, plugin.rootPath);
-                if (rewritten !== content) {
-                    await (0, fs_extra_1.writeFile)(packageSwiftPath, rewritten);
-                }
-                return;
-            }
-            if (version && (0, semver_1.major)(version) != majorCapVersion) {
-                const preCapVersion = (0, semver_1.prerelease)(iosPlatformVersion);
-                const forceVersion = preCapVersion ? iosPlatformVersion : `${majorCapVersion}.0.0`;
-                content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${forceVersion}"`);
-                await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+            // The plugin has to resolve to the same package identity as the app, or SPM ends up with
+            // two packages that both vend a Capacitor product.
+            let rewritten = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackagePath, plugin.rootPath);
+            rewritten = (0, capacitor_package_1.patchPackageSwiftDeploymentTarget)(rewritten, iosVersion).content;
+            if (rewritten !== content) {
+                await (0, fs_extra_1.writeFile)(packageSwiftPath, rewritten);
             }
         }));
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));

package/dist/ipc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.receive = exports.send = void 0;
+exports.deliver = exports.receive = exports.send = void 0;
 const tslib_1 = require("tslib");
 const utils_subprocess_1 = require("@ionic/utils-subprocess");
 const debug_1 = tslib_1.__importDefault(require("debug"));
@@ -9,6 +9,11 @@ const https_1 = require("https");
 const path_1 = require("path");
 const cli_1 = require("./util/cli");
 const debug = (0, debug_1.default)('capacitor:ipc');
+/**
+ * How long an awaited delivery may take. Short enough that a developer never
+ * notices it, long enough for a request from a cold sandbox.
+ */
+const DELIVERY_TIMEOUT = 3000;
 /**
  * Send an IPC message to a forked process.
  */
@@ -32,8 +37,39 @@ exports.send = send;
 async function receive(msg) {
     debug('Received %O IPC message', msg.type);
     if (msg.type === 'telemetry') {
-        const now = new Date().toISOString();
-        const { data } = msg;
+        await deliver(msg.data);
+    }
+}
+exports.receive = receive;
+/**
+ * POST a metric to the events service.
+ *
+ * Never rejects and never writes to stderr. Telemetry failing is not something
+ * the caller can act on, and it must not change the command's outcome or its
+ * exit code — so every ending, including the timeout, resolves.
+ */
+function deliver(data, timeout = DELIVERY_TIMEOUT) {
+    return new Promise((resolve) => {
+        const body = JSON.stringify({ metrics: [data], sent_at: new Date().toISOString() });
+        let settled = false;
+        const finish = (reason) => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            clearTimeout(deadline);
+            debug('Delivery of %O metric %s', data.name, reason);
+            resolve();
+        };
+        // An overall deadline rather than `req.setTimeout`, which is a socket
+        // inactivity timer and only arms once the socket connects — so it never
+        // fires against an unroutable host, which is exactly the sandbox this
+        // bound exists for. Unref'd so a pending request can't hold the CLI open.
+        const deadline = setTimeout(() => {
+            req.destroy();
+            finish('timed out');
+        }, timeout);
+        deadline.unref();
         // This request is only made if telemetry is on.
         const req = (0, https_1.request)({
             hostname: 'metrics-capacitor.outsystems.com',
@@ -45,17 +81,21 @@ async function receive(msg) {
             },
         }, (response) => {
             debug('Sent %O metric to events service (status: %O)', data.name, response.statusCode);
-            if (response.statusCode !== 202) {
+            if (response.statusCode === 202) {
+                // Draining is what lets the socket close; without it an awaited
+                // delivery sits until the timeout fires.
+                response.resume();
+            }
+            else {
                 response.on('data', (chunk) => {
                     debug('Bad response from events service. Request body: %O', chunk.toString());
                 });
             }
+            response.on('end', () => finish('completed'));
+            response.on('error', () => finish('failed reading the response'));
         });
-        const body = {
-            metrics: [data],
-            sent_at: now,
-        };
-        req.end(JSON.stringify(body));
-    }
+        req.on('error', (e) => finish(`failed: ${e.message}`));
+        req.end(body);
+    });
 }
-exports.receive = receive;
+exports.deliver = deliver;

package/dist/plugin.js

@@ -59,7 +59,7 @@ async function resolvePlugin(config, name) {
             xml: xmlMeta.plugin,
         };
     }
-    catch (e) {
+    catch {
         // ignore
     }
     return null;