@bacons/apple-targets 4.0.0 → 4.0.1

package/README.md

@@ -285,47 +285,51 @@ module.exports = {
 
 Ideally, this would be generated automatically based on a fully qualified Xcode project, but for now it's a manual process. The currently supported types are based on static analysis of the most commonly used targets in the iOS App Store. I haven't tested all of these and they may not work.
 
-| Type                    | Description                        |
-| ----------------------- | ---------------------------------- |
-| action                  | Share Action                       |
-| app-intent              | App Intent Extension               |
-| widget                  | Widget / Live Activity             |
-| watch                   | Watch App (with companion iOS App) |
-| clip                    | App Clip                           |
-| safari                  | Safari Extension                   |
-| share                   | Share Extension                    |
-| notification-content    | Notification Content Extension     |
-| notification-service    | Notification Service Extension     |
-| intent                  | Siri Intent Extension              |
-| intent-ui               | Siri Intent UI Extension           |
-| spotlight               | Spotlight Index Extension          |
-| bg-download             | Background Download Extension      |
-| quicklook-thumbnail     | Quick Look Thumbnail Extension     |
-| location-push           | Location Push Service Extension    |
-| credentials-provider    | Credentials Provider Extension     |
-| account-auth            | Account Authentication Extension   |
-| network-packet-tunnel   | Packet Tunnel Network Extension    |
-| 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  |
+| Type                      | Description                        |
+| ------------------------- | ---------------------------------- |
+| action                    | Share Action                       |
+| app-intent                | App Intent Extension               |
+| widget                    | Widget / Live Activity             |
+| watch                     | Watch App (with companion iOS App) |
+| watch-widget              | Watch Face Complication            |
+| clip                      | App Clip                           |
+| safari                    | Safari Extension                   |
+| share                     | Share Extension                    |
+| notification-content      | Notification Content Extension     |
+| notification-service      | Notification Service Extension     |
+| intent                    | Siri Intent Extension              |
+| intent-ui                 | Siri Intent UI Extension           |
+| spotlight                 | Spotlight Index Extension          |
+| bg-download               | Background Download Extension      |
+| quicklook-thumbnail       | Quick Look Thumbnail Extension     |
+| location-push             | Location Push Service Extension    |
+| credentials-provider      | Credentials Provider Extension     |
+| account-auth              | Account Authentication Extension   |
+| device-activity-monitor   | Device Activity Monitor Extension  |
+| keyboard                  | Custom Keyboard Extension          |
+| matter                    | Matter Device Setup Extension      |
+| network-packet-tunnel     | Packet Tunnel Network Extension    |
+| 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               | -->

package/build/configuration-list.js

@@ -320,6 +320,54 @@ function createWatchAppConfigurationList(project, { name, displayName, cwd, bund
         },
     };
 }
