@capacitor/cli 8.4.3-nightly-20260730T154011.0 → 8.5.0

package/dist/tasks/migrate-uiscene.js

@@ -0,0 +1,273 @@
+"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 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;
+    let depth = 1;
+    let i = openIdx + 1;
+    while (i < source.length && depth > 0) {
+        const ch = source[i];
+        if (ch === '{')
+            depth++;
+        else if (ch === '}')
+            depth--;
+        i++;
+    }
+    if (depth !== 0)
+        return false;
+    const body = source.slice(openIdx + 1, i - 1);
+    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;
+    }
+    let depth = 1;
+    let i = openIdx + 1;
+    while (i < appDelegateSource.length && depth > 0) {
+        const ch = appDelegateSource[i];
+        if (ch === '{')
+            depth++;
+        else if (ch === '}')
+            depth--;
+        i++;
+    }
+    if (depth !== 0) {
+        return null;
+    }
+    return '\n' + appDelegateSource.slice(sigMatch.index, i) + '\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);
+    let depth = 1;
+    let i = openIdx + 1;
+    while (i < source.length && depth > 0) {
+        const ch = source[i];
+        if (ch === '{')
+            depth++;
+        else if (ch === '}')
+            depth--;
+        i++;
+    }
+    if (depth !== 0) {
+        return null;
+    }
+    const closeIdx = i - 1;
+    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,
+    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 = ['@capacitor/core', '@capacitor/cli', '@capacitor/ios', '@capacitor/android'];
@@ -136,6 +137,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.`, () => {
@@ -324,6 +326,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']) {
+        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/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");
@@ -221,6 +221,41 @@ 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',
+                    UISceneStoryboardFile: 'Main',
+                },
+            ],
+        },
+    };
+    (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,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findGroupUuidByComment = exports.addSwiftFileToAppTarget = void 0;
+const fs_extra_1 = require("fs-extra");
+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();
+    if (project.hasFile(fileRelPath)) {
+        return { added: false };
+    }
+    const groupUuid = findGroupUuidByComment(project, groupName);
+    if (!groupUuid) {
+        throw new Error(`Could not find PBXGroup with comment "${groupName}" in ${pbxprojPath}`);
+    }
+    const targetUuid = project.getFirstTarget().uuid;
+    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;
+// 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/cli",
-  "version": "8.4.3-nightly-20260730T154011.0",
+  "version": "8.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)",
@@ -60,6 +60,7 @@
     "semver": "^7.6.3",
     "tar": "^7.5.3",
     "tslib": "^2.8.1",
+    "xcode": "^3.0.1",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
@@ -70,6 +71,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",