@callstack/react-native-brownfield 3.0.0-rc.1 → 3.0.0-rc.2

package/ReactBrownfield.podspec

@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
 
   spec.dependency 'ReactAppDependencyProvider'
   add_dependency(spec, "React-RCTAppDelegate")
+  
+  if ENV['REACT_NATIVE_BROWNFIELD_USE_EXPO_HOST'] == '1'
+    spec.dependency 'Expo'
+  end
 
   install_modules_dependencies(spec)
 end

package/ios/BrownfieldBundlePathResolver.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+enum BrownfieldBundlePathResolver {
+  enum Error: Swift.Error {
+    case invalidBundlePath(String)
+  }
+
+  static func resourceComponents(from bundlePath: String) throws -> (
+    resourceName: String,
+    fileExtension: String
+  ) {
+    let fileExtension = (bundlePath as NSString).pathExtension
+    let resourceName = (bundlePath as NSString).deletingPathExtension
+
+    guard !fileExtension.isEmpty, !resourceName.isEmpty else {
+      throw Error.invalidBundlePath(bundlePath)
+    }
+
+    return (resourceName, fileExtension)
+  }
+}

package/ios/ExpoHostRuntime.swift

@@ -0,0 +1,140 @@
+import UIKit
+internal import React
+internal import React_RCTAppDelegate
+internal import ReactAppDependencyProvider
+
+#if canImport(Expo)
+internal import Expo
+
+final class ExpoHostRuntime {
+  static let shared = ExpoHostRuntime()
+
+  private let jsBundleLoadObserver = JSBundleLoadObserver()
+  private var delegate = ExpoHostRuntimeDelegate()
+  private var reactNativeFactory: RCTReactNativeFactory?
+  private var expoDelegate: ExpoAppDelegate?
+
+  /**
+   * Starts React Native with default parameters.
+   */
+  public func startReactNative() {
+    startReactNative(onBundleLoaded: nil)
+  }
+  /**
+   * Starts React Native with optional callback when bundle is loaded.
+   *
+   * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
+   */
+  public func startReactNative(onBundleLoaded: (() -> Void)?) {
+    guard reactNativeFactory == nil else { return }
+
+    let factory = ExpoReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    reactNativeFactory = factory
+
+    let appDelegate = ExpoAppDelegate()
+    appDelegate.bindReactNativeFactory(factory)
+    expoDelegate = appDelegate
+
+    if let onBundleLoaded {
+      jsBundleLoadObserver.observeOnce(onBundleLoaded: onBundleLoaded)
+    }
+  }
+
+  /**
+   * Path to JavaScript root.
+   * Default value: ".expo/.virtual-metro-entry"
+   */
+  public var entryFile: String = ".expo/.virtual-metro-entry" {
+    didSet {
+      delegate.entryFile = entryFile
+    }
+  }
+
+  /**
+   * Path to JavaScript bundle file.
+   * Default value: "main.jsbundle"
+   */
+  public var bundlePath: String = "main.jsbundle" {
+    didSet {
+      delegate.bundlePath = bundlePath
+    }
+  }
+  /**
+   * Bundle instance to lookup the JavaScript bundle.
+   * Default value: Bundle.main
+   */
+  public var bundle: Bundle = Bundle.main {
+    didSet {
+      delegate.bundle = bundle
+    }
+  }
+  /**
+   * Dynamic bundle URL provider called on every bundle load.
+   * When set, this overrides the default bundleURL() behavior in the delegate.
+   * Returns a URL to load a custom bundle, or nil to use default behavior.
+   * Default value: nil
+   */
+  public var bundleURLOverride: (() -> URL?)? = nil {
+    didSet {
+      delegate.bundleURLOverride = bundleURLOverride
+    }
+  }
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    return expoDelegate?.application(
+      application,
+      didFinishLaunchingWithOptions: launchOptions
+    ) != nil
+  }
+
+  func view(
+    moduleName: String,
+    initialProps: [AnyHashable: Any]?,
+    launchOptions: [AnyHashable: Any]?
+  ) -> UIView? {
+    let bundleURL = delegate.bundleURL()
+
+    return expoDelegate?.recreateRootView(
+      withBundleURL: bundleURL,
+      moduleName: moduleName,
+      initialProps: initialProps,
+      launchOptions: launchOptions
+    )
+  }
+}
+
+class ExpoHostRuntimeDelegate: ExpoReactNativeFactoryDelegate {
+  var entryFile = ".expo/.virtual-metro-entry"
+  var bundlePath = "main.jsbundle"
+  var bundle = Bundle.main
+  var bundleURLOverride: (() -> URL?)? = nil
+
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    // needed to return the correct URL for expo-dev-client.
+    bridge.bundleURL ?? bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+    if let bundleURLProvider = bundleURLOverride { return bundleURLProvider() }
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(
+      forBundleRoot: entryFile)
+#else
+    do {
+      let (resourceName, fileExtension) = try BrownfieldBundlePathResolver.resourceComponents(
+        from: bundlePath
+      )
+      return bundle.url(forResource: resourceName, withExtension: fileExtension)
+    } catch {
+      assertionFailure("Invalid bundlePath '\(bundlePath)': \(error)")
+      return nil
+    }
+#endif
+  }
+}
+#endif

