@capacitor/cli 7.4.5 → 7.5.0

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,
     };
 }
@@ -339,10 +341,16 @@ 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';
+    }
     let gemfilePath = '';
     if (await (0, fs_extra_1.pathExists)((0, path_1.resolve)(rootDir, 'Gemfile'))) {
         gemfilePath = (0, path_1.resolve)(rootDir, 'Gemfile');
@@ -369,18 +377,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/index.js

@@ -27,6 +27,15 @@ async function run() {
     }
 }
 exports.run = run;
+async function getPackageManager(config, packageManager) {
+    if (packageManager === 'SPM') {
+        return 'SPM';
+    }
+    if ((await config.ios.packageManager) === 'bundler') {
+        return 'bundler';
+    }
+    return 'Cocoapods';
+}
 function runProgram(config) {
     commander_1.program.version(config.cli.package.version);
     commander_1.program
@@ -179,6 +188,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 === 'SPM') {
             configWritable.cli.assets.ios.platformTemplateArchive = 'ios-spm-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.getMajoriOSVersion = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
+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");
@@ -24,6 +24,17 @@ function execBundler() {
         return -1;
     }
 }
+async function getCommonChecks(config) {
+    const checks = [];
+    if ((await config.ios.packageManager) === 'bundler') {
+        checks.push(() => checkBundler(config));
+    }
+    else if ((await config.ios.packageManager) === 'Cocoapods') {
+        checks.push(() => checkCocoaPods(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, scheme: selectedScheme, configuration: selectedConfiguration }) {
@@ -15,10 +14,10 @@ async function runIOS(config, { target: selectedTarget, scheme: selectedScheme,
     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

@@ -40,7 +40,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));
@@ -110,22 +110,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 {
-        log_1.logger.warn('Skipping pod install because CocoaPods is not installed');
+        await (0, subprocess_1.runCommand)(podPath, ['install', ...(deployment ? ['--deployment'] : [])], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
     }
     const isXcodebuildAvailable = await (0, subprocess_1.isInstalled)('xcodebuild');
     if (isXcodebuildAvailable) {

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

@@ -15,7 +15,6 @@ const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const fs_1 = require("../util/fs");
 const node_1 = require("../util/node");
-const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 // eslint-disable-next-line prefer-const
@@ -128,7 +127,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                     await (0, common_2.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_2.runTask)(`Migrating Podfile to ${iOSVersion}.0.`, () => {
                             return updateFile(config, (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile'), `platform :ios, '`, `'`, `${iOSVersion}.0`);

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/spm.js

@@ -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'))) {
@@ -128,25 +133,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;

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/cli",
-  "version": "7.4.5",
+  "version": "7.5.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -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",