@bacons/apple-targets 0.0.9 → 0.0.10

package/README.md

@@ -97,14 +97,32 @@ There are certain values that are shared across targets. We use a predefined con
 
 Adding a file `pods.rb` in the root of the repo will enable you to modify the target settings for the project.
 
-The ruby module evaluates with global access to the property `podfile_properties` and the method `use_native_modules`.
+The ruby module evaluates with global access to the property `podfile_properties`.
 
 For example, the following is useful for enabling React Native in an App Clip target:
 
 ```rb
+require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
+
 exclude = []
 use_expo_modules!(exclude: exclude)
-config = use_native_modules!
+
+if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
+  config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"];
+else
+  config_command = [
+    'node',
+    '--no-warnings',
+    '--eval',
+    'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))',
+    'react-native-config',
+    '--json',
+    '--platform',
+    'ios'
+  ]
+end
+
+config = use_native_modules!(config_command)
 
 use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
 use_frameworks! :linkage => ENV['USE_FRAMEWORKS'].to_sym if ENV['USE_FRAMEWORKS']

package/build/index.d.ts

@@ -4,5 +4,5 @@ export declare const withTargetsDir: ConfigPlugin<{
     appleTeamId?: string;
     match?: string;
     root?: string;
-}>;
+} | void>;
 export { Config };

package/build/index.js

@@ -9,11 +9,12 @@ const path_1 = __importDefault(require("path"));
 const withPodTargetExtension_1 = require("./withPodTargetExtension");
 const withWidget_1 = __importDefault(require("./withWidget"));
 const withXcparse_1 = require("./withXcparse");
-const withTargetsDir = (config, _a) => {
-    var _b;
-    var { 
-    // @ts-expect-error: not on type yet
-    appleTeamId = (_b = config.ios) === null || _b === void 0 ? void 0 : _b.appleTeamId, root = "./targets", match = "*", } = _a;
+const withTargetsDir = (config, _props) => {
+    var _a;
+    const { appleTeamId = (_a = config === null || config === void 0 ? void 0 : config.ios) === null || _a === void 0 ? void 0 : _a.appleTeamId, root = "./targets", match = "*", } = _props || {};
+    if (!appleTeamId) {
+        throw new Error(`You must specify an \`appleTeamId\` in your app config to use the \`withTargetsDir\` plugin.`);
+    }
     const projectRoot = config._internal.projectRoot;
     const targets = (0, glob_1.sync)(`${root}/${match}/expo-target.config.@(json|js)`, {
         // const targets = globSync(`./targets/action/expo-target.config.@(json|js)`, {

package/build/withEasCredentials.js

@@ -12,7 +12,9 @@ function safeSet(obj, key, value) {
         }
         obj = obj[segment];
     });
