@callstack/react-native-brownfield 3.6.1 → 3.8.0

package/src/expo-config-plugin/ios/xcodeHelpers.ts

@@ -182,6 +182,220 @@ export function addSourceFilesBuildPhase(
   );
 }
 
+export type PbxReferenceLike = { value?: string; comment?: string } | string;
+
+export type PbxNativeTarget = {
+  buildPhases?: PbxReferenceLike[];
+  name?: string;
+};
+
+export type PbxResourcesBuildPhase = {
+  isa: 'PBXResourcesBuildPhase';
+  buildActionMask: number;
+  files?: PbxReferenceLike[];
+  runOnlyForDeploymentPostprocessing: number;
+};
+
+export type PbxBuildFile = {
+  isa: 'PBXBuildFile';
+  fileRef: string;
+};
+
+export type PbxCommentedReference = { value: string; comment: string };
+
+const PBX_BUILD_ACTION_MASK_ALL = 2147483647;
+const PBX_RUN_ONLY_FOR_DEPLOYMENT_POSTPROCESSING_DISABLED = 0;
+const PBX_RESOURCES_BUILD_PHASE_ISA = 'PBXResourcesBuildPhase';
+const PBX_BUILD_FILE_ISA = 'PBXBuildFile';
+
+export function createPbxCommentedReference(
+  value: string,
+  comment: string
+): PbxCommentedReference {
+  return { value, comment };
+}
+
+function createResourcesBuildPhase(): PbxResourcesBuildPhase {
+  return {
+    isa: PBX_RESOURCES_BUILD_PHASE_ISA,
+    buildActionMask: PBX_BUILD_ACTION_MASK_ALL,
+    files: [],
+    runOnlyForDeploymentPostprocessing:
+      PBX_RUN_ONLY_FOR_DEPLOYMENT_POSTPROCESSING_DISABLED,
+  };
+}
+
+function createBuildFile(fileRef: string): PbxBuildFile {
+  return {
+    isa: PBX_BUILD_FILE_ISA,
+    fileRef,
+  };
+}
+
+function getRawProjectObjects(project: XcodeProject): Record<string, any> {
+  return (project as any).hash?.project?.objects ?? {};
+}
+
+function getReferencedUuid(
+  reference: PbxReferenceLike | undefined
+): string | null {
+  if (!reference) {
+    return null;
+  }
+
+  return typeof reference === 'string' ? reference : (reference.value ?? null);
+}
+
+function getFrameworkTargetOrThrow(
+  project: XcodeProject,
+  frameworkTargetUUID: string
+): PbxNativeTarget {
+  const nativeTargets = getRawProjectObjects(project).PBXNativeTarget as
+    | Record<string, PbxNativeTarget>
+    | undefined;
+  const frameworkTarget = nativeTargets?.[frameworkTargetUUID];
+
+  if (!frameworkTarget) {
+    throw new SourceModificationError(
+      `Framework target UUID "${frameworkTargetUUID}" not found while wiring a resources build phase`
+    );
+  }
+
+  return frameworkTarget;
+}
+
+function getOrCreateResourcesBuildPhaseForTarget(
+  project: XcodeProject,
+  frameworkTargetUUID: string,
+  frameworkTarget: PbxNativeTarget,
+  resourcesBuildPhaseComment: string
+): PbxResourcesBuildPhase {
+  const rawProjectObjects = getRawProjectObjects(project);
+  const resourceBuildPhases = (rawProjectObjects.PBXResourcesBuildPhase ??
+    (rawProjectObjects.PBXResourcesBuildPhase = {})) as Record<
+    string,
+    PbxResourcesBuildPhase | string
+  >;
+
+  const resourcesBuildPhaseUuid = (frameworkTarget.buildPhases ?? [])
+    .map((phase) => getReferencedUuid(phase))
+    .find((phaseUuid): phaseUuid is string => {
+      return !!phaseUuid && !!resourceBuildPhases[phaseUuid];
+    });
+
+  if (resourcesBuildPhaseUuid) {
+    return resourceBuildPhases[
+      resourcesBuildPhaseUuid
+    ] as PbxResourcesBuildPhase;
+  }
+
+  const createdResourcesBuildPhaseUuid = (project as any).generateUuid();
+  resourceBuildPhases[createdResourcesBuildPhaseUuid] =
+    createResourcesBuildPhase();
+  resourceBuildPhases[`${createdResourcesBuildPhaseUuid}_comment`] =
+    resourcesBuildPhaseComment;
+
+  const targetBuildPhases = Array.isArray(frameworkTarget.buildPhases)
+    ? frameworkTarget.buildPhases
+    : [];
+  targetBuildPhases.push(
+    createPbxCommentedReference(
+      createdResourcesBuildPhaseUuid,
+      resourcesBuildPhaseComment
+    )
+  );
+  frameworkTarget.buildPhases = targetBuildPhases;
+
+  Logger.logDebug(
+    `Created missing PBXResourcesBuildPhase for framework target "${frameworkTargetUUID}"`
+  );
+
+  return resourceBuildPhases[
+    createdResourcesBuildPhaseUuid
+  ] as PbxResourcesBuildPhase;
+}
+
+function hasBuildFileForFileRef(
+  project: XcodeProject,
+  resourcesBuildPhase: PbxResourcesBuildPhase,
+  fileRefUuid: string
+): boolean {
+  const buildFileSection = project.pbxBuildFileSection() as Record<
+    string,
+    PbxBuildFile
+  >;
+  const files = Array.isArray(resourcesBuildPhase.files)
+    ? resourcesBuildPhase.files
+    : [];
+
+  return files.some((phaseFile) => {
+    const buildFileUuid = getReferencedUuid(phaseFile);
+    if (!buildFileUuid) {
+      return false;
+    }
+
+    return buildFileSection[buildFileUuid]?.fileRef === fileRefUuid;
+  });
+}
+
+function addBuildFileToResourcesPhase(
+  project: XcodeProject,
+  resourcesBuildPhase: PbxResourcesBuildPhase,
+  fileRefUuid: string,
+  buildFileComment: string
+): void {
+  const buildFileSection = project.pbxBuildFileSection() as Record<
+    string,
+    PbxBuildFile | string
+  >;
+  const buildFileUuid = (project as any).generateUuid();
+
+  buildFileSection[buildFileUuid] = createBuildFile(fileRefUuid);
+  buildFileSection[`${buildFileUuid}_comment`] = buildFileComment;
+
+  const files = Array.isArray(resourcesBuildPhase.files)
+    ? resourcesBuildPhase.files
+    : [];
+  files.push(createPbxCommentedReference(buildFileUuid, buildFileComment));
+  resourcesBuildPhase.files = files;
+}
+
+type ResourcesBuildPhaseOptions = {
+  resourcesBuildPhaseComment: string;
+  buildFileComment: string;
+};
+
+export function ensureTargetHasFileReferenceInResourcesBuildPhase(
+  project: XcodeProject,
+  frameworkTargetUUID: string,
+  fileRefUuid: string,
+  { resourcesBuildPhaseComment, buildFileComment }: ResourcesBuildPhaseOptions
+): boolean {
+  const frameworkTarget = getFrameworkTargetOrThrow(
+    project,
+    frameworkTargetUUID
+  );
+  const resourcesBuildPhase = getOrCreateResourcesBuildPhaseForTarget(
+    project,
+    frameworkTargetUUID,
+    frameworkTarget,
+    resourcesBuildPhaseComment
+  );
+
+  if (hasBuildFileForFileRef(project, resourcesBuildPhase, fileRefUuid)) {
+    return false;
+  }
+
+  addBuildFileToResourcesPhase(
+    project,
+    resourcesBuildPhase,
+    fileRefUuid,
+    buildFileComment
+  );
+
+  return true;
+}
+
 /**
  * Returns build settings for the framework target
  * @param options The user configuration
@@ -277,10 +491,9 @@ export function copyBundleReactNativePhase(
           (phase: { value: string }) => phase.value === existingPhaseUuid
         )
       ) {
-        target.buildPhases.push({
-          value: existingPhaseUuid,
-          comment: buildPhaseName,
-        });
+        target.buildPhases.push(
+          createPbxCommentedReference(existingPhaseUuid, buildPhaseName)
+        );
 
         Logger.logDebug(
           `Added "${buildPhaseName}" build phase to framework target ${target.name}`

package/src/expo-config-plugin/template/android/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+{{APPLICATION_BLOCK}}
 </manifest>

package/src/expo-config-plugin/template/android/ReactNativeHostManager.post55.kt

@@ -5,25 +5,19 @@ import android.content.res.Configuration
 import com.callstack.reactnativebrownfield.OnJSBundleLoaded
 import com.callstack.reactnativebrownfield.ReactNativeBrownfield
 import com.facebook.react.PackageList
-import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import expo.modules.ApplicationLifecycleDispatcher
 import expo.modules.ExpoReactHostFactory
 
 object ReactNativeHostManager {
     fun initialize(application: Application, onJSBundleLoaded: OnJSBundleLoaded? = null) {
-        loadReactNative(application)
-
         ApplicationLifecycleDispatcher.onApplicationCreate(application)
 
-        val reactHost: ReactHost by lazy {
+        ReactNativeBrownfield.initialize(application, onJSBundleLoaded) {
             ExpoReactHostFactory.getDefaultReactHost(
                 context = application.applicationContext,
                 packageList = PackageList(application).packages,
             )
         }
-
-        ReactNativeBrownfield.initialize(application, reactHost, onJSBundleLoaded)
     }
 
     fun onConfigurationChanged(application: Application, newConfig: Configuration) {

package/src/expo-config-plugin/template/android/ReactNativeHostManager.pre55.kt

@@ -5,18 +5,15 @@ import android.content.res.Configuration
 import com.callstack.reactnativebrownfield.OnJSBundleLoaded
 import com.callstack.reactnativebrownfield.ReactNativeBrownfield
 import com.facebook.react.PackageList
-import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultReactNativeHost
 import expo.modules.ApplicationLifecycleDispatcher
 import expo.modules.ExpoReactHostFactory
 import expo.modules.ReactNativeHostWrapper
+{{EXPO_UPDATES_IMPORTS}}
 
 object ReactNativeHostManager {
     fun initialize(application: Application, onJSBundleLoaded: OnJSBundleLoaded? = null) {
-        loadReactNative(application)
-
         ApplicationLifecycleDispatcher.onApplicationCreate(application)
 
         val reactNativeHost = ReactNativeHostWrapper(
@@ -38,14 +35,15 @@ object ReactNativeHostManager {
             })
 
 
-        val reactHost: ReactHost by lazy {
-            ExpoReactHostFactory.createFromReactNativeHost(
+        ReactNativeBrownfield.initialize(application, onJSBundleLoaded) {
+            val reactHost = ExpoReactHostFactory.createFromReactNativeHost(
                 context = application.applicationContext,
                 reactNativeHost = reactNativeHost
             )
+    
+            {{EXPO_UPDATES_REACT_HOST_BLOCK}}
+            reactHost
         }
-
-        ReactNativeBrownfield.initialize(application, reactHost, onJSBundleLoaded)
     }
 
     fun onConfigurationChanged(application: Application, newConfig: Configuration) {

package/src/expo-config-plugin/template/android/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+{{STRING_RESOURCES}}
+</resources>

package/src/expo-config-plugin/template/ios/patchExpoPre55.sh

@@ -11,6 +11,8 @@ if [ -f "$FILE" ]; then
   
   sed -i '' 's/^import Ex/internal import Ex/' "$FILE"
 
+  sed -i '' 's/^import EA/internal import EA/' "$FILE"
+
   # 2. Replace class visibility
   sed -i '' 's/public class ExpoModulesProvider/internal class ExpoModulesProvider/' "$FILE"