@bacons/apple-targets 0.0.10 → 0.1.0

package/README.md

@@ -9,11 +9,13 @@ An experimental Expo Config Plugin that generates native Apple Targets like Widg
 
 ## 🚀 How to use
 
+> This plugin requires at least CocoaPods 1.16.2 and Xcode 16.
+
 - Add targets to `targets/` directory with an `expo-target.config.json` file.
 - Currently, if you don't have an `Info.plist`, it'll be generated on `npx expo prebuild`. This may be changed in the future so if you have an `Info.plist` it'll be used, otherwise, it'll be generated.
 - Any files in a top-level `target/*/assets` directory will be linked as resources of the target. This was added to support Safari Extensions.
 - A single top-level `*.entitlements` file will be linked as the entitlements of the target. This is not currently used in EAS Capability signing, but may be in the future.
-- All top-level swift files will be linked as build sources of the target. There is currently no support for storyboard or `.xib` files because I can't be bothered.
+- All Swift files will be linked as build sources of the target. There is currently no support for storyboard or `.xib` files because I can't be bothered.
 - All top-level `*.xcassets` will be linked as resources, and accessible in the targets. If you add files outside of Xcode, you'll need to re-run `npx expo prebuild` to link them.
 - In Expo SDK +52, set the `ios.appleTeamId`, for SDK 51 and below, set the `appleTeamId` prop in the Config Plugin in `app.config.js`:
 

package/build/index.js

@@ -26,6 +26,7 @@ const withTargetsDir = (config, _props) => {
             appleTeamId,
             ...require(configPath),
             directory: path_1.default.relative(projectRoot, path_1.default.dirname(configPath)),
+            configPath,
         });
     });
     (0, withPodTargetExtension_1.withPodTargetExtension)(config);

package/build/withWidget.d.ts

@@ -2,6 +2,7 @@ import { ConfigPlugin } from "@expo/config-plugins";
 import { Config } from "./config";
 type Props = Config & {
     directory: string;
+    configPath: string;
 };
 declare const withWidget: ConfigPlugin<Props>;
 export default withWidget;

package/build/withWidget.js