+function createWatchWidgetConfigurationList(project, { name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, icon, }) {
+    const common = {
+        ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "$accent",
+        ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME: "$widgetBackground",
+        ...(icon && { ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon" }),
+        CLANG_ANALYZER_NONNULL: "YES",
+        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: "YES_AGGRESSIVE",
+        CLANG_CXX_LANGUAGE_STANDARD: "gnu++20",
+        CLANG_ENABLE_OBJC_WEAK: "YES",
+        CLANG_WARN_DOCUMENTATION_COMMENTS: "YES",
+        CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: "YES",
+        CLANG_WARN_UNGUARDED_AVAILABILITY: "YES_AGGRESSIVE",
+        CODE_SIGN_STYLE: "Automatic",
+        CURRENT_PROJECT_VERSION: currentProjectVersion,
+        GCC_C_LANGUAGE_STANDARD: "gnu11",
+        GENERATE_INFOPLIST_FILE: "YES",
+        INFOPLIST_FILE: cwd + "/Info.plist",
+        INFOPLIST_KEY_CFBundleDisplayName: displayName !== null && displayName !== void 0 ? displayName : name,
+        INFOPLIST_KEY_NSHumanReadableCopyright: "",
+        LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"],
+        MARKETING_VERSION: "1.0",
+        MTL_FAST_MATH: "YES",
+        PRODUCT_BUNDLE_IDENTIFIER: bundleId,
+        PRODUCT_NAME: "$(TARGET_NAME)",
+        SDKROOT: "watchos",
+        SKIP_INSTALL: "YES",
+        SWIFT_EMIT_LOC_STRINGS: "YES",
+        SWIFT_VERSION: "5.0",
+        TARGETED_DEVICE_FAMILY: "4",
+        WATCHOS_DEPLOYMENT_TARGET: deploymentTarget !== null && deploymentTarget !== void 0 ? deploymentTarget : "9.4",
+    };
+    return {
+        debug: {
+            ...common,
+            DEBUG_INFORMATION_FORMAT: "dwarf",
+            MTL_ENABLE_DEBUG_INFO: "INCLUDE_SOURCE",
+            SWIFT_ACTIVE_COMPILATION_CONDITIONS: "DEBUG",
+            SWIFT_OPTIMIZATION_LEVEL: "-Onone",
+        },
+        release: {
+            ...common,
+            COPY_PHASE_STRIP: "NO",
+            DEBUG_INFORMATION_FORMAT: "dwarf-with-dsym",
+            SWIFT_COMPILATION_MODE: "wholemodule",
+            SWIFT_OPTIMIZATION_LEVEL: "-O",
+        },
+    };
+}
 function createSafariConfigurationList({ name, displayName, cwd, bundleId, deploymentTarget, currentProjectVersion, }) {
     const common = {
         CLANG_ANALYZER_NONNULL: "YES",
@@ -615,6 +663,8 @@ function getConfigurationListBuildSettingsForType(project, props) {
             return createAppClipConfigurationList(props);
         case "watch":
             return createWatchAppConfigurationList(project, props);
+        case "watch-widget":
+            return createWatchWidgetConfigurationList(project, props);
         case "app-intent":
             return createAppIntentConfigurationList(props);
         case "notification-content":

package/build/target.d.ts

@@ -91,6 +91,12 @@ export declare const TARGET_REGISTRY: {
         readonly needsEmbeddedSwift: true;
         readonly displayName: "Watch";
     };
+    readonly "watch-widget": {
+        readonly frameworks: readonly ["WidgetKit", "SwiftUI"];
+        readonly appGroupsByDefault: true;
+        readonly displayName: "Watch Widget";
+        readonly description: "Watch face complication using WidgetKit";
+    };
     readonly "location-push": {
         readonly extensionPointIdentifier: "com.apple.location.push.service";
         readonly displayName: "Location Push";

package/build/target.js

@@ -75,6 +75,15 @@ exports.TARGET_REGISTRY = {
         needsEmbeddedSwift: true,
         displayName: "Watch",
     },
+    "watch-widget": {
+        // extensionPointIdentifier intentionally omitted to avoid collision
+        // with "widget" in KNOWN_EXTENSION_POINT_IDENTIFIERS. The Info.plist
+        // is handled explicitly in getTargetInfoPlistForType().
+        frameworks: ["WidgetKit", "SwiftUI"],
+        appGroupsByDefault: true,
+        displayName: "Watch Widget",
+        description: "Watch face complication using WidgetKit",
+    },
     "location-push": {
         extensionPointIdentifier: "com.apple.location.push.service",
         displayName: "Location Push",
@@ -278,6 +287,12 @@ function getTargetInfoPlistForType(type) {
     switch (type) {
         case "watch":
             return {};
+        case "watch-widget":
+            return {
+                NSExtension: {
+                    NSExtensionPointIdentifier: "com.apple.widgetkit-extension",
+                },
+            };
         case "action":
             return {
                 NSExtension: {
@@ -641,7 +656,7 @@ exports.getTargetInfoPlistForType = getTargetInfoPlistForType;
 // Target detection & utilities
 // ---------------------------------------------------------------------------
 function isNativeTargetOfType(target, type) {
-    var _a;
+    var _a, _b;
     if (type === "watch" &&
         target.props.productType === "com.apple.product-type.application") {
         return ("WATCHOS_DEPLOYMENT_TARGET" in
@@ -652,12 +667,28 @@ function isNativeTargetOfType(target, type) {
             "com.apple.product-type.application.on-demand-install-capable") {
         return true;
     }
+    const hasWatchOS = "WATCHOS_DEPLOYMENT_TARGET" in
+        target.getDefaultConfiguration().props.buildSettings;
+    if (type === "watch-widget" &&
+        target.props.productType === "com.apple.product-type.app-extension") {
+        if (!hasWatchOS)
+            return false;
+        const infoPlist = target.getDefaultConfiguration().getInfoPlist();
+        return (((_a = infoPlist.NSExtension) === null || _a === void 0 ? void 0 : _a.NSExtensionPointIdentifier) ===
+            "com.apple.widgetkit-extension");
+    }
+    // For iOS widget type, exclude watchOS targets that share the same extension point ID
+    if (type === "widget" &&
+        target.props.productType === "com.apple.product-type.app-extension" &&
+        hasWatchOS) {
+        return false;
+    }
     if (target.props.productType !== "com.apple.product-type.app-extension") {
         return false;
     }
     // Could be a Today Extension, Share Extension, etc.
     const infoPlist = target.getDefaultConfiguration().getInfoPlist();
-    if (!((_a = infoPlist.NSExtension) === null || _a === void 0 ? void 0 : _a.NSExtensionPointIdentifier)) {
+    if (!((_b = infoPlist.NSExtension) === null || _b === void 0 ? void 0 : _b.NSExtensionPointIdentifier)) {
         console.error("No NSExtensionPointIdentifier found in extension Info.plist for target: " +
             target.getDisplayName());
         return false;

package/build/with-widget.js

@@ -17,6 +17,7 @@ const with_eas_credentials_1 = require("./with-eas-credentials");
 const with_xcode_changes_1 = require("./with-xcode-changes");
 const util_1 = require("./util");
 const DEFAULT_DEPLOYMENT_TARGET = "18.0";
+const DEFAULT_WATCHOS_DEPLOYMENT_TARGET = "11.0";
 const withWidget = (config, props) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     util_1.LOG_QUEUE.add(() => (0, util_1.warnOnce)((0, chalk_1.default) `\nUsing experimental Config Plugin {bold @bacons/apple-targets} that is subject to breaking changes.`));
@@ -222,7 +223,9 @@ const withWidget = (config, props) => {
         displayName: props.displayName,
         cwd: "../" +
             path_1.default.relative(config._internal.projectRoot, path_1.default.resolve(props.directory)),
-        deploymentTarget: (_f = props.deploymentTarget) !== null && _f !== void 0 ? _f : DEFAULT_DEPLOYMENT_TARGET,
+        deploymentTarget: (_f = props.deploymentTarget) !== null && _f !== void 0 ? _f : (props.type === "watch" || props.type === "watch-widget"
+            ? DEFAULT_WATCHOS_DEPLOYMENT_TARGET
+            : DEFAULT_DEPLOYMENT_TARGET),
         bundleId,
         icon: props.icon,
         orientation: config.orientation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/ExtensionStorage.js",
   "types": "build/ExtensionStorage.d.ts",