package/ios/JSBundleLoadObserver.swift

@@ -0,0 +1,38 @@
+import Foundation
+internal import React
+
+final class JSBundleLoadObserver {
+  private var onBundleLoaded: (() -> Void)?
+  private var observerToken: NSObjectProtocol?
+
+  func observeOnce(onBundleLoaded: @escaping () -> Void) {
+    removeObserverIfNeeded()
+    self.onBundleLoaded = onBundleLoaded
+
+    observerToken = NotificationCenter.default.addObserver(
+      forName: NSNotification.Name("RCTInstanceDidLoadBundle"),
+      object: nil,
+      queue: nil
+    ) { [weak self] _ in
+      self?.notifyAndClear()
+    }
+  }
+
+  deinit {
+    removeObserverIfNeeded()
+  }
+
+  private func notifyAndClear() {
+    let callback = onBundleLoaded
+    onBundleLoaded = nil
+    removeObserverIfNeeded()
+    callback?()
+  }
+
+  private func removeObserverIfNeeded() {
+    if let observerToken {
+      NotificationCenter.default.removeObserver(observerToken)
+      self.observerToken = nil
+    }
+  }
+}

package/ios/Notification+Brownfield.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+extension Notification.Name {
+  /**
+   * Notification sent when React Native wants to navigate back to native screen.
+   */
+  public static let popToNative = Notification.Name("PopToNativeNotification")
+  /**
+   * Notification sent to enable/disable the pop gesture recognizer.
+   */
+  public static let togglePopGestureRecognizer = Notification.Name("TogglePopGestureRecognizerNotification")
+}

package/ios/ReactNativeBrownfield.swift

@@ -1,74 +1,60 @@
 import UIKit
-internal import React
-internal import React_RCTAppDelegate
-internal import ReactAppDependencyProvider
 
-class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
-  var entryFile = "index"
-  var bundlePath = "main.jsbundle"
-  var bundle = Bundle.main
-  var bundleURLOverride: (() -> URL?)? = nil
-  // MARK: - RCTReactNativeFactoryDelegate Methods
-  
-  override func sourceURL(for bridge: RCTBridge) -> URL? {
-    return bundleURL()
-  }
-  
-  public override func bundleURL() -> URL? {
-    if let bundleURLProvider = bundleURLOverride {
-      return bundleURLProvider()
-    }
-    
-#if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: entryFile)
-#else
-    let resourceURLComponents = bundlePath.components(separatedBy: ".")
-    let withoutLast = resourceURLComponents[..<(resourceURLComponents.count - 1)]
-    let resourceName = withoutLast.joined()
-    let fileExtension = resourceURLComponents.last ?? ""
-    
-    return bundle.url(forResource: resourceName, withExtension: fileExtension)
+#if canImport(Expo)
+internal import Expo
 #endif
-  }
-}
 
 @objc public class ReactNativeBrownfield: NSObject {
   public static let shared = ReactNativeBrownfield()
-  private var onBundleLoaded: (() -> Void)?
-  private var delegate = ReactNativeBrownfieldDelegate()
-  
+
   /**
    * Path to JavaScript root.
-   * Default value: "index"
+   * Default value: "index" for bare React Native, ".expo/.virtual-metro-entry" when built with Expo.
    */
-  @objc public var entryFile: String = "index" {
+  @objc public var entryFile: String = {
+    #if canImport(Expo)
+    return ".expo/.virtual-metro-entry"
+    #else
+    return "index"
+    #endif
+  }() {
     didSet {
-      delegate.entryFile = entryFile
+      #if canImport(Expo)
+      ExpoHostRuntime.shared.entryFile = entryFile
+      #else
+      ReactNativeHostRuntime.shared.entryFile = entryFile
+      #endif
     }
   }
-  /**
-   * Path to bundle fallback resource.
-   * Default value: nil
-   */
-  @objc public var fallbackResource: String? = nil
+
   /**
    * Path to JavaScript bundle file.
    * Default value: "main.jsbundle"
    */
   @objc public var bundlePath: String = "main.jsbundle" {
     didSet {
-      delegate.bundlePath = bundlePath
+      #if canImport(Expo)
+      ExpoHostRuntime.shared.bundlePath = bundlePath
+      #else
+      ReactNativeHostRuntime.shared.bundlePath = bundlePath
+      #endif
     }
   }
+
   /**
    * Bundle instance to lookup the JavaScript bundle.
    * Default value: Bundle.main
    */
-  @objc public var bundle: Bundle = Bundle.main {
+  @objc public var bundle: Bundle = .main {
     didSet {
-      delegate.bundle = bundle
+      #if canImport(Expo)
+      ExpoHostRuntime.shared.bundle = bundle
+      #else
+      ReactNativeHostRuntime.shared.bundle = bundle
+      #endif
     }
   }
+
   /**
    * Dynamic bundle URL provider called on every bundle load.
    * When set, this overrides the default bundleURL() behavior in the delegate.
@@ -77,95 +63,75 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
    */
   @objc public var bundleURLOverride: (() -> URL?)? = nil {
     didSet {
-      delegate.bundleURLOverride = bundleURLOverride
+      #if canImport(Expo)
+      ExpoHostRuntime.shared.bundleURLOverride = bundleURLOverride
+      #else
+      ReactNativeHostRuntime.shared.bundleURLOverride = bundleURLOverride
+      #endif
     }
   }
-  /**
-   * React Native factory instance created when starting React Native.
-   * Default value: nil
-   */
-  private var reactNativeFactory: RCTReactNativeFactory? = nil
-  /**
-   * Root view factory used to create React Native views.
-   */
-  lazy private var rootViewFactory: RCTRootViewFactory? = {
-    return reactNativeFactory?.rootViewFactory
-  }()
-  
+
   /**
    * Starts React Native with default parameters.
    */
   @objc public func startReactNative() {
-    startReactNative(onBundleLoaded: nil)
+    #if canImport(Expo)
+    ExpoHostRuntime.shared.startReactNative()
+    #else
+    ReactNativeHostRuntime.shared.startReactNative()
+    #endif
   }
-  
+
   @objc public func view(
     moduleName: String,
     initialProps: [AnyHashable: Any]?,
     launchOptions: [AnyHashable: Any]? = nil
   ) -> UIView? {
-    rootViewFactory?.view(
-      withModuleName: moduleName,
-      initialProperties: initialProps,
+    #if canImport(Expo)
+    ExpoHostRuntime.shared.view(
+      moduleName: moduleName,
+      initialProps: initialProps,
+      launchOptions: launchOptions
+    )
+    #else
+    ReactNativeHostRuntime.shared.view(
+      moduleName: moduleName,
+      initialProps: initialProps,
       launchOptions: launchOptions
     )
+    #endif
   }
-  
+
   /**
-   * Starts React Native with optional callback when bundle is loaded.
-   *
-   * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
+   * Mirrors the host runtime app delegate API, forwarding to Expo or bare React Native as appropriate.
    */
-  @objc public func startReactNative(onBundleLoaded: (() -> Void)?) {
-    startReactNative(onBundleLoaded: onBundleLoaded, launchOptions: nil)
+  @objc public func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    #if canImport(Expo)
+    return ExpoHostRuntime.shared.application(
+      application,
+      didFinishLaunchingWithOptions: launchOptions
+    )
+    #else
+    return ReactNativeHostRuntime.shared.application(
+      application,
+      didFinishLaunchingWithOptions: launchOptions
+    )
+    #endif
   }
-  
+
   /**
-   * Starts React Native with optional callback and launch options.
+   * Starts React Native with optional callback when bundle is loaded.
    *
    * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
-   * @param launchOptions Launch options, typically passed from AppDelegate.
    */
-  @objc public func startReactNative(onBundleLoaded: (() -> Void)?, launchOptions: [AnyHashable: Any]?) {
-    guard reactNativeFactory == nil else { return }
-    
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-    self.reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
-    
-    if let onBundleLoaded {
-      self.onBundleLoaded = onBundleLoaded
-      if RCTIsNewArchEnabled() {
-        NotificationCenter.default.addObserver(
-          self,
-          selector: #selector(jsLoaded),
-          name: NSNotification.Name("RCTInstanceDidLoadBundle"),
-          object: nil
-        )
-      } else {
-        NotificationCenter.default.addObserver(
-          self,
-          selector: #selector(jsLoaded),
-          name: NSNotification.Name("RCTJavaScriptDidLoadNotification"),
-          object: nil
-        )
-      }
-    }
-  }
-  
-  @objc private func jsLoaded(_ notification: Notification) {
-    onBundleLoaded?()
-    onBundleLoaded = nil
-    NotificationCenter.default.removeObserver(self)
+  @objc public func startReactNative(onBundleLoaded: (() -> Void)?) {
+    #if canImport(Expo)
+    ExpoHostRuntime.shared.startReactNative(onBundleLoaded: onBundleLoaded)
+    #else
+    ReactNativeHostRuntime.shared.startReactNative(onBundleLoaded: onBundleLoaded)
+    #endif
   }
 }
-
-extension Notification.Name {
-  /**
-   * Notification sent when React Native wants to navigate back to native screen.
-   */
-  public static let popToNative = Notification.Name("PopToNativeNotification")
-  /**
-   * Notification sent to enable/disable the pop gesture recognizer.
-   */
-  public static let togglePopGestureRecognizer = Notification.Name("TogglePopGestureRecognizerNotification")
-}

package/ios/ReactNativeHostRuntime.swift

@@ -0,0 +1,138 @@
+import UIKit
+internal import React
+internal import React_RCTAppDelegate
+internal import ReactAppDependencyProvider
+
+class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
+  var entryFile = "index"
+  var bundlePath = "main.jsbundle"
+  var bundle = Bundle.main
+  var bundleURLOverride: (() -> URL?)? = nil
+  // MARK: - RCTReactNativeFactoryDelegate Methods
+
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    return bundleURL()
+  }
+
+  public override func bundleURL() -> URL? {
+    if let bundleURLProvider = bundleURLOverride {
+      return bundleURLProvider()
+    }
+
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: entryFile)
+#else
+    do {
+      let (resourceName, fileExtension) = try BrownfieldBundlePathResolver.resourceComponents(
+        from: bundlePath
+      )
+      return bundle.url(forResource: resourceName, withExtension: fileExtension)
+    } catch {
+      assertionFailure("Invalid bundlePath '\(bundlePath)': \(error)")
+      return nil
+    }
+#endif
+  }
+}
+
+final class ReactNativeHostRuntime {
+  public static let shared = ReactNativeHostRuntime()
+  private let jsBundleLoadObserver = JSBundleLoadObserver()
+  private var delegate = ReactNativeBrownfieldDelegate()
+
+  /**
+   * Path to JavaScript root.
+   * Default value: "index"
+   */
+  public var entryFile: String = "index" {
+    didSet {
+      delegate.entryFile = entryFile
+    }
+  }
+
+  /**
+   * Path to JavaScript bundle file.
+   * Default value: "main.jsbundle"
+   */
+  public var bundlePath: String = "main.jsbundle" {
+    didSet {
+      delegate.bundlePath = bundlePath
+    }
+  }
+  /**
+   * Bundle instance to lookup the JavaScript bundle.
+   * Default value: Bundle.main
+   */
+  public var bundle: Bundle = Bundle.main {
+    didSet {
+      delegate.bundle = bundle
+    }
+  }
+  /**
+   * Dynamic bundle URL provider called on every bundle load.
+   * When set, this overrides the default bundleURL() behavior in the delegate.
+   * Returns a URL to load a custom bundle, or nil to use default behavior.
+   * Default value: nil
+   */
+  public var bundleURLOverride: (() -> URL?)? = nil {
+    didSet {
+      delegate.bundleURLOverride = bundleURLOverride
+    }
+  }
+  /**
+   * React Native factory instance created when starting React Native.
+   * Default value: nil
+   */
+  private var reactNativeFactory: RCTReactNativeFactory? = nil
+  /**
+   * Root view factory used to create React Native views.
+   */
+  lazy private var rootViewFactory: RCTRootViewFactory? = {
+    return reactNativeFactory?.rootViewFactory
+  }()
+
+  /**
+   * Starts React Native with default parameters.
+   */
+  public func startReactNative() {
+    startReactNative(onBundleLoaded: nil)
+  }
+
+  public func view(
+    moduleName: String,
+    initialProps: [AnyHashable: Any]?,
+    launchOptions: [AnyHashable: Any]? = nil
+  ) -> UIView? {
+    rootViewFactory?.view(
+      withModuleName: moduleName,
+      initialProperties: initialProps,
+      launchOptions: launchOptions
+    )
+  }
+
+  /**
+   * Mirrors host manager app delegate API for bare React Native.
+   */
+  public func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    return true
+  }
+
+  /**
+   * Starts React Native with optional callback when bundle is loaded.
+   *
+   * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
+   */
+  public func startReactNative(onBundleLoaded: (() -> Void)?) {
+    guard reactNativeFactory == nil else { return }
+
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+    self.reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
+
+    if let onBundleLoaded {
+      jsBundleLoadObserver.observeOnce(onBundleLoaded: onBundleLoaded)
+    }
+  }
+}