@@ -113,6 +113,7 @@ const withWidget = (config, props) => {
     const targetName = (_c = props.name) !== null && _c !== void 0 ? _c : widget;
     const bundleId = config.ios.bundleIdentifier + "." + widget;
     (0, withXcodeChanges_1.withXcodeChanges)(config, {
+        configPath: props.configPath,
         name: targetName,
         cwd: "../" +
             path_1.default.relative(config._internal.projectRoot, path_1.default.resolve(props.directory)),

package/build/withXcodeChanges.d.ts

@@ -14,5 +14,7 @@ export type XcodeSettings = {
     teamId?: string;
     icon?: string;
     exportJs?: boolean;
+    /** File path to the extension config file. */
+    configPath: string;
 };
 export declare const withXcodeChanges: ConfigPlugin<XcodeSettings>;

package/build/withXcodeChanges.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withXcodeChanges = void 0;
 const xcode_1 = require("@bacons/xcode");
-const json_1 = require("@bacons/xcode/json");
 const fs_1 = __importDefault(require("fs"));
 const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
@@ -40,14 +39,19 @@ function createNotificationContentConfigurationList(project, { name, cwd, bundle
         INFOPLIST_KEY_CFBundleDisplayName: name,
         INFOPLIST_KEY_NSHumanReadableCopyright: "",
         IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: [
+            "$(inherited)",
+            "@executable_path/Frameworks",
+            "@executable_path/../../Frameworks",
+        ],
         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_OPTIMIZATION_LEVEL: "-Owholemodule",
+        SWIFT_COMPILATION_MODE: "wholemodule",
+        SWIFT_OPTIMIZATION_LEVEL: "-O",
         SWIFT_VERSION: "5.0",
         TARGETED_DEVICE_FAMILY: "1,2",
     };
@@ -135,7 +139,11 @@ function createShareConfigurationList(project, { name, cwd, bundleId, deployment
         INFOPLIST_KEY_CFBundleDisplayName: name,
         INFOPLIST_KEY_NSHumanReadableCopyright: "",
         IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: [
+            "$(inherited)",
+            "@executable_path/Frameworks",
+            "@executable_path/../../Frameworks",
+        ],
         MARKETING_VERSION: "1.0",
         MTL_FAST_MATH: "YES",
         PRODUCT_BUNDLE_IDENTIFIER: bundleId,
@@ -202,7 +210,11 @@ function createIMessageConfigurationList(project, { name, cwd, bundleId, deploym
         INFOPLIST_KEY_CFBundleDisplayName: name,
         INFOPLIST_KEY_NSHumanReadableCopyright: "",
         IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: [
+            "$(inherited)",
+            "@executable_path/Frameworks",
+            "@executable_path/../../Frameworks",
+        ],
         MARKETING_VERSION: "1.0",
         MTL_FAST_MATH: "YES",
         PRODUCT_BUNDLE_IDENTIFIER: bundleId,
@@ -260,7 +272,7 @@ function createWatchAppConfigurationList(project, { name, cwd, bundleId, deploym
         INFOPLIST_KEY_WKCompanionAppBundleIdentifier: mainAppTarget.props.buildSettings.PRODUCT_BUNDLE_IDENTIFIER,
         // INFOPLIST_KEY_WKCompanionAppBundleIdentifier: "$(BUNDLE_IDENTIFIER)",
         // INFOPLIST_KEY_WKCompanionAppBundleIdentifier: rootBundleId,
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"],
         MARKETING_VERSION: "1.0",
         MTL_FAST_MATH: "YES",
         PRODUCT_BUNDLE_IDENTIFIER: bundleId,
@@ -292,7 +304,8 @@ function createWatchAppConfigurationList(project, { name, cwd, bundleId, deploym
         buildSettings: {
             ...common,
             // Diff
-            SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule",
+            SWIFT_COMPILATION_MODE: "wholemodule",
+            SWIFT_OPTIMIZATION_LEVEL: "-O",
             COPY_PHASE_STRIP: "NO",
             DEBUG_INFORMATION_FORMAT: "dwarf-with-dsym",
         },
@@ -321,7 +334,11 @@ function createSafariConfigurationList(project, { name, cwd, bundleId, deploymen
         INFOPLIST_KEY_CFBundleDisplayName: name,
         INFOPLIST_KEY_NSHumanReadableCopyright: "",
         IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: [
+            "$(inherited)",
+            "@executable_path/Frameworks",
+            "@executable_path/../../Frameworks",
+        ],
         MARKETING_VERSION: "1.0",
         MTL_FAST_MATH: "YES",
         PRODUCT_BUNDLE_IDENTIFIER: bundleId,
@@ -348,7 +365,8 @@ function createSafariConfigurationList(project, { name, cwd, bundleId, deploymen
         buildSettings: {
             ...common,
             // Diff
-            SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule",
+            SWIFT_COMPILATION_MODE: "wholemodule",
+            SWIFT_OPTIMIZATION_LEVEL: "-O",
             COPY_PHASE_STRIP: "NO",
             DEBUG_INFORMATION_FORMAT: "dwarf-with-dsym",
         },
@@ -404,7 +422,7 @@ function createAppClipConfigurationList(project, { name, cwd, bundleId, deployme
         ...infoPlist,
         ...superCommon,
         ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon",
-        LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks",
+        LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"],
         MTL_FAST_MATH: "YES",
         ENABLE_PREVIEWS: "YES",
     };
@@ -424,7 +442,8 @@ function createAppClipConfigurationList(project, { name, cwd, bundleId, deployme
         buildSettings: {
             ...common,
             // Diff
-            SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule",
+            SWIFT_COMPILATION_MODE: "wholemodule",
+            SWIFT_OPTIMIZATION_LEVEL: "-O",
             COPY_PHASE_STRIP: "NO",
             DEBUG_INFORMATION_FORMAT: "dwarf-with-dsym",
         },
@@ -458,7 +477,11 @@ function createConfigurationList(project, { name, cwd, bundleId, deploymentTarge
             INFOPLIST_KEY_CFBundleDisplayName: name,
             INFOPLIST_KEY_NSHumanReadableCopyright: "",
             IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-            LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+            LD_RUNPATH_SEARCH_PATHS: [
+                "$(inherited)",
+                "@executable_path/Frameworks",
+                "@executable_path/../../Frameworks",
+            ],
             MARKETING_VERSION: "1.0",
             MTL_ENABLE_DEBUG_INFO: "INCLUDE_SOURCE",
             MTL_FAST_MATH: "YES",
@@ -494,14 +517,19 @@ function createConfigurationList(project, { name, cwd, bundleId, deploymentTarge
             INFOPLIST_KEY_CFBundleDisplayName: name,
             INFOPLIST_KEY_NSHumanReadableCopyright: "",
             IPHONEOS_DEPLOYMENT_TARGET: deploymentTarget,
-            LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks",
+            LD_RUNPATH_SEARCH_PATHS: [
+                "$(inherited)",
+                "@executable_path/Frameworks",
+                "@executable_path/../../Frameworks",
+            ],
             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_OPTIMIZATION_LEVEL: "-Owholemodule",
+            SWIFT_COMPILATION_MODE: "wholemodule",
+            SWIFT_OPTIMIZATION_LEVEL: "-O",
             SWIFT_VERSION: "5",
             TARGETED_DEVICE_FAMILY: "1,2",
         },
@@ -540,37 +568,6 @@ function createConfigurationListForType(project, props) {
         return createNotificationContentConfigurationList(project, props);
     }
 }
-/** It's common for all frameworks to exist in the top-level "Frameworks" folder that shows in Xcode. */
-function addFrameworksToDisplayFolder(project, frameworks) {
-    var _a;
-    const mainFrameworksGroup = (_a = project.rootObject.props.mainGroup
-        .getChildGroups()
-        .find((group) => group.getDisplayName() === "Frameworks")) !== null && _a !== void 0 ? _a : 
-    // If this happens, there's a big problem. But just in case...
-    project.rootObject.props.mainGroup.createGroup({
-        name: "Frameworks",
-        sourceTree: "<group>",
-    });
-    frameworks.forEach((file) => {
-        if (!mainFrameworksGroup.props.children.find((child) => child.uuid === file.uuid)) {
-            mainFrameworksGroup.props.children.push(file);
-        }
-    });
-}
-function getFramework(project, name) {
-    const frameworkName = name + ".framework";
-    for (const [, entry] of project.entries()) {
-        if (xcode_1.PBXFileReference.is(entry) &&
-            entry.props.lastKnownFileType === "wrapper.framework" &&
-            entry.props.sourceTree === "SDKROOT" &&
-            entry.props.name === frameworkName) {
-            return entry;
-        }
-    }
-    return xcode_1.PBXFileReference.create(project, {
-        path: "System/Library/Frameworks/" + frameworkName,
-    });
-}
 async function applyXcodeChanges(config, project, props) {
     var _a, _b;
     const mainAppTarget = (0, target_1.getMainAppTarget)(project);
@@ -592,18 +589,6 @@ async function applyXcodeChanges(config, project, props) {
         console.log(`Target "${targetToUpdate.props.productName}" already exists, updating instead of creating a new one`);
     }
     const magicCwd = path_1.default.join(config._internal.projectRoot, "ios", props.cwd);
-    function getOrCreateBuildFile(file) {
-        for (const entry of file.getReferrers()) {
-            if (xcode_1.PBXBuildFile.is(entry) && entry.props.fileRef.uuid === file.uuid) {
-                return entry;
-            }
-        }
-        return xcode_1.PBXBuildFile.create(project, {
-            fileRef: file,
-        });
-    }
-    // Add the widget target to the display folder (cosmetic)
-    addFrameworksToDisplayFolder(project, props.frameworks.map((framework) => getFramework(project, framework)));
     const developmentTeamId = (_b = props.teamId) !== null && _b !== void 0 ? _b : mainAppTarget.getDefaultBuildSetting("DEVELOPMENT_TEAM");
     if (!developmentTeamId) {
         throw new Error("Couldn't find DEVELOPMENT_TEAM in Xcode project and none were provided in the Expo config.");
@@ -646,19 +631,11 @@ async function applyXcodeChanges(config, project, props) {
     }
     function configureTargetWithEntitlements(target) {
         const entitlements = (0, glob_1.sync)("*.entitlements", {
-            absolute: true,
+            absolute: false,
             cwd: magicCwd,
-        }).map((file) => {
-            return xcode_1.PBXBuildFile.create(project, {
-                fileRef: xcode_1.PBXFileReference.create(project, {
-                    path: path_1.default.basename(file),
-                    explicitFileType: "text.plist.entitlements",
-                    sourceTree: "<group>",
-                }),
-            });
         });
         if (entitlements.length > 0) {
-            target.setBuildSetting("CODE_SIGN_ENTITLEMENTS", props.cwd + "/" + entitlements[0].props.fileRef.props.path);
+            target.setBuildSetting("CODE_SIGN_ENTITLEMENTS", props.cwd + "/" + entitlements[0]);
         }
         else {
             target.removeBuildSetting("CODE_SIGN_ENTITLEMENTS");
@@ -674,50 +651,6 @@ async function applyXcodeChanges(config, project, props) {
             }
         });
     }
-    function buildFileGroupHierarchy(files) {
-        const root = [];
-        function getOrCreateGroup(name, segment, group) {
-            const fullPath = path_1.default.join(magicCwd, name);
-            let newGroup = group.find((child) => child.props.isa === json_1.ISA.PBXGroup && child.props.path === fullPath);
-            if (!newGroup) {
-                newGroup = xcode_1.PBXGroup.create(project, {
-                    name: segment,
-                    path: fullPath,
-                    children: [],
-                });
-                group.push(newGroup);
-            }
-            return newGroup;
-        }
-        files.forEach((filePath) => {
-            const pathSegments = filePath.split(path_1.default.sep);
-            let currentLevel = root;
-            pathSegments.forEach((part, index) => {
-                const isRoot = part === ".";
-                const currentPath = pathSegments.slice(0, index + 1).join(path_1.default.sep);
-                currentLevel = isRoot ? currentLevel : getOrCreateGroup(currentPath, part, currentLevel).props.children;
-                const isFinalPart = index === pathSegments.length - 1;
-                if (swiftBuildFiles[filePath] && isFinalPart) {
-                    const filex = swiftBuildFiles[filePath];
-                    currentLevel.push(...filex);
-                }
-            });
-        });
-        return root;
-    }
-    function generateProjectGroups(project, structure, magicCwd) {
-        return structure.map((item) => {
-            if (item.props.isa === json_1.ISA.PBXGroup) {
-                // @ts-ignore
-                const childGroups = generateProjectGroups(project, item.props.children, path_1.default.join(magicCwd, item.props.name));
-                item.props.children = childGroups;
-                return item;
-            }
-            else if (item.props.isa === json_1.ISA.PBXBuildFile) {
-                return item.props.fileRef;
-            }
-        });
-    }
     function configureTargetWithPreview(target) {
         const assets = (0, glob_1.sync)("preview/*.xcassets", {
             absolute: true,
@@ -736,7 +669,9 @@ async function applyXcodeChanges(config, project, props) {
             const shellScript = mainAppTarget.props.buildPhases.find((phase) => xcode_1.PBXShellScriptBuildPhase.is(phase) &&
                 phase.props.name === "Bundle React Native code and images");
             if (!shellScript) {
-                throw new Error('Failed to find the "Bundle React Native code and images" build phase in the main app target.');
+                console.warn('Failed to find the "Bundle React Native code and images" build phase in the main app target. Will not be able to configure: ' +
+                    props.type);
+                return;
             }
             const currentShellScript = target.props.buildPhases.find((phase) => xcode_1.PBXShellScriptBuildPhase.is(phase) &&
                 phase.props.name === "Bundle React Native code and images");
@@ -777,7 +712,8 @@ async function applyXcodeChanges(config, project, props) {
         });
         targetToUpdate.props.buildConfigurationList.removeFromProject();
         // Create new build phases
-        targetToUpdate.props.buildConfigurationList = createConfigurationListForType(project, props);
+        targetToUpdate.props.buildConfigurationList =
+            createConfigurationListForType(project, props);
         configureTargetWithEntitlements(targetToUpdate);
         configureTargetWithPreview(targetToUpdate);
         configureTargetWithKnownSettings(targetToUpdate);
@@ -786,126 +722,7 @@ async function applyXcodeChanges(config, project, props) {
         syncMarketingVersions();
         return project;
     }
-    // Build Files
-    const swiftBuildFiles = {};
-    (0, glob_1.sync)("**/*.swift", {
-        absolute: true,
-        cwd: magicCwd,
-    }).forEach((file) => {
-        const fileDir = path_1.default.dirname(path_1.default.relative(magicCwd, file));
-        const pbxFile = xcode_1.PBXBuildFile.create(project, {
-            fileRef: xcode_1.PBXFileReference.create(project, {
-                path: file,
-                sourceTree: "<group>",
-            }),
-        });
-        if (!swiftBuildFiles[fileDir]) {
-            swiftBuildFiles[fileDir] = [];
-        }
-        swiftBuildFiles[fileDir].push(pbxFile);
-        return undefined;
-    });
-    const swiftStructure = buildFileGroupHierarchy(Object.keys(swiftBuildFiles));
-    const swiftGroups = generateProjectGroups(project, swiftStructure, magicCwd);
-    // NOTE: Single-level only
-    const intentFiles = (0, glob_1.sync)("*.intentdefinition", {
-        absolute: true,
-        cwd: magicCwd,
-    }).map((file) => {
-        return xcode_1.PBXFileReference.create(project, {
-            lastKnownFileType: "file.intentdefinition",
-            path: path_1.default.basename(file),
-            sourceTree: "<group>",
-        });
-    });
-    const intentBuildFiles = [0, 1].map((_) => intentFiles.map((file) => {
-        return xcode_1.PBXBuildFile.create(project, {
-            fileRef: file,
-        });
-    }));
-    let assetFiles = [
-        // All assets`
-        // "assets/*",
-        // NOTE: Single-level only
-        "*.xcassets",
-    ]
-        .map((glob) => (0, glob_1.sync)(glob, {
-        absolute: true,
-        cwd: magicCwd,
-    }).map((file) => {
-        return xcode_1.PBXBuildFile.create(project, {
-            fileRef: xcode_1.PBXFileReference.create(project, {
-                path: path_1.default.basename(file),
-                sourceTree: "<group>",
-            }),
-        });
-    }))
-        .flat();
-    const resAssets = [];
-    // Support for LaunchScreen files
-    const baseProj = path_1.default.join(magicCwd, "Base.lproj");
-    if (fs_1.default.existsSync(baseProj)) {
-        // Link LaunchScreen.storyboard
-        fs_1.default.readdirSync(baseProj).forEach((file) => {
-            if (file === ".DS_Store")
-                return;
-            const stat = fs_1.default.statSync(path_1.default.join(baseProj, file));
-            if (stat.isFile()) {
-                if (file.endsWith(".storyboard")) {
-                    assetFiles.push(xcode_1.PBXBuildFile.create(project, {
-                        fileRef: xcode_1.PBXVariantGroup.create(project, {
-                            name: file,
-                            sourceTree: "<group>",
-                            children: [
-                                xcode_1.PBXFileReference.create(project, {
-                                    lastKnownFileType: "file.storyboard",
-                                    name: "Base",
-                                    path: path_1.default.join("Base.lproj", file),
-                                    sourceTree: "<group>",
-                                }),
-                            ],
-                        }),
-                    }));
-                }
-            }
-        });
-    }
-    // TODO: Maybe just limit this to Safari?
-    if (fs_1.default.existsSync(path_1.default.join(magicCwd, "assets"))) {
-        // get top-level directories in `assets/` and append them to assetFiles as folder types
-        fs_1.default.readdirSync(path_1.default.join(magicCwd, "assets")).forEach((file) => {
-            if (file === ".DS_Store")
-                return;
-            const stat = fs_1.default.statSync(path_1.default.join(magicCwd, "assets", file));
-            if (stat.isDirectory()) {
-                resAssets.push(xcode_1.PBXBuildFile.create(project, {
-                    fileRef: xcode_1.PBXFileReference.create(project, {
-                        path: file,
-                        sourceTree: "<group>",
-                        lastKnownFileType: "folder",
-                    }),
-                }));
-            }
-            else if (stat.isFile()) {
-                resAssets.push(xcode_1.PBXBuildFile.create(project, {
-                    fileRef: xcode_1.PBXFileReference.create(project, {
-                        path: file,
-                        explicitFileType: file.endsWith(".js")
-                            ? "sourcecode.javascript"
-                            : file.endsWith(".json")
-                                ? "text.json"
-                                : file.endsWith(".html")
-                                    ? "text.html"
-                                    : file.endsWith(".css")
-                                        ? "text.css"
-                                        : "text",
-                        sourceTree: "<group>",
-                    }),
-                }));
-            }
-        });
-    }
-    const alphaExtensionAppexBf = xcode_1.PBXBuildFile.create(project, {
+    const appExtensionBuildFile = xcode_1.PBXBuildFile.create(project, {
         fileRef: xcode_1.PBXFileReference.create(project, {
             explicitFileType: "wrapper.app-extension",
             includeInIndex: 0,
@@ -918,44 +735,30 @@ async function applyXcodeChanges(config, project, props) {
     });
     project.rootObject.ensureProductGroup().props.children.push(
     // @ts-expect-error
-    alphaExtensionAppexBf.props.fileRef);
-    const widgetTarget = project.rootObject.createNativeTarget({
+    appExtensionBuildFile.props.fileRef);
+    const extensionTarget = project.rootObject.createNativeTarget({
         buildConfigurationList: createConfigurationListForType(project, props),
         name: productName,
         productName,
         // @ts-expect-error
-        productReference: alphaExtensionAppexBf.props.fileRef /* alphaExtension.appex */,
+        productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
         productType: (0, target_1.productTypeForType)(props.type),
     });
-    configureTargetWithKnownSettings(widgetTarget);
-    const entitlementFiles = configureTargetWithEntitlements(widgetTarget);
-    configureTargetWithPreview(widgetTarget);
-    widgetTarget.createBuildPhase(xcode_1.PBXSourcesBuildPhase, {
-        files: [
-            ...Object.values(swiftBuildFiles).flat(),
-            ...intentBuildFiles[0],
-            // ...entitlementFiles
-        ],
-        // CD0706152A2EBE2E009C1192 /* index.swift in Sources */,
-        // CD07061A2A2EBE2F009C1192 /* alpha.intentdefinition in Sources */,
-        // CD0706112A2EBE2E009C1192 /* alphaBundle.swift in Sources */,
-        // CD0706132A2EBE2E009C1192 /* alphaLiveActivity.swift in Sources */,
-    });
-    widgetTarget.createBuildPhase(xcode_1.PBXFrameworksBuildPhase, {
-        files: props.frameworks.map((framework) => getOrCreateBuildFile(getFramework(project, framework))),
-    });
-    widgetTarget.createBuildPhase(xcode_1.PBXResourcesBuildPhase, {
-        files: [...assetFiles, ...resAssets],
-    });
-    configureJsExport(widgetTarget);
+    configureTargetWithKnownSettings(extensionTarget);
+    configureTargetWithEntitlements(extensionTarget);
+    configureTargetWithPreview(extensionTarget);
+    extensionTarget.ensureFrameworks(props.frameworks);
+    extensionTarget.getSourcesBuildPhase();
+    extensionTarget.getResourcesBuildPhase();
+    configureJsExport(extensionTarget);
     const containerItemProxy = xcode_1.PBXContainerItemProxy.create(project, {
         containerPortal: project.rootObject,
         proxyType: 1,
-        remoteGlobalIDString: widgetTarget.uuid,
+        remoteGlobalIDString: extensionTarget.uuid,
         remoteInfo: productName,
     });
     const targetDependency = xcode_1.PBXTargetDependency.create(project, {
-        target: widgetTarget,
+        target: extensionTarget,
         targetProxy: containerItemProxy,
     });
     // Add the target dependency to the main app, should be only one.
@@ -974,105 +777,63 @@ async function applyXcodeChanges(config, project, props) {
     });
     if (copyFilesBuildPhase) {
         // Assume that this is the first run if there is no matching target that we identified from a previous run.
-        copyFilesBuildPhase.props.files.push(alphaExtensionAppexBf);
+        copyFilesBuildPhase.props.files.push(appExtensionBuildFile);
     }
     else {
-        const dstPath = { clip: "AppClips", watch: "Watch" }[props.type];
-        if (dstPath) {
-            mainAppTarget.createBuildPhase(xcode_1.PBXCopyFilesBuildPhase, {
-                dstPath: "$(CONTENTS_FOLDER_PATH)/" + dstPath,
-                dstSubfolderSpec: 16,
-                buildActionMask: 2147483647,
-                files: [alphaExtensionAppexBf],
-                name: WELL_KNOWN_COPY_EXTENSIONS_NAME,
-                runOnlyForDeploymentPostprocessing: 0,
-            });
-        }
-        else {
-            mainAppTarget.createBuildPhase(xcode_1.PBXCopyFilesBuildPhase, {
-                dstSubfolderSpec: 13,
-                buildActionMask: 2147483647,
-                files: [alphaExtensionAppexBf],
-                name: WELL_KNOWN_COPY_EXTENSIONS_NAME,
-                runOnlyForDeploymentPostprocessing: 0,
-            });
-        }
+        mainAppTarget.createBuildPhase(xcode_1.PBXCopyFilesBuildPhase, {
+            files: [appExtensionBuildFile],
+        });
     }
-    const mainSourcesBuildPhase = mainAppTarget.getBuildPhase(xcode_1.PBXSourcesBuildPhase);
-    // TODO: Idempotent
-    mainSourcesBuildPhase === null || mainSourcesBuildPhase === void 0 ? void 0 : mainSourcesBuildPhase.props.files.push(...intentBuildFiles[1]);
-    const protectedGroup = ensureProtectedGroup(project).createGroup({
-        // This is where it gets fancy
-        // TODO: The user should be able to know that this is safe to modify and won't be overwritten.
-        name: path_1.default.basename(props.cwd),
-        // Like `../alpha`
-        path: props.cwd,
-        sourceTree: "<group>",
-        children: [
-            ...swiftGroups,
-            ...intentFiles.sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            ...assetFiles
-                .map((buildFile) => buildFile.props.fileRef)
-                .sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            ...entitlementFiles
-                .map((buildFile) => buildFile.props.fileRef)
-                .sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            // CD0706192A2EBE2F009C1192 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-            xcode_1.PBXFileReference.create(project, {
-                path: "Info.plist",
-                sourceTree: "<group>",
-            }),
+    const syncException = xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+        target: extensionTarget,
+        membershipExceptions: [
+            // TODO: What other files belong here, why is this here?
+            "Info.plist",
+            // Exclude the config path
+            path_1.default.relative(magicCwd, props.configPath),
         ],
-        // children = (
-        //   CD0706102A2EBE2E009C1192 /* alphaBundle.swift */,
-        //   CD0706122A2EBE2E009C1192 /* alphaLiveActivity.swift */,
-        //   CD0706142A2EBE2E009C1192 /* index.swift */,
-        //   CD0706162A2EBE2E009C1192 /* alpha.intentdefinition */,
-        //   CD0706172A2EBE2F009C1192 /* Assets.xcassets */,
-        //   CD0706192A2EBE2F009C1192 /* Info.plist */,
-        // );
-        // name = "expo:alpha";
-        // path = "../alpha";
-        // sourceTree = "<group>";
     });
-    if (resAssets.length > 0) {
-        protectedGroup.createGroup({
-            name: "assets",
-            path: "assets",
-            sourceTree: "<group>",
-            // @ts-expect-error
-            children: resAssets
-                .map((buildFile) => buildFile.props.fileRef)
-                .sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-        });
+    const assetsDir = path_1.default.join(magicCwd, "assets");
+    // TODO: Maybe just limit this to Safari extensions?
+    const explicitFolders = !fs_1.default.existsSync(assetsDir)
+        ? []
+        : fs_1.default
+            .readdirSync(assetsDir)
+            .filter((file) => file !== ".DS_Store" &&
+            fs_1.default.statSync(path_1.default.join(assetsDir, file)).isDirectory())
+            .map((file) => path_1.default.join("assets", file));
+    const syncRootGroup = xcode_1.PBXFileSystemSynchronizedRootGroup.create(project, {
+        path: path_1.default.basename(props.cwd),
+        exceptions: [syncException],
+        explicitFileTypes: {},
+        explicitFolders: [
+            // Replaces the previous `lastKnownFileType: "folder",` system that's used in things like Safari extensions to include folders of assets.
+            // ex: `"Resources/_locales", "Resources/images"`
+            ...explicitFolders,
+        ],
+        sourceTree: "<group>",
+    });
+    if (!extensionTarget.props.fileSystemSynchronizedGroups) {
+        extensionTarget.props.fileSystemSynchronizedGroups = [];
     }
+    extensionTarget.props.fileSystemSynchronizedGroups.push(syncRootGroup);
+    ensureProtectedGroup(project, path_1.default.dirname(props.cwd)).props.children.push(syncRootGroup);
     applyDevelopmentTeamIdToTargets();
     syncMarketingVersions();
     return project;
 }
 const PROTECTED_GROUP_NAME = "expo:targets";
-function ensureProtectedGroup(project) {
+function ensureProtectedGroup(project, relativePath = "../targets") {
     const hasProtectedGroup = project.rootObject.props.mainGroup
         .getChildGroups()
         .find((group) => group.getDisplayName() === PROTECTED_GROUP_NAME);
     const protectedGroup = hasProtectedGroup !== null && hasProtectedGroup !== void 0 ? hasProtectedGroup : xcode_1.PBXGroup.create(project, {
         name: PROTECTED_GROUP_NAME,
+        path: relativePath,
         sourceTree: "<group>",
     });
     if (!hasProtectedGroup) {
         project.rootObject.props.mainGroup.props.children.unshift(protectedGroup);
-        // let libIndex = project.rootObject.props.mainGroup
-        //   .getChildGroups()
-        //   .findIndex((group) => group.getDisplayName() === "Libraries");
-        // if (libIndex === -1) {
-        //   libIndex = 0;
-        // }
-        // add above the group named "Libraries"
-        // project.rootObject.props.mainGroup.props.children.splice(
-        //   libIndex,
-        //   0,
-        //   protectedGroup
-        // );
     }
     return protectedGroup;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/index.js",
   "files": [
@@ -30,7 +30,7 @@
   "dependencies": {
     "@react-native/normalize-colors": "^0.76.1",
     "glob": "^10.2.6",
-    "@bacons/xcode": "^1.0.0-alpha.13",
+    "@bacons/xcode": "^1.0.0-alpha.21",
     "fs-extra": "^11.2.0"
   },
   "devDependencies": {