@capacitor/cli 9.0.0-alpha.2 → 9.0.0-alpha.3

package/dist/config.js

@@ -244,7 +244,7 @@ async function loadIOSConfig(rootDir, extConfig) {
     };
     return {
         name,
-        minVersion: '15.0',
+        minVersion: '16.0',
         platformDir,
         platformDirAbs,
         scheme,

package/dist/declarations.d.ts

@@ -511,6 +511,15 @@ export interface CapacitorConfig {
                 packageTraits?: {
                     [pluginId: string]: string[];
                 };
+                /**
+                 * Define options to apply to the package.
+                 * The key is the plugin ID (e.g. `@capacitor-community/device`)
+                 *
+                 * @since 8.4.0
+                 */
+                packageOptions?: {
+                    [pluginId: string]: PackageOptions;
+                };
             };
         };
     };
@@ -546,7 +555,7 @@ export interface CapacitorConfig {
          * Configure the local scheme on Android.
          *
          * Custom schemes on Android are unable to change the URL path as of Webview 117. Changing this value from anything other than `http` or `https` can result in your
-         * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarentees that this
+         * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarantees that this
          * will continue to work long term as allowing non-standard schemes to modify query parameters and url fragments is only allowed for compatibility reasons.
          * https://ionic.io/blog/capacitor-android-customscheme-issue-with-chrome-117
          *
@@ -732,3 +741,17 @@ export interface PluginsConfig {
         animation?: 'FADE' | 'NONE';
     };
 }
+export interface PackageOptions {
+    /**
+     * Create a symlink to the plugin folder instead of pointing to the plugin path.
+     * Useful when plugin names conflict.
+     */
+    symlink?: boolean;
+    /**
+     * Useful to avoid target name conflicts in dependencies
+     * [see](https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/modulealiasing/)
+     */
+    moduleAliases?: {
+        [target: string]: string;
+    };
+}

package/dist/index.js

@@ -156,12 +156,9 @@ function runProgram(config) {
         .option('--target-name-sdk-version <version>', 'use a specific sdk version when using --target-name, ex: 26.0 (for iOS 26) or 35 (for Android API 35)')
         .option('--no-sync', `do not run ${colors_1.default.input('sync')}`)
         .option('--forwardPorts <port:port>', 'Automatically run "adb reverse" for better live-reloading support')
-        .option('-l, --live-reload', 'Set live-reload URL via CLI (uses defaults, overrides server.url config)')
-        .option('--host <host>', 'Configure host for live-reload URL (used with --live-reload)')
-        .option('--port <port>', 'Configure port for live-reload URL (used with --live-reload)')
+        .option('--url <url>', 'Load an external URL in the Web View, useful for live-reload (overrides server.url config)')
         .option('--configuration <name>', 'Configuration name of the iOS Scheme')
-        .option('--https', 'Use https:// instead of http:// for live-reload URL (used with --live-reload)')
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, json, target, targetName, targetNameSdkVersion, sync, forwardPorts, liveReload, host, port, configuration, https, }) => {
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, json, target, targetName, targetNameSdkVersion, sync, forwardPorts, url, configuration, }) => {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
         await runCommand(config, platform, {
             scheme,
@@ -173,11 +170,8 @@ function runProgram(config) {
             targetNameSdkVersion,
             sync,
             forwardPorts,
-            liveReload,
-            host,
-            port,
+            url,
             configuration,
-            https,
         });
     })));
     commander_1.program

package/dist/tasks/migrate.js

