@bacons/apple-targets 0.1.0 → 0.1.2

package/README.md

@@ -36,7 +36,7 @@ You can change the root directory from `./targets` to something else with `root:
 
 ## Using React Native in Targets
 
-I'm not sure, that's not the purpose of this plugin. I built this so I could easily build iOS widgets and other minor targets with SwiftUI. I imagine it would be straightforward to use React Native in share, notification, iMessage, Safari, and photo editing extensions, you can build that on top of this plugin if you want.
+I'm not sure, that's not the purpose of this plugin. I built this so I could easily build iOS widgets and other minor targets with SwiftUI. I imagine it would be straightforward to use React Native in share, notification, iMessage, Safari, and photo editing extensions, you can build that on top of this plugin if you want. Look at the App Clip example for a starting point.
 
 ## `expo-target.config.json`
 
@@ -69,7 +69,11 @@ This file can have the following properties:
   },
 
   // The iOS version fot the target.
-  "deploymentTarget": "13.4"
+  "deploymentTarget": "13.4",
+
+  // Optional bundle identifier for the target. Will default to a sanitized version of the root project bundle id + target name.
+  // If the specified bundle identifier is prefixed with a dot (.), the bundle identifier will be appended to the main app's bundle identifier.
+  "bundleIdentifier": ".mywidget"
 }
 ```
 
@@ -242,24 +246,26 @@ 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                       |
-| 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   |
+| 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   |
+| device-activity-monitor | Device Activity Monitor Extension  |
 
 <!-- | imessage             | iMessage Extension               | -->
 

package/build/config.d.ts

