@bacons/apple-targets 0.1.14 → 0.1.16

package/README.md

@@ -77,7 +77,7 @@ module.exports = {
     thing: "../assets/thing.png",
   },
 
-  // The iOS version fot the target. Defaults to 18.1
+  // The iOS version fot the target. Defaults to 18.0
   deploymentTarget: "15.1",
 
   // Optional bundle identifier for the target. Will default to a sanitized version of the root project bundle id + target name.
@@ -174,6 +174,18 @@ end
 
 The name of the target must match the name of the target directory.
 
+## `_shared`
+
+Some files are required to be linked to both your target and the main target. To support this, you can add a top-level `_shared` directory. Any file in this directory will be linked to both the main target and the sub-target. You'll need to re-run prebuild every time you add, rename, or remove a file in this directory.
+
+This is especially useful for Live Activities and Intents.
+
+## `exportJs`
+
+The `exportJs` option should be used when the target uses React Native (App Clip, Share extension). It works by linking the main target's `Bundle React Native code and images` build phase to the target. This will ensure that production builds (`Release`) bundle the main JS entry file with Metro, and embed the bundle/assets for offline use.
+
+To detect which target is being built, you can read the bundle identifier using `expo-application`.
+
 ## Examples
 
 ### `widget`
@@ -392,3 +404,44 @@ let index = defaults?.string(forKey: "myKey")
 ## Xcode parsing
 
 This plugin makes use of my proprietary Xcode parsing library, [`@bacons/xcode`](https://github.com/evanbacon/xcode). It's mostly typed, very untested, and possibly full of bugs––however, it's still 10x nicer than the alternative.
+
+## Generated App Intents
+
+You can make any type of App Intent that you'd like with this plugin. However, the majority of app intents simply launch a URL (specifically a universal link for the same app). Expo Router apps have automatic deep linking and websites, meaning you can get to universal links pretty easily. As such, I've built in support for generating link-opening app intents from JSON.
+
+These actions will show up in the control center, siri suggestions, Shortcuts, and can be added to the bottom of the lock screen in iOS 18.
+
+```js
+{
+  intents: [
+    {
+      // Label that will show up in the control center.
+      label: "Bacon",
+      // Name of an SF Symbol (no custom icons are supported).
+      icon: "laurel.leading",
+      // Universal link to open.
+      url: "https://pillarvalley.netlify.app/settings",
+      // Auxiliary data
+      displayName: "Open Bacon AI",
+      description: "Launch the Bacon AI app.",
+    },
+  ];
+}
+```
+
+You can add multiple intents, they'll be generated during prebuild to the `[target]/_shared/generated-intents.swift` file. This file will have a comment block in it like:
+
+```swift
+// TODO: These must be added to the WidgetBundle manually. They need to be linked outside of the _shared folder.
+// @main
+// struct exportWidgets: WidgetBundle {
+//     var body: some Widget {
+//         widgetControl0()
+//         widgetControl1()
+//     }
+// }
+```
+
+You should copy the generated intents into your main `WidgetBundle` struct.
+
+This system is subject to change with the default intended behavior to be that anywhere a SF Symbol can be used to launch a deep link should be populated by this feature.

package/build/config.d.ts

@@ -84,7 +84,7 @@ export type Config = {
      * @example ["UserNotifications", "Intents"]
      */
     frameworks?: string[];
-    /** Deployment iOS version for the target. Defaults to `18.1` */
+    /** Deployment iOS version for the target. Defaults to `18.0` */
     deploymentTarget?: string;
     /** Apple team ID to use for signing the target. Defaults to whatever is used in the main App target. */
     appleTeamId?: string;

package/build/withEasCredentials.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEASCredentialsForXcodeProject = exports.withAutoEasExtensionCredentials = exports.withEASTargets = void 0;
 const target_1 = require("./target");
 const withXcparse_1 = require("./withXcparse");
+const debug = require("debug")("expo:target:eas");
 function safeSet(obj, key, value) {
     const segments = key.split(".");
     const last = segments.pop();
@@ -17,27 +18,24 @@ function safeSet(obj, key, value) {
     }
     return obj;
 }
+// TODO: This should all go into EAS instead.
 const withEASTargets = (config, { bundleIdentifier, targetName, entitlements }) => {
     // Extra EAS targets
     safeSet(config, "extra.eas.build.experimental.ios.appExtensions", []);
-    const existing = config.extra.eas.build.experimental.ios.appExtensions.findIndex((ext) => ext.targetName === targetName);
+    const existing = config.extra.eas.build.experimental.ios.appExtensions.findIndex((ext) => ext.bundleIdentifier === bundleIdentifier);
+    const settings = {
+        bundleIdentifier,
+        targetName,
+        entitlements,
+    };
     if (existing > -1) {
-        config.extra.eas.build.experimental.ios.appExtensions[existing] = {
-            ...config.extra.eas.build.experimental.ios.appExtensions[existing],
-            bundleIdentifier,
-            entitlements: {
-                ...config.extra.eas.build.experimental.ios.appExtensions[existing]
-                    .entitlements,
-                ...entitlements,
-            },
-        };
+        debug("Found existing EAS target with bundle identifier: %s", bundleIdentifier);
+        debug("Using new settings: %o", settings);
+        config.extra.eas.build.experimental.ios.appExtensions[existing] = settings;
     }
     else {
-        config.extra.eas.build.experimental.ios.appExtensions.push({
-            bundleIdentifier,
-            targetName,
-            entitlements,
-        });
+        debug("Adding new iOS target for code signing with EAS: %o", settings);
+        config.extra.eas.build.experimental.ios.appExtensions.push(settings);
         // "appExtensions": [
         //   {
         //     "targetName": "widgets",

package/build/withWidget.js

@@ -15,7 +15,7 @@ const withIosIcon_1 = require("./icon/withIosIcon");
 const target_1 = require("./target");
 const withEasCredentials_1 = require("./withEasCredentials");
 const withXcodeChanges_1 = require("./withXcodeChanges");
-const DEFAULT_DEPLOYMENT_TARGET = "18.1";
+const DEFAULT_DEPLOYMENT_TARGET = "18.0";
 function memoize(fn) {
     const cache = new Map();
     return ((...args) => {

package/build/withXcodeChanges.js

@@ -12,6 +12,7 @@ const target_1 = require("./target");
 const XCBuildConfiguration_json_1 = __importDefault(require("./template/XCBuildConfiguration.json"));
 const TemplateBuildSettings = XCBuildConfiguration_json_1.default;
 const withXcparse_1 = require("./withXcparse");
+const assert_1 = __importDefault(require("assert"));
 const withXcodeChanges = (config, props) => {
     return (0, withXcparse_1.withXcodeProjectBeta)(config, (config) => {
         // @ts-ignore
@@ -634,7 +635,8 @@ function createConfigurationListForType(project, props) {
     }
 }
 async function applyXcodeChanges(config, project, props) {
-    var _a;
+    var _a, _b;
+    var _c;
     const mainAppTarget = (0, target_1.getMainAppTarget)(project);
     // Special setting for share extensions.
     if ((0, target_1.needsEmbeddedSwift)(props.type)) {
@@ -741,14 +743,20 @@ async function applyXcodeChanges(config, project, props) {
             const currentShellScript = target.props.buildPhases.find((phase) => xcode_1.PBXShellScriptBuildPhase.is(phase) &&
                 phase.props.name === "Bundle React Native code and images");
             if (!currentShellScript) {
-                target.createBuildPhase(xcode_1.PBXShellScriptBuildPhase, {
-                    ...shellScript.props,
-                });
+                // Link the same build script across targets to simplify updates.
+                target.props.buildPhases.push(shellScript);
+                // Alternatively, create a duplicate.
+                // target.createBuildPhase(PBXShellScriptBuildPhase, {
+                //   ...shellScript.props,
+                // });
             }
             else {
-                for (const key in shellScript.props) {
-                    // @ts-expect-error
-                    currentShellScript.props[key] = shellScript.props[key];
+                // If there already is a bundler shell script and it's not the one from the main target, then update it.
+                if (currentShellScript.uuid !== shellScript.uuid) {
+                    for (const key in shellScript.props) {
+                        // @ts-expect-error
+                        currentShellScript.props[key] = shellScript.props[key];
+                    }
                 }
             }
         }
@@ -831,8 +839,13 @@ async function applyXcodeChanges(config, project, props) {
             fs_1.default.statSync(path_1.default.join(assetsDir, file)).isDirectory())
             .map((file) => path_1.default.join("assets", file));
     const protectedGroup = ensureProtectedGroup(project, path_1.default.dirname(props.cwd));
-    if (!protectedGroup.props.children.find((child) => child.props.path === path_1.default.basename(props.cwd))) {
-        const syncRootGroup = xcode_1.PBXFileSystemSynchronizedRootGroup.create(project, {
+    const sharedAssets = (0, glob_1.sync)("_shared/*", {
+        absolute: false,
+        cwd: magicCwd,
+    });
+    let syncRootGroup = protectedGroup.props.children.find((child) => child.props.path === path_1.default.basename(props.cwd));
+    if (!syncRootGroup) {
+        syncRootGroup = xcode_1.PBXFileSystemSynchronizedRootGroup.create(project, {
             path: path_1.default.basename(props.cwd),
             exceptions: [
                 xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
@@ -859,6 +872,23 @@ async function applyXcodeChanges(config, project, props) {
         targetToUpdate.props.fileSystemSynchronizedGroups.push(syncRootGroup);
         protectedGroup.props.children.push(syncRootGroup);
     }
+    // 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 = []);
+    const existingExceptionSet = syncRootGroup.props.exceptions.find((exception) => exception instanceof xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet &&
+        exception.props.target === mainAppTarget);
+    if (sharedAssets.length) {
+        const exceptionSet = existingExceptionSet ||
+            xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                target: mainAppTarget,
+            });
+        exceptionSet.props.membershipExceptions = sharedAssets.sort();
+        syncRootGroup.props.exceptions.push(exceptionSet);
+    }
+    else {
+        // Remove the exception set if there are no shared assets.
+        existingExceptionSet === null || existingExceptionSet === void 0 ? void 0 : existingExceptionSet.removeFromProject();
+    }
     applyDevelopmentTeamIdToTargets();
     syncMarketingVersions();
     return project;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/ExtensionStorage.js",
   "types": "build/ExtensionStorage.d.ts",
@@ -36,12 +36,15 @@
     "@react-native/normalize-colors": "^0.76.1",
     "glob": "^10.2.6",
     "@bacons/xcode": "1.0.0-alpha.24",
-    "fs-extra": "^11.2.0"
+    "fs-extra": "^11.2.0",
+    "debug": "^4.3.4"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.7",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
     "@expo/babel-preset-cli": "^0.3.1",
+    "chalk": "^4.0.0",
     "jest-environment-node": "^26"
   }
 }