@bacons/apple-targets 4.0.4 → 4.0.5

package/build/configuration-list.js

@@ -81,7 +81,6 @@ function createActionConfigurationList({ name, displayName, cwd, bundleId, deplo
         SWIFT_EMIT_LOC_STRINGS: "YES",
         SWIFT_VERSION: "5.0",
         TARGETED_DEVICE_FAMILY: "1,2",
-        // @ts-expect-error
         LOCALIZATION_PREFERS_STRING_CATALOGS: "YES",
         ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS: "YES",
     };
@@ -116,7 +115,6 @@ function createActionConfigurationList({ name, displayName, cwd, bundleId, deplo
 }
 function createAppIntentConfigurationList({ name, displayName, cwd, bundleId, }) {
     const commonBuildSettings = {
-        // @ts-expect-error
         ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS: "YES",
         CLANG_ANALYZER_NONNULL: "YES",
         CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
@@ -262,11 +260,13 @@ function createIMessageConfigurationList({ name, displayName, cwd, bundleId, dep
         },
     };
 }
-function createWatchAppConfigurationList(project, { name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, hasAccentColor, }) {
+function createWatchAppConfigurationList(project, { name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, hasAccentColor, icon, }) {
     const mainAppTarget = (0, target_1.getMainAppTarget)(project).getDefaultConfiguration();
     // NOTE: No base Info.plist needed.
     const common = {
-        ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon",
+        // Only set AppIcon when an icon is provided, otherwise Xcode will fail
+        // to build because the asset catalog doesn't exist
+        ...(icon && { ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon" }),
         CLANG_ANALYZER_NONNULL: "YES",
         CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
         CLANG_CXX_LANGUAGE_STANDARD: "gnu++20",

package/build/with-xcode-changes.js

@@ -14,14 +14,16 @@ 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.
+ * Checks if a target is a watchOS extension (NOT a watch app) by inspecting
+ * its build settings and product type. This includes modern WidgetKit-based
+ * watch widgets which use app-extension product type with WATCHOS_DEPLOYMENT_TARGET.
  */
 function isWatchOSExtensionTarget(target) {
     const buildSettings = target.getDefaultConfiguration().props.buildSettings;
-    return (buildSettings.SDKROOT === "watchos" ||
-        "WATCHOS_DEPLOYMENT_TARGET" in buildSettings);
+    const isWatchOS = buildSettings.SDKROOT === "watchos" ||
+        "WATCHOS_DEPLOYMENT_TARGET" in buildSettings;
+    // Watch apps are detected by isWatchOSTarget() - extensions are watchOS but NOT watch apps
+    return isWatchOS && !target.isWatchOSTarget();
 }
 const withXcodeChanges = (config, props) => {
     return (0, with_bacons_xcode_1.withXcodeProjectBeta)(config, async (config) => {
@@ -204,11 +206,18 @@ async function applyXcodeChanges(config, project, props) {
         const productType = (0, target_1.productTypeForType)(props.type);
         const isExtension = productType === "com.apple.product-type.app-extension";
         const isExtensionKit = productType === "com.apple.product-type.extensionkit-extension";
+        const isApplication = productType === "com.apple.product-type.application";
+        // Determine the correct file type for the product reference
+        const explicitFileType = isExtensionKit
+            ? "wrapper.extensionkit-extension"
+            : isExtension
+                ? "wrapper.app-extension"
+                : isApplication
+                    ? "wrapper.application"
+                    : "wrapper.app-extension";
         const appExtensionBuildFile = xcode_1.PBXBuildFile.create(project, {
             fileRef: xcode_1.PBXFileReference.create(project, {
-                explicitFileType: isExtensionKit
-                    ? "wrapper.extensionkit-extension"
-                    : "wrapper.app-extension",
+                explicitFileType: explicitFileType,
                 includeInIndex: 0,
                 path: props.name + (isExtension ? ".appex" : ".app"),
                 sourceTree: "BUILT_PRODUCTS_DIR",
@@ -228,17 +237,14 @@ async function applyXcodeChanges(config, project, props) {
             productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
             productType: productType,
         });
-        // 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.
+        // For watchOS extensions (like watch-widget), embed in the watchOS app target
+        // instead of the main iOS app 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) &&
+                const existingPhase = watchTarget.props.buildPhases.find((phase) => xcode_1.PBXCopyFilesBuildPhase.is(phase) &&
                     phase.props.name === "Embed Foundation Extensions");
-                const embedPhase = existingPhase !== null && existingPhase !== void 0 ? existingPhase : watchTarget.createBuildPhase(PBXCopyFilesBuildPhase, {
+                const embedPhase = existingPhase !== null && existingPhase !== void 0 ? existingPhase : watchTarget.createBuildPhase(xcode_1.PBXCopyFilesBuildPhase, {
                     name: "Embed Foundation Extensions",
                     dstSubfolderSpec: 13,
                     dstPath: "",
@@ -257,6 +263,8 @@ async function applyXcodeChanges(config, project, props) {
             }
         }
         else {
+            // For watch apps, getCopyBuildPhaseForTarget returns "Embed Watch Content".
+            // For regular extensions, it returns "Embed Foundation Extensions".
             const copyPhase = mainAppTarget.getCopyBuildPhaseForTarget(targetToUpdate);
             if (!copyPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
                 copyPhase.props.files.push(appExtensionBuildFile);
@@ -272,6 +280,7 @@ async function applyXcodeChanges(config, project, props) {
     configureJsExport(targetToUpdate);
     // For watchOS extensions, the dependency belongs on the watchOS
     // app target so Xcode builds the extension before the watch app.
+    // For watch apps, the dependency belongs on the main iOS 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;

package/package.json

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