@capacitor-plus/cli 8.0.7 → 8.3.3

package/dist/config.js

@@ -232,7 +232,8 @@ async function loadIOSConfig(rootDir, extConfig) {
     const nativeXcodeProjDir = `${nativeProjectDir}/App.xcodeproj`;
     const nativeXcodeProjDirAbs = (0, path_1.resolve)(platformDirAbs, nativeXcodeProjDir);
     const nativeXcodeWorkspaceDirAbs = (0, promise_1.lazy)(() => determineXcodeWorkspaceDirAbs(nativeProjectDirAbs));
-    const podPath = (0, promise_1.lazy)(() => determineGemfileOrCocoapodPath(rootDir, platformDirAbs, nativeProjectDirAbs));
+    const podPath = (0, promise_1.lazy)(() => determineCocoapodPath());
+    const packageManager = (0, promise_1.lazy)(() => determinePackageManager(rootDir, platformDirAbs, nativeProjectDirAbs));
     const webDirAbs = (0, promise_1.lazy)(() => determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs));
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     const buildOptions = {
@@ -260,6 +261,7 @@ async function loadIOSConfig(rootDir, extConfig) {
         webDir: (0, promise_1.lazy)(async () => (0, path_1.relative)(platformDirAbs, await webDirAbs)),
         webDirAbs,
         podPath,
+        packageManager,
         buildOptions,
     };
 }
@@ -350,10 +352,19 @@ async function determineAndroidStudioPath(os) {
     }
     return '';
 }
