@capacitor/cli 7.3.1-nightly-20250618T150603.0 → 7.4.0

package/dist/index.js

@@ -228,6 +228,13 @@ function runProgram(config) {
         const { migrateCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/migrate')));
         await migrateCommand(config, noprompt, packagemanager);
     }));
+    commander_1.program
+        .command('spm-migration-assistant')
+        .description('Remove Cocoapods from project and switch to Swift Package Manager')
+        .action((0, cli_1.wrapAction)(async () => {
+        const { migrateToSPM } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/migrate-spm')));
+        await migrateToSPM(config);
+    }));
     commander_1.program.arguments('[command]').action((0, cli_1.wrapAction)(async (cmd) => {
         if (typeof cmd === 'undefined') {
             log_1.output.write(`\n  ${(0, emoji_1.emoji)('⚡️', '--')}  ${colors_1.default.strong('Capacitor - Cross-Platform apps with JavaScript and the Web')}  ${(0, emoji_1.emoji)('⚡️', '--')}\n\n`);

package/dist/ios/update.js

@@ -42,7 +42,8 @@ async function updatePluginFiles(config, plugins, deployment) {
     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') {
         await generateCordovaPackageFiles(cordovaPlugins, config);
-        await (0, spm_1.generatePackageFile)(config, plugins);
+        const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
+        await (0, spm_1.generatePackageFile)(config, validSPMPackages);
     }
     else {
         await generateCordovaPodspecs(cordovaPlugins, config);

package/dist/tasks/migrate-spm.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToSPM = void 0;
+const errors_1 = require("../errors");
+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') {
+        (0, errors_1.fatal)('Capacitor project is already using SPM, exiting.');
+    }
+    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);
+    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/util/spm.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
+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");
+const plist_1 = require("plist");
+const tar_1 = require("tar");
 const common_1 = require("../common");
+const errors_1 = require("../errors");
 const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const subprocess_1 = require("../util/subprocess");
 async function checkPackageManager(config) {
     const iosDirectory = config.ios.nativeProjectDirAbs;
     if ((0, fs_extra_1.existsSync)((0, path_1.resolve)(iosDirectory, 'CapApp-SPM'))) {
@@ -23,6 +28,7 @@ exports.findPackageSwiftFile = findPackageSwiftFile;
 async function generatePackageFile(config, plugins) {
     const packageSwiftFile = await findPackageSwiftFile(config);
     try {
+        log_1.logger.info('Writing Package.swift');
         const textToWrite = await generatePackageText(config, plugins);
         (0, fs_extra_1.writeFileSync)(packageSwiftFile, textToWrite);
     }
@@ -31,6 +37,47 @@ async function generatePackageFile(config, plugins) {
     }
 }
 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');
+    }
+    else {
+        log_1.logger.warn('Some installed packages my not be compatable with SPM');
+    }
+    return packageSwiftPluginList;
+}
+exports.checkPluginsForPackageSwift = checkPluginsForPackageSwift;
+async function extractSPMPackageDirectory(config) {
+    const spmDirectory = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM');
+    const spmTemplate = (0, path_1.join)(config.cli.assetsDirAbs, 'ios-spm-template.tar.gz');
+    const debugConfig = (0, path_1.join)(config.ios.platformDirAbs, 'debug.xcconfig');
+    log_1.logger.info('Extracting ' + spmTemplate + ' to ' + spmDirectory);
+    try {
+        const tempCapDir = await (0, fs_extra_1.mkdtemp)((0, path_1.join)((0, os_1.tmpdir)(), 'cap-'));
+        const tempCapSPM = (0, path_1.join)(tempCapDir, 'App', 'CapApp-SPM');
+        const tempDebugXCConfig = (0, path_1.join)(tempCapDir, 'debug.xcconfig');
+        await (0, tar_1.extract)({ file: spmTemplate, cwd: tempCapDir });
+        await (0, fs_extra_1.move)(tempCapSPM, spmDirectory);
+        await (0, fs_extra_1.move)(tempDebugXCConfig, debugConfig);
+    }
+    catch (err) {
+        (0, errors_1.fatal)('Failed to create ' + spmDirectory + ' with error: ' + err);
+    }
+}
+exports.extractSPMPackageDirectory = extractSPMPackageDirectory;
+async function removeCocoapodsFiles(config) {
+    const iosDirectory = config.ios.nativeProjectDirAbs;
+    const podFile = (0, path_1.resolve)(iosDirectory, 'Podfile');
+    const podlockFile = (0, path_1.resolve)(iosDirectory, 'Podfile.lock');
+    const xcworkspaceFile = (0, path_1.resolve)(iosDirectory, 'App.xcworkspace');
+    await (0, fs_extra_1.remove)(podFile);
+    await (0, fs_extra_1.remove)(podlockFile);
+    await (0, fs_extra_1.remove)(xcworkspaceFile);
+}
+exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
     var _a, _b, _c;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
@@ -77,3 +124,64 @@ let package = Package(
 `;
     return packageSwiftText;
 }
+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.');
+    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,
+            });
+        }
+    }
+    else {
+        log_1.logger.warn('Skipping pod deintegrate because CocoaPods is not installed - migration will be incomplete');
+    }
+}
+exports.runCocoapodsDeintegrate = runCocoapodsDeintegrate;
+async function addInfoPlistDebugIfNeeded(config) {
+    const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
+    log_1.logger.info('Checking ' + infoPlist + ' for CAPACITOR_DEBUG');
+    if ((0, fs_extra_1.existsSync)(infoPlist)) {
+        const infoPlistContents = (0, fs_extra_1.readFileSync)(infoPlist, 'utf-8');
+        const plistEntries = (0, plist_1.parse)(infoPlistContents);
+        if (plistEntries['CAPACITOR_DEBUG'] === undefined) {
+            log_1.logger.info('Writing CAPACITOR_DEBUG to ' + infoPlist);
+            plistEntries['CAPACITOR_DEBUG'] = '$(CAPACITOR_DEBUG)';
+            const plistToWrite = (0, plist_1.build)(plistEntries);
+            (0, fs_extra_1.writeFileSync)(infoPlist, plistToWrite);
+        }
+        else {
+            log_1.logger.warn('Found CAPACITOR_DEBUG set to ' + plistEntries['CAPACITOR_DEBUG'] + ', skipping.');
+        }
+    }
+    else {
+        log_1.logger.warn(infoPlist + ' not found.');
+    }
+}
+exports.addInfoPlistDebugIfNeeded = addInfoPlistDebugIfNeeded;
+// Private Functions
+async function pluginsWithPackageSwift(plugins) {
+    const pluginList = [];
+    for (const plugin of plugins) {
+        const packageSwiftFound = await (0, fs_extra_1.pathExists)((0, path_1.join)(plugin.rootPath, 'Package.swift'));
+        if (packageSwiftFound) {
+            pluginList.push(plugin);
+        }
+        else {
+            log_1.logger.warn(plugin.id + ' does not have a Package.swift');
+        }
+    }
+    return pluginList;
+}

package/package.json

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