@capacitor-plus/cli 8.3.12 → 8.5.1

package/dist/config.js

@@ -87,7 +87,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
                 `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 extConfigObject = (0, node_1.requireTS)(ts, extConfigFilePath);
+        const extConfigObject = (await (0, node_1.requireTS)(ts, extConfigFilePath));
         const extConfig = extConfigObject.default ? await extConfigObject.default : extConfigObject;
         return {
             extConfigType: 'ts',

package/dist/declarations.d.ts

@@ -511,6 +511,15 @@ export interface CapacitorConfig {
                 packageTraits?: {
                     [pluginId: string]: string[];
                 };
+                /**
+                 * Define options to apply to the package.
+                 * The key is the plugin ID (e.g. `@capacitor-community/device`)
+                 *
+                 * @since 8.4.0
+                 */
+                packageOptions?: {
+                    [pluginId: string]: PackageOptions;
+                };
             };
         };
     };
@@ -546,7 +555,7 @@ export interface CapacitorConfig {
          * Configure the local scheme on Android.
          *
          * Custom schemes on Android are unable to change the URL path as of Webview 117. Changing this value from anything other than `http` or `https` can result in your
-         * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarentees that this
+         * application unable to resolve routing. If you must change this for some reason, consider using a hash-based url strategy, but there are no guarantees that this
          * will continue to work long term as allowing non-standard schemes to modify query parameters and url fragments is only allowed for compatibility reasons.
          * https://ionic.io/blog/capacitor-android-customscheme-issue-with-chrome-117
          *
@@ -732,3 +741,17 @@ export interface PluginsConfig {
         animation?: 'FADE' | 'NONE';
     };
 }
+export interface PackageOptions {
+    /**
+     * Create a symlink to the plugin folder instead of pointing to the plugin path.
+     * Useful when plugin names conflict.
+     */
+    symlink?: boolean;
+    /**
+     * Useful to avoid target name conflicts in dependencies
+     * [see](https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/modulealiasing/)
+     */
+    moduleAliases?: {
+        [target: string]: string;
+    };
+}

package/dist/ios/update.js

@@ -4,6 +4,7 @@ exports.installCocoaPodsPlugins = exports.updateIOS = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
@@ -45,6 +46,37 @@ async function updatePluginFiles(config, plugins, deployment) {
         await generateCordovaPackageFiles(cordovaPlugins, config);
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));
+        if (validSPMPackages.length > 0) {
+            let platformVersion;
+            try {
+                platformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+            }
+            catch (err) {
+                log_1.logger.warn(`Skipping plugin Package.swift Capacitor version patching: ${err}`);
+            }
+            if (platformVersion) {
+                const resolvedPlatformVersion = platformVersion;
+                await Promise.all(validSPMPackages.map(async (plugin) => {
+                    var _a;
+                    const packageSwiftPath = (0, path_1.join)(plugin.rootPath, 'Package.swift');
+                    let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+                    const regex = new RegExp('url:\\s*"https://github.com/ionic-team/capacitor-swift-pm\\.git",\\s*(?:from|exact):\\s*"([^"]+)"');
+                    const version = (_a = content.match(regex)) === null || _a === void 0 ? void 0 : _a[1];
+                    if (!version || !(0, semver_1.valid)(version)) {
+                        log_1.logger.warn(`${plugin.id}: skipping Package.swift version check for invalid version "${version !== null && version !== void 0 ? version : ''}"`);
+                        return;
+                    }
+                    const majorCapVersion = (0, semver_1.major)(resolvedPlatformVersion);
+                    if ((0, semver_1.major)(version) != majorCapVersion) {
+                        const preCapVersion = (0, semver_1.prerelease)(resolvedPlatformVersion);
+                        const forceVersion = preCapVersion ? resolvedPlatformVersion : `${majorCapVersion}.0.0`;
+                        content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${forceVersion}"`);
+                        await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+                        log_1.logger.warn(`${plugin.id} is built for Capacitor ${(0, semver_1.major)(version)}, it might cause issues`);
+                    }
+                }));
+            }
+        }
     }
     else {
         await generateCordovaPodspecs(cordovaPlugins, config);
@@ -578,6 +610,9 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
 }
 async function removePluginsNativeFiles(config) {
     await (0, fs_extra_1.remove)(config.ios.cordovaPluginsDirAbs);
+    if ((await config.ios.packageManager) === 'SPM') {
+        await (0, fs_extra_1.remove)((0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM', 'symlinks'));
+    }
     await (0, template_1.extractTemplate)(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
 }
 function filterResources(plugin) {

package/dist/ipc.js

@@ -36,21 +36,26 @@ async function receive(msg) {
         const { data } = msg;
         // This request is only made if telemetry is on.
         const req = (0, https_1.request)({
-            hostname: 'api.ionicjs.com',
+            hostname: 'metrics-capacitor.outsystems.com',
             port: 443,
-            path: '/events/metrics',
+            path: '/metrics',
             method: 'POST',
+            timeout: 5000,
             headers: {
                 'Content-Type': 'application/json',
             },
         }, (response) => {
             debug('Sent %O metric to events service (status: %O)', data.name, response.statusCode);
-            if (response.statusCode !== 204) {
+            if (response.statusCode !== 202) {
                 response.on('data', (chunk) => {
                     debug('Bad response from events service. Request body: %O', chunk.toString());
                 });
             }
         });
+        req.on('timeout', () => req.destroy());
+        req.on('error', (err) => {
+            debug('Failed to send metric to events service: %O', err);
+        });
         const body = {
             metrics: [data],
             sent_at: now,

package/dist/tasks/migrate-uiscene.js

@@ -0,0 +1,349 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__testables = exports.migrateToUIScene = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const common_1 = require("../common");
+const log_1 = require("../log");
+const fs_1 = require("../util/fs");
+const spm_1 = require("../util/spm");
+const template_1 = require("../util/template");
+const xcode_1 = require("../util/xcode");
+async function migrateToUIScene(config) {
+    const signals = readDetectionSignals(config);
+    const state = classify(signals);
+    switch (state) {
+        case 'already-migrated':
+            log_1.logger.info('UIScene migration: project already migrated, skipping.');
+            return;
+        case 'partial':
+            log_1.logger.warn(`UIScene migration: project is in a partial state (${describeSignals(signals)}). ` +
+                `Skipping automated migration — finish the migration by hand or reset to a clean 8.4 state first.`);
+            return;
+        case 'eligible':
+            break;
+    }
+    const assets = await loadTemplateAssets(config);
+    if (!assets) {
+        log_1.logger.error('UIScene migration: could not read shipped iOS template assets; skipping.');
+        return;
+    }
+    await (0, common_1.runTask)('Adding UIApplicationSceneManifest to Info.plist.', () => (0, spm_1.addSceneManifestIfNeeded)(config));
+    await (0, common_1.runTask)('Writing SceneDelegate.swift.', async () => {
+        const { written } = writeSceneDelegate(config, assets.sceneDelegate);
+        if (!written) {
+            log_1.logger.warn('SceneDelegate.swift already exists, skipping.');
+        }
+    });
+    await (0, common_1.runTask)('Patching AppDelegate.swift with configurationForConnecting.', async () => {
+        const { patched, reason } = patchAppDelegate(config, assets.configurationForConnectingSnippet);
+        if (!patched && reason) {
+            log_1.logger.warn(`AppDelegate.swift not patched: ${reason}`);
+        }
+    });
+    await (0, common_1.runTask)('Registering SceneDelegate.swift with the Xcode App target.', async () => {
+        var _a;
+        const pbxprojPath = (0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj');
+        try {
+            const { added } = (0, xcode_1.addSwiftFileToAppTarget)(pbxprojPath, 'App', 'SceneDelegate.swift');
+            if (!added) {
+                log_1.logger.warn('SceneDelegate.swift is already registered in the App target, skipping.');
+            }
+        }
+        catch (err) {
+            log_1.logger.warn(`Could not register SceneDelegate.swift automatically: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}. ` +
+                'Add SceneDelegate.swift to the App target in Xcode manually.');
+        }
+    });
+    await scanAndWarn(config);
+    printNextSteps();
+}
+exports.migrateToUIScene = migrateToUIScene;
+async function scanAndWarn(config) {
+    const findings = [];
+    const swiftFiles = await (0, fs_1.readdirp)(config.ios.platformDirAbs, {
+        filter: (item) => {
+            if (!item.stats.isFile())
+                return false;
+            if (!item.path.endsWith('.swift'))
+                return false;
+            const p = item.path;
+            return (!p.includes(`${path_1.sep}Pods${path_1.sep}`) &&
+                !p.includes(`${path_1.sep}build${path_1.sep}`) &&
+                !p.includes(`${path_1.sep}DerivedData${path_1.sep}`) &&
+                !p.includes(`${path_1.sep}.build${path_1.sep}`));
+        },
+    });
+    const tokenPatterns = [
+        { token: /UIApplication\.shared\.applicationState/, label: 'UIApplication.shared.applicationState' },
+        { token: /\btmpWindow\b/, label: 'tmpWindow' },
+        { token: /\bTmpViewController\b/, label: 'TmpViewController' },
+    ];
+    for (const filePath of swiftFiles) {
+        const source = (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
+        source.split('\n').forEach((line, idx) => {
+            for (const { token, label } of tokenPatterns) {
+                if (token.test(line)) {
+                    findings.push(`${filePath}:${idx + 1}: uses ${label}`);
+                }
+            }
+        });
+    }
+    const appDelegatePath = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift');
+    if ((0, fs_extra_1.existsSync)(appDelegatePath)) {
+        const source = (0, fs_extra_1.readFileSync)(appDelegatePath, 'utf-8');
+        if (hasCustomDelegateBody(source, /func application\([^)]*\bopen url:/)) {
+            findings.push(`${appDelegatePath}: custom application(_:open:) body — review for UIScene compatibility`);
+        }
+        if (hasCustomDelegateBody(source, /func application\([^)]*\bcontinue userActivity:/)) {
+            findings.push(`${appDelegatePath}: custom application(_:continue:) body — review for UIScene compatibility`);
+        }
+    }
+    if (findings.length === 0)
+        return;
+    log_1.logger.warn('UIScene scan found patterns that may need manual review:');
+    for (const finding of findings) {
+        log_1.logger.warn(`  ${finding}`);
+    }
+}
+function findMatchingBrace(source, openIdx) {
+    let depth = 1;
+    let i = openIdx + 1;
+    let inLineComment = false;
+    let blockCommentDepth = 0;
+    let inString = null;
+    let stringHashes = 0;
+    while (i < source.length && depth > 0) {
+        const ch = source[i];
+        const next = source[i + 1];
+        if (inLineComment) {
+            if (ch === '\n')
+                inLineComment = false;
+            i++;
+            continue;
+        }
+        if (blockCommentDepth > 0) {
+            if (ch === '*' && next === '/') {
+                blockCommentDepth--;
+                i += 2;
+                continue;
+            }
+            if (ch === '/' && next === '*') {
+                blockCommentDepth++;
+                i += 2;
+                continue;
+            }
+            i++;
+            continue;
+        }
+        if (inString === '"') {
+            if (stringHashes === 0 && ch === '\\') {
+                i += 2;
+                continue;
+            }
+            if (ch === '"') {
+                let closingHashes = 0;
+                while (source[i + 1 + closingHashes] === '#') {
+                    closingHashes++;
+                }
+                if (closingHashes === stringHashes) {
+                    i += 1 + closingHashes;
+                    inString = null;
+                    stringHashes = 0;
+                    continue;
+                }
+            }
+            i++;
+            continue;
+        }
+        if (inString === '"""') {
+            if (ch === '"' && source[i + 1] === '"' && source[i + 2] === '"') {
+                let closingHashes = 0;
+                while (source[i + 3 + closingHashes] === '#') {
+                    closingHashes++;
+                }
+                if (closingHashes === stringHashes) {
+                    i += 3 + closingHashes;
+                    inString = null;
+                    stringHashes = 0;
+                    continue;
+                }
+            }
+            i++;
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            inLineComment = true;
+            i += 2;
+            continue;
+        }
+        if (ch === '/' && next === '*') {
+            blockCommentDepth++;
+            i += 2;
+            continue;
+        }
+        if (ch === '#' || ch === '"') {
+            let hashes = 0;
+            while (source[i + hashes] === '#') {
+                hashes++;
+            }
+            const quoteIdx = i + hashes;
+            if (source[quoteIdx] === '"') {
+                if (source[quoteIdx + 1] === '"' && source[quoteIdx + 2] === '"') {
+                    inString = '"""';
+                    stringHashes = hashes;
+                    i = quoteIdx + 3;
+                    continue;
+                }
+                inString = '"';
+                stringHashes = hashes;
+                i = quoteIdx + 1;
+                continue;
+            }
+        }
+        if (ch === '{')
+            depth++;
+        else if (ch === '}')
+            depth--;
+        i++;
+    }
+    return depth === 0 ? i - 1 : null;
+}
+function hasCustomDelegateBody(source, sigRegex) {
+    const match = source.match(sigRegex);
+    if (!match || match.index === undefined)
+        return false;
+    const openIdx = source.indexOf('{', match.index);
+    if (openIdx === -1)
+        return false;
+    const closeIdx = findMatchingBrace(source, openIdx);
+    if (closeIdx === null)
+        return false;
+    const body = source.slice(openIdx + 1, closeIdx);
+    const codeLines = body
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((l) => l.length > 0 && !l.startsWith('//'));
+    if (codeLines.length === 0)
+        return false;
+    return codeLines.some((l) => !l.includes('ApplicationDelegateProxy.shared'));
+}
+function printNextSteps() {
+    log_1.logger.info('');
+    log_1.logger.info('UIScene migration next steps:');
+    log_1.logger.info('  • Review any warnings above for legacy API usage or custom AppDelegate URL/activity handlers.');
+    log_1.logger.info('  • Full guide: https://capacitorjs.com/docs/updating/8-5');
+}
+async function loadTemplateAssets(config) {
+    const packageManager = await config.ios.packageManager;
+    const archiveName = packageManager === 'SPM' ? 'ios-spm-template.tar.gz' : 'ios-pods-template.tar.gz';
+    const archivePath = (0, path_1.join)(config.cli.assetsDirAbs, archiveName);
+    const tempDir = (0, path_1.join)(config.cli.assetsDirAbs, 'tempUISceneTemplate');
+    try {
+        await (0, template_1.extractTemplate)(archivePath, tempDir);
+        const sceneDelegatePath = (0, path_1.join)(tempDir, 'App', 'App', 'SceneDelegate.swift');
+        const appDelegatePath = (0, path_1.join)(tempDir, 'App', 'App', 'AppDelegate.swift');
+        if (!(0, fs_extra_1.existsSync)(sceneDelegatePath) || !(0, fs_extra_1.existsSync)(appDelegatePath)) {
+            return null;
+        }
+        const sceneDelegate = (0, fs_extra_1.readFileSync)(sceneDelegatePath, 'utf-8');
+        const appDelegateSource = (0, fs_extra_1.readFileSync)(appDelegatePath, 'utf-8');
+        const configurationForConnectingSnippet = extractConfigurationForConnecting(appDelegateSource);
+        if (!configurationForConnectingSnippet) {
+            return null;
+        }
+        return { sceneDelegate, configurationForConnectingSnippet };
+    }
+    finally {
+        (0, fs_1.deleteFolderRecursive)(tempDir);
+    }
+}
+function writeSceneDelegate(config, contents) {
+    const path = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'SceneDelegate.swift');
+    if ((0, fs_extra_1.existsSync)(path)) {
+        return { written: false };
+    }
+    (0, fs_extra_1.writeFileSync)(path, contents);
+    return { written: true };
+}
+function patchAppDelegate(config, snippet) {
+    const path = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift');
+    if (!(0, fs_extra_1.existsSync)(path)) {
+        return { patched: false, reason: 'AppDelegate.swift not found.' };
+    }
+    const source = (0, fs_extra_1.readFileSync)(path, 'utf-8');
+    if (source.includes('UISceneConfiguration(name:')) {
+        return { patched: false, reason: 'configurationForConnecting already present.' };
+    }
+    const patched = insertBeforeAppDelegateClassEnd(source, snippet);
+    if (!patched) {
+        return { patched: false, reason: 'could not locate AppDelegate class body.' };
+    }
+    (0, fs_extra_1.writeFileSync)(path, patched);
+    return { patched: true };
+}
+function extractConfigurationForConnecting(appDelegateSource) {
+    const sigRegex = /^ {4}func application\(_ application: UIApplication,\n {21}configurationForConnecting\b/m;
+    const sigMatch = appDelegateSource.match(sigRegex);
+    if (!sigMatch || sigMatch.index === undefined) {
+        return null;
+    }
+    const openIdx = appDelegateSource.indexOf('{', sigMatch.index);
+    if (openIdx === -1) {
+        return null;
+    }
+    const closeIdx = findMatchingBrace(appDelegateSource, openIdx);
+    if (closeIdx === null) {
+        return null;
+    }
+    return '\n' + appDelegateSource.slice(sigMatch.index, closeIdx + 1) + '\n';
+}
+function insertBeforeAppDelegateClassEnd(source, snippet) {
+    const classDeclRegex = /\bclass\s+AppDelegate\b[^{]*\{/;
+    const match = source.match(classDeclRegex);
+    if (!match || match.index === undefined) {
+        return null;
+    }
+    const openIdx = source.indexOf('{', match.index);
+    const closeIdx = findMatchingBrace(source, openIdx);
+    if (closeIdx === null) {
+        return null;
+    }
+    return source.slice(0, closeIdx) + snippet + source.slice(closeIdx);
+}
+function readDetectionSignals(config) {
+    const sceneDelegatePath = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'SceneDelegate.swift');
+    const appDelegatePath = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift');
+    return {
+        hasManifest: (0, spm_1.hasSceneManifest)(config),
+        hasSceneDelegate: (0, fs_extra_1.existsSync)(sceneDelegatePath),
+        hasConfigurationForConnecting: (0, fs_extra_1.existsSync)(appDelegatePath) && (0, fs_extra_1.readFileSync)(appDelegatePath, 'utf-8').includes('UISceneConfiguration(name:'),
+    };
+}
+function classify(signals) {
+    const { hasManifest, hasSceneDelegate, hasConfigurationForConnecting } = signals;
+    const trueCount = [hasManifest, hasSceneDelegate, hasConfigurationForConnecting].filter(Boolean).length;
+    if (trueCount === 0)
+        return 'eligible';
+    if (trueCount === 3)
+        return 'already-migrated';
+    return 'partial';
+}
+function describeSignals({ hasManifest, hasSceneDelegate, hasConfigurationForConnecting, }) {
+    const present = [];
+    const missing = [];
+    (hasManifest ? present : missing).push('UIApplicationSceneManifest');
+    (hasSceneDelegate ? present : missing).push('SceneDelegate.swift');
+    (hasConfigurationForConnecting ? present : missing).push('AppDelegate.configurationForConnecting');
+    return `present: [${present.join(', ')}]; missing: [${missing.join(', ')}]`;
+}
+// Exported for tests.
+exports.__testables = {
+    classify,
+    describeSignals,
+    findMatchingBrace,
+    insertBeforeAppDelegateClassEnd,
+    extractConfigurationForConnecting,
+    hasCustomDelegateBody,
+    scanAndWarn,
+};

package/dist/tasks/migrate.js

@@ -14,6 +14,7 @@ const log_1 = require("../log");
 const fs_1 = require("../util/fs");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
+const migrate_uiscene_1 = require("./migrate-uiscene");
 // eslint-disable-next-line prefer-const
 let allDependencies = {};
 const libs = [
@@ -171,6 +172,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 else {
                     log_1.logger.warn('Skipped updating deployment target');
                 }
+                await (0, migrate_uiscene_1.migrateToUIScene)(config);
             }
             if (!installFailed) {
                 await (0, common_1.runTask)(`Running cap sync.`, () => {
@@ -371,6 +373,10 @@ async function writeBreakingChanges() {
     if (broken.length > 0) {
         log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/next/updating/8-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
+    if (allDependencies['@capacitor/ios'] || allDependencies['@capacitor-plus/ios']) {
+        log_1.logger.info('IMPORTANT: Capacitor 8.5 adopts UIScene on iOS. ' +
+            'See https://capacitorjs.com/docs/updating/8-5 for the full 8.4 → 8.5 migration guide.');
+    }
 }
 async function getAndroidVariablesAndClasspaths(config) {
     const tempAndroidTemplateFolder = (0, path_1.join)(config.cli.assetsDirAbs, 'tempAndroidTemplate');

package/dist/tasks/run.js

@@ -59,15 +59,18 @@ async function runCommand(config, selectedPlatformName, options) {
             }
             return;
         }
+        let cordovaPlugins;
+        let liveReloadManifestUpdated = false;
         try {
+            cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
             if (options.sync) {
                 await (0, sync_1.sync)(config, platformName, false, true);
             }
-            const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
             if (options.liveReload) {
                 await livereload_1.CapLiveReloadHelper.editCapConfigForLiveReload(config, platformName, options);
                 if (platformName === config.android.name) {
-                    await await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, true);
+                    await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, true);
+                    liveReloadManifestUpdated = true;
                 }
             }
             await run(config, platformName, options);
@@ -75,7 +78,7 @@ async function runCommand(config, selectedPlatformName, options) {
                 new Promise((resolve) => process.on('SIGINT', resolve))
                     .then(async () => {
                     await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
-                    if (platformName === config.android.name) {
+                    if (liveReloadManifestUpdated && platformName === config.android.name && cordovaPlugins) {
                         await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, false);
                     }
                 })
@@ -85,6 +88,12 @@ async function runCommand(config, selectedPlatformName, options) {
             }
         }
         catch (e) {
+            if (options.liveReload) {
+                await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
+                if (liveReloadManifestUpdated && platformName === config.android.name && cordovaPlugins) {
+                    await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName, false);
+                }
+            }
             if (!(0, errors_1.isFatal)(e)) {
                 (0, errors_1.fatal)((_c = e.stack) !== null && _c !== void 0 ? _c : e);
             }

package/dist/telemetry.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMetric = exports.telemetryAction = void 0;
+exports.getIOSPackageManager = exports.sendMetric = exports.telemetryAction = void 0;
 const tslib_1 = require("tslib");
 const commander_1 = require("commander");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const ipc_1 = require("./ipc");
 const log_1 = require("./log");
@@ -51,8 +52,10 @@ function telemetryAction(config, action) {
             error: error ? (error.message ? error.message : String(error)) : null,
             node_version: process.version,
             os: config.cli.os,
+            ios_package_manager: await getIOSPackageManager(config),
             ...Object.fromEntries(versions),
         };
+        debug('metric payload: %O', data);
         if ((0, term_1.isInteractive)()) {
             let sysconfig = await (0, sysconfig_1.readConfig)();
             if (!error && typeof sysconfig.telemetry === 'undefined') {
@@ -88,6 +91,24 @@ async function sendMetric(sysconfig, name, data) {
     }
 }
 exports.sendMetric = sendMetric;
+/**
+ * Resolve the iOS dependency manager for telemetry. Returns 'unknown' for
+ * non-iOS projects or when detection throws, so callers never have to handle
+ * errors from this signal.
+ */
+async function getIOSPackageManager(config) {
+    try {
+        if (!(await (0, fs_extra_1.pathExists)(config.ios.platformDirAbs))) {
+            return 'unknown';
+        }
+        return await config.ios.packageManager;
+    }
+    catch (e) {
+        debug('Could not resolve iOS package manager for telemetry: %O', e);
+        return 'unknown';
+    }
+}
+exports.getIOSPackageManager = getIOSPackageManager;
 /**
  * Get a unique anonymous identifier for this app.
  */

package/dist/util/node.js

@@ -4,11 +4,28 @@ exports.resolveNode = exports.requireTS = void 0;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const url_1 = require("url");
+/**
+ * TypeScript 7 dropped the classic compiler API (transpileModule, ModuleKind, etc.) from its
+ * default export -- `require('typescript')` now only exposes `version`/`versionMajorMinor`.
+ * Detect that case so we can fall back to a loading strategy that doesn't depend on it.
+ *
+ * @see https://github.com/ionic-team/capacitor/issues/8531
+ */
+function hasClassicCompilerAPI(ts) {
+    return typeof ts.transpileModule === 'function';
+}
+/**
+ * A plain `import()` here gets downleveled to a `require()` call by tsc when compiling to
+ * CommonJS (our build target), which defeats the purpose -- we specifically need the real ESM
+ * loader so Node's native TypeScript stripping kicks in. Constructing the import from a string
+ * keeps tsc from touching it.
+ */
+const dynamicImport = new Function('specifier', 'return import(specifier)');
 /**
  * @see https://github.com/ionic-team/stencil/blob/HEAD/src/compiler/sys/node-require.ts
  */
-const requireTS = (ts, p) => {
-    const id = (0, path_1.resolve)(p);
+function loadWithClassicCompiler(ts, id) {
     delete require.cache[id];
     require.extensions['.ts'] = (module, fileName) => {
         var _a;
@@ -37,6 +54,49 @@ const requireTS = (ts, p) => {
     const m = require(id); // eslint-disable-line @typescript-eslint/no-var-requires
     delete require.extensions['.ts'];
     return m;
+}
+function loadWithCliBundledCompiler(id) {
+    const cliRoot = (0, path_1.resolve)(__dirname, '..', '..');
+    let cliTsPath;
+    try {
+        cliTsPath = require.resolve('typescript', { paths: [cliRoot] });
+    }
+    catch {
+        return null;
+    }
+    const cliTs = require(cliTsPath); // eslint-disable-line @typescript-eslint/no-var-requires
+    if (!hasClassicCompilerAPI(cliTs)) {
+        return null;
+    }
+    return loadWithClassicCompiler(cliTs, id);
+}
+const requireTS = async (ts, p) => {
+    const id = (0, path_1.resolve)(p);
+    if (!hasClassicCompilerAPI(ts)) {
+        // Node has its own built-in TypeScript syntax stripping (stable since Node 23.6, and
+        // available behind --experimental-strip-types since Node 22.6), so we can load the file
+        // directly via the native ESM loader instead of transpiling it ourselves.
+        try {
+            return await dynamicImport((0, url_1.pathToFileURL)(id).href);
+        }
+        catch (e) {
+            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.');
+            }
+            if ((e === null || e === void 0 ? void 0 : e.code) === 'ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX') {
+                const compiled = loadWithCliBundledCompiler(id);
+                if (compiled !== null) {
+                    return compiled;
+                }
+                throw new Error(`Your capacitor.config.ts uses TypeScript syntax that cannot be loaded with Node's native type stripping (${e.message}).\n` +
+                    'Use erasable TypeScript syntax in capacitor.config.ts, or install a TypeScript version that still exposes the compiler API.');
+            }
+            throw e;
+        }
+    }
+    return loadWithClassicCompiler(ts, id);
 };
 exports.requireTS = requireTS;
 function resolveNode(root, ...pathSegments) {

package/dist/util/spm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPackageTraitsRequirements = 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.addSceneManifestIfNeeded = exports.hasSceneManifest = 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");
@@ -11,6 +11,7 @@ const errors_1 = require("../errors");
 const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const fs_1 = require("../util/fs");
 const subprocess_1 = require("../util/subprocess");
 /**
  * @deprecated use config.ios.packageManager
@@ -84,11 +85,12 @@ async function removeCocoapodsFiles(config) {
 }
 exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajorMinoriOSVersion)(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';
+    const packageOptions = (_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.packageOptions) !== null && _h !== void 0 ? _h : {};
+    const swiftToolsVersion = (_m = (_l = (_k = (_j = config.app.extConfig.experimental) === null || _j === void 0 ? void 0 : _j.ios) === null || _k === void 0 ? void 0 : _k.spm) === null || _l === void 0 ? void 0 : _l.swiftToolsVersion) !== null && _m !== void 0 ? _m : '5.9';
     let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
 import PackageDescription
 
@@ -106,8 +108,8 @@ let package = Package(
     for (const plugin of plugins) {
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
             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);
+            if ((_o = platformTag.$) === null || _o === void 0 ? void 0 : _o.package) {
+                const relPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath));
                 packageSwiftText += `,\n        .package(name: "${plugin.id}", path: "${relPath}")`;
             }
             else {
@@ -120,7 +122,13 @@ let package = Package(
             }
         }
         else {
-            const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+            const options = packageOptions[plugin.id];
+            const symlink = options === null || options === void 0 ? void 0 : options.symlink;
+            const symlinkFolder = (0, path_1.join)('symlinks', plugin.name);
+            const relPath = (0, fs_1.convertToUnixPath)(symlink ? symlinkFolder : (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath));
+            if (symlink) {
+                await (0, fs_extra_1.ensureSymlink)(plugin.rootPath, (0, path_1.resolve)(config.ios.nativeProjectDirAbs, 'CapApp-SPM', symlinkFolder));
+            }
             const traits = packageTraits[plugin.id];
             const traitsSuffix = (traits === null || traits === void 0 ? void 0 : traits.length)
                 ? `, traits: [${traits
@@ -130,7 +138,7 @@ let package = Package(
                 })
                     .join(', ')}]`
                 : '';
-            packageSwiftText += `,\n        .package(name: "${(_k = plugin.ios) === null || _k === void 0 ? void 0 : _k.name}", path: "${relPath}"${traitsSuffix})`;
+            packageSwiftText += `,\n        .package(name: "${(_p = plugin.ios) === null || _p === void 0 ? void 0 : _p.name}", path: "${relPath}"${traitsSuffix})`;
         }
     }
     packageSwiftText += `
@@ -142,11 +150,19 @@ let package = Package(
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
                 .product(name: "Cordova", package: "capacitor-swift-pm")`;
     for (const plugin of plugins) {
-        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}")`;
+        const aliases = Object.entries((_r = (_q = packageOptions[plugin.id]) === null || _q === void 0 ? void 0 : _q.moduleAliases) !== null && _r !== void 0 ? _r : {});
+        const aliasText = (aliases === null || aliases === void 0 ? void 0 : aliases.length)
+            ? `, moduleAliases:  [${aliases
+                .map(([target, replacement]) => {
+                return `"${target}": "${replacement}"`;
+            })
+                .join(', ')}]`
+            : '';
+        let pluginText = `,\n                .product(name: "${(_s = plugin.ios) === null || _s === void 0 ? void 0 : _s.name}", package: "${(_t = plugin.ios) === null || _t === void 0 ? void 0 : _t.name}"${aliasText})`;
         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}")`;
+            if ((_u = platformTag.$) === null || _u === void 0 ? void 0 : _u.package) {
+                pluginText = `,\n                .product(name: "${plugin.id}", package: "${plugin.id}"${aliasText})`;
             }
             else {
                 const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'source-file');
@@ -206,6 +222,40 @@ async function addInfoPlistDebugIfNeeded(config) {
     }
 }
 exports.addInfoPlistDebugIfNeeded = addInfoPlistDebugIfNeeded;
+function hasSceneManifest(config) {
+    const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
+    if (!(0, fs_extra_1.existsSync)(infoPlist)) {
+        return false;
+    }
+    const entries = (0, plist_1.parse)((0, fs_extra_1.readFileSync)(infoPlist, 'utf-8'));
+    return entries['UIApplicationSceneManifest'] !== undefined;
+}
+exports.hasSceneManifest = hasSceneManifest;
+async function addSceneManifestIfNeeded(config) {
+    const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
+    if (!(0, fs_extra_1.existsSync)(infoPlist)) {
+        log_1.logger.warn(infoPlist + ' not found.');
+        return;
+    }
+    const entries = (0, plist_1.parse)((0, fs_extra_1.readFileSync)(infoPlist, 'utf-8'));
+    if (entries['UIApplicationSceneManifest'] !== undefined) {
+        log_1.logger.warn('Found UIApplicationSceneManifest in ' + infoPlist + ', skipping.');
+        return;
+    }
+    entries['UIApplicationSceneManifest'] = {
+        UIApplicationSupportsMultipleScenes: false,
+        UISceneConfigurations: {
+            UIWindowSceneSessionRoleApplication: [
+                {
+                    UISceneConfigurationName: 'Default Configuration',
+                    UISceneDelegateClassName: '$(PRODUCT_MODULE_NAME).SceneDelegate',
+                },
+            ],
+        },
+    };
+    (0, fs_extra_1.writeFileSync)(infoPlist, (0, plist_1.build)(entries));
+}
+exports.addSceneManifestIfNeeded = addSceneManifestIfNeeded;
 async function checkSwiftToolsVersion(config, version) {
     if (!version) {
         return null;

package/dist/util/xcode.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findGroupUuidByComment = exports.addSwiftFileToAppTarget = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const xcode_1 = require("xcode");
+/**
+ * Register a Swift source file with the first native target of an Xcode project.
+ *
+ * Writes entries in PBXFileReference, PBXBuildFile, the named PBXGroup's children,
+ * and the target's Sources build phase. Idempotent: a second call is a no-op.
+ *
+ * @param pbxprojPath   Absolute path to project.pbxproj
+ * @param groupName     Comment/name of the PBXGroup the file belongs under (e.g. 'App')
+ * @param fileRelPath   Path of the file relative to the group (e.g. 'SceneDelegate.swift')
+ */
+function addSwiftFileToAppTarget(pbxprojPath, groupName, fileRelPath) {
+    const project = (0, xcode_1.project)(pbxprojPath);
+    project.parseSync();
+    const targetUuid = project.getFirstTarget().uuid;
+    if (project.hasFile(fileRelPath) && isSwiftFileInTargetSources(project, fileRelPath, targetUuid)) {
+        return { added: false };
+    }
+    const groupUuid = findGroupUuidByComment(project, groupName);
+    if (!groupUuid) {
+        throw new Error(`Could not find PBXGroup with comment "${groupName}" in ${pbxprojPath}`);
+    }
+    if (project.hasFile(fileRelPath) && !isSwiftFileInTargetSources(project, fileRelPath, targetUuid)) {
+        const fileRefUuid = findFileRefUuid(project, fileRelPath);
+        if (!fileRefUuid) {
+            throw new Error(`Could not find PBXFileReference for ${fileRelPath} in ${pbxprojPath}`);
+        }
+        const group = project.getPBXGroupByKey(groupUuid);
+        if (group && !group.children.some((child) => child.comment === fileRelPath)) {
+            group.children.push({ value: fileRefUuid, comment: fileRelPath });
+        }
+        const file = {
+            fileRef: fileRefUuid,
+            path: fileRelPath,
+            basename: (0, path_1.basename)(fileRelPath),
+            group: 'Sources',
+            target: targetUuid,
+            uuid: project.generateUuid(),
+        };
+        project.addToPbxBuildFileSection(file);
+        project.addToPbxSourcesBuildPhase(file);
+        (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+        return { added: true };
+    }
+    const result = project.addSourceFile(fileRelPath, { target: targetUuid }, groupUuid);
+    if (!result) {
+        throw new Error(`Failed to register ${fileRelPath} in ${pbxprojPath}`);
+    }
+    (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+    return { added: true };
+}
+exports.addSwiftFileToAppTarget = addSwiftFileToAppTarget;
+function fileReferenceMatchesPath(ref, fileRelPath) {
+    const path = ref.path;
+    return path === fileRelPath || path === `"${fileRelPath}"`;
+}
+function findFileRefUuid(project, fileRelPath) {
+    var _a;
+    const objects = project.hash.project.objects;
+    const fileRefs = Object.entries(objects.PBXFileReference).filter(([k]) => !k.endsWith('_comment'));
+    const fileRefEntry = fileRefs.find(([, ref]) => typeof ref === 'object' && fileReferenceMatchesPath(ref, fileRelPath));
+    return (_a = fileRefEntry === null || fileRefEntry === void 0 ? void 0 : fileRefEntry[0]) !== null && _a !== void 0 ? _a : null;
+}
+function isSwiftFileInTargetSources(project, fileRelPath, targetUuid) {
+    const fileRefUuid = findFileRefUuid(project, fileRelPath);
+    if (!fileRefUuid) {
+        return false;
+    }
+    const objects = project.hash.project.objects;
+    const sourcesPhase = project.pbxSourcesBuildPhaseObj(targetUuid);
+    if (!(sourcesPhase === null || sourcesPhase === void 0 ? void 0 : sourcesPhase.files)) {
+        return false;
+    }
+    return sourcesPhase.files.some((file) => {
+        var _a;
+        const buildFile = objects.PBXBuildFile[(_a = file.value) !== null && _a !== void 0 ? _a : ''];
+        return typeof buildFile === 'object' && (buildFile === null || buildFile === void 0 ? void 0 : buildFile.fileRef) === fileRefUuid;
+    });
+}
+// Exported for tests.
+function findGroupUuidByComment(project, comment) {
+    const groups = project.hash.project.objects.PBXGroup;
+    const COMMENT_SUFFIX = '_comment';
+    for (const key of Object.keys(groups)) {
+        if (!key.endsWith(COMMENT_SUFFIX))
+            continue;
+        if (groups[key] === comment) {
+            return key.substring(0, key.length - COMMENT_SUFFIX.length);
+        }
+    }
+    return null;
+}
+exports.findGroupUuidByComment = findGroupUuidByComment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.3.12",
+  "version": "8.5.1",
   "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)",
@@ -60,6 +60,8 @@
     "semver": "^7.6.3",
     "tar": "^7.5.3",
     "tslib": "^2.8.1",
+    "typescript": "~5.0.2",
+    "xcode": "^3.0.1",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
@@ -70,6 +72,7 @@
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
     "@types/tmp": "^0.2.6",
+    "@types/xcode": "^3.0.0",
     "@types/xml2js": "0.4.5",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",