-async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjectDirAbs) {
+async function determineCocoapodPath() {
     if (process.env.CAPACITOR_COCOAPODS_PATH) {
         return process.env.CAPACITOR_COCOAPODS_PATH;
     }
+    return 'pod';
+}
+async function determinePackageManager(rootDir, platformDir, nativeProjectDirAbs) {
+    if ((0, fs_extra_1.existsSync)((0, path_1.resolve)(nativeProjectDirAbs, 'CapApp-SPM'))) {
+        return 'SPM';
+    }
+    if (process.env.CAPACITOR_COCOAPODS_PATH) {
+        return 'Cocoapods';
+    }
     let gemfilePath = '';
     if (await (0, fs_extra_1.pathExists)((0, path_1.resolve)(rootDir, 'Gemfile'))) {
         gemfilePath = (0, path_1.resolve)(rootDir, 'Gemfile');
@@ -380,18 +391,18 @@ async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjec
     try {
         const gemfileText = (await (0, fs_extra_1.readFile)(gemfilePath)).toString();
         if (!gemfileText) {
-            return 'pod';
+            return 'Cocoapods';
         }
         const cocoapodsInGemfile = new RegExp(/gem\s+['"]cocoapods/).test(gemfileText);
-        if (cocoapodsInGemfile) {
-            return 'bundle exec pod';
+        if (cocoapodsInGemfile && (await (0, subprocess_1.isInstalled)('bundle'))) {
+            return 'bundler';
         }
         else {
-            return 'pod';
+            return 'Cocoapods';
         }
     }
     catch {
-        return 'pod';
+        return 'Cocoapods';
     }
 }
 function formatConfigTS(extConfig) {

package/dist/declarations.d.ts

@@ -460,6 +460,60 @@ export interface CapacitorConfig {
             provisioningProfile?: string;
         };
     };
+    experimental?: {
+        /**
+         * Experimental iOS-specific configuration.
+         *
+         * These options may change or be removed in future versions.
+         *
+         * @since 8.2.0
+         */
+        ios?: {
+            /**
+             * Swift Package Manager (SPM) specific configuration.
+             *
+             * @since 8.2.0
+             */
+            spm?: {
+                /**
+                 * Swift tools version to use in Package.swift header.
+                 *
+                 * Defines the minimum version of the Swift compiler version required to build your app.
+                 * For more information check the [swift documentation](https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/settingswifttoolsversion/)
+                 *
+                 * Warning: Capacitor does not officially support Swift 6 yet.
+                 * Setting this property to 6.0 or higher may cause issues.
+                 * If you need to set this property to 6.0 or higher, make sure to throughrouly test your iOS app.
+                 *
+                 * This setting may graduate to `ios.spm.swiftToolsVersion` in a future major release.
+                 *
+                 * @since 8.3.0
+                 * @default '5.9'
+                 * @example '6.1'
+                 */
+                swiftToolsVersion?: string;
+                /**
+                 * Define package traits for SPM plugin dependencies.
+                 *
+                 * This requires explicitly setting experimental.ios.spm.swiftToolsVersion
+                 * to '6.1' or higher.
+                 *
+                 * The key is the plugin ID (e.g. `@capacitor-firebase/analytics`)
+                 * and the value is an array of trait names.
+                 *
+                 * Packages can have default traits. If you use this property, and
+                 * want to preserve the defaults, include ".defaults" in the array.
+                 *
+                 * This setting may graduate to `ios.spm.packageTraits` in a future major release.
+                 *
+                 * @since 8.3.0
+                 */
+                packageTraits?: {
+                    [pluginId: string]: string[];
+                };
+            };
+        };
+    };
     server?: {
         /**
          * Configure the local hostname of the device.
@@ -648,7 +702,7 @@ export interface PluginsConfig {
          *
          * `css` = Injects CSS variables (`--safe-area-inset-*`) containing correct safe area inset values into the webview.
          *
-         * `disable` = Disable all inset handling.
+         * `disable` = Disable CSS variables injection.
          *
          * @default "css"
          */

package/dist/index.js

@@ -27,6 +27,15 @@ async function run() {
     }
 }
 exports.run = run;
+async function getPackageManager(config, packageManager) {
+    if (packageManager === 'cocoapods') {
+        if ((await config.ios.packageManager) === 'bundler') {
+            return 'bundler';
+        }
+        return 'Cocoapods';
+    }
+    return 'SPM';
+}
 function runProgram(config) {
     commander_1.program.version(config.cli.package.version);
     commander_1.program
@@ -147,11 +156,12 @@ 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', 'Enable Live Reload')
-        .option('--host <host>', 'Host used for live reload')
-        .option('--port <port>', 'Port used for live reload')
+        .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('--configuration <name>', 'Configuration name of the iOS Scheme')
-        .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, }) => {
+        .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, }) => {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
         await runCommand(config, platform, {
             scheme,
@@ -167,6 +177,7 @@ function runProgram(config) {
             host,
             port,
             configuration,
+            https,
         });
     })));
     commander_1.program
@@ -183,6 +194,7 @@ function runProgram(config) {
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { packagemanager }) => {
         const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
         const configWritable = config;
+        configWritable.ios.packageManager = getPackageManager(config, packagemanager === null || packagemanager === void 0 ? void 0 : packagemanager.toLowerCase());
         if ((packagemanager === null || packagemanager === void 0 ? void 0 : packagemanager.toLowerCase()) === 'CocoaPods'.toLowerCase()) {
             configWritable.cli.assets.ios.platformTemplateArchive = 'ios-pods-template.tar.gz';
             configWritable.cli.assets.ios.platformTemplateArchiveAbs = (0, path_1.resolve)(configWritable.cli.assetsDirAbs, configWritable.cli.assets.ios.platformTemplateArchive);

package/dist/ios/build.js

@@ -7,15 +7,13 @@ const rimraf_1 = require("rimraf");
 const common_1 = require("../common");
 const definitions_1 = require("../definitions");
 const log_1 = require("../log");
-const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 async function buildiOS(config, buildOptions) {
     var _a, _b, _c, _d;
     const theScheme = (_a = buildOptions.scheme) !== null && _a !== void 0 ? _a : 'App';
-    const packageManager = await (0, spm_1.checkPackageManager)(config);
     let typeOfBuild;
     let projectName;
-    if (packageManager == 'Cocoapods') {
+    if ((await config.ios.packageManager) !== 'SPM') {
         typeOfBuild = '-workspace';
         projectName = (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs);
     }

package/dist/ios/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMajorMinoriOSVersion = exports.getMajoriOSVersion = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
+exports.getMajorMinoriOSVersion = exports.getMajoriOSVersion = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.getCommonChecks = exports.checkIOSPackage = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fs_extra_1 = require("fs-extra");
@@ -10,6 +10,7 @@ const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 async function checkIOSPackage(config) {
     return (0, common_1.checkCapacitorPlatform)(config, 'ios');
@@ -24,6 +25,28 @@ function execBundler() {
         return -1;
     }
 }
+async function getCommonChecks(config) {
+    var _a, _b, _c;
+    const checks = [];
+    if ((await config.ios.packageManager) === 'bundler') {
+        const bundlerCheck = await checkBundler(config);
+        if (bundlerCheck) {
+            checks.push(() => Promise.resolve(bundlerCheck));
+        }
+    }
+    else if ((await config.ios.packageManager) === 'Cocoapods') {
+        checks.push(() => checkCocoaPods(config));
+    }
+    else if ((await config.ios.packageManager) === 'SPM') {
+        const swiftToolsVersion = (_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.swiftToolsVersion;
+        if (swiftToolsVersion) {
+            checks.push(() => (0, spm_1.checkSwiftToolsVersion)(config, swiftToolsVersion));
+        }
+        checks.push(() => (0, spm_1.checkPackageTraitsRequirements)(config));
+    }
+    return checks;
+}
+exports.getCommonChecks = getCommonChecks;
 async function checkBundler(config) {
     if (config.cli.os === "mac" /* OS.Mac */) {
         let bundlerResult = execBundler();

package/dist/ios/doctor.js

@@ -20,7 +20,7 @@ async function doctorIOS(config) {
     // check online datebase of common errors
     // check if www folder is empty (index.html does not exist)
     try {
-        await (0, common_1.check)([() => (0, common_2.checkBundler)(config) || (0, common_2.checkCocoaPods)(config), () => (0, common_1.checkWebDir)(config), checkXcode]);
+        await (0, common_1.check)([() => (0, common_1.checkWebDir)(config), checkXcode, ...(await (0, common_2.getCommonChecks)(config))]);
         (0, log_1.logSuccess)('iOS looking great! 👌');
     }
     catch (e) {

package/dist/ios/open.js

@@ -4,9 +4,8 @@ exports.openIOS = void 0;
 const tslib_1 = require("tslib");
 const open_1 = tslib_1.__importDefault(require("open"));
 const common_1 = require("../common");
-const spm_1 = require("../util/spm");
 async function openIOS(config) {
-    if ((await (0, spm_1.checkPackageManager)(config)) == 'SPM') {
+    if ((await config.ios.packageManager) == 'SPM') {
         await (0, open_1.default)(config.ios.nativeXcodeProjDirAbs, { wait: false });
     }
     else {

package/dist/ios/run.js

@@ -7,7 +7,6 @@ const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const native_run_1 = require("../util/native-run");
-const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 const debug = (0, debug_1.default)('capacitor:ios:run');
 async function runIOS(config, { target: selectedTarget, targetName: selectedTargetName, targetNameSdkVersion: selectedTargetSdkVersion, scheme: selectedScheme, configuration: selectedConfiguration, }) {
@@ -15,10 +14,10 @@ async function runIOS(config, { target: selectedTarget, targetName: selectedTarg
     const runScheme = selectedScheme || config.ios.scheme;
     const configuration = selectedConfiguration || 'Debug';
     const derivedDataPath = (0, path_1.resolve)(config.ios.platformDirAbs, 'DerivedData', target.id);
-    const packageManager = await (0, spm_1.checkPackageManager)(config);
+    const packageManager = await config.ios.packageManager;
     let typeOfBuild;
     let projectName;
-    if (packageManager == 'Cocoapods') {
+    if (packageManager !== 'SPM') {
         typeOfBuild = '-workspace';
         projectName = (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs);
     }

package/dist/ios/update.js

@@ -11,6 +11,7 @@ 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 fs_1 = require("../util/fs");
 const iosplugin_1 = require("../util/iosplugin");
 const node_1 = require("../util/node");
@@ -40,7 +41,7 @@ async function updatePluginFiles(config, plugins, deployment) {
     }
     await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platform);
     await (0, cordova_1.checkPluginDependencies)(plugins, platform, (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.failOnUninstalledPlugins);
-    if ((await (0, spm_1.checkPackageManager)(config)) === 'SPM') {
+    if ((await config.ios.packageManager) === 'SPM') {
         await generateCordovaPackageFiles(cordovaPlugins, config);
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));
@@ -59,14 +60,132 @@ async function generateCordovaPackageFiles(cordovaPlugins, config) {
     });
 }
 async function generateCordovaPackageFile(p, config) {
+    var _a;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+    const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
+    if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+        const packageSwiftPath = (0, path_1.join)(p.rootPath, 'Package.swift');
+        let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+        content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, `capacitor-swift-pm`);
+        content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${iosPlatformVersion}"`);
+        await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+    }
+    else {
+        await writeGeneratedPackageSwift(p, config, iosPlatformVersion);
+    }
+}
+function buildBinaryTargetEntries(p, frameworks) {
+    const customXcframeworks = frameworks.filter((f) => f.$.custom === 'true' && f.$.src.endsWith('.xcframework'));
+    const customFrameworks = frameworks.filter((f) => f.$.custom === 'true' && f.$.src.endsWith('.framework'));
+    if (customFrameworks.length > 0) {
+        customFrameworks.forEach((f) => {
+            log_1.logger.warn(`${p.id}: custom .framework files are not supported as binaryTarget in SPM (${f.$.src}). Convert to .xcframework for SPM compatibility.`);
+        });
+    }
+    const binaryTargetsText = customXcframeworks
+        .map((f) => {
+        const name = f.$.src.split('/').pop().replace('.xcframework', '');
+        return `,
+        .binaryTarget(
+            name: "${name}",
+            path: "${f.$.src}"
+        )`;
+    })
+        .join('');
+    const binaryDepsText = customXcframeworks
+        .map((f) => {
+        const name = f.$.src.split('/').pop().replace('.xcframework', '');
+        return `,\n                .target(name: "${name}")`;
+    })
+        .join('');
+    return { binaryTargetsText, binaryDepsText };
+}
+function buildResourcesText(resources) {
+    const resourceEntry = [];
+    for (const resource of resources) {
+        resourceEntry.push(`.copy("resources/${resource.$.src.split('/').pop()}")`);
+    }
+    return resources.length > 0
+        ? `,
+            resources: [
+                ${resourceEntry.join(',\n                ')}
+            ]`
+        : '';
+}
+function buildCSettingsText(p, sourceFiles) {
+    var _a;
+    const pluginId = p.id;
+    const allFlags = new Set();
+    for (const sourceFile of sourceFiles) {
+        const flags = (_a = sourceFile.$) === null || _a === void 0 ? void 0 : _a['compiler-flags'];
+        if (flags) {
+            flags
+                .split(/\s+/)
+                .map((f) => f.trim())
+                .filter((f) => f.length > 0)
+                .forEach((f) => allFlags.add(f));
+        }
+    }
+    if (allFlags.size === 0) {
+        return '';
+    }
+    const entries = [];
+    const unsupportedFlags = [];
+    for (const flag of allFlags) {
+        if (flag.startsWith('-D')) {
+            const definition = flag.slice(2);
+            const eqIndex = definition.indexOf('=');
+            if (eqIndex !== -1) {
+                const name = definition.slice(0, eqIndex);
+                const value = definition.slice(eqIndex + 1);
+                entries.push(`                .define("${name}", to: "${value}")`);
+            }
+            else {
+                entries.push(`                .define("${definition}")`);
+            }
+        }
+        else {
+            unsupportedFlags.push(flag);
+        }
+    }
+    if (unsupportedFlags.length > 0) {
+        log_1.logger.warn(`${pluginId}: the following compiler flags are not supported in SPM and were ignored: ${unsupportedFlags.join(', ')}. ` +
+            `This might cause the plugin to fail to compile.`);
+    }
+    if (entries.length === 0) {
+        return '';
+    }
+    return `,
+            cSettings: [
+${entries.join(',\n')}
+            ]`;
+}
+async function writeGeneratedPackageSwift(p, config, iosPlatformVersion) {
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
     const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
-    let headersText = '';
-    if (headerFiles.length > 0) {
-        headersText = `,
-            publicHeadersPath: "."`;
+    const headersText = headerFiles.length > 0
+        ? `,
+            publicHeadersPath: "."`
+        : '';
+    const resources = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
+    const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');
+    if (sourceFiles.length === 0 && headerFiles.length === 0 && resources.length === 0) {
+        return;
     }
+    const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
+    const { binaryTargetsText, binaryDepsText } = buildBinaryTargetEntries(p, frameworks);
+    const cSettingsText = buildCSettingsText(p, sourceFiles);
+    const systemFrameworks = frameworks.filter((f) => !f.$.custom && f.$.src.endsWith('.framework'));
+    const hasWeakFrameworks = systemFrameworks.some((f) => f.$.weak === 'true');
+    const requiredSystemFrameworks = systemFrameworks.filter((f) => f.$.weak !== 'true');
+    const resourcesText = buildResourcesText(resources);
+    const libraryTypeText = hasWeakFrameworks ? `\n            type: .dynamic,` : '';
+    const linkerSettingsText = requiredSystemFrameworks.length > 0
+        ? `,
+            linkerSettings: [
+${requiredSystemFrameworks.map((f) => `                .linkedFramework("${f.$.src.replace('.framework', '')}")`).join(',\n')}
+            ]`
+        : '';
     const content = `// swift-tools-version: 5.9
 
 import PackageDescription
@@ -76,7 +195,7 @@ let package = Package(
     platforms: [.iOS(.v${iosVersion})],
     products: [
         .library(
-            name: "${p.name}",
+            name: "${p.name}",${libraryTypeText}
             targets: ["${p.name}"]
         )
     ],
@@ -87,10 +206,10 @@ let package = Package(
         .target(
             name: "${p.name}",
             dependencies: [
-                .product(name: "Cordova", package: "capacitor-swift-pm")
+                .product(name: "Cordova", package: "capacitor-swift-pm")${binaryDepsText}
             ],
-            path: "."${headersText}
-        )
+            path: "."${resourcesText}${headersText}${cSettingsText}${linkerSettingsText}
+        )${binaryTargetsText}
     ]
 )`;
     await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
@@ -110,19 +229,16 @@ async function updatePodfile(config, plugins, deployment) {
     podfileContent = podfileContent.replace(/(require_relative)[\s\S]+?(@capacitor\/ios\/scripts\/pods_helpers')/, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
     await (0, fs_extra_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
     const podPath = await config.ios.podPath;
-    const useBundler = podPath.startsWith('bundle') && (await (0, subprocess_1.isInstalled)('bundle'));
-    const podCommandExists = await (0, subprocess_1.isInstalled)('pod');
-    if (useBundler || podCommandExists) {
-        if (useBundler) {
-            await (0, subprocess_1.runCommand)('bundle', ['exec', 'pod', 'install', ...(deployment ? ['--deployment'] : [])], {
-                cwd: config.ios.nativeProjectDirAbs,
-            });
-        }
-        else {
-            await (0, subprocess_1.runCommand)(podPath, ['install', ...(deployment ? ['--deployment'] : [])], {
-                cwd: config.ios.nativeProjectDirAbs,
-            });
-        }
+    const useBundler = (await config.ios.packageManager) === 'bundler';
+    if (useBundler) {
+        await (0, subprocess_1.runCommand)('bundle', ['exec', 'pod', 'install', ...(deployment ? ['--deployment'] : [])], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
+    }
+    else if (await (0, subprocess_1.isInstalled)('pod')) {
+        await (0, subprocess_1.runCommand)(podPath, ['install', ...(deployment ? ['--deployment'] : [])], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
     }
     else {
         log_1.logger.warn('Skipping pod install because CocoaPods is not installed');
@@ -361,13 +477,19 @@ function getLinkerFlags(config) {
     return '';
 }
 async function copyPluginsNativeFiles(config, cordovaPlugins) {
+    var _a;
+    const isSPM = (await config.ios.packageManager) === 'SPM';
     for (const p of cordovaPlugins) {
+        const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
+        if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+            continue;
+        }
         const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');
         const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
         const codeFiles = sourceFiles.concat(headerFiles);
         const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
         let sourcesFolderName = 'sources';
-        if ((0, cordova_1.needsStaticPod)(p)) {
+        if (!isSPM && (0, cordova_1.needsStaticPod)(p)) {
             sourcesFolderName += 'static';
         }
         const sourcesFolder = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);
@@ -378,7 +500,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                 fileName = 'lib' + fileName;
             }
             let destFolder = sourcesFolderName;
-            if (codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
+            if (!isSPM && codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
                 destFolder = 'noarc';
             }
             const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
@@ -397,8 +519,13 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                     }
                     if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
                         fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', '[NSBundle mainBundle]');
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', '[NSBundle mainBundle]');
+                        const bundleName = isSPM ? 'SWIFTPM_MODULE_BUNDLE' : '[NSBundle mainBundle]';
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', bundleName);
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', bundleName);
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
+                    if (isSPM && fileContent.includes('[NSBundle mainBundle] URLForResource')) {
+                        fileContent = fileContent.replace('[NSBundle mainBundle] URLForResource', 'SWIFTPM_MODULE_BUNDLE URLForResource');
                         await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                     if (fileContent.includes('[self.webView superview]') || fileContent.includes('self.webView.superview')) {
@@ -412,7 +539,8 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
         for (const resourceFile of resourceFiles) {
             const fileName = resourceFile.$.src.split('/').pop();
-            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'resources', fileName));
+            const rootResFolder = isSPM ? sourcesFolder : config.ios.cordovaPluginsDirAbs;
+            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(rootResFolder, 'resources', fileName));
         }
         for (const framework of frameworks) {
             if (framework.$.custom && framework.$.custom === 'true') {

package/dist/tasks/add.js

@@ -47,7 +47,7 @@ async function addCommand(config, selectedPlatformName) {
                 `${colors_1.default.strong('WARNING')}: Your native project will be completely removed.`);
         }
         try {
-            await (0, common_2.check)([() => (0, common_2.checkPackage)(), () => (0, common_2.checkAppConfig)(config), ...addChecks(config, platformName)]);
+            await (0, common_2.check)([() => (0, common_2.checkPackage)(), () => (0, common_2.checkAppConfig)(config), ...(await getAddChecks(config, platformName))]);
             await doAdd(config, platformName);
             await editPlatforms(config, platformName);
             if (await (0, fs_extra_1.pathExists)(config.app.webDirAbs)) {
@@ -76,9 +76,9 @@ function printNextSteps(platformName) {
     (0, log_1.logSuccess)(`${colors_1.default.strong(platformName)} platform added!`);
     log_1.output.write(`Follow the Developer Workflow guide to get building:\n${colors_1.default.strong(`https://capacitorjs.com/docs/basics/workflow`)}\n`);
 }
-function addChecks(config, platformName) {
+async function getAddChecks(config, platformName) {
     if (platformName === config.ios.name) {
-        return [() => (0, common_3.checkIOSPackage)(config), () => (0, common_3.checkBundler)(config) || (0, common_3.checkCocoaPods)(config)];
+        return [() => (0, common_3.checkIOSPackage)(config), ...(await (0, common_3.getCommonChecks)(config))];
     }
     else if (platformName === config.android.name) {
         return [() => (0, common_1.checkAndroidPackage)(config)];

package/dist/tasks/migrate-spm.js

@@ -1,19 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateToSPM = void 0;
+const common_1 = require("../common");
 const errors_1 = require("../errors");
+const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const spm_1 = require("../util/spm");
 const update_1 = require("./update");
 async function migrateToSPM(config) {
-    if ((await (0, spm_1.checkPackageManager)(config)) == 'SPM') {
+    if ((await config.ios.packageManager) == 'SPM') {
         (0, errors_1.fatal)('Capacitor project is already using SPM, exiting.');
     }
+    await (0, common_1.check)(await (0, common_2.getCommonChecks)(config));
     await (0, spm_1.extractSPMPackageDirectory)(config);
     await (0, spm_1.runCocoapodsDeintegrate)(config);
     await (0, spm_1.removeCocoapodsFiles)(config);
     await (0, spm_1.addInfoPlistDebugIfNeeded)(config);
-    await (0, update_1.update)(config, 'ios', true);
+    const configWritable = config;
+    configWritable.ios.packageManager = Promise.resolve('SPM');
+    await (0, update_1.update)(configWritable, 'ios', false);
     log_1.logger.info('To complete migration follow the manual steps at https://capacitorjs.com/docs/ios/spm#using-our-migration-tool');
 }
 exports.migrateToSPM = migrateToSPM;

package/dist/tasks/migrate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateCommand = void 0;
+exports.setAllStringIn = exports.migrateCommand = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -12,7 +12,6 @@ const errors_1 = require("../errors");
 const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const fs_1 = require("../util/fs");
-const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 // eslint-disable-next-line prefer-const
@@ -162,7 +161,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                     await (0, common_1.runTask)(`Migrating deployment target to ${iOSVersion}.0.`, () => {
                         return updateFile(config, (0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'IPHONEOS_DEPLOYMENT_TARGET = ', ';', `${iOSVersion}.0`);
                     });
-                    if ((await (0, spm_1.checkPackageManager)(config)) === 'Cocoapods') {
+                    if ((await config.ios.packageManager) !== 'SPM') {
                         // Update Podfile
                         await (0, common_1.runTask)(`Migrating Podfile to ${iOSVersion}.0.`, () => {
                             return updateFile(config, (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile'), `platform :ios, '`, `'`, `${iOSVersion}.0`);
@@ -545,6 +544,7 @@ function setAllStringIn(data, start, end, replacement) {
     }
     return result;
 }
+exports.setAllStringIn = setAllStringIn;
 async function updateAndroidManifest(filename) {
     const txt = readFile(filename);
     if (!txt) {

package/dist/tasks/run.js

@@ -14,9 +14,11 @@ 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, _d;
+    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';
-    options.port = (_c = options.port) !== null && _c !== void 0 ? _c : '3000';
+    if (!options.port) {
+        options.port = '3000';
+    }
     if (selectedPlatformName && !(await (0, common_1.isValidPlatform)(selectedPlatformName))) {
         const platformDir = (0, common_1.resolvePlatform)(config, selectedPlatformName);
         if (platformDir) {
@@ -78,13 +80,13 @@ async function runCommand(config, selectedPlatformName, options) {
                     }
                 })
                     .then(() => process.exit());
-                log_1.logger.info(`App running with live reload listing for: http://${options.host}:${options.port}. Press Ctrl+C to quit.`);
+                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.`);
                 await sleepForever();
             }
         }
         catch (e) {
             if (!(0, errors_1.isFatal)(e)) {
-                (0, errors_1.fatal)((_d = e.stack) !== null && _d !== void 0 ? _d : e);
+                (0, errors_1.fatal)((_c = e.stack) !== null && _c !== void 0 ? _c : e);
             }
             throw e;
         }

package/dist/tasks/sourcemaps.js

@@ -13,7 +13,7 @@ function walkDirectory(dirPath) {
         }
         else {
             const mapFile = (0, path_1.join)(dirPath, `${file}.map`);
-            if ((0, path_1.extname)(file) === '.js' && (0, fs_extra_1.existsSync)(mapFile)) {
+            if (((0, path_1.extname)(file) === '.js' || (0, path_1.extname)(file) === '.css') && (0, fs_extra_1.existsSync)(mapFile)) {
                 const bufMap = (0, fs_extra_1.readFileSync)(mapFile).toString('base64');
                 const bufFile = (0, fs_extra_1.readFileSync)(targetFile, 'utf8');
                 const result = bufFile.replace(`sourceMappingURL=${file}.map`, 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + bufMap);

package/dist/tasks/sync.js

@@ -25,7 +25,7 @@ async function syncCommand(config, selectedPlatformName, deployment, inline = fa
         const then = +new Date();
         const platforms = await (0, common_1.selectPlatforms)(config, selectedPlatformName);
         try {
-            await (0, common_1.check)([() => (0, common_1.checkPackage)(), () => (0, common_1.checkWebDir)(config), ...(0, update_1.updateChecks)(config, platforms)]);
+            await (0, common_1.check)([() => (0, common_1.checkPackage)(), () => (0, common_1.checkWebDir)(config), ...(await (0, update_1.addUpdateChecks)(config, platforms))]);
             await (0, promise_1.allSerial)(platforms.map((platformName) => () => sync(config, platformName, deployment, inline)));
             const now = +new Date();
             const diff = (now - then) / 1000;

package/dist/tasks/update.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = exports.updateChecks = exports.updateCommand = void 0;
+exports.update = exports.updateChecks = exports.addUpdateChecks = exports.updateCommand = void 0;
 const tslib_1 = require("tslib");
 const update_1 = require("../android/update");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
@@ -25,7 +25,7 @@ async function updateCommand(config, selectedPlatformName, deployment) {
         const then = +new Date();
         const platforms = await (0, common_1.selectPlatforms)(config, selectedPlatformName);
         try {
-            await (0, common_1.check)([() => (0, common_1.checkPackage)(), ...updateChecks(config, platforms)]);
+            await (0, common_1.check)([() => (0, common_1.checkPackage)(), ...(await addUpdateChecks(config, platforms))]);
             await (0, promise_1.allSerial)(platforms.map((platformName) => async () => await update(config, platformName, deployment)));
             const now = +new Date();
             const diff = (now - then) / 1000;
@@ -40,6 +40,31 @@ async function updateCommand(config, selectedPlatformName, deployment) {
     }
 }
 exports.updateCommand = updateCommand;
+async function addUpdateChecks(config, platforms) {
+    let checks = [];
+    for (const platformName of platforms) {
+        if (platformName === config.ios.name) {
+            checks = await (0, common_2.getCommonChecks)(config);
+        }
+        else if (platformName === config.android.name) {
+            continue;
+        }
+        else if (platformName === config.web.name) {
+            continue;
+        }
+        else {
+            throw `Platform ${platformName} is not valid.`;
+        }
+    }
+    return checks;
+}
+exports.addUpdateChecks = addUpdateChecks;
+/**
+ * @deprecated use addUpdateChecks
+ * @param config
+ * @param platforms
+ * @returns
+ */
 function updateChecks(config, platforms) {
     const checks = [];
     for (const platformName of platforms) {

package/dist/util/livereload.js

@@ -129,8 +129,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 = `http://${options.host}:${options.port}`;
+        const url = `${options.https ? 'https' : 'http'}://${options.host}${options.port ? `:${options.port}` : ''}`;
         configJson.server = {
+            ...configJson.server,
             url,
         };
         (0, fs_extra_1.writeJSONSync)(capConfigPath, configJson, { spaces: '\t' });

package/dist/util/spm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addInfoPlistDebugIfNeeded = exports.runCocoapodsDeintegrate = exports.generatePackageText = exports.removeCocoapodsFiles = exports.extractSPMPackageDirectory = exports.checkPluginsForPackageSwift = exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
+exports.checkPackageTraitsRequirements = exports.checkSwiftToolsVersion = exports.addInfoPlistDebugIfNeeded = exports.runCocoapodsDeintegrate = exports.generatePackageText = exports.removeCocoapodsFiles = exports.extractSPMPackageDirectory = exports.checkPluginsForPackageSwift = exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
 const fs_extra_1 = require("fs-extra");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -12,6 +12,11 @@ const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const subprocess_1 = require("../util/subprocess");
+/**
+ * @deprecated use config.ios.packageManager
+ * @param config
+ * @returns 'Cocoapods' | 'SPM'
+ */
 async function checkPackageManager(config) {
     const iosDirectory = config.ios.nativeProjectDirAbs;
     if ((0, fs_extra_1.existsSync)((0, path_1.resolve)(iosDirectory, 'CapApp-SPM'))) {
@@ -40,12 +45,12 @@ exports.generatePackageFile = generatePackageFile;
 async function checkPluginsForPackageSwift(config, plugins) {
     const iOSCapacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, 'ios') === 0 /* PluginType.Core */);
     const packageSwiftPluginList = await pluginsWithPackageSwift(iOSCapacitorPlugins);
-    if (plugins.length == packageSwiftPluginList.length) {
-        log_1.logger.debug(`Found ${plugins.length} iOS plugins, ${packageSwiftPluginList.length} have a Package.swift file`);
-        log_1.logger.info('All plugins have a Package.swift file and will be included in Package.swift');
+    if (iOSCapacitorPlugins.length == packageSwiftPluginList.length) {
+        log_1.logger.debug(`Found ${iOSCapacitorPlugins.length} Capacitor iOS plugins, ${packageSwiftPluginList.length} have a Package.swift file`);
+        log_1.logger.info('All Capacitor plugins have a Package.swift file and will be included in Package.swift');
     }
     else {
-        log_1.logger.warn('Some installed packages are not compatable with SPM');
+        log_1.logger.warn('Some installed Capacitor plugins are not compatible with SPM');
     }
     return packageSwiftPluginList;
 }
@@ -79,10 +84,12 @@ async function removeCocoapodsFiles(config) {
 }
 exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
-    const iosVersion = (0, common_2.getMajorMinoriOSVersion)(config);
-    let packageSwiftText = `// swift-tools-version: 5.9
+    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
+    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';
+    let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
 import PackageDescription
 
 // DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
@@ -98,11 +105,32 @@ let package = Package(
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "${iosPlatformVersion}")`;
     for (const plugin of plugins) {
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
-            packageSwiftText += `,\n        .package(name: "${plugin.name}", path: "../../capacitor-cordova-ios-plugins/sources/${plugin.name}")`;
+            const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
+            if ((_j = platformTag.$) === null || _j === void 0 ? void 0 : _j.package) {
+                const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+                packageSwiftText += `,\n        .package(name: "${plugin.id}", path: "${relPath}")`;
+            }
+            else {
+                const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'source-file');
+                const headerFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'header-file');
+                if (sourceFiles.length === 0 && headerFiles.length === 0) {
+                    continue;
+                }
+                packageSwiftText += `,\n        .package(name: "${plugin.name}", path: "../../capacitor-cordova-ios-plugins/sources/${plugin.name}")`;
+            }
         }
         else {
             const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
-            packageSwiftText += `,\n        .package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}")`;
+            const traits = packageTraits[plugin.id];
+            const traitsSuffix = (traits === null || traits === void 0 ? void 0 : traits.length)
+                ? `, traits: [${traits
+                    .map((t) => {
+                    // Any trait is written with quotes, with the exception of .defaults
+                    return /^\.?defaults?$/i.test(t) ? '.defaults' : `"${t}"`;
+                })
+                    .join(', ')}]`
+                : '';
+            packageSwiftText += `,\n        .package(name: "${(_k = plugin.ios) === null || _k === void 0 ? void 0 : _k.name}", path: "${relPath}"${traitsSuffix})`;
         }
     }
     packageSwiftText += `
@@ -114,7 +142,21 @@ let package = Package(
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
                 .product(name: "Cordova", package: "capacitor-swift-pm")`;
     for (const plugin of plugins) {
-        packageSwiftText += `,\n                .product(name: "${(_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.name}", package: "${(_c = plugin.ios) === null || _c === void 0 ? void 0 : _c.name}")`;
+        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}")`;
+        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) {
+                pluginText = `,\n                .product(name: "${plugin.id}", package: "${plugin.id}")`;
+            }
+            else {
+                const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'source-file');
+                const headerFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'header-file');
+                if (sourceFiles.length === 0 && headerFiles.length === 0) {
+                    pluginText = '';
+                }
+            }
+        }
+        packageSwiftText += pluginText;
     }
     packageSwiftText += `
             ]
@@ -128,25 +170,18 @@ exports.generatePackageText = generatePackageText;
 async function runCocoapodsDeintegrate(config) {
     const podPath = await config.ios.podPath;
     const projectFileName = config.ios.nativeXcodeProjDirAbs;
-    const useBundler = podPath.startsWith('bundle') && (await (0, subprocess_1.isInstalled)('bundle'));
-    const podCommandExists = await (0, subprocess_1.isInstalled)('pod');
-    if (useBundler)
-        log_1.logger.info('Found bundler, using it to run CocoaPods.');
+    const useBundler = (await config.ios.packageManager) === 'bundler';
     log_1.logger.info('Running pod deintegrate on project ' + projectFileName);
-    if (useBundler || podCommandExists) {
-        if (useBundler) {
-            await (0, subprocess_1.runCommand)('bundle', ['exec', 'pod', 'deintegrate', projectFileName], {
-                cwd: config.ios.nativeProjectDirAbs,
-            });
-        }
-        else {
-            await (0, subprocess_1.runCommand)(podPath, ['deintegrate', projectFileName], {
-                cwd: config.ios.nativeProjectDirAbs,
-            });
-        }
+    if (useBundler) {
+        log_1.logger.info('Found bundler, using it to run CocoaPods.');
+        await (0, subprocess_1.runCommand)('bundle', ['exec', 'pod', 'deintegrate', projectFileName], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
     }
     else {
-        log_1.logger.warn('Skipping pod deintegrate because CocoaPods is not installed - migration will be incomplete');
+        await (0, subprocess_1.runCommand)(podPath, ['deintegrate', projectFileName], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
     }
 }
 exports.runCocoapodsDeintegrate = runCocoapodsDeintegrate;
@@ -171,6 +206,40 @@ async function addInfoPlistDebugIfNeeded(config) {
     }
 }
 exports.addInfoPlistDebugIfNeeded = addInfoPlistDebugIfNeeded;
+async function checkSwiftToolsVersion(config, version) {
+    if (!version) {
+        return null;
+    }
+    const swiftToolsVersionRegex = /^[0-9]+\.[0-9]+(\.[0-9]+)?$/;
+    if (!swiftToolsVersionRegex.test(version)) {
+        return (`Invalid Swift tools version: "${version}".\n` +
+            `The Swift tools version must be in major.minor or major.minor.patch format (e.g., "5.9", "6.0", "5.9.2").`);
+    }
+    return null;
+}
+exports.checkSwiftToolsVersion = checkSwiftToolsVersion;
+async function checkPackageTraitsRequirements(config) {
+    var _a, _b, _c, _d, _e, _f;
+    const packageTraits = (_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;
+    const swiftToolsVersion = (_f = (_e = (_d = config.app.extConfig.experimental) === null || _d === void 0 ? void 0 : _d.ios) === null || _e === void 0 ? void 0 : _e.spm) === null || _f === void 0 ? void 0 : _f.swiftToolsVersion;
+    const hasPackageTraits = packageTraits && Object.keys(packageTraits).some((key) => { var _a; return ((_a = packageTraits[key]) === null || _a === void 0 ? void 0 : _a.length) > 0; });
+    if (!hasPackageTraits) {
+        return null;
+    }
+    if (!swiftToolsVersion) {
+        return (`Package traits require an explicit Swift tools version of 6.1 or higher.\n` +
+            `Set experimental.ios.spm.swiftToolsVersion to '6.1' or higher in your Capacitor configuration.`);
+    }
+    const versionParts = swiftToolsVersion.split('.').map((part) => parseInt(part, 10));
+    const major = versionParts[0] || 0;
+    const minor = versionParts[1] || 0;
+    if (major < 6 || (major === 6 && minor < 1)) {
+        return (`Package traits require Swift tools version 6.1 or higher, but "${swiftToolsVersion}" was specified.\n` +
+            `Update experimental.ios.spm.swiftToolsVersion to '6.1' or higher in your Capacitor configuration.`);
+    }
+    return null;
+}
+exports.checkPackageTraitsRequirements = checkPackageTraitsRequirements;
 // Private Functions
 async function pluginsWithPackageSwift(plugins) {
     const pluginList = [];

package/dist/util/template.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractTemplate = void 0;
-const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
-const tar_1 = tslib_1.__importDefault(require("tar"));
+const tar_1 = require("tar");
 async function extractTemplate(src, dir) {
     await (0, fs_extra_1.mkdirp)(dir);
-    await tar_1.default.extract({ file: src, cwd: dir });
+    await (0, tar_1.extract)({ file: src, cwd: dir });
 }
 exports.extractTemplate = extractTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.0.7",
+  "version": "8.3.3",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
@@ -58,7 +58,7 @@
     "prompts": "^2.4.2",
     "rimraf": "^6.0.1",
     "semver": "^7.6.3",
-    "tar": "^6.1.11",
+    "tar": "^7.5.3",
     "tslib": "^2.8.1",
     "xml2js": "^0.6.2"
   },
@@ -69,7 +69,6 @@
     "@types/plist": "^3.0.5",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
-    "@types/tar": "^6.1.1",
     "@types/tmp": "^0.2.6",
     "@types/xml2js": "0.4.5",
     "jest": "^29.7.0",