@bacons/apple-targets 0.1.5 → 0.1.6

package/build/index.js

@@ -42,7 +42,8 @@ const withTargetsDir = (config, _props) => {
         });
     });
     (0, withPodTargetExtension_1.withPodTargetExtension)(config);
-    return (0, withXcparse_1.withXcodeProjectBetaBaseMod)(config);
+    (0, withXcparse_1.withXcodeProjectBetaBaseMod)(config);
+    return config;
 };
 exports.withTargetsDir = withTargetsDir;
 module.exports = exports.withTargetsDir;

package/build/withXcodeChanges.js

@@ -648,8 +648,7 @@ async function applyXcodeChanges(config, project, props) {
     }
     const targets = getExtensionTargets();
     const productName = props.name;
-    // const productName = props.name + "Extension";
-    const targetToUpdate = (_a = targets.find((target) => target.props.productName === productName)) !== null && _a !== void 0 ? _a : targets[0];
+    let targetToUpdate = (_a = targets.find((target) => target.props.productName === productName)) !== null && _a !== void 0 ? _a : targets[0];
     if (targetToUpdate) {
         console.log(`Target "${targetToUpdate.props.productName}" already exists, updating instead of creating a new one`);
     }
@@ -661,9 +660,14 @@ async function applyXcodeChanges(config, project, props) {
     function applyDevelopmentTeamIdToTargets() {
         var _a, _b;
         var _c, _d, _e;
+        // Set to the provided value or any value.
+        const devTeamId = developmentTeamId ||
+            project.rootObject.props.targets
+                .map((target) => target.getDefaultBuildSetting("DEVELOPMENT_TEAM"))
+                .find(Boolean);
         project.rootObject.props.targets.forEach((target) => {
-            if (developmentTeamId) {
-                target.setBuildSetting("DEVELOPMENT_TEAM", developmentTeamId);
+            if (devTeamId) {
+                target.setBuildSetting("DEVELOPMENT_TEAM", devTeamId);
             }
             else {
                 target.removeBuildSetting("DEVELOPMENT_TEAM");
@@ -675,7 +679,7 @@ async function applyXcodeChanges(config, project, props) {
             (_b = (_d = project.rootObject.props.attributes.TargetAttributes)[_e = target.uuid]) !== null && _b !== void 0 ? _b : (_d[_e] = {
                 CreatedOnToolsVersion: "14.3",
                 ProvisioningStyle: "Automatic",
-                DevelopmentTeam: developmentTeamId,
+                DevelopmentTeam: devTeamId,
             });
         }
     }
@@ -779,95 +783,48 @@ async function applyXcodeChanges(config, project, props) {
         // Create new build phases
         targetToUpdate.props.buildConfigurationList =
             createConfigurationListForType(project, props);
-        configureTargetWithEntitlements(targetToUpdate);
-        configureTargetWithPreview(targetToUpdate);
-        configureTargetWithKnownSettings(targetToUpdate);
-        configureJsExport(targetToUpdate);
-        applyDevelopmentTeamIdToTargets();
-        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: isExtensionKit
-                ? "wrapper.extensionkit-extension"
-                : "wrapper.app-extension",
-            includeInIndex: 0,
-            path: productName + (isExtension ? ".appex" : ".app"),
-            sourceTree: "BUILT_PRODUCTS_DIR",
-        }),
-        settings: {
-            ATTRIBUTES: ["RemoveHeadersOnCopy"],
-        },
-    });
-    project.rootObject.ensureProductGroup().props.children.push(
-    // @ts-expect-error
-    appExtensionBuildFile.props.fileRef);
-    const extensionTarget = project.rootObject.createNativeTarget({
-        buildConfigurationList: createConfigurationListForType(project, props),
-        name: productName,
-        productName,
-        // @ts-expect-error
-        productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
-        productType: productType,
-    });
-    configureTargetWithKnownSettings(extensionTarget);
-    configureTargetWithEntitlements(extensionTarget);
-    configureTargetWithPreview(extensionTarget);
-    extensionTarget.ensureFrameworks(props.frameworks);
-    extensionTarget.getSourcesBuildPhase();
-    extensionTarget.getResourcesBuildPhase();
-    configureJsExport(extensionTarget);
-    // Add the target dependency to the main app, should be only one.
-    mainAppTarget.props.dependencies.push(xcode_1.PBXTargetDependency.create(project, {
-        target: extensionTarget,
-        targetProxy: xcode_1.PBXContainerItemProxy.create(project, {
-            containerPortal: project.rootObject,
-            proxyType: 1,
-            remoteGlobalIDString: extensionTarget.uuid,
-            remoteInfo: productName,
-        }),
-    }));
-    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)) {
-            // TODO: maybe there's a safer way to do this? The name is not a good identifier.
-            return phase.props.name === WELL_KNOWN_COPY_EXTENSIONS_NAME;
-        }
-    });
-    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(appExtensionBuildFile);
     }
     else {
-        mainAppTarget.createBuildPhase(xcode_1.PBXCopyFilesBuildPhase, {
-            files: [appExtensionBuildFile],
+        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: isExtensionKit
+                    ? "wrapper.extensionkit-extension"
+                    : "wrapper.app-extension",
+                includeInIndex: 0,
+                path: productName + (isExtension ? ".appex" : ".app"),
+                sourceTree: "BUILT_PRODUCTS_DIR",
+            }),
+            settings: {
+                ATTRIBUTES: ["RemoveHeadersOnCopy"],
+            },
+        });
+        project.rootObject.ensureProductGroup().props.children.push(
+        // @ts-expect-error
+        appExtensionBuildFile.props.fileRef);
+        targetToUpdate = project.rootObject.createNativeTarget({
+            buildConfigurationList: createConfigurationListForType(project, props),
+            name: productName,
+            productName,
+            // @ts-expect-error
+            productReference: appExtensionBuildFile.props.fileRef /* alphaExtension.appex */,
+            productType: productType,
         });
