@callstack/react-native-brownfield 3.9.0 → 3.11.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @callstack/react-native-brownfield
 
+## 3.11.0
+
+### Minor Changes
+
+- [#317](https://github.com/callstack/react-native-brownfield/pull/317) [`c04301b`](https://github.com/callstack/react-native-brownfield/commit/c04301b79d288ab108aaa44d7c79dd876b8405e9) Thanks [@adamTrz](https://github.com/adamTrz)! - Add an opt-in iOS Debug mode for loading the embedded JavaScript bundle with `preferEmbeddedBundleInDebug`, fix `bundleURLOverride` fallback behavior when the override returns `nil`, and add native bundle-resolution tests.
+
+### Patch Changes
+
+- [#361](https://github.com/callstack/react-native-brownfield/pull/361) [`aa14eb2`](https://github.com/callstack/react-native-brownfield/commit/aa14eb26e26ea1e6075b91027237e4b41b932b57) Thanks [@hurali97](https://github.com/hurali97)! - make EXUpdates as a dependency only when installed
+
+- [#347](https://github.com/callstack/react-native-brownfield/pull/347) [`c19a81b`](https://github.com/callstack/react-native-brownfield/commit/c19a81b7502cc458d742ab947186591bb69cb261) Thanks [@marcinszalski-callstack](https://github.com/marcinszalski-callstack)! - fix: fix method to deallocate reactNativeFactory instance for expo
+
+- Updated dependencies [[`3715ac7`](https://github.com/callstack/react-native-brownfield/commit/3715ac7783000756ef1c66ecfe24a85c5e43abab), [`05c557d`](https://github.com/callstack/react-native-brownfield/commit/05c557da9e2b6fca02e6e1a0b0fe71a909bab15f)]:
+  - @callstack/brownfield-cli@3.11.0
+
+## 3.10.0
+
+### Patch Changes
+
+- [#323](https://github.com/callstack/react-native-brownfield/pull/323) [`3456d3a`](https://github.com/callstack/react-native-brownfield/commit/3456d3aded18002475def4b79889979e76e1db5e) Thanks [@artus9033](https://github.com/artus9033)! - Force `BUILD_LIBRARY_FOR_DISTRIBUTION` / `SWIFT_EMIT_MODULE_INTERFACE` on the CocoaPods ReactBrownfield, Brownie and BrownfieldNavigation targets so Release builds emit `.swiftinterface` files and `xcodebuild -create-xcframework` (brownfield `package:ios`) can merge slices.
+
+- Updated dependencies [[`3456d3a`](https://github.com/callstack/react-native-brownfield/commit/3456d3aded18002475def4b79889979e76e1db5e)]:
+  - @callstack/brownfield-cli@3.10.0
+
 ## 3.9.0
 
 ### Minor Changes

package/ReactBrownfield.podspec

@@ -2,6 +2,18 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
+expo_updates_installed = lambda do
+  Pod::Executable.execute_command('node', [
+    '-p',
+    'require.resolve("expo-updates/package.json", { paths: [process.argv[1]] })',
+    Pod::Config.instance.installation_root.to_s,
+  ])
+
+  true
+rescue
+  false
+end
+
 Pod::Spec.new do |spec|
   spec.name         = "ReactBrownfield"
   spec.version      = package['version']
@@ -15,17 +27,25 @@ Pod::Spec.new do |spec|
   spec.module_name = "ReactBrownfield"
   spec.source       = { :git => "git@github.com:callstack/react-native-brownfield.git", :tag => "#{spec.version}" }
   spec.source_files  = "ios/**/*.{h,m,mm,swift}"
+  spec.exclude_files = "ios/swiftpm/Package.swift", "ios/swiftpm/Tests/**/*"
   spec.pod_target_xcconfig = {
+    # below: needed to build the XCFramework with `.swiftinterface` files, required by xcodebuild -create-xcframework to succeed
     'DEFINES_MODULE' => 'YES',
+    'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES',
+    'SWIFT_EMIT_MODULE_INTERFACE' => 'YES',
     'OTHER_SWIFT_FLAGS' => "-enable-experimental-feature AccessLevelOnImport"
   }
 
+  if ENV['RCT_USE_PREBUILT_RNCORE'] == '1'
+    spec.dependency 'React-Core-prebuilt'
+  end
+
   spec.dependency 'ReactAppDependencyProvider'
-  add_dependency(spec, "React-RCTAppDelegate")
-  
+  spec.dependency 'React-RCTAppDelegate'
+
   if ENV['REACT_NATIVE_BROWNFIELD_USE_EXPO_HOST'] == '1'
     spec.dependency 'Expo'
-    spec.dependency 'EXUpdates'
+    spec.dependency 'EXUpdates' if expo_updates_installed.call
   end
 
   install_modules_dependencies(spec)

package/ios/BrownfieldDevLoadingViewBridge.h

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BrownfieldDevLoadingViewBridge : NSObject
+
++ (void)setEnabled:(BOOL)enabled;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/BrownfieldDevLoadingViewBridge.m

@@ -0,0 +1,12 @@
+#import "BrownfieldDevLoadingViewBridge.h"
+
+#import <React/RCTDevLoadingViewSetEnabled.h>
+
+@implementation BrownfieldDevLoadingViewBridge
+
++ (void)setEnabled:(BOOL)enabled
+{
+  RCTDevLoadingViewSetEnabled(enabled);
+}
+
+@end

package/ios/{ExpoHostRuntime.swift → Expo/ExpoHostRuntime.swift}

@@ -1,9 +1,8 @@
+#if canImport(Expo)
 import UIKit
 internal import React
-internal import React_RCTAppDelegate
 internal import ReactAppDependencyProvider
 
-#if canImport(Expo)
 internal import Expo
 #if canImport(EXUpdates)
 internal import EXUpdates
@@ -17,6 +16,16 @@ final class ExpoHostRuntime {
   private var reactNativeFactory: RCTReactNativeFactory?
   private var expoDelegate: ExpoAppDelegate?
 
+  private func configureDevLoadingView(with bundleURL: URL? = nil) {
+    #if DEBUG
+    let resolvedBundleURL = bundleURL ?? delegate.bundleURL()
+    let shouldDisableDevLoadingView =
+      preferEmbeddedBundleInDebug && (resolvedBundleURL?.isFileURL ?? false)
+
+    BrownfieldDevLoadingViewBridge.setEnabled(!shouldDisableDevLoadingView)
+    #endif
+  }
+
   /**
    * Starts React Native with default parameters.
    */
@@ -36,12 +45,12 @@ final class ExpoHostRuntime {
     reactNativeFactory = ExpoReactNativeFactory(delegate: delegate)
     // below: https://github.com/expo/expo/pull/39418/changes/5abd332b55b2ee7daee848284ed5f7fe1639452e
     // has removed bindReactNativeFactory method from ExpoAppDelegate
-    #if !EXPO_SDK_GTE_55 // this define comes from the Brownfield Expo config plugin
+    #if !EXPO_SDK_GTE_55  // this define comes from the Brownfield Expo config plugin
     guard let reactNativeFactory else { return }
     appDelegate.bindReactNativeFactory(reactNativeFactory)
     #endif
     expoDelegate = appDelegate
-      
+
     if let onBundleLoaded {
       jsBundleLoadObserver.observeOnce(onBundleLoaded: onBundleLoaded)
     }
@@ -56,6 +65,9 @@ final class ExpoHostRuntime {
       return
     }
 
+    if let rootViewFactory = reactNativeFactory?.rootViewFactory {
+        (rootViewFactory as AnyObject).setValue(nil, forKey: "reactHost")
+    }
     reactNativeFactory = nil
     expoDelegate = nil
   }
@@ -88,6 +100,17 @@ final class ExpoHostRuntime {
       delegate.bundle = bundle
     }
   }
+
+  /**
+   * Prefer the embedded JavaScript bundle instead of Metro when this framework is built in Debug.
+   * Default value: false
+   */
+  public var preferEmbeddedBundleInDebug: Bool = false {
+    didSet {
+      delegate.preferEmbeddedBundleInDebug = preferEmbeddedBundleInDebug
+    }
+  }
+
   /**
    * Dynamic bundle URL provider called on every bundle load.
    * When set, this overrides the default bundleURL() behavior in the delegate.
@@ -104,11 +127,11 @@ final class ExpoHostRuntime {
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
   ) -> Bool {
-#if canImport(EXUpdates)
+    #if canImport(EXUpdates)
     if !AppController.isInitialized() {
       AppController.initializeWithoutStarting()
     }
-#endif
+    #endif
     return ExpoAppDelegateSubscriberManager.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 
@@ -130,7 +153,7 @@ final class ExpoHostRuntime {
     let result = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)
     return (expoDelegate?.application(application, continue: userActivity, restorationHandler: restorationHandler) ?? false) || result
   }
-    
+
   func application(
     _ application: UIApplication,
     willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
@@ -144,10 +167,11 @@ final class ExpoHostRuntime {
     launchOptions: [AnyHashable: Any]?
   ) -> UIView? {
     let bundleURL = delegate.bundleURL()
+    configureDevLoadingView(with: bundleURL)
 
     // below: https://github.com/expo/expo/commit/2013760c46cde1404872d181a691da72fbf207a4
     // has moved the recreateRootView method to ExpoReactNativeFactory
-    #if EXPO_SDK_GTE_55 // this define comes from the Brownfield Expo config plugin
+    #if EXPO_SDK_GTE_55  // this define comes from the Brownfield Expo config plugin
     return (reactNativeFactory as? ExpoReactNativeFactory)?.recreateRootView(
       withBundleURL: bundleURL,
       moduleName: moduleName,
@@ -169,6 +193,7 @@ class ExpoHostRuntimeDelegate: ExpoReactNativeFactoryDelegate {
   var entryFile = ".expo/.virtual-metro-entry"
   var bundlePath = "main.jsbundle"
   var bundle = Bundle.main
+  var preferEmbeddedBundleInDebug = false
   var bundleURLOverride: (() -> URL?)? = nil
 
   override func sourceURL(for bridge: RCTBridge) -> URL? {
@@ -177,27 +202,44 @@ class ExpoHostRuntimeDelegate: ExpoReactNativeFactoryDelegate {
   }
 
   override func bundleURL() -> URL? {
-    if let bundleURLProvider = bundleURLOverride { return bundleURLProvider() }
-#if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(
-      forBundleRoot: entryFile)
-#else
-    #if canImport(EXUpdates)
-    if AppController.isInitialized(),
-       let launchAssetURL = AppController.sharedInstance.launchAssetUrl() {
-      return launchAssetURL
-    }
-    #endif
     do {
-      let (resourceName, fileExtension) = try BrownfieldBundlePathResolver.resourceComponents(
-        from: bundlePath
+      #if DEBUG
+      let isDebug = true
+      #else
+      let isDebug = false
+      #endif
+
+      if let overriddenURL = bundleURLOverride?() {
+        return overriddenURL
+      }
+
+      #if canImport(EXUpdates)
+      if !isDebug,
+        AppController.isInitialized(),
+        let launchAssetURL = AppController.sharedInstance.launchAssetUrl()
+      {
+        return launchAssetURL
+      }
+      #endif
+
+      // The override is resolved here so it wins over the Expo Updates launch asset
+      // and the closure is not evaluated a second time inside the shared resolver.
+      return try BrownfieldBundleURLResolver.resolve(
+        isDebug: isDebug,
+        preferEmbeddedBundleInDebug: preferEmbeddedBundleInDebug,
+        bundlePath: bundlePath,
+        bundle: bundle,
+        bundleURLOverride: nil,
+        metroURL: {
+          RCTBundleURLProvider.sharedSettings().jsBundleURL(
+            forBundleRoot: entryFile
+          )
+        }
       )
-      return bundle.url(forResource: resourceName, withExtension: fileExtension)
     } catch {
       assertionFailure("Invalid bundlePath '\(bundlePath)': \(error)")
       return nil
     }
-#endif
   }
 }
 #endif

package/ios/ReactNativeBrownfield.swift

@@ -55,6 +55,20 @@ internal import Expo
     }
   }
 
+  /**
+   * Prefer the embedded JavaScript bundle instead of Metro when this framework is built in Debug.
+   * Default value: false
+   */
+  @objc public var preferEmbeddedBundleInDebug: Bool = false {
+    didSet {
+      #if canImport(Expo)
+      ExpoHostRuntime.shared.preferEmbeddedBundleInDebug = preferEmbeddedBundleInDebug
+      #else
+      ReactNativeHostRuntime.shared.preferEmbeddedBundleInDebug = preferEmbeddedBundleInDebug
+      #endif
+    }
+  }
+
   /**
    * Dynamic bundle URL provider called on every bundle load.
    * When set, this overrides the default bundleURL() behavior in the delegate.

package/ios/ReactNativeBrownfield.xcodeproj/project.pbxproj

@@ -7,10 +7,16 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		696CB249230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */; };
-		696CB24A230EF9EA000207AF /* ReactNativeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB244230EF9EA000207AF /* ReactNativeViewController.m */; };
-		696CB24B230EF9EA000207AF /* ReactNativeBrownfield.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */; };
-		696CB24C230EF9EA000207AF /* ReactNativeBrownfieldModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */; };
+		79FEE7742FB499C700E407DE /* BrownfieldBundlePathResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE76D2FB499C700E407DE /* BrownfieldBundlePathResolver.swift */; };
+		79FEE7752FB499C700E407DE /* ReactNativeBrownfieldModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE7722FB499C700E407DE /* ReactNativeBrownfieldModule.mm */; };
+		79FEE7762FB499C700E407DE /* Notification+Brownfield.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE76F2FB499C700E407DE /* Notification+Brownfield.swift */; };
+		79FEE7772FB499C700E407DE /* ReactNativeBrownfieldModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE7732FB499C700E407DE /* ReactNativeBrownfieldModule.swift */; };
+		79FEE7782FB499C700E407DE /* JSBundleLoadObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE76E2FB499C700E407DE /* JSBundleLoadObserver.swift */; };
+		79FEE7792FB499C700E407DE /* ReactNativeBrownfield.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE7702FB499C700E407DE /* ReactNativeBrownfield.swift */; };
+		79FEE77D2FB499E400E407DE /* ReactNativeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE77B2FB499E400E407DE /* ReactNativeView.swift */; };
+		79FEE77E2FB499E400E407DE /* ReactNativeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE77C2FB499E400E407DE /* ReactNativeViewController.swift */; };
+		79FEE7802FB499EC00E407DE /* ReactNativeHostRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE77F2FB499EC00E407DE /* ReactNativeHostRuntime.swift */; };
+		79FEE7822FB499F300E407DE /* ExpoHostRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79FEE7812FB499F300E407DE /* ExpoHostRuntime.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -27,14 +33,17 @@
 
 /* Begin PBXFileReference section */
 		696CB229230EF910000207AF /* libReactNativeBrownfield.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeBrownfield.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		696CB241230EF9EA000207AF /* ReactNativeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeViewController.h; sourceTree = "<group>"; };
-		696CB242230EF9EA000207AF /* ReactNativeBrownfieldModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfieldModule.h; sourceTree = "<group>"; };
-		696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfieldNotifications.m; sourceTree = "<group>"; };
-		696CB244230EF9EA000207AF /* ReactNativeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeViewController.m; sourceTree = "<group>"; };
-		696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfield.m; sourceTree = "<group>"; };
-		696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNativeBrownfieldModule.m; sourceTree = "<group>"; };
-		696CB247230EF9EA000207AF /* ReactNativeBrownfieldNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfieldNotifications.h; sourceTree = "<group>"; };
-		696CB248230EF9EA000207AF /* ReactNativeBrownfield.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfield.h; sourceTree = "<group>"; };
+		79FEE76D2FB499C700E407DE /* BrownfieldBundlePathResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrownfieldBundlePathResolver.swift; sourceTree = "<group>"; };
+		79FEE76E2FB499C700E407DE /* JSBundleLoadObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSBundleLoadObserver.swift; sourceTree = "<group>"; };
+		79FEE76F2FB499C700E407DE /* Notification+Brownfield.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification+Brownfield.swift"; sourceTree = "<group>"; };
+		79FEE7702FB499C700E407DE /* ReactNativeBrownfield.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNativeBrownfield.swift; sourceTree = "<group>"; };
+		79FEE7712FB499C700E407DE /* ReactNativeBrownfieldModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeBrownfieldModule.h; sourceTree = "<group>"; };
+		79FEE7722FB499C700E407DE /* ReactNativeBrownfieldModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ReactNativeBrownfieldModule.mm; sourceTree = "<group>"; };
+		79FEE7732FB499C700E407DE /* ReactNativeBrownfieldModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNativeBrownfieldModule.swift; sourceTree = "<group>"; };
+		79FEE77B2FB499E400E407DE /* ReactNativeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNativeView.swift; sourceTree = "<group>"; };
+		79FEE77C2FB499E400E407DE /* ReactNativeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNativeViewController.swift; sourceTree = "<group>"; };
+		79FEE77F2FB499EC00E407DE /* ReactNativeHostRuntime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNativeHostRuntime.swift; sourceTree = "<group>"; };
+		79FEE7812FB499F300E407DE /* ExpoHostRuntime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpoHostRuntime.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -51,15 +60,17 @@
 		696CB220230EF910000207AF = {
 			isa = PBXGroup;
 			children = (
-				696CB248230EF9EA000207AF /* ReactNativeBrownfield.h */,
-				696CB245230EF9EA000207AF /* ReactNativeBrownfield.m */,
-				696CB242230EF9EA000207AF /* ReactNativeBrownfieldModule.h */,
-				696CB246230EF9EA000207AF /* ReactNativeBrownfieldModule.m */,
-				696CB247230EF9EA000207AF /* ReactNativeBrownfieldNotifications.h */,
-				696CB243230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m */,
-				696CB241230EF9EA000207AF /* ReactNativeViewController.h */,
-				696CB244230EF9EA000207AF /* ReactNativeViewController.m */,
+				79FEE76C2FB499A800E407DE /* Views */,
+				79FEE76B2FB4998300E407DE /* Vanilla */,
+				79FEE7692FB4997100E407DE /* Expo */,
 				696CB22A230EF910000207AF /* Products */,
+				79FEE76D2FB499C700E407DE /* BrownfieldBundlePathResolver.swift */,
+				79FEE76E2FB499C700E407DE /* JSBundleLoadObserver.swift */,
+				79FEE76F2FB499C700E407DE /* Notification+Brownfield.swift */,
+				79FEE7702FB499C700E407DE /* ReactNativeBrownfield.swift */,
+				79FEE7712FB499C700E407DE /* ReactNativeBrownfieldModule.h */,
+				79FEE7722FB499C700E407DE /* ReactNativeBrownfieldModule.mm */,
+				79FEE7732FB499C700E407DE /* ReactNativeBrownfieldModule.swift */,
 			);
 			sourceTree = "<group>";
 		};
@@ -71,6 +82,31 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		79FEE7692FB4997100E407DE /* Expo */ = {
+			isa = PBXGroup;
+			children = (
+				79FEE7812FB499F300E407DE /* ExpoHostRuntime.swift */,
+			);
+			path = Expo;
+			sourceTree = "<group>";
+		};
+		79FEE76B2FB4998300E407DE /* Vanilla */ = {
+			isa = PBXGroup;
+			children = (
+				79FEE77F2FB499EC00E407DE /* ReactNativeHostRuntime.swift */,
+			);
+			path = Vanilla;
+			sourceTree = "<group>";
+		};
+		79FEE76C2FB499A800E407DE /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				79FEE77B2FB499E400E407DE /* ReactNativeView.swift */,
+				79FEE77C2FB499E400E407DE /* ReactNativeViewController.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -102,6 +138,7 @@
 				TargetAttributes = {
 					696CB228230EF910000207AF = {
 						CreatedOnToolsVersion = 10.2.1;
+						LastSwiftMigration = 2650;
 					};
 				};
 			};
@@ -127,10 +164,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				696CB24C230EF9EA000207AF /* ReactNativeBrownfieldModule.m in Sources */,
-				696CB24B230EF9EA000207AF /* ReactNativeBrownfield.m in Sources */,
-				696CB249230EF9EA000207AF /* ReactNativeBrownfieldNotifications.m in Sources */,
-				696CB24A230EF9EA000207AF /* ReactNativeViewController.m in Sources */,
+				79FEE7802FB499EC00E407DE /* ReactNativeHostRuntime.swift in Sources */,
+				79FEE7742FB499C700E407DE /* BrownfieldBundlePathResolver.swift in Sources */,
+				79FEE7752FB499C700E407DE /* ReactNativeBrownfieldModule.mm in Sources */,
+				79FEE7762FB499C700E407DE /* Notification+Brownfield.swift in Sources */,
+				79FEE7822FB499F300E407DE /* ExpoHostRuntime.swift in Sources */,
+				79FEE7772FB499C700E407DE /* ReactNativeBrownfieldModule.swift in Sources */,
+				79FEE7782FB499C700E407DE /* JSBundleLoadObserver.swift in Sources */,
+				79FEE7792FB499C700E407DE /* ReactNativeBrownfield.swift in Sources */,
+				79FEE77D2FB499E400E407DE /* ReactNativeView.swift in Sources */,
+				79FEE77E2FB499E400E407DE /* ReactNativeViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -252,11 +295,15 @@
 		696CB233230EF910000207AF /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = PJL7DA2X5F;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "ReactNativeBrownfield-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -264,11 +311,14 @@
 		696CB234230EF910000207AF /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = PJL7DA2X5F;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "ReactNativeBrownfield-Bridging-Header.h";
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

package/ios/{ReactNativeHostRuntime.swift → Vanilla/ReactNativeHostRuntime.swift}

@@ -1,3 +1,4 @@
+#if !canImport(Expo)
 import UIKit
 internal import React
 internal import React_RCTAppDelegate
@@ -7,6 +8,7 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
   var entryFile = "index"
   var bundlePath = "main.jsbundle"
   var bundle = Bundle.main
+  var preferEmbeddedBundleInDebug = false
   var bundleURLOverride: (() -> URL?)? = nil
   // MARK: - RCTReactNativeFactoryDelegate Methods
 
@@ -15,23 +17,27 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
   }
 
   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
+      #if DEBUG
+      let isDebug = true
+      #else
+      let isDebug = false
+      #endif
+
+      return try BrownfieldBundleURLResolver.resolve(
+        isDebug: isDebug,
+        preferEmbeddedBundleInDebug: preferEmbeddedBundleInDebug,
+        bundlePath: bundlePath,
+        bundle: bundle,
+        bundleURLOverride: bundleURLOverride,
+        metroURL: {
+          RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: entryFile)
+        }
       )
-      return bundle.url(forResource: resourceName, withExtension: fileExtension)
     } catch {
       assertionFailure("Invalid bundlePath '\(bundlePath)': \(error)")
       return nil
     }
-#endif
   }
 }
 
@@ -40,6 +46,15 @@ final class ReactNativeHostRuntime {
   private let jsBundleLoadObserver = JSBundleLoadObserver()
   private var delegate = ReactNativeBrownfieldDelegate()
 
+  private func configureDevLoadingView() {
+    #if DEBUG
+    let shouldDisableDevLoadingView =
+      preferEmbeddedBundleInDebug && (delegate.bundleURL()?.isFileURL ?? false)
+
+    BrownfieldDevLoadingViewBridge.setEnabled(!shouldDisableDevLoadingView)
+    #endif
+  }
+
   /**
    * Path to JavaScript root.
    * Default value: "index"
@@ -70,6 +85,16 @@ final class ReactNativeHostRuntime {
     }
   }
 
+  /**
+   * Prefer the embedded JavaScript bundle instead of Metro when this framework is built in Debug.
+   * Default value: false
+   */
+  public var preferEmbeddedBundleInDebug: Bool = false {
+    didSet {
+      delegate.preferEmbeddedBundleInDebug = preferEmbeddedBundleInDebug
+    }
+  }
+
   /**
    * Dynamic bundle URL provider called on every bundle load.
    * When set, this overrides the default bundleURL() behavior in the delegate.
@@ -112,7 +137,9 @@ final class ReactNativeHostRuntime {
     initialProps: [AnyHashable: Any]?,
     launchOptions: [AnyHashable: Any]? = nil
   ) -> UIView? {
-    reactNativeFactory?.rootViewFactory.view(
+    configureDevLoadingView()
+
+    return reactNativeFactory?.rootViewFactory.view(
       withModuleName: moduleName,
       initialProperties: initialProps,
       launchOptions: launchOptions
@@ -171,3 +198,4 @@ final class ReactNativeHostRuntime {
     }
   }
 }
+#endif

package/ios/swiftpm/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+  name: "BrownfieldBundleSupport",
+  platforms: [
+    .macOS(.v13),
+  ],
+  products: [
+    .library(
+      name: "BrownfieldBundleSupport",
+      targets: ["BrownfieldBundleSupport"]
+    ),
+  ],
+  targets: [
+    .target(
+      name: "BrownfieldBundleSupport",
+      path: "Sources/BrownfieldBundleSupport"
+    ),
+    .testTarget(
+      name: "BrownfieldBundleSupportTests",
+      dependencies: ["BrownfieldBundleSupport"],
+      path: "Tests/BrownfieldBundleSupportTests"
+    ),
+  ]
+)

package/ios/swiftpm/Sources/BrownfieldBundleSupport/BrownfieldBundleURLResolver.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+final class BrownfieldBundleURLResolver {
+  private init() {}
+
+  static func resolve(
+    isDebug: Bool,
+    preferEmbeddedBundleInDebug: Bool,
+    bundlePath: String,
+    bundle: Bundle,
+    bundleURLOverride: (() -> URL?)?,
+    metroURL: () -> URL?
+  ) throws -> URL? {
+    if let overriddenURL = bundleURLOverride?() {
+      return overriddenURL
+    }
+
+    if isDebug && !preferEmbeddedBundleInDebug {
+      return metroURL()
+    }
+
+    let (resourceName, fileExtension) = try BrownfieldBundlePathResolver.resourceComponents(
+      from: bundlePath
+    )
+
+    return bundle.url(forResource: resourceName, withExtension: fileExtension)
+  }
+}