wip: reorder build script phases PoC for Expo config plugin

Author: artus9033

packages/cli/src/brownfield/commands/packageIos.ts

@@ -77,6 +77,8 @@ export const packageIosCommand = curryOptions(
       'swift'
     );
 
+    // TODO: ARTUR install pods here
+
     await packageIosAction(
       options,
       {
@@ -89,10 +91,22 @@ export const packageIosCommand = curryOptions(
         usePrebuiltRNCore: false, // for brownfield, it is required to build RN from source
         packageDir, // the output directory for artifacts
         skipCache: true, // cache is dependent on existence of Rock config file
+        // TODO: ARTUR disable installing pods in packageIosAction
       },
       platformConfig
     );
 
+    // TODO: ARTUR - below:
+    // const existingTarget = project.pbxTargetByName(frameworkName);
+    // const frameworkTargetUUID = Object.entries(
+    //   project.pbxNativeTargetSection()
+    // ).find(
+    //   ([_key, value]) =>
+    //     (value as any)?.productReference === frameworkName
+    // )?.[0];
+    // load xcodeproj from platformConfig?.xcodeProject?.path using 'xcode' package
+    // ensureExpoPre55ShellPatchScriptPhaseIsOrdered(project, frameworkTargetUUID)
+
     if (hasBrownie) {
       const productsPath = path.join(options.buildFolder, 'Build', 'Products');
       const brownieOutputPath = path.join(packageDir, 'Brownie.xcframework');

packages/cli/src/brownfield/utils/expo.ts

@@ -52,7 +52,9 @@ export async function runExpoPrebuildIfNeeded({
     return false;
   }
 
-  logger.info(`Expo project detected. Running expo prebuild for ${platform}...`);
+  logger.info(
+    `Expo project detected. Running expo prebuild for ${platform}...`
+  );
 
   const args = ['expo', 'prebuild', '--platform', platform];
   if (platform === 'ios') {

packages/react-native-brownfield/src/expo-config-plugin/ios/withBrownfieldIos.ts

@@ -31,13 +31,18 @@ export const withBrownfieldIos: ConfigPlugin<
   config = withXcodeProject(config, (xcodeConfig) => {
     const { modResults: project, modRequest } = xcodeConfig;
 
-    const frameworkTargetUUIDIfAdded = addFrameworkTarget(
+    const { frameworkTargetUUID, targetAlreadyExists } = addFrameworkTarget(
       project,
       modRequest,
       props.ios
     );
 
-    if (!frameworkTargetUUIDIfAdded) {
+    const expoMajor = config.sdkVersion
+      ? parseInt(config.sdkVersion.split('.')[0], 10)
+      : -1;
+    const isExpoPre55 = expoMajor < 55;
+
+    if (targetAlreadyExists) {
       Logger.logDebug(
         `Skipping further Xcode modifications as framework target was already present`
       );
@@ -46,20 +51,17 @@ export const withBrownfieldIos: ConfigPlugin<
     }
 
     // copy the "Bundle React Native code and images" build phase from the main target to the framework target
-    copyBundleReactNativePhase(project, frameworkTargetUUIDIfAdded);
+    copyBundleReactNativePhase(project, frameworkTargetUUID);
 
     // for Expo SDK versions < 55, add a script phase to patch ExpoModulesProvider.swift
-    const major = config.sdkVersion
-      ? parseInt(config.sdkVersion.split('.')[0], 10)
-      : -1;
-    if (major < 55) {
+    if (isExpoPre55) {
       Logger.logDebug(
         `Adding ExpoModulesProvider patch phase for Expo SDK ${config.sdkVersion}`
       );
 
       addExpoPre55ShellPatchScriptPhase(project, {
         frameworkName: props.ios.frameworkName,
-        frameworkTargetUUID: frameworkTargetUUIDIfAdded,
+        frameworkTargetUUID: frameworkTargetUUID,
       });
     } else {
       Logger.logDebug(

packages/react-native-brownfield/src/expo-config-plugin/ios/xcodeHelpers.ts

@@ -18,7 +18,10 @@ export function addFrameworkTarget(
   project: XcodeProject,
   modRequest: ModProps<XcodeProject>,
   options: ResolvedBrownfieldPluginIosConfig
-): string | null {
+): {
+  frameworkTargetUUID: string;
+  targetAlreadyExists: boolean;
+} {
   const { frameworkName, bundleIdentifier } = options;
 
   // check if target already exists
@@ -28,7 +31,23 @@ export function addFrameworkTarget(
       `Framework target "${frameworkName}" already exists, skipping creation`
     );
 
-    return null;
+    const frameworkTargetUUID = Object.entries(
+      project.pbxNativeTargetSection()
+    ).find(
+      ([_key, value]) =>
+        (value as any)?.productReference === existingTarget.productReference
+    )?.[0];
+
+    if (!frameworkTargetUUID) {
+      throw new SourceModificationError(
+        `Failed to find framework target UUID for ${frameworkName}, although it can be resolved by name`
+      );
+    }
+
+    return {
+      frameworkTargetUUID,
+      targetAlreadyExists: true,
+    };
   }
 
   Logger.logDebug(`Adding iOS framework target: ${frameworkName}`);
@@ -130,7 +149,10 @@ export function addFrameworkTarget(
 
   Logger.logInfo(`Successfully added framework target: ${frameworkName}`);
 
-  return frameworkTarget.uuid;
+  return {
+    frameworkTargetUUID: frameworkTarget.uuid,
+    targetAlreadyExists: false,
+  };
 }
 
 /**
@@ -265,22 +287,24 @@ export function addExpoPre55ShellPatchScriptPhase(
       }),
     }
   );
+}
 
-  // make sure the patch phase is after the expo configure phase,
-  // otherwise the patched file will be overwritten by the expo configure phase
+/**
+ * Makes sure the patch expo modules provider phase is after the expo configure phase,
+ * otherwise the patched file would be overwritten by the expo configure phase
+ * @param project The Xcode project
+ * @param frameworkTargetUUID The UUID of the framework target
+ * @returns True if the build phases were modified, false otherwise
+ */
+export function ensureExpoPre55ShellPatchScriptPhaseIsOrdered(
+  project: XcodeProject,
+  frameworkTargetUUID: string
+) {
+  let modified = false;
   const nativeTargetSection = project.pbxNativeTargetSection();
 
-  const brownfieldTarget = Object.entries(nativeTargetSection).find(
-    ([_key, value]) =>
-      typeof value === 'object' &&
-      (value as any)?.productType.includes(
-        'com.apple.product-type.framework'
-      ) &&
-      (value as any)?.name === frameworkName
-  )![0];
-
   const buildPhases: { value: string; comment?: string }[] =
-    nativeTargetSection[brownfieldTarget].buildPhases;
+    nativeTargetSection[frameworkTargetUUID].buildPhases;
 
   const expoConfigurePhaseIndex = buildPhases.findIndex(
     (phase) =>
@@ -301,9 +325,12 @@ export function addExpoPre55ShellPatchScriptPhase(
       1
     )[0]; // pop the element at patchExpoModulesProviderPhaseIndex
     buildPhases.splice(expoConfigurePhaseIndex, 0, element); // insert the element at expoConfigurePhaseIndex ("after")
+    modified = true;
   }
 
-  nativeTargetSection[brownfieldTarget].buildPhases = buildPhases;
+  nativeTargetSection[frameworkTargetUUID].buildPhases = buildPhases;
 
   project.writeSync();
+
+  return modified;
 }