@@ -68,6 +68,11 @@ export type Config = {
     type: ExtensionType;
     /** Name of the target. Will default to a sanitized version of the directory name. */
     name?: string;
+    /**
+     * Bundle identifier for the target. Will default to a sanitized version of the root project + name.
+     * If the specified bundle identifier is prefixed with a dot (.), the bundle identifier will be appended to the main app's bundle identifier.
+     **/
+    bundleIdentifier?: string;
     /**
      * A local file path or URL to an image asset.
      * @example "./assets/icon.png"

package/build/target.d.ts

@@ -1,8 +1,8 @@
 import { PBXNativeTarget, XcodeProject } from "@bacons/xcode";
-export type ExtensionType = "widget" | "notification-content" | "notification-service" | "share" | "intent" | "bg-download" | "intent-ui" | "spotlight" | "matter" | "quicklook-thumbnail" | "imessage" | "clip" | "watch" | "location-push" | "credentials-provider" | "account-auth" | "action" | "safari";
+export type ExtensionType = "widget" | "notification-content" | "notification-service" | "share" | "intent" | "bg-download" | "intent-ui" | "spotlight" | "matter" | "quicklook-thumbnail" | "imessage" | "clip" | "watch" | "location-push" | "credentials-provider" | "account-auth" | "action" | "safari" | "app-intent" | "device-activity-monitor";
 export declare const KNOWN_EXTENSION_POINT_IDENTIFIERS: Record<string, ExtensionType>;
 export declare function getTargetInfoPlistForType(type: ExtensionType): string;
-export declare function productTypeForType(type: ExtensionType): "com.apple.product-type.application.on-demand-install-capable" | "com.apple.product-type.application" | "com.apple.product-type.app-extension";
+export declare function productTypeForType(type: ExtensionType): "com.apple.product-type.application.on-demand-install-capable" | "com.apple.product-type.application" | "com.apple.product-type.extensionkit-extension" | "com.apple.product-type.app-extension";
 export declare function needsEmbeddedSwift(type: ExtensionType): boolean;
 export declare function getFrameworksForType(type: ExtensionType): string[];
 export declare function isNativeTargetOfType(target: PBXNativeTarget, type: ExtensionType): boolean;

package/build/target.js

@@ -22,6 +22,7 @@ exports.KNOWN_EXTENSION_POINT_IDENTIFIERS = {
     "com.apple.authentication-services-credential-provider-ui": "credentials-provider",
     "com.apple.authentication-services-account-authentication-modification-ui": "account-auth",
     "com.apple.services": "action",
+    "com.apple.appintents-extension": "app-intent",
     // "com.apple.intents-service": "intents",
 };
 // TODO: Maybe we can replace `NSExtensionPrincipalClass` with the `@main` annotation that newer extensions use?
@@ -232,6 +233,8 @@ function productTypeForType(type) {
             return "com.apple.product-type.application.on-demand-install-capable";
         case "watch":
             return "com.apple.product-type.application";
+        case "app-intent":
+            return "com.apple.product-type.extensionkit-extension";
         default:
             return "com.apple.product-type.app-extension";
     }
@@ -272,6 +275,12 @@ function getFrameworksForType(type) {
     else if (type === "notification-content") {
         return ["UserNotifications", "UserNotificationsUI"];
     }
+    else if (type === "app-intent") {
+        return ["AppIntents"];
+    }
+    else if (type === "device-activity-monitor") {
+        return ["DeviceActivity"];
+    }
     else if (type === "action") {
         return [
         // "UniformTypeIdentifiers"

package/build/withWidget.js

@@ -22,7 +22,7 @@ function kebabToCamelCase(str) {
 }
 const withWidget = (config, props) => {
     // TODO: Magically based on the top-level folders in the `ios-widgets/` folder
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if (props.icon && !/https?:\/\//.test(props.icon)) {
         props.icon = path_1.default.join(props.directory, props.icon);
     }
@@ -111,22 +111,25 @@ const withWidget = (config, props) => {
         },
     ]);
     const targetName = (_c = props.name) !== null && _c !== void 0 ? _c : widget;
-    const bundleId = config.ios.bundleIdentifier + "." + widget;
+    const mainAppBundleId = config.ios.bundleIdentifier;
+    const bundleId = ((_d = props.bundleIdentifier) === null || _d === void 0 ? void 0 : _d.startsWith("."))
+        ? mainAppBundleId + props.bundleIdentifier
+        : (_e = props.bundleIdentifier) !== null && _e !== void 0 ? _e : `${mainAppBundleId}.${targetName}`;
     (0, withXcodeChanges_1.withXcodeChanges)(config, {
         configPath: props.configPath,
         name: targetName,
         cwd: "../" +
             path_1.default.relative(config._internal.projectRoot, path_1.default.resolve(props.directory)),
-        deploymentTarget: (_d = props.deploymentTarget) !== null && _d !== void 0 ? _d : "16.4",
+        deploymentTarget: (_f = props.deploymentTarget) !== null && _f !== void 0 ? _f : "16.4",
         bundleId,
         icon: props.icon,
-        hasAccentColor: !!((_e = props.colors) === null || _e === void 0 ? void 0 : _e.$accent),
+        hasAccentColor: !!((_g = props.colors) === null || _g === void 0 ? void 0 : _g.$accent),
         // @ts-expect-error: who cares
-        currentProjectVersion: ((_f = config.ios) === null || _f === void 0 ? void 0 : _f.buildNumber) || 1,
+        currentProjectVersion: ((_h = config.ios) === null || _h === void 0 ? void 0 : _h.buildNumber) || 1,
         frameworks: (0, target_1.getFrameworksForType)(props.type).concat(props.frameworks || []),
         type: props.type,
         teamId: props.appleTeamId,
-        exportJs: (_g = props.exportJs) !== null && _g !== void 0 ? _g : 
+        exportJs: (_j = props.exportJs) !== null && _j !== void 0 ? _j : 
         // Assume App Clips are used for React Native.
         props.type === "clip",
     });

package/build/withXcodeChanges.js

@@ -121,6 +121,68 @@ extensionType, { name, cwd, bundleId, deploymentTarget, currentProjectVersion, i
     });
     return configurationList;
 }
+function createAppIntentConfigurationList(project, { name, 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",
+        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: "1",
+        DEBUG_INFORMATION_FORMAT: "dwarf",
+        ENABLE_USER_SCRIPT_SANDBOXING: "YES",
+        GCC_C_LANGUAGE_STANDARD: "gnu17",
+        GENERATE_INFOPLIST_FILE: "YES",
+        INFOPLIST_FILE: cwd + "/Info.plist",
+        INFOPLIST_KEY_CFBundleDisplayName: name,
+        INFOPLIST_KEY_NSHumanReadableCopyright: "",
+        IPHONEOS_DEPLOYMENT_TARGET: "17.0",
+        LD_RUNPATH_SEARCH_PATHS: [
+            "$(inherited)",
+            "@executable_path/Frameworks",
+            "@executable_path/../../Frameworks",
+        ],
+        LOCALIZATION_PREFERS_STRING_CATALOGS: "YES",
+        MARKETING_VERSION: "1.0",
+        MTL_FAST_MATH: "YES",
+        PRODUCT_BUNDLE_IDENTIFIER: bundleId,
+        PRODUCT_NAME: "$(TARGET_NAME)",
+        SKIP_INSTALL: "YES",
+        SWIFT_EMIT_LOC_STRINGS: "YES",
+        SWIFT_VERSION: "5.0",
+        TARGETED_DEVICE_FAMILY: "1,2",
+    };
+    const debugBuildConfig = xcode_1.XCBuildConfiguration.create(project, {
+        name: "Debug",
+        buildSettings: {
+            ...commonBuildSettings,
+            GCC_PREPROCESSOR_DEFINITIONS: ["DEBUG=1", "$(inherited)"],
+            MTL_ENABLE_DEBUG_INFO: "INCLUDE_SOURCE",
+            SWIFT_ACTIVE_COMPILATION_CONDITIONS: "DEBUG $(inherited)",
+            SWIFT_OPTIMIZATION_LEVEL: "-Onone",
+        },
+    });
+    const releaseBuildConfig = xcode_1.XCBuildConfiguration.create(project, {
+        name: "Release",
+        buildSettings: {
+            ...commonBuildSettings,
+            COPY_PHASE_STRIP: "NO",
+            DEBUG_INFORMATION_FORMAT: "dwarf-with-dsym",
+            ...{ SWIFT_COMPILATION_MODE: "wholemodule" },
+        },
+    });
+    const configurationList = xcode_1.XCConfigurationList.create(project, {
+        buildConfigurations: [debugBuildConfig, releaseBuildConfig],
+        defaultConfigurationIsVisible: 0,
+        defaultConfigurationName: "Release",
+    });
+    return configurationList;
+}
 function createShareConfigurationList(project, { name, cwd, bundleId, deploymentTarget, currentProjectVersion, }) {
     const common = {
         CLANG_ANALYZER_NONNULL: "YES",
@@ -563,6 +625,9 @@ function createConfigurationListForType(project, props) {
     else if (props.type === "watch") {
         return createWatchAppConfigurationList(project, props);
     }
+    else if (props.type === "app-intent") {
+        return createAppIntentConfigurationList(project, props);
+    }
     else {
         // TODO: More
         return createNotificationContentConfigurationList(project, props);
@@ -722,11 +787,16 @@ async function applyXcodeChanges(config, project, props) {
         syncMarketingVersions();
         return project;
     }
+    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 appExtensionBuildFile = xcode_1.PBXBuildFile.create(project, {
         fileRef: xcode_1.PBXFileReference.create(project, {
-            explicitFileType: "wrapper.app-extension",
+            explicitFileType: isExtensionKit
+                ? "wrapper.extensionkit-extension"
+                : "wrapper.app-extension",
             includeInIndex: 0,
-            path: productName + ".appex",
+            path: productName + (isExtension ? ".appex" : ".app"),
             sourceTree: "BUILT_PRODUCTS_DIR",
         }),
         settings: {
@@ -742,7 +812,7 @@ async function applyXcodeChanges(config, project, props) {
         productName,
         // @ts-expect-error
         productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
-        productType: (0, target_1.productTypeForType)(props.type),
+        productType: productType,
     });
     configureTargetWithKnownSettings(extensionTarget);
     configureTargetWithEntitlements(extensionTarget);
@@ -763,11 +833,18 @@ async function applyXcodeChanges(config, project, props) {
     });
     // Add the target dependency to the main app, should be only one.
     mainAppTarget.props.dependencies.push(targetDependency);
-    const WELL_KNOWN_COPY_EXTENSIONS_NAME = props.type === "clip"
-        ? "Embed App Clips"
-        : props.type === "watch"
-            ? "Embed Watch Content"
-            : "Embed Foundation Extensions";
+    const WELL_KNOWN_COPY_EXTENSIONS_NAME = (() => {
+        switch (props.type) {
+            case "clip":
+                return "Embed App Clips";
+            case "watch":
+                return "Embed Watch Content";
+            case "app-intent":
+                return "Embed ExtensionKit Extensions";
+            default:
+                return "Embed Foundation Extensions";
+        }
+    })();
     // Could exist from a Share Extension
     const copyFilesBuildPhase = mainAppTarget.props.buildPhases.find((phase) => {
         if (xcode_1.PBXCopyFilesBuildPhase.is(phase)) {
@@ -791,7 +868,7 @@ async function applyXcodeChanges(config, project, props) {
             "Info.plist",
             // Exclude the config path
             path_1.default.relative(magicCwd, props.configPath),
-        ],
+        ].sort(),
     });
     const assetsDir = path_1.default.join(magicCwd, "assets");
     // TODO: Maybe just limit this to Safari extensions?

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/index.js",
   "files": [
     "app.plugin.js",
-    "build"
+    "build",
+    "prebuild-blank.tgz"
   ],
   "scripts": {
     "build": "expo-module build",
@@ -30,7 +31,7 @@
   "dependencies": {
     "@react-native/normalize-colors": "^0.76.1",
     "glob": "^10.2.6",
-    "@bacons/xcode": "^1.0.0-alpha.21",
+    "@bacons/xcode": "^1.0.0-alpha.22",
     "fs-extra": "^11.2.0"
   },
   "devDependencies": {