@capacitor/cli 9.0.0-alpha.7 → 9.0.0-alpha.8

package/dist/common.js

@@ -423,7 +423,7 @@ async function checkJDKMajorVersion() {
             return -1;
         }
     }
-    catch (e) {
+    catch {
         return -1;
     }
 }

package/dist/config.js

@@ -88,7 +88,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
             (0, errors_1.fatal)('Could not find installation of TypeScript.\n' +
                 `To use ${colors_1.default.strong(extConfigName)} files, you must install TypeScript in your project, e.g. w/ ${colors_1.default.input('npm install -D typescript')}`);
         }
-        const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
+        const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-require-imports
         const extConfigObject = (await (0, node_1.requireTS)(ts, extConfigFilePath));
         const extConfig = extConfigObject.default ? await extConfigObject.default : extConfigObject;
         return {
@@ -112,6 +112,7 @@ async function loadExtConfigJS(rootDir, extConfigName, extConfigFilePath) {
             extConfigType: 'js',
             extConfigName,
             extConfigFilePath: extConfigFilePath,
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
             extConfig: await require(extConfigFilePath),
         };
     }
@@ -302,7 +303,7 @@ async function determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, na
             return (0, path_1.resolve)(nativeProjectDirAbs, 'public');
         }
     }
-    catch (e) {
+    catch {
         // ignore
     }
     return (0, path_1.resolve)(nativeTargetDirAbs, 'public');
@@ -386,7 +387,7 @@ async function determinePackageManager(rootDir, platformDir, nativeProjectDirAbs
                 gemfilePath = (0, path_1.resolve)(output, 'Gemfile');
             }
         }
-        catch (e) {
+        catch {
             // Nothing
         }
     }

package/dist/ios/common.js

@@ -21,7 +21,7 @@ function execBundler() {
         const bundleOutput = (0, child_process_1.execSync)('bundle &> /dev/null ; echo $?');
         return parseInt(bundleOutput.toString());
     }
-    catch (e) {
+    catch {
         return -1;
     }
 }

package/dist/ios/update.js

@@ -56,6 +56,7 @@ async function updatePluginFiles(config, plugins, deployment) {
         const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
         const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
         const capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config, 'from');
