@capacitor/cli 9.0.0-alpha.7 → 9.0.0-beta.0

package/dist/util/xcode.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findGroupUuidByComment = exports.addSwiftFileToAppTarget = void 0;
+exports.removeBaseConfigurationFile = exports.findGroupUuidByComment = exports.addMultipleBuildSettings = exports.removeStoryboardFromAppTarget = exports.removeSwiftFileFromAppTarget = exports.addSwiftFileToAppTarget = void 0;
 const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 const xcode_1 = require("xcode");
+const COMMENT_SUFFIX = '_comment';
 /**
  * Register a Swift source file with the first native target of an Xcode project.
  *
@@ -32,10 +34,140 @@ function addSwiftFileToAppTarget(pbxprojPath, groupName, fileRelPath) {
     return { added: true };
 }
 exports.addSwiftFileToAppTarget = addSwiftFileToAppTarget;
+/**
+ * Unregister a Swift source file from an Xcode project.
+ *
+ * Clears the file's PBXBuildFile, its entry in every Sources build phase, its listing in
+ * any PBXGroup, and its PBXFileReference. Matching is by resolved file reference UUID, so
+ * nothing else that happens to share the name is touched. Idempotent: a second call is a
+ * no-op and leaves the file untouched.
+ *
+ * @param pbxprojPath   Absolute path to project.pbxproj
+ * @param fileName      Basename of the Swift file to unregister (e.g. 'SceneDelegate.swift')
+ */
+function removeSwiftFileFromAppTarget(pbxprojPath, fileName) {
+    const project = (0, xcode_1.project)(pbxprojPath);
+    project.parseSync();
+    const objects = project.hash.project.objects;
+    const fileRefUuids = findSwiftFileUuidsByFileName(objects.PBXFileReference, fileName);
+    if (fileRefUuids.length === 0) {
+        return { removed: false };
+    }
+    const buildFileUuids = removeFromBuildFileSection(objects.PBXBuildFile, fileRefUuids);
+    removeFromBuildPhaseFiles(objects.PBXSourcesBuildPhase, buildFileUuids);
+    removeFromGroupChildren(objects.PBXGroup, fileRefUuids);
+    for (const uuid of fileRefUuids) {
+        deleteWithComment(objects.PBXFileReference, uuid);
+    }
+    (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+    return { removed: true };
+}
+exports.removeSwiftFileFromAppTarget = removeSwiftFileFromAppTarget;
+/**
+ * Unregister a storyboard from an Xcode project.
+ *
+ * A localized storyboard is a PBXVariantGroup whose children are the per-language
+ * PBXFileReferences, and it is the variant group — not the file reference — that the
+ * PBXBuildFile and the owning PBXGroup point at. Both levels are removed here, along with
+ * the Resources build phase entry. Falls back to a bare PBXFileReference for a project
+ * whose storyboard was moved out of Base.lproj. Idempotent: a second call is a no-op.
+ *
+ * @param pbxprojPath     Absolute path to project.pbxproj
+ * @param storyboardName  Basename of the storyboard to unregister (e.g. 'Main.storyboard')
+ */
+function removeStoryboardFromAppTarget(pbxprojPath, storyboardName) {
+    const project = (0, xcode_1.project)(pbxprojPath);
+    project.parseSync();
+    const objects = project.hash.project.objects;
+    const variantGroupUuids = findVariantGroupUuidsByName(objects.PBXVariantGroup, storyboardName);
+    const fileRefUuids = findStoryboardFileRefUuids(objects.PBXFileReference, storyboardName);
+    const uuids = [...variantGroupUuids, ...fileRefUuids];
+    if (uuids.length === 0) {
+        return { removed: false };
+    }
+    const buildFileUuids = removeFromBuildFileSection(objects.PBXBuildFile, uuids);
+    removeFromBuildPhaseFiles(objects.PBXResourcesBuildPhase, buildFileUuids);
+    removeFromGroupChildren(objects.PBXGroup, uuids);
+    for (const uuid of variantGroupUuids) {
+        deleteWithComment(objects.PBXVariantGroup, uuid);
+    }
+    for (const uuid of fileRefUuids) {
+        deleteWithComment(objects.PBXFileReference, uuid);
+    }
+    (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+    return { removed: true };
+}
+exports.removeStoryboardFromAppTarget = removeStoryboardFromAppTarget;
+function addMultipleBuildSettings(pbxprojPath, settings) {
+    const project = (0, xcode_1.project)(pbxprojPath);
+    project.parseSync();
+    for (const key in settings) {
+        const value = settings[key];
+        project.addToBuildSettings(key, value);
+    }
+    (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+}
+exports.addMultipleBuildSettings = addMultipleBuildSettings;
+function findSwiftFileUuidsByFileName(section, fileName) {
+    return sectionEntries(section)
+        .filter(([, fileReference]) => unquote(fileReference['lastKnownFileType']) === 'sourcecode.swift' &&
+        (0, path_1.basename)(unquote(fileReference['path'])) === fileName)
+        .map(([uuid]) => uuid);
+}
+function findVariantGroupUuidsByName(section, storyboardName) {
+    if (!section)
+        return [];
+    return sectionEntries(section)
+        .filter(([, group]) => unquote(group['name']) === storyboardName)
+        .map(([uuid]) => uuid);
+}
+function findStoryboardFileRefUuids(section, storyboardName) {
+    return sectionEntries(section)
+        .filter(([, fileReference]) => (0, path_1.basename)(unquote(fileReference['path'])) === storyboardName)
+        .map(([uuid]) => uuid);
+}
+/** Deletes every PBXBuildFile pointing at one of `fileRefUuids` and returns their UUIDs. */
+function removeFromBuildFileSection(section, fileRefUuids) {
+    const removed = [];
+    for (const [uuid, buildFile] of sectionEntries(section)) {
+        if (!fileRefUuids.includes(buildFile['fileRef']))
+            continue;
+        removed.push(uuid);
+        deleteWithComment(section, uuid);
+    }
+    return removed;
+}
+function removeFromBuildPhaseFiles(section, buildFileUuids) {
+    if (!section)
+        return;
+    for (const [, buildPhase] of sectionEntries(section)) {
+        const files = buildPhase['files'];
+        if (!Array.isArray(files))
+            continue;
+        buildPhase['files'] = files.filter((file) => !buildFileUuids.includes(file.value));
+    }
+}
+function removeFromGroupChildren(section, uuids) {
+    for (const [, group] of sectionEntries(section)) {
+        const children = group['children'];
+        if (!Array.isArray(children))
+            continue;
+        group['children'] = children.filter((child) => !uuids.includes(child.value));
+    }
+}
+function sectionEntries(section) {
+    return Object.entries(section).filter((entry) => !entry[0].endsWith(COMMENT_SUFFIX) && typeof entry[1] !== 'string');
+}
+function deleteWithComment(section, uuid) {
+    delete section[uuid];
+    delete section[`${uuid}${COMMENT_SUFFIX}`];
+}
+function unquote(value) {
+    return typeof value === 'string' ? value.replace(/^"(.*)"$/, '$1') : '';
+}
 // 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;
@@ -46,3 +178,62 @@ function findGroupUuidByComment(project, comment) {
     return null;
 }
 exports.findGroupUuidByComment = findGroupUuidByComment;
+/**
+ * Unregister an .xcconfig file from an Xcode project.
+ *
+ * Clears the baseConfigurationReference of every build configuration using it, drops it
+ * from any group it is listed under, and deletes its PBXFileReference. Matches on the
+ * resolved file reference rather than on text, so a CocoaPods project's
+ * Pods-App.debug.xcconfig is left alone. Idempotent: a second call is a no-op.
+ *
+ * @param pbxprojPath   Absolute path to project.pbxproj
+ * @param fileName      Basename of the .xcconfig to unregister (e.g. 'debug.xcconfig')
+ */
+function removeBaseConfigurationFile(pbxprojPath, fileName) {
+    const project = (0, xcode_1.project)(pbxprojPath);
+    project.parseSync();
+    const objects = project.hash.project.objects;
+    const uuids = findXCConfigUuidsByFileName(objects.PBXFileReference, fileName);
+    if (uuids.length === 0) {
+        return { removed: false };
+    }
+    clearBaseConfigurationReferences(objects.XCBuildConfiguration, uuids);
+    removeFromGroupChildren(objects.PBXGroup, uuids);
+    for (const uuid of uuids) {
+        delete objects.PBXFileReference[uuid];
+        delete objects.PBXFileReference[`${uuid}${COMMENT_SUFFIX}`];
+    }
+    (0, fs_extra_1.writeFileSync)(pbxprojPath, project.writeSync(), 'utf-8');
+    return { removed: true };
+}
+exports.removeBaseConfigurationFile = removeBaseConfigurationFile;
+function findXCConfigUuidsByFileName(section, fileName) {
+    const uuids = [];
+    for (const key of Object.keys(section)) {
+        if (key.endsWith(COMMENT_SUFFIX))
+            continue;
+        const fileReference = section[key];
+        if (typeof fileReference === 'string')
+            continue;
+        if (unquote(fileReference['lastKnownFileType']) !== 'text.xcconfig')
+            continue;
+        if ((0, path_1.basename)(unquote(fileReference['path'])) !== fileName)
+            continue;
+        uuids.push(key);
+    }
+    return uuids;
+}
+function clearBaseConfigurationReferences(section, uuids) {
+    for (const key of Object.keys(section)) {
+        if (key.endsWith(COMMENT_SUFFIX))
+            continue;
+        const buildConfiguration = section[key];
+        if (typeof buildConfiguration === 'string')
+            continue;
+        const reference = buildConfiguration['baseConfigurationReference'];
+        if (typeof reference !== 'string' || !uuids.includes(reference))
+            continue;
+        delete buildConfiguration['baseConfigurationReference'];
+        delete buildConfiguration[`baseConfigurationReference${COMMENT_SUFFIX}`];
+    }
+}

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-beta.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -47,6 +47,7 @@
     "@ionic/cli-framework-output": "^2.2.8",
     "@ionic/utils-subprocess": "^3.0.1",
     "@ionic/utils-terminal": "^2.3.5",
+    "agent-cli-detector": "^0.1.7",
     "commander": "^12.1.0",
     "debug": "^4.4.0",
     "env-paths": "^2.2.0",
@@ -60,7 +61,7 @@
     "semver": "^7.6.3",
     "tar": "^7.5.3",
     "tslib": "^2.8.1",
-    "xcode": "^3.0.1",
+    "xcode": "^4.0.0",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {