@callstack/react-native-brownfield 3.14.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-brownfield",
-  "version": "3.14.0",
+  "version": "4.0.0",
   "license": "MIT",
   "author": "Michal Chudziak <mike.chudziak@callstack.com>",
   "bin": {
@@ -89,7 +89,7 @@
     "@expo/config-plugins": ">=54 <100"
   },
   "dependencies": {
-    "@callstack/brownfield-cli": "^3.14.0"
+    "@callstack/brownfield-cli": "^4.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

package/src/expo-config-plugin/android/utils/constants.ts

@@ -1,2 +1,2 @@
-export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha03';
+export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha05';
 export const brownfieldGradlePluginDependency = `classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;

package/src/expo-config-plugin/android/withAndroidModuleFiles.ts

@@ -9,7 +9,6 @@ import type {
 } from '../types';
 import { Logger } from '../logging';
 import { renderTemplate } from '../template/engine';
-import { getExpoInfo, hasExpoUpdatesInstalled } from '../expoUtils';
 import {
   type AndroidManifestMetaDataEntry,
   type AndroidStringResourceEntry,
@@ -49,19 +48,12 @@ export function createAndroidModule({
   androidDir,
   config,
   rnVersion,
-  isExpoPre55,
   projectRoot,
 }: {
   /**
    * Expo app root (used to detect optional dependencies such as expo-updates)
    */
   projectRoot?: string;
-
-  /**
-   * Whether the Expo project is pre-55
-   */
-  isExpoPre55: boolean;
-
   /**
    * The root Android directory path
    */
@@ -79,7 +71,6 @@ export function createAndroidModule({
 }): void {
   const { android } = config;
   const moduleDir = path.join(androidDir, android.moduleName);
-  const hasExpoUpdates = hasExpoUpdatesInstalled(projectRoot);
 
   Logger.logDebug(`Creating Android module in: ${androidDir}`);
 
@@ -113,25 +104,9 @@ export function createAndroidModule({
     },
     {
       relativePath: `src/main/java/${config.android.packageName.replace(/\./g, '/')}/ReactNativeHostManager.kt`,
-      content: renderTemplate(
-        'android',
-        isExpoPre55
-          ? 'ReactNativeHostManager.pre55.kt'
-          : 'ReactNativeHostManager.post55.kt',
-        isExpoPre55
-          ? {
-              '{{PACKAGE_NAME}}': android.packageName,
-              '{{EXPO_UPDATES_IMPORTS}}': hasExpoUpdates
-                ? 'import expo.modules.updates.UpdatesController'
-                : '',
-              '{{EXPO_UPDATES_REACT_HOST_BLOCK}}': hasExpoUpdates
-                ? '\n        UpdatesController.setReactHost(reactHost)\n'
-                : '\n',
-            }
-          : {
-              '{{PACKAGE_NAME}}': android.packageName,
-            }
-      ),
+      content: renderTemplate('android', 'ReactNativeHostManager.post55.kt', {
+        '{{PACKAGE_NAME}}': android.packageName,
+      }),
     },
     {
       relativePath: 'consumer-rules.pro',
@@ -284,13 +259,10 @@ export const withAndroidModuleFiles: ConfigPlugin<
         );
       }
 
-      const { isExpoPre55 } = getExpoInfo(config);
-
       createAndroidModule({
         androidDir,
         config: props,
         rnVersion,
-        isExpoPre55,
         projectRoot: dangerousConfig.modRequest.projectRoot,
       });
 

package/src/expo-config-plugin/expoUtils.ts

@@ -4,10 +4,9 @@ export function getExpoInfo(config: ExpoConfig) {
   const expoMajor = config.sdkVersion
     ? parseInt(config.sdkVersion.split('.')[0], 10)
     : -1;
-  const isExpoPre55 = expoMajor < 55;
+
   return {
     expoMajor,
-    isExpoPre55,
   };
 }
 

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

@@ -2,56 +2,10 @@ import { SourceModificationError } from '../errors/SourceModificationError';
 import { Logger } from '../logging';
 import { renderTemplate } from '../template/engine';
 
-const BROWNFIELD_POD_HOOK_MARKER_START =
-  '# >>> react-native-brownfield expo phase ordering >>>';
-const BROWNFIELD_POD_HOOK_MARKER_END =
-  '# <<< react-native-brownfield expo phase ordering <<<';
 const BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_START =
   '# >>> react-native-brownfield Expo SDK 55+ swift defines >>>';
 const BROWNFIELD_EXPO_GTE_55_SWIFT_DEFINES_MARKER_END =
   '# <<< react-native-brownfield Expo SDK 55+ swift defines <<<';
-const BROWNFIELD_POST_INTEGRATE_REQUIRE = `require File.join(File.dirname(\`node --print "require.resolve('@callstack/react-native-brownfield/package.json')"\`), "scripts/react_native_brownfield_post_integrate")`;
-const REACT_NATIVE_PODS_REQUIRE_REGEX =
-  /^require File\.join\(File\.dirname\(`node --print "require\.resolve\('react-native\/package\.json'\)"`\), "scripts\/react_native_pods"\)\s*$/m;
-
-function ensureBrownfieldPostIntegrateRequire(podfile: string): string {
-  if (podfile.includes('scripts/react_native_brownfield_post_integrate')) {
-    return podfile;
-  }
-
-  const reactNativePodsRequireMatch = podfile.match(
-    REACT_NATIVE_PODS_REQUIRE_REGEX
-  );
-  if (reactNativePodsRequireMatch) {
-    const requireLine = reactNativePodsRequireMatch[0];
-    return podfile.replace(
-      requireLine,
-      `${requireLine}\n${BROWNFIELD_POST_INTEGRATE_REQUIRE}\n`
-    );
-  }
-
-  return `${BROWNFIELD_POST_INTEGRATE_REQUIRE}\n\n${podfile}`;
-}
-
-function ensureExpoPhaseOrderingHook(podfile: string): string {
-  let modifiedPodfile = ensureBrownfieldPostIntegrateRequire(podfile);
-
-  if (modifiedPodfile.includes(BROWNFIELD_POD_HOOK_MARKER_START)) {
-    return modifiedPodfile;
-  }
-
-  const hook = `
-${BROWNFIELD_POD_HOOK_MARKER_START}
-post_integrate do |installer|
-  react_native_brownfield_post_integrate(installer)
-end
-${BROWNFIELD_POD_HOOK_MARKER_END}
-`;
-
-  modifiedPodfile = `${modifiedPodfile.trimEnd()}\n\n${hook}\n`;
-
-  return modifiedPodfile;
-}
 
 function ensureExpoDefinesForSDK55AndAbove(
   podfile: string,
@@ -146,14 +100,16 @@ export function modifyPodfile(
   Logger.logDebug(`Added framework target "${frameworkName}" to Podfile`);
 
   if (expoMajor < 55) {
-    modifiedPodfile = ensureExpoPhaseOrderingHook(modifiedPodfile);
-  } else {
-    // Expo SDK >= 55
-    modifiedPodfile = ensureExpoDefinesForSDK55AndAbove(
-      modifiedPodfile,
-      expoMajor
+    const versionLabel = expoMajor < 0 ? 'unknown' : expoMajor.toString();
+    throw new SourceModificationError(
+      `Expo SDK ${versionLabel} is not supported. Please use Expo SDK 55 or newer. For older versions, please use the v3.x.x of @callstack/react-native-brownfield.`
     );
   }
 
+  modifiedPodfile = ensureExpoDefinesForSDK55AndAbove(
+    modifiedPodfile,
+    expoMajor
+  );
+
   return modifiedPodfile;
 }

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

@@ -5,7 +5,6 @@ import {
 } from '@expo/config-plugins';
 
 import {
-  addExpoPre55ShellPatchScriptPhase,
   addFrameworkTarget,
   addSourceFilesBuildPhase,
   copyBundleReactNativePhase,
@@ -32,7 +31,7 @@ import { getExpoInfo, hasExpoUpdatesInstalled } from '../expoUtils';
 export const withBrownfieldIos: ConfigPlugin<
   ResolvedBrownfieldPluginConfigWithIos
 > = (config, props) => {
-  const { isExpoPre55, expoMajor } = getExpoInfo(config);
+  const { expoMajor } = getExpoInfo(config);
 
   // Step 1: modify the Xcode project to add framework target &
   config = withXcodeProject(config, (xcodeConfig) => {
@@ -68,35 +67,12 @@ export const withBrownfieldIos: ConfigPlugin<
 
       copyBundleReactNativePhase(project, frameworkTargetUUID);
 
-      if (isExpoPre55) {
-        addExpoPre55ShellPatchScriptPhase(modRequest, project, {
-          frameworkName: props.ios.frameworkName,
-          frameworkTargetUUID: frameworkTargetUUID,
-        });
-      }
-
       return xcodeConfig;
     }
 
     // copy the "Bundle React Native code and images" build phase from the main target to the framework target
     copyBundleReactNativePhase(project, frameworkTargetUUID);
 
-    // for Expo SDK versions < 55, add a script phase to patch ExpoModulesProvider.swift
-    if (isExpoPre55) {
-      Logger.logDebug(
-        `Adding ExpoModulesProvider patch phase for Expo SDK ${config.sdkVersion}`
-      );
-
-      addExpoPre55ShellPatchScriptPhase(modRequest, project, {
-        frameworkName: props.ios.frameworkName,
-        frameworkTargetUUID: frameworkTargetUUID,
-      });
-    } else {
-      Logger.logDebug(
-        `Skipping ExpoModulesProvider patch phase for Expo SDK ${config.sdkVersion}`
-      );
-    }
-
     addSourceFilesBuildPhase(project, frameworkTargetUUID, iosProps);
 
     return xcodeConfig;

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

@@ -10,7 +10,6 @@ import { Logger } from '../logging';
 import type { ResolvedBrownfieldPluginIosConfig } from '../types';
 import { SourceModificationError } from '../errors/SourceModificationError';
 import { getFrameworkSourceFiles } from './withIosFrameworkFiles';
-import { renderTemplate } from '../template/engine';
 
 /**
  * Adds a new Framework target to the Xcode project for Brownfield packaging
@@ -741,101 +740,3 @@ export function resolveFrameworkDeploymentTarget(
 
   return appTargetDeploymentTarget ?? '15.0';
 }
-
-/**
- * Adds the "Patch ExpoModulesProvider" shell script phase to the framework target.
- * Safe to call on every prebuild: skips creation when the phase is already present.
- */
-export function addExpoPre55ShellPatchScriptPhase(
-  modRequest: ModProps<XcodeProject>,
-  project: XcodeProject,
-  {
-    frameworkName,
-    frameworkTargetUUID,
-  }: {
-    frameworkName: string;
-    frameworkTargetUUID: string;
-  }
-) {
-  const resolvedAppTargetName = resolveAppTargetName(project, modRequest);
-
-  Logger.logInfo(`Resolved iOS app target name: ${resolvedAppTargetName}`);
-
-  if (!resolvedAppTargetName) {
-    throw new SourceModificationError(
-      `Could not determine the iOS app target name from the Xcode project.`
-    );
-  }
-
-  const existingBuildPhases =
-    project.pbxNativeTargetSection()[frameworkTargetUUID]?.buildPhases ?? [];
-  if (
-    existingBuildPhases.some((phase: { comment?: string }) =>
-      hasBuildPhaseComment(phase, 'Patch ExpoModulesProvider')
-    )
-  ) {
-    return;
-  }
-
-  project.addBuildPhase(
-    [
-      // no associated files
-    ],
-    'PBXShellScriptBuildPhase',
-    'Patch ExpoModulesProvider',
-    frameworkTargetUUID,
-    {
-      shellPath: '/bin/sh',
-      shellScript: renderTemplate('ios', 'patchExpoPre55.sh', {
-        '{{APP_TARGET_NAME}}': resolvedAppTargetName,
-        '{{FRAMEWORK_NAME}}': frameworkName,
-      }),
-    }
-  );
-}
-
-/**
- * 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 buildPhases: { value: string; comment?: string }[] =
-    nativeTargetSection[frameworkTargetUUID].buildPhases;
-
-  const expoConfigurePhaseIndex = buildPhases.findIndex(
-    (phase) =>
-      (phase as any)?.comment?.toLowerCase() ===
-      '[Expo] Configure project'.toLowerCase()
-  );
-
-  const patchExpoModulesProviderPhaseIndex = buildPhases.findIndex(
-    (phase) =>
-      (phase as any)?.comment?.toLowerCase() ===
-      'Patch ExpoModulesProvider'.toLowerCase()
-  );
-
-  // ensure patch expo modules provider phase is after expo configure phase
-  if (patchExpoModulesProviderPhaseIndex < expoConfigurePhaseIndex) {
-    const element = buildPhases.splice(
-      patchExpoModulesProviderPhaseIndex,
-      1
-    )[0]; // pop the element at patchExpoModulesProviderPhaseIndex
-    buildPhases.splice(expoConfigurePhaseIndex, 0, element); // insert the element at expoConfigurePhaseIndex ("after")
-    modified = true;
-  }
-
-  nativeTargetSection[frameworkTargetUUID].buildPhases = buildPhases;
-
-  project.writeSync();
-
-  return modified;
-}

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

@@ -1,52 +0,0 @@
-package {{PACKAGE_NAME}}
-
-import android.app.Application
-import android.content.res.Configuration
-import com.callstack.reactnativebrownfield.OnJSBundleLoaded
-import com.callstack.reactnativebrownfield.ReactNativeBrownfield
-import com.facebook.react.PackageList
-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) {
-        ApplicationLifecycleDispatcher.onApplicationCreate(application)
-
-        val reactNativeHost = ReactNativeHostWrapper(
-            application,
-            object : DefaultReactNativeHost(application) {
-                override fun getUseDeveloperSupport(): Boolean {
-                    return BuildConfig.DEBUG
-                }
-
-                override fun getPackages(): List<ReactPackage> {
-                    return PackageList(application).packages
-                }
-
-                override fun getJSMainModuleName(): String {
-                    return ".expo/.virtual-metro-entry"
-                }
-
-                override fun getBundleAssetName(): String = "index.android.bundle"
-            })
-
-
-        ReactNativeBrownfield.initialize(application, onJSBundleLoaded) {
-            val reactHost = ExpoReactHostFactory.createFromReactNativeHost(
-                context = application.applicationContext,
-                reactNativeHost = reactNativeHost
-            )
-    
-            {{EXPO_UPDATES_REACT_HOST_BLOCK}}
-            reactHost
-        }
-    }
-
-    fun onConfigurationChanged(application: Application, newConfig: Configuration) {
-        ApplicationLifecycleDispatcher.onConfigurationChanged(application, newConfig)
-    }
-}

package/lib/commonjs/expo-config-plugin/template/ios/patchExpoPre55.sh

@@ -1,22 +0,0 @@
-# Patch by @hurali97, source: https://github.com/callstackincubator/rock/issues/492#issuecomment-3225109837
-# Applicable only to Expo SDK versions prior to 55, which made ExpoModulesProvider internal by default: https://github.com/expo/expo/pull/42317
-# Path to ExpoModulesProvider.swift
-FILE="${SRCROOT}/Pods/Target Support Files/Pods-{{APP_TARGET_NAME}}-{{FRAMEWORK_NAME}}/ExpoModulesProvider.swift"
-
-if [ -f "$FILE" ]; then
-  echo "Patching $FILE to hide Expo from public interface"
-
-  # 1. Replace imports with internal imports
-  sed -i '' 's/^import EX/internal import EX/' "$FILE"
-  
-  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"
-
-  echo "Patched $FILE to hide Expo from public interface"
-  echo "Contents of $FILE:"
-  cat "$FILE"
-fi

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

@@ -1,52 +0,0 @@
-package {{PACKAGE_NAME}}
-
-import android.app.Application
-import android.content.res.Configuration
-import com.callstack.reactnativebrownfield.OnJSBundleLoaded
-import com.callstack.reactnativebrownfield.ReactNativeBrownfield
-import com.facebook.react.PackageList
-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) {
-        ApplicationLifecycleDispatcher.onApplicationCreate(application)
-
-        val reactNativeHost = ReactNativeHostWrapper(
-            application,
-            object : DefaultReactNativeHost(application) {
-                override fun getUseDeveloperSupport(): Boolean {
-                    return BuildConfig.DEBUG
-                }
-
-                override fun getPackages(): List<ReactPackage> {
-                    return PackageList(application).packages
-                }
-
-                override fun getJSMainModuleName(): String {
-                    return ".expo/.virtual-metro-entry"
-                }
-
-                override fun getBundleAssetName(): String = "index.android.bundle"
-            })
-
-
-        ReactNativeBrownfield.initialize(application, onJSBundleLoaded) {
-            val reactHost = ExpoReactHostFactory.createFromReactNativeHost(
-                context = application.applicationContext,
-                reactNativeHost = reactNativeHost
-            )
-    
-            {{EXPO_UPDATES_REACT_HOST_BLOCK}}
-            reactHost
-        }
-    }
-
-    fun onConfigurationChanged(application: Application, newConfig: Configuration) {
-        ApplicationLifecycleDispatcher.onConfigurationChanged(application, newConfig)
-    }
-}

package/lib/module/expo-config-plugin/template/ios/patchExpoPre55.sh

@@ -1,22 +0,0 @@
-# Patch by @hurali97, source: https://github.com/callstackincubator/rock/issues/492#issuecomment-3225109837
-# Applicable only to Expo SDK versions prior to 55, which made ExpoModulesProvider internal by default: https://github.com/expo/expo/pull/42317
-# Path to ExpoModulesProvider.swift
-FILE="${SRCROOT}/Pods/Target Support Files/Pods-{{APP_TARGET_NAME}}-{{FRAMEWORK_NAME}}/ExpoModulesProvider.swift"
-
-if [ -f "$FILE" ]; then
-  echo "Patching $FILE to hide Expo from public interface"
-
-  # 1. Replace imports with internal imports
-  sed -i '' 's/^import EX/internal import EX/' "$FILE"
-  
-  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"
-
-  echo "Patched $FILE to hide Expo from public interface"
-  echo "Contents of $FILE:"
-  cat "$FILE"
-fi

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

@@ -1,52 +0,0 @@
-package {{PACKAGE_NAME}}
-
-import android.app.Application
-import android.content.res.Configuration
-import com.callstack.reactnativebrownfield.OnJSBundleLoaded
-import com.callstack.reactnativebrownfield.ReactNativeBrownfield
-import com.facebook.react.PackageList
-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) {
-        ApplicationLifecycleDispatcher.onApplicationCreate(application)
-
-        val reactNativeHost = ReactNativeHostWrapper(
-            application,
-            object : DefaultReactNativeHost(application) {
-                override fun getUseDeveloperSupport(): Boolean {
-                    return BuildConfig.DEBUG
-                }
-
-                override fun getPackages(): List<ReactPackage> {
-                    return PackageList(application).packages
-                }
-
-                override fun getJSMainModuleName(): String {
-                    return ".expo/.virtual-metro-entry"
-                }
-
-                override fun getBundleAssetName(): String = "index.android.bundle"
-            })
-
-
-        ReactNativeBrownfield.initialize(application, onJSBundleLoaded) {
-            val reactHost = ExpoReactHostFactory.createFromReactNativeHost(
-                context = application.applicationContext,
-                reactNativeHost = reactNativeHost
-            )
-    
-            {{EXPO_UPDATES_REACT_HOST_BLOCK}}
-            reactHost
-        }
-    }
-
-    fun onConfigurationChanged(application: Application, newConfig: Configuration) {
-        ApplicationLifecycleDispatcher.onConfigurationChanged(application, newConfig)
-    }
-}

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

@@ -1,22 +0,0 @@
-# Patch by @hurali97, source: https://github.com/callstackincubator/rock/issues/492#issuecomment-3225109837
-# Applicable only to Expo SDK versions prior to 55, which made ExpoModulesProvider internal by default: https://github.com/expo/expo/pull/42317
-# Path to ExpoModulesProvider.swift
-FILE="${SRCROOT}/Pods/Target Support Files/Pods-{{APP_TARGET_NAME}}-{{FRAMEWORK_NAME}}/ExpoModulesProvider.swift"
-
-if [ -f "$FILE" ]; then
-  echo "Patching $FILE to hide Expo from public interface"
-
-  # 1. Replace imports with internal imports
-  sed -i '' 's/^import EX/internal import EX/' "$FILE"
-  
-  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"
-
-  echo "Patched $FILE to hide Expo from public interface"
-  echo "Contents of $FILE:"
-  cat "$FILE"
-fi