+        const iosVersion = (0, common_2.getMajoriOSVersion)(config);
         await Promise.all(validSPMPackages.map(async (plugin) => {
             const packageSwiftPath = (0, path_1.join)(plugin.rootPath, 'Package.swift');
             let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
@@ -66,7 +67,8 @@ async function updatePluginFiles(config, plugins, deployment) {
             if (capacitorPackage.sourceBased) {
                 // The plugin has to resolve to the same package identity as the app, or SPM ends up with
                 // two packages that both vend a Capacitor product.
-                const rewritten = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, plugin.rootPath);
+                let rewritten = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, plugin.rootPath);
+                rewritten = (0, capacitor_package_1.patchPackageSwiftDeploymentTarget)(rewritten, iosVersion).content;
                 if (rewritten !== content) {
                     await (0, fs_extra_1.writeFile)(packageSwiftPath, rewritten);
                 }

package/dist/plugin.js

@@ -59,7 +59,7 @@ async function resolvePlugin(config, name) {
             xml: xmlMeta.plugin,
         };
     }
-    catch (e) {
+    catch {
         // ignore
     }
     return null;

package/dist/tasks/list.js

@@ -26,7 +26,7 @@ async function listCommand(config, selectedPlatformName) {
 exports.listCommand = listCommand;
 async function list(config, platform) {
     const allPlugins = await (0, plugin_1.getPlugins)(config, platform);
-    let plugins = [];
+    let plugins;
     if (platform === config.ios.name) {
         plugins = await (0, common_3.getIOSPlugins)(allPlugins);
     }

package/dist/tasks/migrate.js

@@ -16,7 +16,6 @@ const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 const migrate_edge_to_edge_1 = require("./migrate-edge-to-edge");
 const migrate_swiftui_1 = require("./migrate-swiftui");
-// eslint-disable-next-line prefer-const
 let allDependencies = {};
 const libs = ['@capacitor/core', '@capacitor/cli', '@capacitor/ios', '@capacitor/android'];
 const plugins = [
@@ -132,7 +131,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                     return installLatestLibs(installerType, runNpmInstall, config);
                 });
             }
-            catch (ex) {
+            catch {
                 log_1.logger.error(`${installerType} install failed. Try deleting node_modules folder and running ${colors_1.default.input(`${installerType} install --force`)} manually.`);
                 installFailed = true;
             }

package/dist/util/capacitor-package.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findCapacitorDependencyVersion = exports.rewriteCapacitorDependency = exports.renderCapacitorPackage = exports.resolveCapacitorPackage = void 0;
+exports.patchPackageSwiftDeploymentTarget = exports.findCapacitorDependencyVersion = exports.rewriteCapacitorDependency = exports.renderCapacitorPackage = exports.resolveCapacitorPackage = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -95,6 +95,33 @@ function findCapacitorDependencyVersion(content) {
     return undefined;
 }
 exports.findCapacitorDependencyVersion = findCapacitorDependencyVersion;
+const IOS_PLATFORM_VERSION_REGEX = /\.iOS\(\s*(?:\.v(\d+)|"([\d.]+)")\s*\)/;
+/**
+ * Bumps a Package.swift's declared iOS deployment target (e.g. `.iOS(.v13)` or `.iOS("14.0")`) up to
+ * `requiredIosVersion` if it's lower.
+ *
+ * Only relevant for the source package: it declares `platforms: [.iOS(.v16)]` on its own manifest,
+ * and SwiftPM enforces that across the whole graph, so a plugin still declaring an older, lower
+ * target fails to resolve with "requires minimum platform version X ... but this target supports Y" —
+ * even though the very same plugin links fine against the prebuilt `capacitor-swift-pm`, which never
+ * declared a `platforms:` entry for SwiftPM to check against.
+ */
+function patchPackageSwiftDeploymentTarget(content, requiredIosVersion) {
+    const match = content.match(IOS_PLATFORM_VERSION_REGEX);
+    if (!match) {
+        return { content, changed: false, previousVersion: null };
+    }
+    const isSymbolic = match[1] !== undefined;
+    const previousVersion = isSymbolic ? match[1] : match[2];
+    const requiredMajor = Math.trunc(parseFloat(requiredIosVersion));
+    if (parseFloat(previousVersion) >= requiredMajor) {
+        return { content, changed: false, previousVersion };
+    }
+    const replacement = isSymbolic ? `.iOS(.v${requiredMajor})` : `.iOS("${requiredMajor}.0")`;
+    const patchedContent = content.replace(IOS_PLATFORM_VERSION_REGEX, replacement);
+    return { content: patchedContent, changed: true, previousVersion };
+}
+exports.patchPackageSwiftDeploymentTarget = patchPackageSwiftDeploymentTarget;
 function referencesCapacitor(call) {
     return call.includes(BINARY_PACKAGE_IDENTITY) || call.includes(`${SOURCE_PACKAGE_URL}`);
 }

package/dist/util/cordova-ios.js

@@ -218,6 +218,10 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                         fileContent = fileContent.replace(/self.webView.superview/g, 'self.viewController.view');
                         await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
+                    if (isSPM && fileContent.includes(`#import "AppDelegate.h"`)) {
+                        fileContent = fileContent.replace(`#import "AppDelegate.h"`, `#import <Cordova/AppDelegate.h>`);
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
                 }
             }
         }
@@ -449,6 +453,9 @@ async function generateCordovaPackageFile(p, config) {
         let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
         content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, capacitorPackage.identity);
         content = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, p.rootPath);
+        if (capacitorPackage.sourceBased) {
+            content = (0, capacitor_package_1.patchPackageSwiftDeploymentTarget)(content, iosVersion).content;
+        }
         await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
     }
     else {

package/dist/util/js.js

@@ -8,7 +8,7 @@ function formatJSObject(o) {
         o = JSON.parse(JSON.stringify(o));
     }
     catch (e) {
-        throw new Error(`Cannot parse object as JSON: ${e.stack ? e.stack : e}`);
+        throw new Error(`Cannot parse object as JSON: ${e.stack ? e.stack : e}`, { cause: e });
     }
     return util_1.default.inspect(o, {
         compact: false,

package/dist/util/monorepotools.js

@@ -87,7 +87,7 @@ function isMonorepo(currentPath) {
         findMonorepoRoot(currentPath);
         return true;
     }
-    catch (error) {
+    catch {
         return false;
     }
 }
@@ -102,7 +102,7 @@ function isNXMonorepo(currentPath) {
         findNXMonorepoRoot(currentPath);
         return true;
     }
-    catch (error) {
+    catch {
         return false;
     }
 }

package/dist/util/node.js

@@ -38,7 +38,7 @@ const requireTS = async (ts, p) => {
             if ((e === null || e === void 0 ? void 0 : e.code) === 'ERR_UNKNOWN_FILE_EXTENSION') {
                 throw new Error(`Your installed version of TypeScript (${ts.version}) no longer provides the compiler API Capacitor previously used to load .ts config files, ` +
                     `and your Node.js runtime (${process.version}) doesn't support loading them natively either.\n` +
-                    'Upgrade to Node.js 22.6+ (running with --experimental-strip-types), or Node.js 23.6+, to continue using capacitor.config.ts.');
+                    'Upgrade to Node.js 22.6+ (running with --experimental-strip-types), or Node.js 23.6+, to continue using capacitor.config.ts.', { cause: e });
             }
             throw e;
         }
@@ -68,7 +68,7 @@ const requireTS = async (ts, p) => {
         }
         (_a = module._compile) === null || _a === void 0 ? void 0 : _a.call(module, sourceText, fileName);
     };
-    const m = require(id); // eslint-disable-line @typescript-eslint/no-var-requires
+    const m = require(id); // eslint-disable-line @typescript-eslint/no-require-imports
     delete require.extensions['.ts'];
     return m;
 };
@@ -77,7 +77,7 @@ function resolveNode(root, ...pathSegments) {
     try {
         return require.resolve(pathSegments.join('/'), { paths: [root] });
     }
-    catch (e) {
+    catch {
         const path = [root, 'node_modules', ...pathSegments].join('/');
         if ((0, fs_1.existsSync)(path)) {
             return path;

package/dist/util/subprocess.js

@@ -20,7 +20,7 @@ async function getCommandOutput(command, args, options = {}) {
     try {
         return (await runCommand(command, args, options)).trim();
     }
-    catch (e) {
+    catch {
         return null;
     }
 }
@@ -29,7 +29,7 @@ async function isInstalled(command) {
     try {
         await (0, utils_subprocess_1.which)(command);
     }
-    catch (e) {
+    catch {
         return false;
     }
     return true;

package/dist/util/xml.js

@@ -15,7 +15,7 @@ async function readXML(path) {
             throw `Error parsing: ${path}, ${(_a = e.stack) !== null && _a !== void 0 ? _a : e}`;
         }
     }
-    catch (e) {
+    catch {
         throw `Unable to read: ${path}`;
     }
 }

package/package.json

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