@bacons/apple-targets 0.1.16 → 0.1.17

package/build/config-plugin.js

@@ -20,7 +20,7 @@ const withTargetsDir = (config, _props) => {
         hasWarned = true;
         console.warn((0, chalk_1.default) `{yellow [bacons/apple-targets]} Expo config is missing required {cyan ios.appleTeamId} property. Find this in Xcode and add to the Expo Config to correct. iOS builds may fail until this is corrected.`);
     }
-    const targets = (0, glob_1.sync)(`${root}/${match}/expo-target.config.@(json|js)`, {
+    const targets = (0, glob_1.globSync)(`${root}/${match}/expo-target.config.@(json|js)`, {
         // const targets = globSync(`./targets/action/expo-target.config.@(json|js)`, {
         cwd: projectRoot,
         absolute: true,

package/build/config.d.ts

@@ -3,6 +3,17 @@ export type DynamicColor = {
     light: string;
     dark?: string;
 };
+export type AppIntent = {
+    /** Main text to show in the control */
+    label: string;
+    /** SF Symbol name */
+    icon: string;
+    displayName: string;
+    description: string;
+    kind?: string;
+    /** URL to open when the intent is triggered. Should be a universal link. */
+    url: string;
+};
 export type Entitlements = Partial<{
     "com.apple.developer.healthkit": boolean;
     "com.apple.developer.healthkit.access": string[];
@@ -108,5 +119,7 @@ export type Config = {
     }>;
     /** Should the release build export the JS bundle and embed. Intended for App Clips and Share Extensions where you may want to use React Native. */
     exportJs?: boolean;
+    /** App Intents to generate. */
+    intents?: AppIntent[];
 };
 export type ConfigFunction = (config: import("expo/config").ExpoConfig) => Config;

package/build/icon/withImageAsset.js

@@ -27,7 +27,7 @@ exports.generateWatchIconsInternalAsync = exports.generateIconsInternalAsync = e
 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-extra"));
+const fs = __importStar(require("fs"));
 const path_1 = __importStar(require("path"));
 const withImageAsset = (config, { cwd, name, image }) => {
     return (0, config_plugins_1.withDangerousMod)(config, [
@@ -37,7 +37,9 @@ const withImageAsset = (config, { cwd, name, image }) => {
             const iosNamedProjectRoot = (0, path_1.join)(projectRoot, cwd);
             const imgPath = `Assets.xcassets/${name}.imageset`;
             // Ensure the Images.xcassets/AppIcon.appiconset path exists
-            await fs.ensureDir((0, path_1.join)(iosNamedProjectRoot, imgPath));
+            await fs.promises.mkdir((0, path_1.join)(iosNamedProjectRoot, imgPath), {
+                recursive: true,
+            });
             const userDefinedIcon = typeof image === "string"
                 ? { "1x": image, "2x": undefined, "3x": undefined }
                 : image;
@@ -120,7 +122,9 @@ exports.ICON_CONTENTS = [
 ];
 async function setIconsAsync(icon, projectRoot, iosNamedProjectRoot, cacheComponent) {
     // Ensure the Images.xcassets/AppIcon.appiconset path exists
-    await fs.ensureDir((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH));
+    await fs.promises.mkdir((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH), {
+        recursive: true,
+    });
     // Finally, write the Config.json
     await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH), {
         images: await generateIconsInternalAsync(icon, projectRoot, iosNamedProjectRoot, cacheComponent),
@@ -154,7 +158,7 @@ async function generateResizedImageAsync(icon, name, projectRoot, iosNamedProjec
             });
             // Write image buffer to the file system.
             const assetPath = (0, path_1.join)(iosNamedProjectRoot, `Assets.xcassets/${name}.imageset`, filename);
-            await fs.writeFile(assetPath, source);
+            await fs.promises.writeFile(assetPath, source);
             if (filename) {
                 imgEntry.filename = filename;
             }
@@ -196,7 +200,7 @@ async function generateIconsInternalAsync(icon, projectRoot, iosNamedProjectRoot
                     });
                     // Write image buffer to the file system.
                     const assetPath = (0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH, filename);
-                    await fs.writeFile(assetPath, source);
+                    await fs.promises.writeFile(assetPath, source);
                     // Save a reference to the generated image so we don't create a duplicate.
                     generatedIcons[filename] = true;
                 }
@@ -234,7 +238,7 @@ async function generateWatchIconsInternalAsync(icon, projectRoot, iosNamedProjec
     });
     // Write image buffer to the file system.
     const assetPath = (0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH, filename);
-    await fs.writeFile(assetPath, source);
+    await fs.promises.writeFile(assetPath, source);
     imagesJson.push({
         filename: getAppleIconName(size, 1),
         idiom: "universal",

package/build/icon/withIosIcon.js

@@ -27,7 +27,7 @@ exports.generateWatchIconsInternalAsync = exports.generateIconsInternalAsync = e
 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-extra"));
+const fs = __importStar(require("fs"));
 const path_1 = require("path");
 // TODO: support dark, tinted, and universal icons for widgets.
 const withIosIcon = (config, { cwd, type, iconFilePath, isTransparent = false }) => {
@@ -38,7 +38,9 @@ const withIosIcon = (config, { cwd, type, iconFilePath, isTransparent = false })
             const namedProjectRoot = (0, path_1.join)(projectRoot, cwd);
             if (type === "watch") {
                 // Ensure the Images.xcassets/AppIcon.appiconset path exists
-                await fs.ensureDir((0, path_1.join)(namedProjectRoot, IMAGESET_PATH));
+                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),
@@ -119,7 +121,9 @@ exports.ICON_CONTENTS = [
 ];
 async function setIconsAsync(icon, projectRoot, iosNamedProjectRoot, cacheComponent, isTransparent) {
     // Ensure the Images.xcassets/AppIcon.appiconset path exists
-    await fs.ensureDir((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH));
+    await fs.promises.mkdir((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH), {
+        recursive: true,
+    });
     // Finally, write the Config.json
     await (0, AssetContents_1.writeContentsJsonAsync)((0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH), {
         images: await generateIconsInternalAsync(icon, projectRoot, iosNamedProjectRoot, cacheComponent, isTransparent),
@@ -158,7 +162,7 @@ async function generateIconsInternalAsync(icon, projectRoot, iosNamedProjectRoot
                     });
                     // Write image buffer to the file system.
                     const assetPath = (0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH, filename);
-                    await fs.writeFile(assetPath, source);
+                    await fs.promises.writeFile(assetPath, source);
                     // Save a reference to the generated image so we don't create a duplicate.
                     generatedIcons[filename] = true;
                 }
@@ -196,7 +200,7 @@ async function generateWatchIconsInternalAsync(icon, projectRoot, iosNamedProjec
     });
     // Write image buffer to the file system.
     const assetPath = (0, path_1.join)(iosNamedProjectRoot, IMAGESET_PATH, filename);
-    await fs.writeFile(assetPath, source);
+    await fs.promises.writeFile(assetPath, source);
     imagesJson.push({
         filename: getAppleIconName(size, 1),
         idiom: "universal",

package/build/withLinkAppIntent.d.ts

@@ -0,0 +1,7 @@
+import { ConfigPlugin } from "expo/config-plugins";
+import { AppIntent } from "./config";
+declare const withLinkAppIntent: ConfigPlugin<{
+    intents: AppIntent[];
+    targetRoot: string;
+}>;
+export default withLinkAppIntent;

package/build/withLinkAppIntent.js

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_plugins_1 = require("expo/config-plugins");
+function generateSwiftModule(config) {
+    const { intents } = config;
+    const widgetBundleBody = intents
+        .map((intent, index) => `//         widgetControl${index}()`)
+        .join("\n");
+    const widgetDefinitions = intents
+        .map((intent, index) => {
+        return `
+@available(iOS 18.0, *)
+struct widgetControl${index}: ControlWidget {
+    static let kind: String = "${intent.kind}"
+    var body: some ControlWidgetConfiguration {
+      StaticControlConfiguration(kind: Self.kind) {
+        ControlWidgetButton(action: OpenAppIntent${index}()) {
+          Label("${intent.label}", ${
+        // If the icon is generated, use the image system
+        intent.icon.startsWith("generated_expo_intent_icon_")
+            ? "image"
+            : "systemImage"}: "${intent.icon}")
+        }
+      }
+      .displayName("${intent.displayName}")
+      .description("${intent.description}")
+    }
+}
+
+// This must be in both targets when \`openAppWhenRun = true\`
+// https://developer.apple.com/forums/thread/763851
+@available(iOS 18.0, *)
+struct OpenAppIntent${index}: ControlConfigurationIntent {
+    static let title: LocalizedStringResource = "${intent.displayName}"
+    static let description = IntentDescription(stringLiteral: "${intent.description}")
+    static let isDiscoverable = true
+    static let openAppWhenRun: Bool = true
+    
+    @MainActor
+    func perform() async throws -> some IntentResult & OpensIntent {
+        return .result(opensIntent: OpenURLIntent(URL(string: "${intent.url}")!))
+    }
+}`;
+    })
+        .join("\n");
+    return `
+// Generated by @bacons/apple-targets via the appIntents option in the config file.
+import AppIntents
+import SwiftUI
+import WidgetKit
+
+// 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 {
+${widgetBundleBody}
+//     }
+// }
+${widgetDefinitions}
+      `;
+}
+const fs_1 = __importDefault(require("fs"));
+const withLinkAppIntent = (config, { targetRoot, intents }) => {
+    (0, config_plugins_1.withDangerousMod)(config, [
+        "ios",
+        async (config) => {
+            const sharedFile = `${targetRoot}/_shared/generated-intents.swift`;
+            await fs_1.default.promises.mkdir(`${targetRoot}/_shared`, { recursive: true });
+            await fs_1.default.promises.writeFile(sharedFile, generateSwiftModule({
+                intents: intents.map((intent, index) => {
+                    var _a;
+                    return ({
+                        ...intent,
+                        kind: (_a = intent.kind) !== null && _a !== void 0 ? _a : `${config.ios.bundleIdentifier}.${index}`,
+                    });
+                }),
+            }), "utf-8");
+            return config;
+        },
+    ]);
+    return config;
+};
+exports.default = withLinkAppIntent;

package/build/withWidget.js

@@ -15,6 +15,7 @@ const withIosIcon_1 = require("./icon/withIosIcon");
 const target_1 = require("./target");
 const withEasCredentials_1 = require("./withEasCredentials");
 const withXcodeChanges_1 = require("./withXcodeChanges");
+const withLinkAppIntent_1 = __importDefault(require("./withLinkAppIntent"));
 const DEFAULT_DEPLOYMENT_TARGET = "18.0";
 function memoize(fn) {
     const cache = new Map();
@@ -63,7 +64,7 @@ const withWidget = (config, props) => {
         .replace(/^\/+/, "");
     const widget = kebabToCamelCase(widgetDir);
     const widgetFolderAbsolutePath = path_1.default.join((_b = (_a = config._internal) === null || _a === void 0 ? void 0 : _a.projectRoot) !== null && _b !== void 0 ? _b : "", props.directory);
-    const entitlementsFiles = (0, glob_1.sync)("*.entitlements", {
+    const entitlementsFiles = (0, glob_1.globSync)("*.entitlements", {
         absolute: true,
         cwd: widgetFolderAbsolutePath,
     });
@@ -116,6 +117,29 @@ const withWidget = (config, props) => {
         };
         entitlementsJson = applyDefaultEntitlements(entitlementsJson);
     }
+    if (props.intents) {
+        // Add local images:
+        // TODO: Apple only supports custom SF Symbols for intents, so we'll need to create a system to generate these from an SVG or accept .SFSymbol.svg files.
+        // props.intents.forEach((intent, index) => {
+        //   // Is local image?
+        //   if (intent.icon.match(/^\./)) {
+        //     props.images ??= {};
+        //     const intentIconName = "generated_expo_intent_icon_" + index;
+        //     props.images[intentIconName] = intent.icon;
+        //     props.intents![index].icon = intentIconName;
+        //   }
+        // });
+        props.intents.forEach((intent) => {
+            if (intent.icon.match(/^\./)) {
+                throw new Error("Local images are not supported for intents. Use an SF Symbol name. From: " +
+                    intent.icon);
+            }
+        });
+        (0, withLinkAppIntent_1.default)(config, {
+            intents: props.intents,
+            targetRoot: widgetFolderAbsolutePath,
+        });
+    }
     // If the user defined entitlements, then overwrite any existing entitlements file
     if (entitlementsJson) {
         (0, config_plugins_1.withDangerousMod)(config, [

package/build/withXcodeChanges.js

@@ -697,7 +697,7 @@ async function applyXcodeChanges(config, project, props) {
         }
     }
     function configureTargetWithEntitlements(target) {
-        const entitlements = (0, glob_1.sync)("*.entitlements", {
+        const entitlements = (0, glob_1.globSync)("*.entitlements", {
             absolute: false,
             cwd: magicCwd,
         });
@@ -719,7 +719,7 @@ async function applyXcodeChanges(config, project, props) {
         });
     }
     function configureTargetWithPreview(target) {
-        const assets = (0, glob_1.sync)("preview/*.xcassets", {
+        const assets = (0, glob_1.globSync)("preview/*.xcassets", {
             absolute: true,
             cwd: magicCwd,
         })[0];
@@ -839,7 +839,7 @@ 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));
-    const sharedAssets = (0, glob_1.sync)("_shared/*", {
+    const sharedAssets = (0, glob_1.globSync)("_shared/*", {
         absolute: false,
         cwd: magicCwd,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/ExtensionStorage.js",
   "types": "build/ExtensionStorage.d.ts",
@@ -33,15 +33,13 @@
   "author": "Evan Bacon",
   "license": "MIT",
   "dependencies": {
-    "@react-native/normalize-colors": "^0.76.1",
-    "glob": "^10.2.6",
     "@bacons/xcode": "1.0.0-alpha.24",
-    "fs-extra": "^11.2.0",
+    "@react-native/normalize-colors": "^0.76.1",
+    "glob": "^10.4.2",
     "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",