@@ -47,7 +47,7 @@ const plugins = [
 const coreVersion = '^8.0.0';
 const pluginVersion = '^8.0.0';
 const gradleVersion = '8.14.3';
-const iOSVersion = '15';
+const iOSVersion = '16';
 const kotlinVersion = '2.2.20';
 let installFailed = false;
 async function migrateCommand(config, noprompt, packagemanager) {

package/dist/tasks/run.js

@@ -14,8 +14,19 @@ const livereload_1 = require("../util/livereload");
 const native_run_1 = require("../util/native-run");
 const sync_1 = require("./sync");
 async function runCommand(config, selectedPlatformName, options) {
-    var _a, _b, _c;
-    options.host = (_b = (_a = options.host) !== null && _a !== void 0 ? _a : livereload_1.CapLiveReloadHelper.getIpAddress()) !== null && _b !== void 0 ? _b : 'localhost';
+    var _a;
+    if (options.url) {
+        let parsed;
+        try {
+            parsed = new URL(options.url);
+        }
+        catch {
+            (0, errors_1.fatal)(`Invalid --url: "${options.url}" is not a valid URL`);
+        }
+        if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+            (0, errors_1.fatal)(`Invalid --url: must use http:// or https:// (got "${parsed.protocol}//")`);
+        }
+    }
     if (selectedPlatformName && !(await (0, common_1.isValidPlatform)(selectedPlatformName))) {
         const platformDir = (0, common_1.resolvePlatform)(config, selectedPlatformName);
         if (platformDir) {
@@ -61,14 +72,14 @@ async function runCommand(config, selectedPlatformName, options) {
                 await (0, sync_1.sync)(config, platformName, false, true);
             }
             const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
-            if (options.liveReload) {
+            if (options.url) {
                 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) {
+            if (options.url) {
                 new Promise((resolve) => process.on('SIGINT', resolve))
                     .then(async () => {
                     await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
@@ -77,13 +88,16 @@ async function runCommand(config, selectedPlatformName, options) {
                     }
                 })
                     .then(() => process.exit());
-                log_1.logger.info(`App running with live reload listing for: ${options.https ? 'https' : 'http'}://${options.host}${options.port ? `:${options.port}` : ''}. Press Ctrl+C to quit.`);
+                log_1.logger.info(`App running with live reload listening for: ${options.url}. Press Ctrl+C to quit.`);
                 await sleepForever();
             }
         }
         catch (e) {
+            if (options.url) {
+                await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
+            }
             if (!(0, errors_1.isFatal)(e)) {
-                (0, errors_1.fatal)((_c = e.stack) !== null && _c !== void 0 ? _c : e);
+                (0, errors_1.fatal)((_a = e.stack) !== null && _a !== void 0 ? _a : e);
             }
             throw e;
         }

package/dist/telemetry.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMetric = exports.telemetryAction = void 0;
+exports.getIOSPackageManager = exports.sendMetric = exports.telemetryAction = void 0;
 const tslib_1 = require("tslib");
 const commander_1 = require("commander");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const ipc_1 = require("./ipc");
 const log_1 = require("./log");
@@ -51,8 +52,10 @@ function telemetryAction(config, action) {
             error: error ? (error.message ? error.message : String(error)) : null,
             node_version: process.version,
             os: config.cli.os,
+            ios_package_manager: await getIOSPackageManager(config),
             ...Object.fromEntries(versions),
         };
+        debug('metric payload: %O', data);
         if ((0, term_1.isInteractive)()) {
             let sysconfig = await (0, sysconfig_1.readConfig)();
             if (!error && typeof sysconfig.telemetry === 'undefined') {
@@ -88,6 +91,24 @@ async function sendMetric(sysconfig, name, data) {
     }
 }
 exports.sendMetric = sendMetric;
+/**
+ * Resolve the iOS dependency manager for telemetry. Returns 'unknown' for
+ * non-iOS projects or when detection throws, so callers never have to handle
+ * errors from this signal.
+ */
+async function getIOSPackageManager(config) {
+    try {
+        if (!(await (0, fs_extra_1.pathExists)(config.ios.platformDirAbs))) {
+            return 'unknown';
+        }
+        return await config.ios.packageManager;
+    }
+    catch (e) {
+        debug('Could not resolve iOS package manager for telemetry: %O', e);
+        return 'unknown';
+    }
+}
+exports.getIOSPackageManager = getIOSPackageManager;
 /**
  * Get a unique anonymous identifier for this app.
  */

package/dist/util/cordova-ios.js

@@ -236,6 +236,9 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
 exports.copyPluginsNativeFiles = copyPluginsNativeFiles;
 async function removePluginsNativeFiles(config) {
     await (0, fs_extra_1.remove)(config.ios.cordovaPluginsDirAbs);
+    if ((await config.ios.packageManager) === 'SPM') {
+        await (0, fs_extra_1.remove)((0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM', 'symlinks'));
+    }
     await (0, template_1.extractTemplate)(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
 }
 exports.removePluginsNativeFiles = removePluginsNativeFiles;

package/dist/util/livereload.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CapLiveReloadHelper = void 0;
 const fs_extra_1 = require("fs-extra");
-const os_1 = require("os");
 const path_1 = require("path");
 class CapLiveReload {
     constructor() {
@@ -12,87 +11,6 @@ class CapLiveReload {
         };
         // nothing to do
     }
-    getIpAddress(name, family) {
-        var _a;
-        const interfaces = (_a = (0, os_1.networkInterfaces)()) !== null && _a !== void 0 ? _a : {};
-        const _normalizeFamily = (family) => {
-            if (family === 4) {
-                return 'ipv4';
-            }
-            if (family === 6) {
-                return 'ipv6';
-            }
-            return family ? family.toLowerCase() : 'ipv4';
-        };
-        const isLoopback = (addr) => {
-            return (/^(::f{4}:)?127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/.test(addr) ||
-                /^fe80::1$/.test(addr) ||
-                /^::1$/.test(addr) ||
-                /^::$/.test(addr));
-        };
-        const isPrivate = (addr) => {
-            return (/^(::f{4}:)?10\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
-                /^(::f{4}:)?192\.168\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
-                /^(::f{4}:)?172\.(1[6-9]|2\d|30|31)\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
-                /^(::f{4}:)?127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
-                /^(::f{4}:)?169\.254\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
-                /^f[cd][0-9a-f]{2}:/i.test(addr) ||
-                /^fe80:/i.test(addr) ||
-                /^::1$/.test(addr) ||
-                /^::$/.test(addr));
-        };
-        const isPublic = (addr) => {
-            return !isPrivate(addr);
-        };
-        const loopback = (family) => {
-            //
-            // Default to `ipv4`
-            //
-            family = _normalizeFamily(family);
-            if (family !== 'ipv4' && family !== 'ipv6') {
-                throw new Error('family must be ipv4 or ipv6');
-            }
-            return family === 'ipv4' ? '127.0.0.1' : 'fe80::1';
-        };
-        //
-        // Default to `ipv4`
-        //
-        family = _normalizeFamily(family);
-        //
-        // If a specific network interface has been named,
-        // return the address.
-        //
-        if (name && name !== 'private' && name !== 'public') {
-            const res = interfaces[name].filter((details) => {
-                const itemFamily = _normalizeFamily(details.family);
-                return itemFamily === family;
-            });
-            if (res.length === 0) {
-                return undefined;
-            }
-            return res[0].address;
-        }
-        const all = Object.keys(interfaces)
-            .map((nic) => {
-            //
-            // Note: name will only be `public` or `private`
-            // when this is called.
-            //
-            const addresses = interfaces[nic].filter((details) => {
-                details.family = _normalizeFamily(details.family);
-                if (details.family !== family || isLoopback(details.address)) {
-                    return false;
-                }
-                if (!name) {
-                    return true;
-                }
-                return name === 'public' ? isPrivate(details.address) : isPublic(details.address);
-            });
-            return addresses.length ? addresses[0].address : undefined;
-        })
-            .filter(Boolean);
-        return !all.length ? loopback(family) : all[0];
-    }
     async editCapConfigForLiveReload(config, platformName, options) {
         const platformAbsPath = platformName == config.ios.name
             ? config.ios.nativeTargetDirAbs
@@ -105,10 +23,9 @@ class CapLiveReload {
         const configJson = (0, fs_extra_1.readJSONSync)(capConfigPath);
         this.configJsonToRevertTo.json = JSON.stringify(configJson, null, 2);
         this.configJsonToRevertTo.platformPath = capConfigPath;
-        const url = `${options.https ? 'https' : 'http'}://${options.host}${options.port ? `:${options.port}` : ''}`;
         configJson.server = {
             ...configJson.server,
-            url,
+            url: options.url,
         };
         (0, fs_extra_1.writeJSONSync)(capConfigPath, configJson, { spaces: '\t' });
     }

package/dist/util/spm.js

@@ -85,13 +85,14 @@ async function removeCocoapodsFiles(config) {
 }
 exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
     const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
     const enableCordova = cordovaPlugins.length > 0;
     const packageTraits = (_d = (_c = (_b = (_a = config.app.extConfig.experimental) === null || _a === void 0 ? void 0 : _a.ios) === null || _b === void 0 ? void 0 : _b.spm) === null || _c === void 0 ? void 0 : _c.packageTraits) !== null && _d !== void 0 ? _d : {};
-    const swiftToolsVersion = (_h = (_g = (_f = (_e = config.app.extConfig.experimental) === null || _e === void 0 ? void 0 : _e.ios) === null || _f === void 0 ? void 0 : _f.spm) === null || _g === void 0 ? void 0 : _g.swiftToolsVersion) !== null && _h !== void 0 ? _h : '5.9';
+    const packageOptions = (_h = (_g = (_f = (_e = config.app.extConfig.experimental) === null || _e === void 0 ? void 0 : _e.ios) === null || _f === void 0 ? void 0 : _f.spm) === null || _g === void 0 ? void 0 : _g.packageOptions) !== null && _h !== void 0 ? _h : {};
+    const swiftToolsVersion = (_m = (_l = (_k = (_j = config.app.extConfig.experimental) === null || _j === void 0 ? void 0 : _j.ios) === null || _k === void 0 ? void 0 : _k.spm) === null || _l === void 0 ? void 0 : _l.swiftToolsVersion) !== null && _m !== void 0 ? _m : '5.9';
     let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
 import PackageDescription
 
@@ -109,7 +110,7 @@ let package = Package(
     for (const plugin of plugins) {
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
             const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
-            if ((_j = platformTag.$) === null || _j === void 0 ? void 0 : _j.package) {
+            if ((_o = platformTag.$) === null || _o === void 0 ? void 0 : _o.package) {
                 const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
                 packageSwiftText += `,\n        .package(name: "${plugin.id}", path: "${relPath}")`;
             }
@@ -123,7 +124,13 @@ let package = Package(
             }
         }
         else {
-            const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+            const options = packageOptions[plugin.id];
+            const symlink = options === null || options === void 0 ? void 0 : options.symlink;
+            const symlinkFolder = (0, path_1.join)('symlinks', plugin.name);
+            const relPath = symlink ? symlinkFolder : (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+            if (symlink) {
+                await (0, fs_extra_1.ensureSymlink)(plugin.rootPath, (0, path_1.resolve)(config.ios.nativeProjectDirAbs, 'CapApp-SPM', symlinkFolder));
+            }
             const traits = packageTraits[plugin.id];
             const traitsSuffix = (traits === null || traits === void 0 ? void 0 : traits.length)
                 ? `, traits: [${traits
@@ -133,7 +140,7 @@ let package = Package(
                 })
                     .join(', ')}]`
                 : '';
-            packageSwiftText += `,\n        .package(name: "${(_k = plugin.ios) === null || _k === void 0 ? void 0 : _k.name}", path: "${relPath}"${traitsSuffix})`;
+            packageSwiftText += `,\n        .package(name: "${(_p = plugin.ios) === null || _p === void 0 ? void 0 : _p.name}", path: "${relPath}"${traitsSuffix})`;
         }
     }
     packageSwiftText += `
@@ -147,10 +154,18 @@ let package = Package(
         packageSwiftText += `                .product(name: "Cordova", package: "capacitor-swift-pm")`;
     }
     for (const plugin of plugins) {
-        let pluginText = `,\n                .product(name: "${(_l = plugin.ios) === null || _l === void 0 ? void 0 : _l.name}", package: "${(_m = plugin.ios) === null || _m === void 0 ? void 0 : _m.name}")`;
+        const aliases = Object.entries((_r = (_q = packageOptions[plugin.id]) === null || _q === void 0 ? void 0 : _q.moduleAliases) !== null && _r !== void 0 ? _r : {});
+        const aliasText = (aliases === null || aliases === void 0 ? void 0 : aliases.length)
+            ? `, moduleAliases:  [${aliases
+                .map(([target, replacement]) => {
+                return `"${target}": "${replacement}"`;
+            })
+                .join(', ')}]`
+            : '';
+        let pluginText = `,\n                .product(name: "${(_s = plugin.ios) === null || _s === void 0 ? void 0 : _s.name}", package: "${(_t = plugin.ios) === null || _t === void 0 ? void 0 : _t.name}"${aliasText})`;
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
             const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
-            if ((_o = platformTag.$) === null || _o === void 0 ? void 0 : _o.package) {
+            if ((_u = platformTag.$) === null || _u === void 0 ? void 0 : _u.package) {
                 pluginText = `,\n                .product(name: "${plugin.id}", package: "${plugin.id}")`;
             }
             else {

package/package.json

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