@bacons/apple-targets 4.0.1 → 4.0.2

package/build/with-xcode-changes.js

@@ -13,6 +13,16 @@ const with_bacons_xcode_1 = require("./with-bacons-xcode");
 const assert_1 = __importDefault(require("assert"));
 const configuration_list_1 = require("./configuration-list");
 const util_1 = require("./util");
+/**
+ * Checks if a target is a watchOS extension by inspecting its build settings.
+ * This is more agnostic than checking props.type directly, as it derives
+ * the behavior from Xcode project attributes.
+ */
+function isWatchOSExtensionTarget(target) {
+    const buildSettings = target.getDefaultConfiguration().props.buildSettings;
+    return (buildSettings.SDKROOT === "watchos" ||
+        "WATCHOS_DEPLOYMENT_TARGET" in buildSettings);
+}
 const withXcodeChanges = (config, props) => {
     return (0, with_bacons_xcode_1.withXcodeProjectBeta)(config, async (config) => {
         await applyXcodeChanges(config, config.modResults, props);
@@ -33,8 +43,8 @@ exports.withXcodeChanges = withXcodeChanges;
 //   return version;
 // }
 async function applyXcodeChanges(config, project, props) {
-    var _a, _b;
-    var _c;
+    var _a, _b, _c;
+    var _d;
     const mainAppTarget = (0, target_1.getMainAppTarget)(project);
     // Special setting for share extensions.
     if ((0, target_1.needsEmbeddedSwift)(props.type)) {
@@ -218,9 +228,39 @@ async function applyXcodeChanges(config, project, props) {
             productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
             productType: productType,
         });
-        const copyPhase = mainAppTarget.getCopyBuildPhaseForTarget(targetToUpdate);
-        if (!copyPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
-            copyPhase.props.files.push(appExtensionBuildFile);
+        // For watchOS extensions, embed in the watchOS app target instead of
+        // the main iOS app target. getCopyBuildPhaseForTarget() throws when
+        // called on non-main targets, so we manually create the
+        // "Embed Foundation Extensions" copy phase on the watch target.
+        if (isWatchOSExtensionTarget(targetToUpdate)) {
+            const watchTarget = project.rootObject.props.targets.find((t) => xcode_1.PBXNativeTarget.is(t) && t.isWatchOSTarget());
+            if (watchTarget) {
+                const { PBXCopyFilesBuildPhase, } = require("@bacons/xcode/build/api/PBXSourcesBuildPhase");
+                const existingPhase = watchTarget.props.buildPhases.find((phase) => PBXCopyFilesBuildPhase.is(phase) &&
+                    phase.props.name === "Embed Foundation Extensions");
+                const embedPhase = existingPhase !== null && existingPhase !== void 0 ? existingPhase : watchTarget.createBuildPhase(PBXCopyFilesBuildPhase, {
+                    name: "Embed Foundation Extensions",
+                    dstSubfolderSpec: 13,
+                    dstPath: "",
+                    files: [],
+                });
+                if (!embedPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
+                    embedPhase.props.files.push(appExtensionBuildFile);
+                }
+            }
+            else {
+                console.warn("[apple-targets] watchOS extension: could not find watchOS app target, falling back to main app");
+                const copyPhase = mainAppTarget.getCopyBuildPhaseForTarget(targetToUpdate);
+                if (!copyPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
+                    copyPhase.props.files.push(appExtensionBuildFile);
+                }
+            }
+        }
+        else {
+            const copyPhase = mainAppTarget.getCopyBuildPhaseForTarget(targetToUpdate);
+            if (!copyPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
+                copyPhase.props.files.push(appExtensionBuildFile);
+            }
         }
     }
     configureTargetWithKnownSettings(targetToUpdate);
@@ -230,7 +270,12 @@ async function applyXcodeChanges(config, project, props) {
     targetToUpdate.getSourcesBuildPhase();
     targetToUpdate.getResourcesBuildPhase();
     configureJsExport(targetToUpdate);
-    mainAppTarget.addDependency(targetToUpdate);
+    // For watchOS extensions, the dependency belongs on the watchOS
+    // app target so Xcode builds the extension before the watch app.
+    const dependencyParent = isWatchOSExtensionTarget(targetToUpdate)
+        ? (_b = project.rootObject.props.targets.find((t) => xcode_1.PBXNativeTarget.is(t) && t.isWatchOSTarget())) !== null && _b !== void 0 ? _b : mainAppTarget
+        : mainAppTarget;
+    dependencyParent.addDependency(targetToUpdate);
     const assetsDir = path_1.default.join(magicCwd, "assets");
     // TODO: Maybe just limit this to Safari extensions?
     const explicitFolders = !fs_1.default.existsSync(assetsDir)
@@ -282,7 +327,7 @@ async function applyXcodeChanges(config, project, props) {
     }
     // If there's a `_shared` folder, create a PBXFileSystemSynchronizedBuildFileExceptionSet and set the `target` to the main app target. Then add exceptions to the new target's PBXFileSystemSynchronizedRootGroup's exceptions. Finally, ensure the relative paths for each file in the _shared folder are added to the `membershipExceptions` array.
     (0, assert_1.default)(syncRootGroup instanceof xcode_1.PBXFileSystemSynchronizedRootGroup);
-    (_b = (_c = syncRootGroup.props).exceptions) !== null && _b !== void 0 ? _b : (_c.exceptions = []);
+    (_c = (_d = syncRootGroup.props).exceptions) !== null && _c !== void 0 ? _c : (_d.exceptions = []);
     const existingExceptionSet = syncRootGroup.props.exceptions.find((exception) => exception instanceof xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet &&
         exception.props.target === mainAppTarget);
     if (sharedAssets.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/ExtensionStorage.js",
   "types": "build/ExtensionStorage.d.ts",
@@ -20,7 +20,7 @@
     "test": "jest --watch",
     "test:e2e": "jest --no-watch --config e2e/jest.config.js",
     "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
+    "prepublishOnly": "proofread",
     "expo-module": "expo-module"
   },
   "repository": {
@@ -45,17 +45,18 @@
     "debug": "^4.3.4"
   },
   "devDependencies": {
-    "expo-module-scripts": "^4.1.7",
-    "@types/debug": "^4.1.7",
-    "@types/glob": "^8.1.0",
     "@expo/babel-preset-cli": "^0.3.1",
     "@expo/config": "^12.0.13",
     "@expo/config-plugins": "^54.0.4",
     "@expo/image-utils": "^0.8.8",
+    "@expo/npm-proofread": "^1.0.1",
     "@expo/plist": "^0.4.8",
     "@expo/prebuild-config": "^54.0.8",
+    "@types/debug": "^4.1.7",
+    "@types/glob": "^8.1.0",
     "chalk": "^4.0.0",
     "expo": "^54.0.32",
+    "expo-module-scripts": "^4.1.7",
     "jest-environment-node": "^26"
   },
   "peerDependencies": {