@use-voltra/ios-client 2.1.1 → 2.3.0

package/expo-plugin/build/cjs/ios-widget/xcode/fileReferences.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePath = normalizePath;
+exports.normalizeRef = normalizeRef;
+exports.ensureWidgetFileReference = ensureWidgetFileReference;
+const pbxFile = require('xcode/lib/pbxFile');
+/** Strips surrounding quotes from a pbx path/name value. */
+function normalizePath(value) {
+    if (!value) {
+        return '';
+    }
+    return value.replace(/^"|"$/g, '');
+}
+/** Strips a trailing `/* comment *\/` and whitespace, yielding the bare UUID of a pbx reference. */
+function normalizeRef(value) {
+    return String(value)
+        .replace(/\/\*.*?\*\//g, '')
+        .trim();
+}
+/**
+ * Resolves the PBXFileReference UUID for a widget file, scoped to the widget's own PBXGroup.
+ *
+ * pbxproj paths are group-relative, so a bare path like `Assets.xcassets` collides with any other
+ * extension's identically named file. Scoping the lookup to the children of the widget group
+ * (identified by `targetName`) keeps the widget's references distinct from those, which is what
+ * prevents the shared-fileRef corruption behind issues #87/#32. When the widget group does not
+ * exist yet, a fresh reference is created.
+ */
+function ensureWidgetFileReference(xcodeProject, filePath, targetName) {
+    const file = new pbxFile(filePath);
+    const fileReferenceSection = xcodeProject.pbxFileReferenceSection();
+    const group = xcodeProject.pbxGroupByName(targetName);
+    if (group?.children) {
+        for (const child of group.children) {
+            const refKey = normalizeRef(child.value);
+            const entry = fileReferenceSection[refKey];
+            if (!entry) {
+                continue;
+            }
+            const entryPath = normalizePath(entry.path);
+            if (entryPath === file.path || entryPath === normalizePath(filePath)) {
+                return refKey;
+            }
+        }
+    }
+    file.fileRef = xcodeProject.generateUuid();
+    xcodeProject.addToPbxFileReferenceSection(file);
+    return file.fileRef;
+}
+//# sourceMappingURL=fileReferences.js.map

package/expo-plugin/build/cjs/ios-widget/xcode/fileReferences.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileReferences.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/fileReferences.ts"],"names":[],"mappings":";;AAKA,sCAKC;AAGD,oCAIC;AAWD,8DAsBC;AAhDD,MAAM,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAE5C,4DAA4D;AAC5D,SAAgB,aAAa,CAAC,KAAyB;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAA;IACX,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AACpC,CAAC;AAED,oGAAoG;AACpG,SAAgB,YAAY,CAAC,KAAc;IACzC,OAAO,MAAM,CAAC,KAAK,CAAC;SACjB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,IAAI,EAAE,CAAA;AACX,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,yBAAyB,CAAC,YAA0B,EAAE,QAAgB,EAAE,UAAkB;IACxG,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClC,MAAM,oBAAoB,GAAG,YAAY,CAAC,uBAAuB,EAAE,CAAA;IACnE,MAAM,KAAK,GAAG,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;IAErD,IAAI,KAAK,EAAE,QAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACxC,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAA;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,SAAQ;YACV,CAAC;YACD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC3C,IAAI,SAAS,KAAK,IAAI,CAAC,IAAI,IAAI,SAAS,KAAK,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,MAAM,CAAA;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,CAAA;IAC1C,YAAY,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAA;IAC/C,OAAO,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC"}

package/expo-plugin/build/cjs/ios-widget/xcode/groups.js

@@ -1,47 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addPbxGroup = addPbxGroup;
 exports.ensurePbxGroup = ensurePbxGroup;
+const fileReferences_1 = require("./fileReferences");
 const pbxFile = require('xcode/lib/pbxFile');
-/**
- * Adds a PBXGroup for the widget extension files.
- */
-function addPbxGroup(xcodeProject, options) {
-    const { targetName, widgetFiles } = options;
+function collectGroupFiles(widgetFiles) {
     const { swiftFiles, intentFiles, assetDirectories, entitlementFiles, plistFiles, localizedStringResources } = widgetFiles;
-    // Add PBX group with all widget files
-    const { uuid: pbxGroupUuid } = xcodeProject.addPbxGroup([
+    return [
         ...swiftFiles,
         ...intentFiles,
         ...entitlementFiles,
         ...plistFiles,
         ...assetDirectories,
         ...localizedStringResources,
-    ], targetName, targetName);
-    // Add PBXGroup to top level group
+    ];
+}
+/**
+ * Adds a PBXGroup for the widget extension files.
+ *
+ * Constructs the PBXGroup and its PBXFileReference children by hand rather than delegating to
+ * `xcodeProject.addPbxGroup`, because that helper also creates a PBXBuildFile per file as a side
+ * effect. Those extra build files collide with the ones managed by the build-phase functions and
+ * produce the "no parent for object" consistency errors from issues #87/#32. File references are
+ * resolved through the widget-scoped {@link ensureWidgetFileReference} so they are shared with the
+ * build phases instead of duplicated.
+ *
+ * Internal create-only fallback for {@link ensurePbxGroup}; not part of the public pipeline.
+ */
+function addPbxGroup(xcodeProject, options) {
+    const { targetName, widgetFiles } = options;
+    const allFiles = collectGroupFiles(widgetFiles);
+    const pbxGroupUuid = xcodeProject.generateUuid();
+    const pbxGroup = {
+        isa: 'PBXGroup',
+        children: [],
+        name: targetName,
+        path: targetName,
+        sourceTree: '"<group>"',
+    };
     const groups = xcodeProject.hash.project.objects['PBXGroup'];
-    if (pbxGroupUuid) {
-        Object.keys(groups).forEach(function (key) {
-            if (groups[key].name === undefined && groups[key].path === undefined) {
-                xcodeProject.addToPbxGroup(pbxGroupUuid, key);
-            }
-        });
+    groups[pbxGroupUuid] = pbxGroup;
+    groups[`${pbxGroupUuid}_comment`] = targetName;
+    for (const filePath of allFiles) {
+        const file = new pbxFile(filePath);
+        const fileRef = (0, fileReferences_1.ensureWidgetFileReference)(xcodeProject, filePath, targetName);
+        pbxGroup.children.push({ value: fileRef, comment: file.basename });
     }
+    // Attach the new group to the top-level (unnamed, path-less) group.
+    Object.keys(groups).forEach(function (key) {
+        if (/_comment$/.test(key)) {
+            return;
+        }
+        if (groups[key].name === undefined && groups[key].path === undefined) {
+            xcodeProject.addToPbxGroup(pbxGroupUuid, key);
+        }
+    });
 }
 /**
  * Ensures a PBXGroup exists for the widget extension files.
  */
 function ensurePbxGroup(xcodeProject, options) {
     const { targetName, widgetFiles } = options;
-    const { swiftFiles, intentFiles, assetDirectories, entitlementFiles, plistFiles, localizedStringResources } = widgetFiles;
-    const allFiles = [
-        ...swiftFiles,
-        ...intentFiles,
-        ...entitlementFiles,
-        ...plistFiles,
-        ...assetDirectories,
-        ...localizedStringResources,
-    ];
+    const allFiles = collectGroupFiles(widgetFiles);
     const existingGroup = xcodeProject.pbxGroupByName(targetName);
     if (!existingGroup) {
         addPbxGroup(xcodeProject, options);
@@ -52,28 +71,11 @@ function ensurePbxGroup(xcodeProject, options) {
     }
     for (const filePath of allFiles) {
         const file = new pbxFile(filePath);
-        const fileRef = ensureFileReference(xcodeProject, filePath);
+        const fileRef = (0, fileReferences_1.ensureWidgetFileReference)(xcodeProject, filePath, targetName);
         const alreadyInGroup = existingGroup.children.some((child) => child.value === fileRef || child.comment === file.basename);
         if (!alreadyInGroup) {
             existingGroup.children.push({ value: fileRef, comment: file.basename });
         }
     }
 }
-function ensureFileReference(xcodeProject, filePath) {
-    const fileReferenceSection = xcodeProject.pbxFileReferenceSection();
-    const file = new pbxFile(filePath);
-    for (const key of Object.keys(fileReferenceSection)) {
-        if (/_comment$/.test(key)) {
-            continue;
-        }
-        const entry = fileReferenceSection[key];
-        const entryPath = typeof entry?.path === 'string' ? entry.path.replace(/^"|"$/g, '') : '';
-        if (entryPath === file.path || entryPath === filePath) {
-            return key;
-        }
-    }
-    file.fileRef = xcodeProject.generateUuid();
-    xcodeProject.addToPbxFileReferenceSection(file);
-    return file.fileRef;
-}
 //# sourceMappingURL=groups.js.map

package/expo-plugin/build/cjs/ios-widget/xcode/groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/groups.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/groups.ts"],"names":[],"mappings":"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"}

package/expo-plugin/build/cjs/ios-widget/xcode/index.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureXcodeProject = void 0;
+exports.applyXcodeChanges = applyXcodeChanges;
 const config_plugins_1 = require("@expo/config-plugins");
 const path = __importStar(require("path"));
 const fileDiscovery_1 = require("../../utils/fileDiscovery");
@@ -44,6 +45,93 @@ const groups_1 = require("./groups");
 const mainAppSettings_1 = require("./mainAppSettings");
 const productFile_1 = require("./productFile");
 const target_1 = require("./target");
+/**
+ * Applies all widget-extension changes to an already-parsed Xcode project.
+ *
+ * This is the pure core of {@link configureXcodeProject}: it takes the parsed project, the plugin
+ * props, the discovered widget files, and whether any widget is client-rendered, then mutates the
+ * project in place. It performs no filesystem or `modRequest` access, which makes it directly
+ * testable against pbxproj fixtures.
+ *
+ * When the widget target does not exist yet, the minimal native-target skeleton is created first
+ * (targets cannot be "ensured" into existence); every other object is then reconciled by the same
+ * idempotent ensure pipeline that runs for an already-existing target.
+ */
+function applyXcodeChanges(xcodeProject, props, widgetFiles, hasClientRenderedWidgets = false) {
+    const { targetName, bundleIdentifier, deploymentTarget, version, buildNumber } = props;
+    const groupName = 'Embed Foundation Extensions';
+    const mainTargetUuid = xcodeProject.getFirstTarget().uuid;
+    // The catalog is compiled into the app even for a legacy-only configuration.
+    // Keep it in the extension group too so both targets share one PBX file reference.
+    const effectiveWidgetFiles = {
+        ...widgetFiles,
+        swiftFiles: Array.from(new Set([...widgetFiles.swiftFiles, 'VoltraDynamicLiveActivityTypes.swift'])),
+    };
+    // Read main app target settings to synchronize code signing (per configuration).
+    const mainAppSettings = (0, mainAppSettings_1.getMainAppTargetSettings)(xcodeProject);
+    // Use the deploymentTarget from plugin config (or default), ignore main app's deployment target.
+    // This allows the widget extension to have its own deployment target independent of the main app.
+    // Resolve (or create) the widget target. A target cannot be reconciled into existence, so the
+    // absent case creates the minimal skeleton; from here on both paths share one pipeline.
+    let targetUuid = xcodeProject.findTargetKey(targetName);
+    if (!targetUuid) {
+        targetUuid = xcodeProject.generateUuid();
+        (0, target_1.createTargetSkeleton)(xcodeProject, { targetName, targetUuid });
+    }
+    const target = xcodeProject.pbxNativeTargetSection()[targetUuid];
+    // Ensure the configuration list is present and its settings are in sync.
+    const xCConfigurationList = (0, configurationList_1.ensureXCConfigurationList)(xcodeProject, {
+        targetName,
+        bundleIdentifier,
+        deploymentTarget,
+        version,
+        buildNumber,
+        mainAppSettings,
+    }, target.buildConfigurationList);
+    // Ensure the product file (.appex) exists.
+    const productFile = (0, productFile_1.ensureProductFile)(xcodeProject, {
+        targetName,
+        groupName,
+    });
+    // Point the target at the reconciled configuration list and product file.
+    target.productReference = productFile.fileRef;
+    target.buildConfigurationList = xCConfigurationList.uuid;
+    target.productType = `"com.apple.product-type.app-extension"`;
+    target.name = targetName;
+    target.productName = targetName;
+    if (!target.buildPhases) {
+        target.buildPhases = [];
+    }
+    // Ensure the group first so the widget's file references exist before the build phases
+    // reference them (the phases resolve files through the widget-scoped group).
+    (0, groups_1.ensurePbxGroup)(xcodeProject, {
+        targetName,
+        widgetFiles: effectiveWidgetFiles,
+    });
+    // Ensure build phases and their files.
+    (0, buildPhases_1.ensureBuildPhases)(xcodeProject, {
+        targetUuid,
+        targetName,
+        groupName,
+        productFile,
+        widgetFiles: effectiveWidgetFiles,
+        mainTargetUuid: xcodeProject.getFirstTarget().uuid,
+        // The app-side lifecycle service always compiles against the generated catalog.
+        // An empty catalog keeps legacy-only apps source-compatible.
+        mainSwiftFiles: ['VoltraDynamicLiveActivityTypes.swift'],
+    });
+    if (hasClientRenderedWidgets || (props.liveActivities?.length ?? 0) > 0) {
+        (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, targetUuid);
+    }
+    if ((props.liveActivities?.length ?? 0) > 0) {
+        // Local Dynamic Live Activity starts preflight the baked definition from
+        // the app process, while WidgetKit renders from the extension process.
+        // Bake the same manifest into both products.
+        (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, mainTargetUuid, 'live-activities');
+    }
+    (0, target_1.ensureTargetAttributes)(xcodeProject, targetUuid);
+    (0, target_1.ensureTargetDependency)(xcodeProject, targetUuid);
+}
 /**
  * Plugin step that configures the Xcode project for the widget extension.
  *
@@ -54,111 +142,25 @@ const target_1 = require("./target");
  * - Adds build phases (Sources, CopyFiles, Frameworks, Resources)
  * - Adds PBXGroup for widget files
  *
- * This should run after generateWidgetExtensionFiles so the files exist.
+ * This should run after generateWidgetExtensionFiles so the files exist. The wrapper is kept thin:
+ * it discovers widget files and detects client-rendered widgets, then delegates the actual pbxproj
+ * mutation to {@link applyXcodeChanges}.
  */
 const configureXcodeProject = (config, props) => {
-    const { targetName, bundleIdentifier, deploymentTarget, widgets } = props;
+    const { targetName, widgets, liveActivities } = props;
     return (0, config_plugins_1.withXcodeProject)(config, (config) => {
         if (config.modRequest.introspect) {
             return config;
         }
         const xcodeProject = config.modResults;
-        const groupName = 'Embed Foundation Extensions';
         // The release widget-bundling phase is only needed when a widget is a Dynamic Widget (server
         // widgets carry no JS bundle). Detect once so both the create and update paths agree.
         const hasClientRenderedWidgets = !!widgets &&
             (0, clientRendered_1.detectClientRenderedWidgets)(widgets, config.modRequest.projectRoot).some((widget) => widget.clientRendered);
-        // Check if target already exists
-        const nativeTargets = xcodeProject.pbxNativeTargetSection();
-        const existingTargetKey = xcodeProject.findTargetKey(targetName);
-        const existingTarget = existingTargetKey ? nativeTargets[existingTargetKey] : null;
         const { platformProjectRoot } = config.modRequest;
         const targetPath = path.join(platformProjectRoot, targetName);
         const widgetFiles = (0, fileDiscovery_1.getIOSWidgetExtensionFiles)(targetPath, targetName);
-        // Read main app target settings to synchronize code signing
-        const mainAppSettings = (0, mainAppSettings_1.getMainAppTargetSettings)(xcodeProject);
-        // Use the deploymentTarget from plugin config (or default), ignore main app's deployment target
-        // This allows the widget extension to have its own deployment target independent of the main app
-        if (existingTarget && existingTargetKey) {
-            // Ensure configuration list is up to date
-            const xCConfigurationList = (0, configurationList_1.ensureXCConfigurationList)(xcodeProject, {
-                targetName,
-                bundleIdentifier,
-                deploymentTarget,
-                codeSignStyle: mainAppSettings?.codeSignStyle,
-                developmentTeam: mainAppSettings?.developmentTeam,
-                provisioningProfileSpecifier: mainAppSettings?.provisioningProfileSpecifier,
-            }, existingTarget.buildConfigurationList);
-            // Ensure product file exists
-            const productFile = (0, productFile_1.ensureProductFile)(xcodeProject, {
-                targetName,
-                groupName,
-            });
-            // Update target references
-            existingTarget.productReference = productFile.fileRef;
-            existingTarget.buildConfigurationList = xCConfigurationList.uuid;
-            existingTarget.productType = `"com.apple.product-type.app-extension"`;
-            existingTarget.name = targetName;
-            existingTarget.productName = targetName;
-            if (!existingTarget.buildPhases) {
-                existingTarget.buildPhases = [];
-            }
-            // Ensure build phases and groups
-            (0, buildPhases_1.ensureBuildPhases)(xcodeProject, {
-                targetUuid: existingTargetKey,
-                groupName,
-                productFile,
-                widgetFiles,
-                mainTargetUuid: xcodeProject.getFirstTarget().uuid,
-            });
-            if (hasClientRenderedWidgets) {
-                (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, existingTargetKey);
-            }
-            (0, groups_1.ensurePbxGroup)(xcodeProject, {
-                targetName,
-                widgetFiles,
-            });
-            (0, target_1.ensureTargetAttributes)(xcodeProject, existingTargetKey);
-            (0, target_1.ensureTargetDependency)(xcodeProject, existingTargetKey);
-            return config;
-        }
-        // Add configuration list
-        const targetUuid = xcodeProject.generateUuid();
-        const xCConfigurationList = (0, configurationList_1.addXCConfigurationList)(xcodeProject, {
-            targetName,
-            bundleIdentifier,
-            deploymentTarget,
-            codeSignStyle: mainAppSettings?.codeSignStyle,
-            developmentTeam: mainAppSettings?.developmentTeam,
-            provisioningProfileSpecifier: mainAppSettings?.provisioningProfileSpecifier,
-        });
-        // Add product file
-        const productFile = (0, productFile_1.addProductFile)(xcodeProject, {
-            targetName,
-            groupName,
-        });
-        // Configure target (native target, project section, dependency)
-        (0, target_1.configureTarget)(xcodeProject, {
-            targetName,
-            targetUuid,
-            productFile,
-            xCConfigurationList,
-        });
-        // Add build phases
-        (0, buildPhases_1.addBuildPhases)(xcodeProject, {
-            targetUuid,
-            groupName,
-            productFile,
-            widgetFiles,
-        });
-        if (hasClientRenderedWidgets) {
-            (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, targetUuid);
-        }
-        // Add PBX group
-        (0, groups_1.addPbxGroup)(xcodeProject, {
-            targetName,
-            widgetFiles,
-        });
+        applyXcodeChanges(xcodeProject, props, widgetFiles, hasClientRenderedWidgets || (liveActivities?.length ?? 0) > 0);
         return config;
     });
 };

package/expo-plugin/build/cjs/ios-widget/xcode/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/index.ts"],"names":[],"mappings":"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"}

package/expo-plugin/build/cjs/ios-widget/xcode/mainAppSettings.js

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMainAppTargetSettings = getMainAppTargetSettings;
+/** Strips surrounding quotes from a raw build-setting value. */
+function unquote(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    return value.replace(/^"|"$/g, '');
+}
+/** Reads the signing-related build settings from a single XCBuildConfiguration. */
+function readSigningSettings(buildSettings) {
+    return {
+        codeSignStyle: unquote(buildSettings.CODE_SIGN_STYLE),
+        developmentTeam: unquote(buildSettings.DEVELOPMENT_TEAM),
+        provisioningProfileSpecifier: unquote(buildSettings.PROVISIONING_PROFILE_SPECIFIER),
+    };
+}
 /**
- * Reads build settings from the main app target to synchronize code signing with the widget extension.
+ * Reads code-signing build settings from every build configuration of the main app target, so the
+ * widget extension can synchronize signing per configuration (Debug→Debug, Release→Release).
  *
  * @param xcodeProject The Xcode project instance
- * @returns The main app target's build settings, or null if not found
+ * @returns Signing settings keyed by configuration name plus a first-configuration fallback, or
+ * null when the main app target or its configurations cannot be resolved
  */
 function getMainAppTargetSettings(xcodeProject) {
     try {
@@ -13,7 +30,6 @@ function getMainAppTargetSettings(xcodeProject) {
         if (!mainAppTarget) {
             return null;
         }
-        // Get the build configuration list for the main app target
         const buildConfigurationListId = mainAppTarget.buildConfigurationList;
         if (!buildConfigurationListId) {
             return null;
@@ -21,47 +37,33 @@ function getMainAppTargetSettings(xcodeProject) {
         // Extract UUID from buildConfigurationListId (it might include a comment like "UUID /* comment */")
         const buildConfigurationListUuid = buildConfigurationListId.split(' ')[0];
         const buildConfigurationList = xcodeProject.hash.project.objects['XCConfigurationList']?.[buildConfigurationListUuid];
-        if (!buildConfigurationList || !buildConfigurationList.buildConfigurations) {
-            return null;
-        }
-        // Get the first build configuration (usually Debug) to read settings
-        const firstConfigRef = buildConfigurationList.buildConfigurations[0];
-        if (!firstConfigRef) {
-            return null;
-        }
-        // Extract UUID from config reference (it might include a comment)
-        const firstConfigUuid = typeof firstConfigRef === 'string' ? firstConfigRef.split(' ')[0] : firstConfigRef.value?.split(' ')[0];
-        if (!firstConfigUuid) {
+        if (!buildConfigurationList?.buildConfigurations) {
             return null;
         }
-        const buildConfiguration = xcodeProject.hash.project.objects['XCBuildConfiguration']?.[firstConfigUuid];
-        if (!buildConfiguration || !buildConfiguration.buildSettings) {
-            return null;
+        const buildConfigurationSection = xcodeProject.hash.project.objects['XCBuildConfiguration'] ?? {};
+        const byConfigurationName = {};
+        let fallback = null;
+        for (const configRef of buildConfigurationList.buildConfigurations) {
+            // Extract UUID from the config reference (it might include a comment)
+            const configUuid = typeof configRef === 'string' ? configRef.split(' ')[0] : configRef.value?.split(' ')[0];
+            if (!configUuid) {
+                continue;
+            }
+            const buildConfiguration = buildConfigurationSection[configUuid];
+            if (!buildConfiguration?.buildSettings) {
+                continue;
+            }
+            const settings = readSigningSettings(buildConfiguration.buildSettings);
+            const configName = unquote(buildConfiguration.name);
+            if (configName && !(configName in byConfigurationName)) {
+                byConfigurationName[configName] = settings;
+            }
+            fallback = fallback ?? settings;
         }
-        const buildSettings = buildConfiguration.buildSettings;
-        // Extract deployment target (remove quotes if present)
-        const deploymentTarget = buildSettings.IPHONEOS_DEPLOYMENT_TARGET?.replace(/^"|"$/g, '') ||
-            buildSettings['IPHONEOS_DEPLOYMENT_TARGET']?.replace(/^"|"$/g, '') ||
-            null;
-        // Extract code signing settings
-        const codeSignStyle = buildSettings.CODE_SIGN_STYLE?.replace(/^"|"$/g, '') ||
-            buildSettings['CODE_SIGN_STYLE']?.replace(/^"|"$/g, '') ||
-            null;
-        const developmentTeam = buildSettings.DEVELOPMENT_TEAM?.replace(/^"|"$/g, '') ||
-            buildSettings['DEVELOPMENT_TEAM']?.replace(/^"|"$/g, '') ||
-            null;
-        const provisioningProfileSpecifier = buildSettings.PROVISIONING_PROFILE_SPECIFIER?.replace(/^"|"$/g, '') ||
-            buildSettings['PROVISIONING_PROFILE_SPECIFIER']?.replace(/^"|"$/g, '') ||
-            null;
-        if (!deploymentTarget) {
+        if (!fallback) {
             return null;
         }
-        return {
-            deploymentTarget,
-            codeSignStyle: codeSignStyle || undefined,
-            developmentTeam: developmentTeam || undefined,
-            provisioningProfileSpecifier: provisioningProfileSpecifier || undefined,
-        };
+        return { byConfigurationName, fallback };
     }
     catch {
         // If we can't read the settings, return null and use fallback values

package/expo-plugin/build/cjs/ios-widget/xcode/mainAppSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"mainAppSettings.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/mainAppSettings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mainAppSettings.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/mainAppSettings.ts"],"names":[],"mappings":";;AA6CA,4DAsDC;AA/ED,gEAAgE;AAChE,SAAS,OAAO,CAAC,KAAc;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AACpC,CAAC;AAED,mFAAmF;AACnF,SAAS,mBAAmB,CAAC,aAAsC;IACjE,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC;QACrD,eAAe,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACxD,4BAA4B,EAAE,OAAO,CAAC,aAAa,CAAC,8BAA8B,CAAC;KACpF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CAAC,YAA0B;IACjE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,YAAY,CAAC,cAAc,EAAE,EAAE,WAAW,CAAA;QAChE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CAAA;QACrE,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAA;QACb,CAAC;QAED,oGAAoG;QACpG,MAAM,0BAA0B,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAEzE,MAAM,sBAAsB,GAC1B,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAA;QACxF,IAAI,CAAC,sBAAsB,EAAE,mBAAmB,EAAE,CAAC;YACjD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,yBAAyB,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAA;QACjG,MAAM,mBAAmB,GAA2C,EAAE,CAAA;QACtE,IAAI,QAAQ,GAAkC,IAAI,CAAA;QAElD,KAAK,MAAM,SAAS,IAAI,sBAAsB,CAAC,mBAAmB,EAAE,CAAC;YACnE,sEAAsE;YACtE,MAAM,UAAU,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,SAAQ;YACV,CAAC;YAED,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAA;YAChE,IAAI,CAAC,kBAAkB,EAAE,aAAa,EAAE,CAAC;gBACvC,SAAQ;YACV,CAAC;YAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;YACtE,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;YACnD,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAmB,CAAC,EAAE,CAAC;gBACvD,mBAAmB,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAA;YAC5C,CAAC;YACD,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;QACrE,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}

package/expo-plugin/build/cjs/ios-widget/xcode/productFile.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addProductFile = addProductFile;
 exports.ensureProductFile = ensureProductFile;
 function findProductFileReference(xcodeProject, targetName) {
     const fileReferenceSection = xcodeProject.pbxFileReferenceSection();
@@ -32,7 +31,8 @@ function findBuildFileForFileRef(xcodeProject, fileRef) {
     return null;
 }
 /**
- * Adds the product file (.appex) for the widget extension.
+ * Adds the product file (.appex) for the widget extension. Internal create-only fallback for
+ * {@link ensureProductFile}; not part of the public pipeline.
  */
 function addProductFile(xcodeProject, options) {
     const { targetName, groupName } = options;

package/expo-plugin/build/cjs/ios-widget/xcode/productFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"productFile.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/productFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"productFile.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/productFile.ts"],"names":[],"mappings":"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"}