-    obj[last] = value;
+    if (!obj[last]) {
+        obj[last] = value;
+    }
     return obj;
 }
 const withEASTargets = (config, { bundleIdentifier, targetName, entitlements }) => {

package/build/withPodTargetExtension.js

@@ -10,7 +10,6 @@ Dir.glob(File.join(__dir__, '..', 'targets', '**', 'pods.rb')).each do |target_f
     # Create a new binding with access to necessary methods and variables
     target_binding = binding
     target_binding.local_variable_set(:podfile_properties, podfile_properties)
-    target_binding.local_variable_set(:config, use_native_modules!)
 
     # Evaluate the target file content in the new binding
     eval(File.read(target_file), target_binding, target_file)

package/build/withXcodeChanges.js

@@ -5,6 +5,7 @@ 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"));
@@ -126,7 +127,7 @@ function createShareConfigurationList(project, { name, cwd, bundleId, deployment
         CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: "YES",
         CLANG_WARN_UNGUARDED_AVAILABILITY: "YES_AGGRESSIVE",
         CODE_SIGN_STYLE: "Automatic",
-        DEBUG_INFORMATION_FORMAT: "dwarf",
+        DEBUG_INFORMATION_FORMAT: "dwarf", // NOTE
         GCC_C_LANGUAGE_STANDARD: "gnu11",
         GENERATE_INFOPLIST_FILE: "YES",
         CURRENT_PROJECT_VERSION: currentProjectVersion,
@@ -193,7 +194,7 @@ function createIMessageConfigurationList(project, { name, cwd, bundleId, deploym
         CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: "YES",
         CLANG_WARN_UNGUARDED_AVAILABILITY: "YES_AGGRESSIVE",
         CODE_SIGN_STYLE: "Automatic",
-        DEBUG_INFORMATION_FORMAT: "dwarf",
+        DEBUG_INFORMATION_FORMAT: "dwarf", // NOTE
         GCC_C_LANGUAGE_STANDARD: "gnu11",
         GENERATE_INFOPLIST_FILE: "YES",
         CURRENT_PROJECT_VERSION: currentProjectVersion,
@@ -667,13 +668,56 @@ async function applyXcodeChanges(config, project, props) {
     }
     function syncMarketingVersions() {
         const mainVersion = getMainMarketingVersion(project);
-        // console.log('main marketing version:', mainVersion)
         project.rootObject.props.targets.forEach((target) => {
             if (xcode_1.PBXNativeTarget.is(target)) {
                 target.setBuildSetting("MARKETING_VERSION", mainVersion);
             }
         });
     }
+    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,
@@ -733,8 +777,7 @@ 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);
@@ -744,18 +787,26 @@ async function applyXcodeChanges(config, project, props) {
         return project;
     }
     // Build Files
-    // NOTE: Single-level only
-    const swiftFiles = (0, glob_1.sync)("*.swift", {
+    const swiftBuildFiles = {};
+    (0, glob_1.sync)("**/*.swift", {
         absolute: true,
         cwd: magicCwd,
-    }).map((file) => {
-        return xcode_1.PBXBuildFile.create(project, {
+    }).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: path_1.default.basename(file),
+                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,
@@ -879,10 +930,9 @@ async function applyXcodeChanges(config, project, props) {
     configureTargetWithKnownSettings(widgetTarget);
     const entitlementFiles = configureTargetWithEntitlements(widgetTarget);
     configureTargetWithPreview(widgetTarget);
-    // CD0706062A2EBE2E009C1192
     widgetTarget.createBuildPhase(xcode_1.PBXSourcesBuildPhase, {
         files: [
-            ...swiftFiles,
+            ...Object.values(swiftBuildFiles).flat(),
             ...intentBuildFiles[0],
             // ...entitlementFiles
         ],
@@ -959,22 +1009,15 @@ async function applyXcodeChanges(config, project, props) {
         path: props.cwd,
         sourceTree: "<group>",
         children: [
-            // @ts-expect-error
-            ...swiftFiles
-                .map((buildFile) => buildFile.props.fileRef)
-                .sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            // @ts-expect-error
+            ...swiftGroups,
             ...intentFiles.sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            // @ts-expect-error
             ...assetFiles
                 .map((buildFile) => buildFile.props.fileRef)
                 .sort((a, b) => a.getDisplayName().localeCompare(b.getDisplayName())),
-            // @ts-expect-error
             ...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>"; };
-            // @ts-expect-error
             xcode_1.PBXFileReference.create(project, {
                 path: "Info.plist",
                 sourceTree: "<group>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacons/apple-targets",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Generate Apple Targets with Expo Prebuild",
   "main": "build/index.js",
   "files": [
@@ -28,7 +28,7 @@
   "author": "Evan Bacon",
   "license": "MIT",
   "dependencies": {
-    "@react-native/normalize-colors": "^0.75.4",
+    "@react-native/normalize-colors": "^0.76.1",
     "glob": "^10.2.6",
     "@bacons/xcode": "^1.0.0-alpha.13",
     "fs-extra": "^11.2.0"