@capacitor/cli 8.2.1-nightly-20260324T152823.0 → 8.3.0

package/dist/declarations.d.ts

@@ -487,11 +487,30 @@ export interface CapacitorConfig {
                  *
                  * This setting may graduate to `ios.spm.swiftToolsVersion` in a future major release.
                  *
-                 * @since 8.2.0
+                 * @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[];
+                };
             };
         };
     };

package/dist/ios/common.js

@@ -39,6 +39,7 @@ async function getCommonChecks(config) {
         if (swiftToolsVersion) {
             checks.push(() => (0, spm_1.checkSwiftToolsVersion)(config, swiftToolsVersion));
         }
+        checks.push(() => (0, spm_1.checkPackageTraitsRequirements)(config));
     }
     return checks;
 }

package/dist/util/spm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSwiftToolsVersion = 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");
@@ -84,10 +84,11 @@ async function removeCocoapodsFiles(config) {
 }
 exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
-    const swiftToolsVersion = (_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.swiftToolsVersion) !== null && _d !== void 0 ? _d : '5.9';
+    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
 
@@ -108,7 +109,16 @@ let package = Package(
         }
         else {
             const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
-            packageSwiftText += `,\n        .package(name: "${(_e = plugin.ios) === null || _e === void 0 ? void 0 : _e.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: "${(_j = plugin.ios) === null || _j === void 0 ? void 0 : _j.name}", path: "${relPath}"${traitsSuffix})`;
         }
     }
     packageSwiftText += `
@@ -120,7 +130,7 @@ 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: "${(_f = plugin.ios) === null || _f === void 0 ? void 0 : _f.name}", package: "${(_g = plugin.ios) === null || _g === void 0 ? void 0 : _g.name}")`;
+        packageSwiftText += `,\n                .product(name: "${(_k = plugin.ios) === null || _k === void 0 ? void 0 : _k.name}", package: "${(_l = plugin.ios) === null || _l === void 0 ? void 0 : _l.name}")`;
     }
     packageSwiftText += `
             ]
@@ -182,6 +192,28 @@ async function checkSwiftToolsVersion(config, version) {
     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/package.json

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