@bacons/apple-targets 3.0.2 → 3.0.4

package/README.md

@@ -178,6 +178,8 @@ The name of the target must match the name of the target directory.
 
 Some files are required to be linked to both your target and the main target. To support this, you can add a top-level `_shared` directory. Any file in this directory will be linked to both the main target and the sub-target. You'll need to re-run prebuild every time you add, rename, or remove a file in this directory.
 
+You can additionally add a `_shared` directory inside of the root `targets/_shared` directory. This will link files to all targets in your project.
+
 ## `exportJs`
 
 The `exportJs` option should be used when the target uses React Native (App Clip, Share extension). It works by linking the main target's `Bundle React Native code and images` build phase to the target. This will ensure that production builds (`Release`) bundle the main JS entry file with Metro, and embed the bundle/assets for offline use.

package/build/target.js

@@ -90,7 +90,6 @@ function getTargetInfoPlistForType(type) {
         return plist_1.default.build({
             CFBundleName: "$(PRODUCT_NAME)",
             CFBundleIdentifier: "$(PRODUCT_BUNDLE_IDENTIFIER)",
-            CFBundleVersion: "$(CURRENT_PROJECT_VERSION)",
             CFBundleExecutable: "$(EXECUTABLE_NAME)",
             CFBundlePackageType: "$(PRODUCT_BUNDLE_PACKAGE_TYPE)",
             CFBundleShortVersionString: "$(MARKETING_VERSION)",

package/build/withXcodeChanges.js

@@ -475,8 +475,15 @@ function createAppClipConfigurationList(project, { name, cwd, bundleId, deployme
         INFOPLIST_KEY_UIApplicationSceneManifest_Generation: "YES",
         INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents: "YES",
         INFOPLIST_KEY_UILaunchScreen_Generation: "YES",
+        INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad: "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight",
         ...getOrientationBuildSettings(orientation),
     };
+    // Attempt to automatically set the build number to match the main app. 
+    // This only works with EAS Build, other processes can simply set the number manually.
+    if (process.env.EAS_BUILD_IOS_BUILD_NUMBER) {
+        // NOTE: INFOPLIST_KEY_CFBundleVersion doesn't work here.
+        infoPlist.CURRENT_PROJECT_VERSION = process.env.EAS_BUILD_IOS_BUILD_NUMBER;
+    }
     // @ts-expect-error
     const common = {
         ...dynamic,
@@ -517,22 +524,21 @@ function createAppClipConfigurationList(project, { name, cwd, bundleId, deployme
     return configurationList;
 }
 function getOrientationBuildSettings(orientation) {
+    // NOTE: The requiresFullScreen support is deprecated in iOS 26+
+    // https://developer.apple.com/documentation/BundleResources/Information-Property-List/UIRequiresFullScreen
     // Try to align the orientation with the main app.
     if (orientation === "landscape") {
         return {
             INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone: "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight",
-            INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad: "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight",
         };
     }
     else if (orientation === "portrait") {
         return {
             INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone: "UIInterfaceOrientationPortrait",
-            INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad: "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown",
         };
     }
     return {
         INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone: "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight",
-        INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad: "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight",
     };
 }
 function getDeviceFamilyBuildSettings(deviceFamilies) {
@@ -877,6 +883,12 @@ async function applyXcodeChanges(config, project, props) {
         absolute: false,
         cwd: magicCwd,
     });
+    // Also look for global shared assets in the parent targets/_shared directory
+    const targetsDir = path_1.default.dirname(magicCwd);
+    const globalSharedAssets = (0, glob_1.globSync)("_shared/*", {
+        absolute: false,
+        cwd: targetsDir,
+    });
     let syncRootGroup = protectedGroup.props.children.find((child) => child.props.path === path_1.default.basename(props.cwd));
     if (!syncRootGroup) {
         syncRootGroup = xcode_1.PBXFileSystemSynchronizedRootGroup.create(project, {
@@ -923,6 +935,84 @@ async function applyXcodeChanges(config, project, props) {
         // Remove the exception set if there are no shared assets.
         existingExceptionSet === null || existingExceptionSet === void 0 ? void 0 : existingExceptionSet.removeFromProject();
     }
+    function configureTargetWithGlobalSharedAssets(target) {
+        var _a;
+        var _b;
+        if (!globalSharedAssets.length)
+            return;
+        // Create or find the global shared synchronized root group
+        let globalSharedSyncGroup = protectedGroup.props.children.find((child) => child.props.path === "_shared" && child instanceof xcode_1.PBXFileSystemSynchronizedRootGroup);
+        if (!globalSharedSyncGroup) {
+            globalSharedSyncGroup = xcode_1.PBXFileSystemSynchronizedRootGroup.create(project, {
+                path: "_shared",
+                exceptions: [
+                    // Create exception set for the main app target
+                    xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                        target: mainAppTarget,
+                        membershipExceptions: globalSharedAssets.sort(),
+                    }),
+                    // Create exception set for the extension target
+                    xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                        target: target,
+                        membershipExceptions: globalSharedAssets.sort(),
+                    }),
+                ],
+                explicitFileTypes: {},
+                explicitFolders: [],
+                sourceTree: "<group>",
+            });
+            // Add to both targets' fileSystemSynchronizedGroups
+            if (!mainAppTarget.props.fileSystemSynchronizedGroups) {
+                mainAppTarget.props.fileSystemSynchronizedGroups = [];
+            }
+            mainAppTarget.props.fileSystemSynchronizedGroups.push(globalSharedSyncGroup);
+            if (!target.props.fileSystemSynchronizedGroups) {
+                target.props.fileSystemSynchronizedGroups = [];
+            }
+            target.props.fileSystemSynchronizedGroups.push(globalSharedSyncGroup);
+            protectedGroup.props.children.push(globalSharedSyncGroup);
+        }
+        else {
+            // Update existing synchronized group with current global shared assets
+            (_a = (_b = globalSharedSyncGroup.props).exceptions) !== null && _a !== void 0 ? _a : (_b.exceptions = []);
+            // Update or create exception set for main app target
+            let mainAppExceptionSet = globalSharedSyncGroup.props.exceptions.find((exception) => exception instanceof xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet &&
+                exception.props.target === mainAppTarget);
+            if (!mainAppExceptionSet) {
+                mainAppExceptionSet = xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                    target: mainAppTarget,
+                    membershipExceptions: globalSharedAssets.sort(),
+                });
+                globalSharedSyncGroup.props.exceptions.push(mainAppExceptionSet);
+            }
+            else {
+                mainAppExceptionSet.props.membershipExceptions = globalSharedAssets.sort();
+            }
+            // Update or create exception set for extension target
+            let extensionExceptionSet = globalSharedSyncGroup.props.exceptions.find((exception) => exception instanceof xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet &&
+                exception.props.target === target);
+            if (!extensionExceptionSet) {
+                extensionExceptionSet = xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                    target: target,
+                    membershipExceptions: globalSharedAssets.sort(),
+                });
+                globalSharedSyncGroup.props.exceptions.push(extensionExceptionSet);
+            }
+            else {
+                extensionExceptionSet.props.membershipExceptions = globalSharedAssets.sort();
+            }
+            // Ensure the current target has the synchronized group in its fileSystemSynchronizedGroups
+            if (!target.props.fileSystemSynchronizedGroups) {
+                target.props.fileSystemSynchronizedGroups = [];
+            }
+            // Check if this target already has the synchronized group
+            const hasGroup = target.props.fileSystemSynchronizedGroups.some((group) => group === globalSharedSyncGroup);
+            if (!hasGroup) {
+                target.props.fileSystemSynchronizedGroups.push(globalSharedSyncGroup);
+            }
+        }
+    }
+    configureTargetWithGlobalSharedAssets(targetToUpdate);
     applyDevelopmentTeamIdToTargets();
     syncMarketingVersions();
     return project;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/ExtensionStorage.js",
   "types": "build/ExtensionStorage.d.ts",
@@ -33,7 +33,7 @@
   "author": "Evan Bacon",
   "license": "MIT",
   "dependencies": {
-    "@bacons/xcode": "1.0.0-alpha.24",
+    "@bacons/xcode": "1.0.0-alpha.27",
     "@react-native/normalize-colors": "^0.79.2",
     "glob": "^10.4.2",
     "debug": "^4.3.4"