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

package/dist/util/spm.js

@@ -1,17 +1,18 @@
 "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.setSwiftUISceneManifest = exports.hasSwiftUISceneManifest = 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");
 const plist_1 = require("plist");
 const tar_1 = require("tar");
-const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
-const common_2 = require("../ios/common");
+const common_1 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const capacitor_package_1 = require("../util/capacitor-package");
+const fs_1 = require("../util/fs");
 const subprocess_1 = require("../util/subprocess");
 /**
  * @deprecated use config.ios.packageManager
@@ -86,12 +87,13 @@ 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, _p, _q, _r, _s, _t, _u;
-    const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
-    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
+    const iosVersion = (0, common_1.getMajoriOSVersion)(config);
     const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
-    const enableCordova = cordovaPlugins.length > 0;
+    const enableCordova = cordovaPlugins.length > 0 || config.app.forceCordova;
     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 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 capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config);
+    const spmDirectory = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'CapApp-SPM');
     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,12 +108,12 @@ let package = Package(
             targets: ["CapApp-SPM"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "${iosPlatformVersion}")`;
+        ${(0, capacitor_package_1.renderCapacitorPackage)(capacitorPackage, spmDirectory)}`;
     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 ((_o = platformTag.$) === null || _o === void 0 ? void 0 : _o.package) {
-                const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+                const relPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath));
                 packageSwiftText += `,\n        .package(name: "${plugin.id}", path: "${relPath}")`;
             }
             else {
@@ -127,7 +129,9 @@ let package = Package(
             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 = symlink ? symlinkFolder : (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+            const relPath = symlink
+                ? symlinkFolder
+                : (0, fs_1.convertToUnixPath)((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));
             }
@@ -149,9 +153,9 @@ let package = Package(
         .target(
             name: "CapApp-SPM",
             dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm")`;
+                .product(name: "Capacitor", package: "${capacitorPackage.identity}")`;
     if (enableCordova) {
-        packageSwiftText += `,\n                .product(name: "Cordova", package: "capacitor-swift-pm")`;
+        packageSwiftText += `,\n                .product(name: "${capacitorPackage.cordovaProduct}", package: "${capacitorPackage.identity}")`;
     }
     for (const plugin of plugins) {
         const aliases = Object.entries((_r = (_q = packageOptions[plugin.id]) === null || _q === void 0 ? void 0 : _q.moduleAliases) !== null && _r !== void 0 ? _r : {});
@@ -226,6 +230,73 @@ 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;
+function hasSwiftUISceneManifest(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'));
+    const manifest = entries['UIApplicationSceneManifest'];
+    return manifest !== undefined && manifest['UISceneConfigurations'] === undefined;
+}
+exports.hasSwiftUISceneManifest = hasSwiftUISceneManifest;
+/**
+ * Point Info.plist at the SwiftUI App-struct scene setup: a scene manifest with no
+ * UISceneConfigurations (SwiftUI declares the scene itself) and no main storyboard.
+ *
+ * Preserves UIApplicationSupportsMultipleScenes when the project already set it, and
+ * refuses to touch a manifest that names a scene delegate class other than the stock
+ * SceneDelegate.
+ */
+async function setSwiftUISceneManifest(config) {
+    var _a;
+    const infoPlist = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
+    if (!(0, fs_extra_1.existsSync)(infoPlist)) {
+        return { status: 'skipped', reason: `${infoPlist} not found.` };
+    }
+    const entries = (0, plist_1.parse)((0, fs_extra_1.readFileSync)(infoPlist, 'utf-8'));
+    const manifest = entries['UIApplicationSceneManifest'];
+    const customDelegates = customSceneDelegateClassNames(manifest);
+    if (customDelegates.length > 0) {
+        return {
+            status: 'skipped',
+            reason: `UIApplicationSceneManifest names custom scene delegate(s): ${customDelegates.join(', ')}. ` +
+                'Remove UISceneConfigurations by hand once the delegate is ported to the SwiftUI scene body.',
+        };
+    }
+    if (manifest !== undefined &&
+        manifest['UISceneConfigurations'] === undefined &&
+        !('UIMainStoryboardFile' in entries)) {
+        return { status: 'unchanged' };
+    }
+    entries['UIApplicationSceneManifest'] = {
+        UIApplicationSupportsMultipleScenes: (_a = manifest === null || manifest === void 0 ? void 0 : manifest['UIApplicationSupportsMultipleScenes']) !== null && _a !== void 0 ? _a : false,
+    };
+    delete entries['UIMainStoryboardFile'];
+    (0, fs_extra_1.writeFileSync)(infoPlist, (0, plist_1.build)(entries));
+    return { status: 'written' };
+}
+exports.setSwiftUISceneManifest = setSwiftUISceneManifest;
+function customSceneDelegateClassNames(manifest) {
+    const configurations = manifest === null || manifest === void 0 ? void 0 : manifest['UISceneConfigurations'];
+    if (!configurations) {
+        return [];
+    }
+    return Object.values(configurations)
+        .flatMap((roleConfigs) => (Array.isArray(roleConfigs) ? roleConfigs : []))
+        .map((roleConfig) => roleConfig['UISceneDelegateClassName'])
+        .filter((className) => typeof className === 'string')
+        .filter((className) => className.split('.').pop() !== 'SceneDelegate');
+}
 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": "9.0.0-alpha.5",
+  "version": "9.0.0-alpha.7",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -27,7 +27,7 @@
     "cross platform"
   ],
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=24.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/declarations.d.ts",
@@ -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",