@bacons/apple-targets 3.0.6 → 4.0.0

package/README.md

@@ -1,11 +1,11 @@
-# Apple Targets plugin
+# Apple Targets
 
 > [!WARNING]
-> This is highly experimental and not part of any official Expo workflow.
+> This is an experimental Config Plugin not part of any official Expo workflow. Automated testing of targets is seemingly impossible meaning unexpected regressions can occur between versions.
 
-<img width="1061" alt="Screenshot 2023-06-10 at 1 59 26 PM" src="https://github.com/EvanBacon/expo-apple-targets/assets/9664363/4cd8399d-53aa-401a-9caa-3a1432a0640c">
+An experimental Expo Config Plugin that generates native Apple Targets like Widgets or App Clips, and links them outside the `/ios` directory. You can open Xcode and develop the targets inside the virtual `expo:targets` folder and the changes will be saved outside of the `ios` directory. This pattern enables building things that fall outside of the scope of React Native while still obtaining all the benefits of [Continuous Native Generation](https://docs.expo.dev/workflow/continuous-native-generation/).
 
-An experimental Expo Config Plugin that generates native Apple Targets like Widgets or App Clips, and links them outside the `/ios` directory. You can open Xcode and develop the targets inside the virtual `expo:targets` folder and the changes will be saved outside of the `ios` directory. This pattern enables building things that fall outside of the scope of React Native while still obtaining all the benefits of Continuous Native Generation.
+<img width="1728" height="963" alt="targets" src="https://github.com/user-attachments/assets/aedaafa0-1ef0-403c-a797-9f4c82cdb9f1" />
 
 ## 🚀 How to use
 
@@ -308,10 +308,40 @@ Ideally, this would be generated automatically based on a fully qualified Xcode
 | network-app-proxy       | App Proxy Network Extension        |
 | network-dns-proxy       | DNS Proxy Network Extension        |
 | network-filter-data     | Filter Data Network Extension      |
+| content-blocker         | Safari Content Blocker Extension   |
+| file-provider           | File Provider Extension            |
+| broadcast-upload        | Broadcast Upload Extension         |
+| call-directory          | Call Directory Extension           |
+| message-filter          | Message Filter Extension           |
+| file-provider-ui        | File Provider UI Extension         |
+| broadcast-setup-ui      | Broadcast Setup UI Extension       |
+| classkit-context        | ClassKit Context Provider Extension|
+| unwanted-communication  | Unwanted Communication Reporting   |
+| photo-editing           | Photo Editing Extension            |
+| quicklook-preview       | Quick Look Preview Extension       |
+| spotlight-delegate      | CoreSpotlight Delegate Extension   |
+| virtual-conference      | Virtual Conference Provider        |
+| shield-action           | Shield Action Extension            |
+| shield-config           | Shield Configuration Extension     |
+| print-service           | Print Service Extension            |
+| smart-card              | Smart Card / Persistent Token      |
+| authentication-services | Authentication Services Extension  |
 
 
 <!-- | imessage             | iMessage Extension               | -->
 
+### Not yet supported
+
+The following extension types exist in Xcode but aren't supported yet. Contributions welcome! See `docs/xcode-target-discovery.md` for details on how these were discovered.
+
+| Extension Point Identifier | Xcode Template Name |
+| --- | --- |
+| `com.apple.tv-top-shelf` | TV Top Shelf Extension (tvOS) |
+| `com.apple.FinderSync` | Finder Sync Extension (macOS) |
+| `com.apple.email.extension` | Mail Extension (macOS) |
+
+> Run `bun scripts/scan-xcode-targets.ts --diff` to regenerate this list from your local Xcode installation.
+
 ## Code Signing
 
 The codesigning is theoretically handled entirely by [EAS Build](https://docs.expo.dev/build/introduction/). This plugin will add the requisite entitlements for target signing to work. I've only tested this end-to-end with my Pillar Valley Widget.

package/build/config-plugin.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "@expo/config-plugins";
+import { ConfigPlugin } from "expo/config-plugins";
 import type { Config, ConfigFunction } from "./config";
 export declare const withTargetsDir: ConfigPlugin<{
     appleTeamId?: string;

package/build/configuration-list.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createConfigurationListForType = void 0;
 const xcode_1 = require("@bacons/xcode");
 const target_1 = require("./target");
-function createNotificationContentConfigurationList({ name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, }) {
+function createDefaultConfigurationList({ name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, }) {
     const common = {
         CLANG_ANALYZER_NONNULL: "YES",
         CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
@@ -484,6 +484,8 @@ function createWidgetConfigurationList({ name, displayName, cwd, bundleId, deplo
         debug: {
             ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "$accent",
             ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME: "$widgetBackground",
+            // Add app icon name when icon is provided to prevent inheriting main app's icon setting
+            ...(icon && { ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon" }),
             CLANG_ANALYZER_NONNULL: "YES",
             CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
             CLANG_CXX_LANGUAGE_STANDARD: "gnu++20",
@@ -520,6 +522,8 @@ function createWidgetConfigurationList({ name, displayName, cwd, bundleId, deplo
         release: {
             ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "$accent",
             ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME: "$widgetBackground",
+            // Add app icon name when icon is provided to prevent inheriting main app's icon setting
+            ...(icon && { ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon" }),
             CLANG_ANALYZER_NONNULL: "YES",
             CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
             CLANG_CXX_LANGUAGE_STANDARD: "gnu++20",
@@ -630,7 +634,25 @@ function getConfigurationListBuildSettingsForType(project, props) {
         case "network-packet-tunnel":
         case "quicklook-thumbnail":
         case "spotlight":
-            return createNotificationContentConfigurationList(props);
+        case "content-blocker":
+        case "file-provider":
+        case "broadcast-upload":
+        case "call-directory":
+        case "message-filter":
+        case "file-provider-ui":
+        case "broadcast-setup-ui":
+        case "classkit-context":
+        case "unwanted-communication":
+        case "photo-editing":
+        case "quicklook-preview":
+        case "spotlight-delegate":
+        case "virtual-conference":
+        case "shield-action":
+        case "shield-config":
+        case "print-service":
+        case "smart-card":
+        case "authentication-services":
+            return createDefaultConfigurationList(props);
         default:
             const exhaustiveCheck = props.type;
             throw new Error(`Unhandled case: ${exhaustiveCheck}`);

package/build/icon/with-image-asset.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "@expo/config-plugins";
+import { ConfigPlugin } from "expo/config-plugins";
 import { ContentsJsonImageIdiom, ContentsJsonImage } from "@expo/prebuild-config/build/plugins/icons/AssetContents";
 export declare const withImageAsset: ConfigPlugin<{
     cwd: string;

package/build/icon/with-image-asset.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWatchIconsInternalAsync = exports.generateIconsInternalAsync = exports.generateResizedImageAsync = exports.setIconsAsync = exports.ICON_CONTENTS = exports.withImageAsset = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
+const config_plugins_1 = require("expo/config-plugins");
 const image_utils_1 = require("@expo/image-utils");
 const AssetContents_1 = require("@expo/prebuild-config/build/plugins/icons/AssetContents");
 const fs = __importStar(require("fs"));
@@ -43,13 +43,18 @@ const withImageAsset = (config, { cwd, name, image }) => {
             const userDefinedIcon = typeof image === "string"
                 ? { "1x": image, "2x": undefined, "3x": undefined }
                 : image;
-            // Finally, write the Config.json
-            await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(iosNamedProjectRoot, imgPath), {
-                images: await generateResizedImageAsync(Object.fromEntries(Object.entries(userDefinedIcon).map(([key, value]) => [
-                    key,
-                    (value === null || value === void 0 ? void 0 : value.match(/^[./]/)) ? path_1.default.join(cwd, value) : value,
-                ])), name, projectRoot, iosNamedProjectRoot, path_1.default.join(cwd, "gen-image", name)),
-            });
+            try {
+                // Finally, write the Config.json
+                await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(iosNamedProjectRoot, imgPath), {
+                    images: await generateResizedImageAsync(Object.fromEntries(Object.entries(userDefinedIcon).map(([key, value]) => [
+                        key,
+                        (value === null || value === void 0 ? void 0 : value.match(/^[./]/)) ? path_1.default.join(cwd, value) : value,
+                    ])), name, projectRoot, iosNamedProjectRoot, path_1.default.join(cwd, "gen-image", name)),
+                });
+            }
+            catch (error) {
+                console.warn(`Failed to generate image asset "${name}" for target "${cwd}": ${error.message}. Skipping image generation.`);
+            }
             return config;
         },
     ]);

package/build/icon/with-ios-icon.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from "@expo/config-plugins";
+import { ConfigPlugin } from "expo/config-plugins";
 import { ContentsJsonImageIdiom } from "@expo/prebuild-config/build/plugins/icons/AssetContents";
 import { ExtensionType } from "../target";
 export declare const withIosIcon: ConfigPlugin<{

package/build/icon/with-ios-icon.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWatchIconsInternalAsync = exports.generateIconsInternalAsync = exports.setIconsAsync = exports.ICON_CONTENTS = exports.withIosIcon = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
+const config_plugins_1 = require("expo/config-plugins");
 const image_utils_1 = require("@expo/image-utils");
 const AssetContents_1 = require("@expo/prebuild-config/build/plugins/icons/AssetContents");
 const fs = __importStar(require("fs"));
@@ -36,18 +36,23 @@ const withIosIcon = (config, { cwd, type, iconFilePath, isTransparent = false })
         async (config) => {
             const projectRoot = config.modRequest.projectRoot;
             const namedProjectRoot = (0, path_1.join)(projectRoot, cwd);
-            if (type === "watch") {
-                // Ensure the Images.xcassets/AppIcon.appiconset path exists
-                await fs.promises.mkdir((0, path_1.join)(namedProjectRoot, IMAGESET_PATH), {
-                    recursive: true,
-                });
-                // Finally, write the Config.json
-                await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(namedProjectRoot, IMAGESET_PATH), {
-                    images: await generateWatchIconsInternalAsync(iconFilePath, projectRoot, namedProjectRoot, cwd, isTransparent),
-                });
+            try {
+                if (type === "watch") {
+                    // Ensure the Images.xcassets/AppIcon.appiconset path exists
+                    await fs.promises.mkdir((0, path_1.join)(namedProjectRoot, IMAGESET_PATH), {
+                        recursive: true,
+                    });
+                    // Finally, write the Config.json
+                    await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(namedProjectRoot, IMAGESET_PATH), {
+                        images: await generateWatchIconsInternalAsync(iconFilePath, projectRoot, namedProjectRoot, cwd, isTransparent),
+                    });
+                }
+                else {
+                    await setIconsAsync(iconFilePath, projectRoot, (0, path_1.join)(projectRoot, cwd), cwd, isTransparent);
+                }
             }
-            else {
-                await setIconsAsync(iconFilePath, projectRoot, (0, path_1.join)(projectRoot, cwd), cwd, isTransparent);
+            catch (error) {
+                console.warn(`Failed to generate icon for target "${cwd}" using "${iconFilePath}": ${error.message}. Skipping icon generation.`);
             }
             return config;
         },