fix(expo): link iOS SDK through podspec SPM dependencies

Author: mikepitre

.changeset/tidy-expo-ios-import.md

@@ -2,4 +2,4 @@
 "@clerk/expo": patch
 ---
 
-Fixes iOS development builds across Expo SDK versions by moving shared native bridge APIs into a separate iOS module.
+Fixes iOS development builds across Expo SDK versions by linking the Clerk iOS SDK through React Native's Swift Package Manager podspec support.

packages/expo/app.plugin.js

@@ -1,6 +1,5 @@
 import React
 import UIKit
-import ClerkExpoBridge
 
 public class ClerkAuthNativeView: ClerkNativeViewHost {
   private var currentMode: String = "signInOrUp"

packages/expo/ios/ClerkAuthNativeView.swift

@@ -17,6 +17,9 @@ else
   }
 end
 
+clerk_ios_repo = 'https://github.com/clerk/clerk-ios.git'
+clerk_ios_version = '1.2.4'
+
 Pod::Spec.new do |s|
   s.name           = 'ClerkExpo'
   s.version        = package['version']
@@ -35,12 +38,20 @@ Pod::Spec.new do |s|
     'SWIFT_COMPILATION_MODE' => 'wholemodule'
   }
 
-  s.dependency 'ClerkExpoBridge'
+  if defined?(spm_dependency)
+    spm_dependency(
+      s,
+      url: clerk_ios_repo,
+      requirement: { :kind => 'exactVersion', :version => clerk_ios_version },
+      products: ['ClerkKit', 'ClerkKitUI']
+    )
+  else
+    raise 'ClerkExpo requires React Native 0.75 or newer for iOS Swift Package Manager dependencies.'
+  end
 
-  # Only include the module files in the pod (both Swift and ObjC bridges).
-  # ClerkNativeBridge.swift is injected into the app target by the config plugin
-  # because it uses `import ClerkKit` which is only available via SPM in the app target.
-  s.source_files = "ClerkExpoModule.swift", "ClerkExpoModule.m",
+  s.source_files = "ClerkExpoBridge.swift",
+                   "ClerkNativeBridge.swift",
+                   "ClerkExpoModule.swift", "ClerkExpoModule.m",
                    "ClerkNativeViewHost.swift",
                    "ClerkAuthNativeView.swift",
                    "ClerkAuthViewManager.m",

packages/expo/ios/ClerkExpo.podspec

@@ -7,7 +7,7 @@ public enum ClerkNativeViewEvent: String {
   case dismissed
 }
 
-// Protocol that the app target implements to provide Clerk SDK operations and SwiftUI views.
+// Protocol used by the native module and view wrappers to reach Clerk SDK operations and SwiftUI views.
 public protocol ClerkNativeBridgeProtocol {
   // Inline rendering - returns UIViewController to preserve SwiftUI lifecycle
   func makeAuthViewController(mode: String, dismissible: Bool, onEvent: @escaping (ClerkNativeViewEvent, [String: Any]) -> Void) -> UIViewController?
@@ -20,8 +20,8 @@ public protocol ClerkNativeBridgeProtocol {
   func syncFromJsClientToken(_ clientToken: String?, sourceId: String?, shouldRefreshClient: Bool) async throws
 }
 
-// Global registry for the app-target native bridge (set by the app target at startup).
-public var clerkNativeBridge: ClerkNativeBridgeProtocol? {
+// Global native bridge used by the ClerkExpo pod.
+public var clerkNativeBridge: ClerkNativeBridgeProtocol? = ClerkNativeBridge.shared {
   didSet {
     if clerkNativeBridge != nil {
       emitClerkNativeBridgeReady()

packages/expo/ios/ClerkExpoBridge.podspec

@@ -1,11 +1,9 @@
 // ClerkExpoModule - Native module for Clerk integration
 // This module provides the configure function, client sync, and native view bridges.
-// SwiftUI Clerk views are created by the app target through ClerkNativeBridge because
-// the Clerk SDK (SPM) isn't accessible from the CocoaPods-backed React Native pod.
+// SwiftUI Clerk views are created by ClerkNativeBridge through the Clerk iOS SPM dependency.
 
 import UIKit
 import React
-import ClerkExpoBridge
 
 // MARK: - Module
 
@@ -69,7 +67,7 @@ class ClerkExpoModule: RCTEventEmitter {
                         resolve: @escaping RCTPromiseResolveBlock,
                         reject: @escaping RCTPromiseRejectBlock) {
     guard let bridge = clerkNativeBridge else {
-      reject("E_NOT_INITIALIZED", "Clerk not initialized. Make sure ClerkNativeBridge is registered.", nil)
+      reject("E_NOT_INITIALIZED", "Clerk native bridge is unavailable.", nil)
       return
     }
 

packages/expo/ios/ClerkExpoBridge.swift

@@ -1,21 +1,21 @@
-// ClerkNativeBridge - Provides app-target Clerk SDK operations and SwiftUI view controllers to ClerkExpo.
-// This file is injected into the app target by the config plugin.
-// It uses the ClerkKit Swift package, which is only accessible from the app target.
+// ClerkNativeBridge - Provides Clerk SDK operations and SwiftUI view controllers to ClerkExpo.
 
 import UIKit
 import SwiftUI
 import Observation
 @_spi(FrameworkIntegration) import ClerkKit
 import ClerkKitUI
-import ClerkExpo  // Import the pod to access ClerkNativeBridgeProtocol
 
 private struct ClerkExpoHeaderMiddleware: ClerkRequestMiddleware {
-  // Replaced by the config plugin when this bridge is copied into the app target.
-  private static let hostSdkVersion = "__CLERK_EXPO_VERSION__"
+  private static var hostSdkVersion: String? {
+    Bundle.main.object(forInfoDictionaryKey: "ClerkExpoVersion") as? String
+  }
 
   func prepare(_ request: inout URLRequest) async throws {
     request.addValue("expo", forHTTPHeaderField: "x-clerk-host-sdk")
-    request.addValue(Self.hostSdkVersion, forHTTPHeaderField: "x-clerk-host-sdk-version")
+    if let hostSdkVersion = Self.hostSdkVersion, !hostSdkVersion.isEmpty {
+      request.addValue(hostSdkVersion, forHTTPHeaderField: "x-clerk-host-sdk-version")
+    }
   }
 }
 
@@ -52,14 +52,10 @@ final class ClerkNativeBridge: ClerkNativeBridgeProtocol {
     return Bundle.main.bundleIdentifier
   }
 
-  // Register this app-target bridge with the ClerkExpo module.
-  @MainActor static func register() {
-    shared.loadThemes()
-    clerkNativeBridge = shared
-  }
-
   @MainActor
   func configure(publishableKey: String, bearerToken: String? = nil) async throws {
+    loadThemes()
+
     if Self.shouldReconfigure(for: publishableKey) {
       try await Clerk.reconfigure(publishableKey: publishableKey, options: Self.makeClerkOptions())
       Self.clerkConfigured = true

packages/expo/ios/ClerkExpoModule.swift

@@ -1,5 +1,4 @@
 import UIKit
-import ClerkExpoBridge
 
 public class ClerkNativeViewHost: UIView, ClerkNativeBridgeReadyObserver {
   private lazy var hostingCoordinator = ClerkNativeHostingCoordinator(containerView: self)

packages/expo/ios/ClerkNativeBridge.swift

@@ -1,6 +1,5 @@
 import React
 import UIKit
-import ClerkExpoBridge
 
 public class ClerkUserButtonNativeView: ClerkNativeViewHost {
   override func makeHostedController() -> UIViewController? {