package/lib/commonjs/expo-config-plugin/android/constants.js

@@ -1,2 +1,2 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='0.7.3';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
+Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='1.0.0';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
 //# sourceMappingURL=constants.js.map

package/lib/commonjs/expo-config-plugin/ios/podfileHelpers.js

@@ -1,31 +1,8 @@
-var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.modifyPodfile=modifyPodfile;var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _SourceModificationError=require("../errors/SourceModificationError");var _logging=require("../logging");var _engine=require("../template/engine");var BROWNFIELD_POD_HOOK_MARKER_START='# >>> react-native-brownfield expo phase ordering >>>';var BROWNFIELD_POD_HOOK_MARKER_END='# <<< react-native-brownfield expo phase ordering <<<';function ensureExpoPhaseOrderingHook(podfile){if(podfile.includes(BROWNFIELD_POD_HOOK_MARKER_START)){return podfile;}var hook=`
+var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.modifyPodfile=modifyPodfile;var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _SourceModificationError=require("../errors/SourceModificationError");var _logging=require("../logging");var _engine=require("../template/engine");var BROWNFIELD_POD_HOOK_MARKER_START='# >>> react-native-brownfield expo phase ordering >>>';var BROWNFIELD_POD_HOOK_MARKER_END='# <<< react-native-brownfield expo phase ordering <<<';var 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")`;var 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){if(podfile.includes('scripts/react_native_brownfield_post_integrate')){return podfile;}var reactNativePodsRequireMatch=podfile.match(REACT_NATIVE_PODS_REQUIRE_REGEX);if(reactNativePodsRequireMatch){var 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){var modifiedPodfile=ensureBrownfieldPostIntegrateRequire(podfile);if(modifiedPodfile.includes(BROWNFIELD_POD_HOOK_MARKER_START)){return modifiedPodfile;}var hook=`
 ${BROWNFIELD_POD_HOOK_MARKER_START}
-def reorder_brownfield_expo_patch_phase!(installer)
-  projects = installer.aggregate_targets.map(&:user_project).compact.uniq
-  projects.each do |project|
-    modified = false
-
-    project.native_targets.each do |target|
-      phases = target.build_phases
-      expo_idx = phases.index { |p| p.respond_to?(:name) && p.name == '[Expo] Configure project' }
-      patch_idx = phases.index { |p| p.respond_to?(:name) && p.name == 'Patch ExpoModulesProvider' }
-
-      next if expo_idx.nil? || patch_idx.nil?
-      next if patch_idx > expo_idx
-
-      patch = phases.delete_at(patch_idx)
-      expo_idx = phases.index { |p| p.respond_to?(:name) && p.name == '[Expo] Configure project' }
-      phases.insert(expo_idx + 1, patch)
-      modified = true
-    end
-
-    project.save if modified
-  end
-end
-
 post_integrate do |installer|
-  reorder_brownfield_expo_patch_phase!(installer)
+  react_native_brownfield_post_integrate(installer)
 end
 ${BROWNFIELD_POD_HOOK_MARKER_END}
-`;return`${podfile.trimEnd()}\n\n${hook}\n`;}function modifyPodfile(podfile,frameworkName,isExpoPre55){if(podfile.includes(`target '${frameworkName}'`)){_logging.Logger.logDebug(`Framework target "${frameworkName}" already in Podfile, skipping modification`);return podfile;}_logging.Logger.logDebug(`Modifying Podfile for framework: ${frameworkName}`);var frameworkTargetBlock=(0,_engine.renderTemplate)('ios','PodfileTargetBlock.rb',{'{{FRAMEWORK_NAME}}':frameworkName});var mainTargetMatch=podfile.match(/(target\s+['"][^'"]+['"]\s+do\s*\n)([\s\S]*?)(^end\s*$)/m);if(!mainTargetMatch){throw new _SourceModificationError.SourceModificationError('Could not find main target in Podfile. Please manually add the framework target.');}var _mainTargetMatch=(0,_slicedToArray2.default)(mainTargetMatch,3),targetStart=_mainTargetMatch[1],targetContent=_mainTargetMatch[2];var insertIndex=podfile.indexOf(mainTargetMatch[0])+targetStart.length+targetContent.length;var modifiedPodfile=podfile.slice(0,insertIndex)+frameworkTargetBlock+podfile.slice(insertIndex);_logging.Logger.logDebug(`Added framework target "${frameworkName}" to Podfile`);if(isExpoPre55){modifiedPodfile=ensureExpoPhaseOrderingHook(modifiedPodfile);}return modifiedPodfile;}
+`;modifiedPodfile=`${modifiedPodfile.trimEnd()}\n\n${hook}\n`;return modifiedPodfile;}function modifyPodfile(podfile,frameworkName,isExpoPre55){if(podfile.includes(`target '${frameworkName}'`)){_logging.Logger.logDebug(`Framework target "${frameworkName}" already in Podfile, skipping modification`);return podfile;}_logging.Logger.logDebug(`Modifying Podfile for framework: ${frameworkName}`);var frameworkTargetBlock=(0,_engine.renderTemplate)('ios','PodfileTargetBlock.rb',{'{{FRAMEWORK_NAME}}':frameworkName});var mainTargetMatch=podfile.match(/(target\s+['"][^'"]+['"]\s+do\s*\n)([\s\S]*?)(^end\s*$)/m);if(!mainTargetMatch){throw new _SourceModificationError.SourceModificationError('Could not find main target in Podfile. Please manually add the framework target.');}var _mainTargetMatch=(0,_slicedToArray2.default)(mainTargetMatch,3),targetStart=_mainTargetMatch[1],targetContent=_mainTargetMatch[2];var insertIndex=podfile.indexOf(mainTargetMatch[0])+targetStart.length+targetContent.length;var modifiedPodfile=podfile.slice(0,insertIndex)+frameworkTargetBlock+podfile.slice(insertIndex);_logging.Logger.logDebug(`Added framework target "${frameworkName}" to Podfile`);if(isExpoPre55){modifiedPodfile=ensureExpoPhaseOrderingHook(modifiedPodfile);}return modifiedPodfile;}
 //# sourceMappingURL=podfileHelpers.js.map

package/lib/commonjs/expo-config-plugin/ios/podfileHelpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["_SourceModificationError","require","_logging","_engine","BROWNFIELD_POD_HOOK_MARKER_START","BROWNFIELD_POD_HOOK_MARKER_END","ensureExpoPhaseOrderingHook","podfile","includes","hook","trimEnd","modifyPodfile","frameworkName","isExpoPre55","Logger","logDebug","frameworkTargetBlock","renderTemplate","mainTargetMatch","match","SourceModificationError","_mainTargetMatch","_slicedToArray2","default","targetStart","targetContent","insertIndex","indexOf","length","modifiedPodfile","slice"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/ios/podfileHelpers.ts"],"mappings":"4QAAA,IAAAA,wBAAA,CAAAC,OAAA,sCACA,IAAAC,QAAA,CAAAD,OAAA,eACA,IAAAE,OAAA,CAAAF,OAAA,uBAEA,GAAM,CAAAG,gCAAgC,CACpC,uDAAuD,CACzD,GAAM,CAAAC,8BAA8B,CAClC,uDAAuD,CAEzD,QAAS,CAAAC,2BAA2BA,CAACC,OAAe,CAAU,CAC5D,GAAIA,OAAO,CAACC,QAAQ,CAACJ,gCAAgC,CAAC,CAAE,CACtD,MAAO,CAAAG,OAAO,CAChB,CAEA,GAAM,CAAAE,IAAI,CAAG;AACf,EAAEL,gCAAgC;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,EAAEC,8BAA8B;AAChC,CAAC,CAEC,MAAO,GAAGE,OAAO,CAACG,OAAO,CAAC,CAAC,OAAOD,IAAI,IAAI,CAC5C,CAQO,QAAS,CAAAE,aAAaA,CAC3BJ,OAAe,CACfK,aAAqB,CACrBC,WAAoB,CACZ,CAER,GAAIN,OAAO,CAACC,QAAQ,CAAC,WAAWI,aAAa,GAAG,CAAC,CAAE,CACjDE,eAAM,CAACC,QAAQ,CACb,qBAAqBH,aAAa,6CACpC,CAAC,CACD,MAAO,CAAAL,OAAO,CAChB,CAEAO,eAAM,CAACC,QAAQ,CAAC,oCAAoCH,aAAa,EAAE,CAAC,CAGpE,GAAM,CAAAI,oBAAoB,CAAG,GAAAC,sBAAc,EAAC,KAAK,CAAE,uBAAuB,CAAE,CAC1E,oBAAoB,CAAEL,aACxB,CAAC,CAAC,CAGF,GAAM,CAAAM,eAAe,CAAGX,OAAO,CAACY,KAAK,CACnC,0DACF,CAAC,CAED,GAAI,CAACD,eAAe,CAAE,CACpB,KAAM,IAAI,CAAAE,gDAAuB,CAC/B,kFACF,CAAC,CACH,CAEA,IAAAC,gBAAA,IAAAC,eAAA,CAAAC,OAAA,EAAuCL,eAAe,IAA7CM,WAAW,CAAAH,gBAAA,IAAEI,aAAa,CAAAJ,gBAAA,IACnC,GAAM,CAAAK,WAAW,CACfnB,OAAO,CAACoB,OAAO,CAACT,eAAe,CAAC,CAAC,CAAC,CAAC,CACnCM,WAAW,CAACI,MAAM,CAClBH,aAAa,CAACG,MAAM,CAEtB,GAAI,CAAAC,eAAe,CACjBtB,OAAO,CAACuB,KAAK,CAAC,CAAC,CAAEJ,WAAW,CAAC,CAC7BV,oBAAoB,CACpBT,OAAO,CAACuB,KAAK,CAACJ,WAAW,CAAC,CAE5BZ,eAAM,CAACC,QAAQ,CAAC,2BAA2BH,aAAa,cAAc,CAAC,CAEvE,GAAIC,WAAW,CAAE,CACfgB,eAAe,CAAGvB,2BAA2B,CAACuB,eAAe,CAAC,CAChE,CAEA,MAAO,CAAAA,eAAe,CACxB","ignoreList":[]}
+{"version":3,"names":["_SourceModificationError","require","_logging","_engine","BROWNFIELD_POD_HOOK_MARKER_START","BROWNFIELD_POD_HOOK_MARKER_END","BROWNFIELD_POST_INTEGRATE_REQUIRE","REACT_NATIVE_PODS_REQUIRE_REGEX","ensureBrownfieldPostIntegrateRequire","podfile","includes","reactNativePodsRequireMatch","match","requireLine","replace","ensureExpoPhaseOrderingHook","modifiedPodfile","hook","trimEnd","modifyPodfile","frameworkName","isExpoPre55","Logger","logDebug","frameworkTargetBlock","renderTemplate","mainTargetMatch","SourceModificationError","_mainTargetMatch","_slicedToArray2","default","targetStart","targetContent","insertIndex","indexOf","length","slice"],"sourceRoot":"../../../../src","sources":["expo-config-plugin/ios/podfileHelpers.ts"],"mappings":"4QAAA,IAAAA,wBAAA,CAAAC,OAAA,sCACA,IAAAC,QAAA,CAAAD,OAAA,eACA,IAAAE,OAAA,CAAAF,OAAA,uBAEA,GAAM,CAAAG,gCAAgC,CACpC,uDAAuD,CACzD,GAAM,CAAAC,8BAA8B,CAClC,uDAAuD,CACzD,GAAM,CAAAC,iCAAiC,CAAG,0KAA0K,CACpN,GAAM,CAAAC,+BAA+B,CACnC,+IAA+I,CAEjJ,QAAS,CAAAC,oCAAoCA,CAACC,OAAe,CAAU,CACrE,GAAIA,OAAO,CAACC,QAAQ,CAAC,gDAAgD,CAAC,CAAE,CACtE,MAAO,CAAAD,OAAO,CAChB,CAEA,GAAM,CAAAE,2BAA2B,CAAGF,OAAO,CAACG,KAAK,CAC/CL,+BACF,CAAC,CACD,GAAII,2BAA2B,CAAE,CAC/B,GAAM,CAAAE,WAAW,CAAGF,2BAA2B,CAAC,CAAC,CAAC,CAClD,MAAO,CAAAF,OAAO,CAACK,OAAO,CACpBD,WAAW,CACX,GAAGA,WAAW,KAAKP,iCAAiC,IACtD,CAAC,CACH,CAEA,MAAO,GAAGA,iCAAiC,OAAOG,OAAO,EAAE,CAC7D,CAEA,QAAS,CAAAM,2BAA2BA,CAACN,OAAe,CAAU,CAC5D,GAAI,CAAAO,eAAe,CAAGR,oCAAoC,CAACC,OAAO,CAAC,CAEnE,GAAIO,eAAe,CAACN,QAAQ,CAACN,gCAAgC,CAAC,CAAE,CAC9D,MAAO,CAAAY,eAAe,CACxB,CAEA,GAAM,CAAAC,IAAI,CAAG;AACf,EAAEb,gCAAgC;AAClC;AACA;AACA;AACA,EAAEC,8BAA8B;AAChC,CAAC,CAECW,eAAe,CAAG,GAAGA,eAAe,CAACE,OAAO,CAAC,CAAC,OAAOD,IAAI,IAAI,CAE7D,MAAO,CAAAD,eAAe,CACxB,CAQO,QAAS,CAAAG,aAAaA,CAC3BV,OAAe,CACfW,aAAqB,CACrBC,WAAoB,CACZ,CAER,GAAIZ,OAAO,CAACC,QAAQ,CAAC,WAAWU,aAAa,GAAG,CAAC,CAAE,CACjDE,eAAM,CAACC,QAAQ,CACb,qBAAqBH,aAAa,6CACpC,CAAC,CACD,MAAO,CAAAX,OAAO,CAChB,CAEAa,eAAM,CAACC,QAAQ,CAAC,oCAAoCH,aAAa,EAAE,CAAC,CAGpE,GAAM,CAAAI,oBAAoB,CAAG,GAAAC,sBAAc,EAAC,KAAK,CAAE,uBAAuB,CAAE,CAC1E,oBAAoB,CAAEL,aACxB,CAAC,CAAC,CAGF,GAAM,CAAAM,eAAe,CAAGjB,OAAO,CAACG,KAAK,CACnC,0DACF,CAAC,CAED,GAAI,CAACc,eAAe,CAAE,CACpB,KAAM,IAAI,CAAAC,gDAAuB,CAC/B,kFACF,CAAC,CACH,CAEA,IAAAC,gBAAA,IAAAC,eAAA,CAAAC,OAAA,EAAuCJ,eAAe,IAA7CK,WAAW,CAAAH,gBAAA,IAAEI,aAAa,CAAAJ,gBAAA,IACnC,GAAM,CAAAK,WAAW,CACfxB,OAAO,CAACyB,OAAO,CAACR,eAAe,CAAC,CAAC,CAAC,CAAC,CACnCK,WAAW,CAACI,MAAM,CAClBH,aAAa,CAACG,MAAM,CAEtB,GAAI,CAAAnB,eAAe,CACjBP,OAAO,CAAC2B,KAAK,CAAC,CAAC,CAAEH,WAAW,CAAC,CAC7BT,oBAAoB,CACpBf,OAAO,CAAC2B,KAAK,CAACH,WAAW,CAAC,CAE5BX,eAAM,CAACC,QAAQ,CAAC,2BAA2BH,aAAa,cAAc,CAAC,CAEvE,GAAIC,WAAW,CAAE,CACfL,eAAe,CAAGD,2BAA2B,CAACC,eAAe,CAAC,CAChE,CAEA,MAAO,CAAAA,eAAe,CACxB","ignoreList":[]}