+        const copyPhase = mainAppTarget.getCopyBuildPhaseForTarget(targetToUpdate);
+        if (!copyPhase.getBuildFile(appExtensionBuildFile.props.fileRef)) {
+            copyPhase.props.files.push(appExtensionBuildFile);
+        }
     }
-    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),
-        ].sort(),
-    });
+    configureTargetWithKnownSettings(targetToUpdate);
+    configureTargetWithEntitlements(targetToUpdate);
+    configureTargetWithPreview(targetToUpdate);
+    targetToUpdate.ensureFrameworks(props.frameworks);
+    targetToUpdate.getSourcesBuildPhase();
+    targetToUpdate.getResourcesBuildPhase();
+    configureJsExport(targetToUpdate);
+    mainAppTarget.addDependency(targetToUpdate);
     const assetsDir = path_1.default.join(magicCwd, "assets");
     // TODO: Maybe just limit this to Safari extensions?
     const explicitFolders = !fs_1.default.existsSync(assetsDir)
@@ -877,22 +834,35 @@ async function applyXcodeChanges(config, project, props) {
             .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 = [];
+    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, {
+            path: path_1.default.basename(props.cwd),
+            exceptions: [
+                xcode_1.PBXFileSystemSynchronizedBuildFileExceptionSet.create(project, {
+                    target: targetToUpdate,
+                    membershipExceptions: [
+                        // TODO: What other files belong here, why is this here?
+                        "Info.plist",
+                        // Exclude the config path
+                        path_1.default.relative(magicCwd, props.configPath),
+                    ].sort(),
+                }),
+            ],
+            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 (!targetToUpdate.props.fileSystemSynchronizedGroups) {
+            targetToUpdate.props.fileSystemSynchronizedGroups = [];
+        }
+        targetToUpdate.props.fileSystemSynchronizedGroups.push(syncRootGroup);
+        protectedGroup.props.children.push(syncRootGroup);
     }
-    extensionTarget.props.fileSystemSynchronizedGroups.push(syncRootGroup);
-    ensureProtectedGroup(project, path_1.default.dirname(props.cwd)).props.children.push(syncRootGroup);
     applyDevelopmentTeamIdToTargets();
     syncMarketingVersions();
     return project;

package/package.json

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