Release 0.7.0 (#56)

* feat!: remove deprecated APIs

android/src/main/java/io/ionic/portals/reactnative/PortalView.kt

@@ -33,7 +33,7 @@ internal class PortalViewManager(private val context: ReactApplicationContext) :
         when (fragmentMap[viewGroup.id]) {
             null -> fragmentMap[viewGroup.id] = PortalViewState(
                 fragment = null,
-                portal = RNPortalManager.getPortal(name) ?: RNPortalManager.createPortal(portal),
+                portal = RNPortalManager.createPortal(portal),
                 initialContext = portal.getMap("initialContext")?.toHashMap()
             )
         }

android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalManager.kt

@@ -41,20 +41,11 @@ internal data class PortalPlugin(val androidClassPath: String, val iosClassName:
 
 internal object RNPortalManager {
     private val manager = PortalManager
-    @Deprecated("Will be removed in the next release.")
-    private val portals: ConcurrentHashMap<String, RNPortal> = ConcurrentHashMap()
     private lateinit var reactApplicationContext: ReactApplicationContext
     private var usesSecureLiveUpdates = false
 
     fun register(key: String) = manager.register(key)
 
-    @Deprecated("Will be removed in the next release.")
-    fun addPortal(map: ReadableMap): RNPortal? {
-        val portal = createPortal(map) ?: return null
-        portals[portal.builder.name] = portal
-        return portal
-    }
-
     fun createPortal(map: ReadableMap): RNPortal? {
         val name = map.getString("name") ?: return null
         val portalBuilder = PortalBuilder(name)
@@ -147,11 +138,6 @@ internal object RNPortalManager {
         )
     }
 
-    @Deprecated("Will be removed in the next release.")
-    fun getPortal(name: String): RNPortal? {
-        return portals[name]
-    }
-
     fun enableSecureLiveUpdates(keyPath: String) {
         LiveUpdateManager.secureLiveUpdatePEM = keyPath
         usesSecureLiveUpdates = true
@@ -183,13 +169,6 @@ internal object RNPortalManager {
             LiveUpdateManager.secureLiveUpdatePEM = it
             usesSecureLiveUpdates = true
         }
-
-        val portalJsonArray = configJson.getJSONArray("portals")
-
-        for (index in 0 until portalJsonArray.length()) {
-            val portalJson = portalJsonArray.getJSONObject(index)
-            addPortal(portalJson.toReactMap())
-        }
     }
 }
 

android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsModule.kt

@@ -16,39 +16,6 @@ internal class PortalManagerModule(reactContext: ReactApplicationContext) :
         promise.resolve(null)
     }
 
-    @ReactMethod
-    fun addPortal(map: ReadableMap, promise: Promise) {
-        val portal = RNPortalManager.addPortal(map)
-        if (portal == null) {
-            promise.reject(null, "Invalid Portal configuration.")
-        } else {
-            promise.resolve(portal.toReadableMap())
-        }
-    }
-
-    @ReactMethod
-    fun addPortals(array: ReadableArray, promise: Promise) {
-        val portals = WritableNativeArray()
-
-        for (i in 0 until array.size()) {
-            val map = array.getMap(i)
-            val portal = RNPortalManager.addPortal(map) ?: continue
-            portals.pushMap(portal.toReadableMap())
-        }
-
-        promise.resolve(portals)
-    }
-
-    @ReactMethod
-    fun getPortal(name: String, promise: Promise) {
-        try {
-            val portal = RNPortalManager.getPortal(name)
-            promise.resolve(portal?.toReadableMap())
-        } catch (e: IllegalStateException) {
-            promise.reject(null, "Portal named $name not registered.")
-        }
-    }
-
     @ReactMethod
     fun enableSecureLiveUpdates(keyPath: String, promise: Promise) {
         RNPortalManager.enableSecureLiveUpdates(keyPath)

android/src/main/java/io/ionic/portals/reactnative/ReactNativeWebVitalsModule.kt

@@ -8,32 +8,6 @@ import com.facebook.react.bridge.ReactMethod
 internal class PortalWebVitalsModule(reactContext: ReactApplicationContext): ReactContextBaseJavaModule(reactContext) {
     override fun getName() = "IONPortalsWebVitals"
 
-    private fun registerVital(portalName: String, vitalName: String) {
-        val portal = RNPortalManager.getPortal(portalName) ?: return
-        if (portal.vitals == null) {
-            portal.vitals = mutableListOf()
-        }
-        portal.vitals?.add(vitalName)
-    }
-
-    @ReactMethod
-    fun registerOnFirstContentfulPaint(portalName: String, promise: Promise) {
-        registerVital(portalName,"fcp")
-        promise.resolve(null)
-    }
-
-    @ReactMethod
-    fun registerOnFirstInputDelay(portalName: String, promise: Promise) {
-        registerVital(portalName,"fid")
-        promise.resolve(null)
-    }
-
-    @ReactMethod
-    fun registerOnTimeToFirstByte(portalName: String, promise: Promise) {
-        registerVital(portalName,"ttfb")
-        promise.resolve(null)
-    }
-
     @ReactMethod
     fun addListener(eventName: String) {
     }

example/ios/Podfile.lock

@@ -1171,7 +1171,7 @@ PODS:
     - React-logger (= 0.74.2)
     - React-perflogger (= 0.74.2)
     - React-utils (= 0.74.2)
-  - ReactNativePortals (0.5.2):
+  - ReactNativePortals (0.6.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1435,10 +1435,10 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 56b642bf605ba5afa500d35790928fc1d51565ad
   React-utils: 4476b7fcbbd95cfd002f3e778616155241d86e31
   ReactCommon: ecad995f26e0d1e24061f60f4e5d74782f003f12
-  ReactNativePortals: 9bfdb3928c55e58ba22b21d99775aa3bb33c4df8
+  ReactNativePortals: 42f59afa6ed4119897d2dd7c9e5f66599c022684
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: ae3c32c514802d30f687a04a6a35b348506d411f
 
 PODFILE CHECKSUM: ce82c2dd878c18eaa5b59018ea58e2e1c0876c21
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2

example/ios/PortalsReactNativeExample.xcodeproj/project.pbxproj

@@ -608,11 +608,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -684,11 +680,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

example/src/App.tsx

@@ -48,19 +48,19 @@ export default function App() {
     <View style={styles.container}>
       <PubSubLabel initialNumber={initialNumber} />
       {/* {ready ? ( */}
-        <PortalView
-          portal={portal}
-          style={styles.portalView}
-          // webVitals={{
-          //   firstContentfulPaint: (duration: number) =>
-          //     console.log('firstContentfulPaint', duration),
-          //   firstInputDelay: (duration: number) =>
-          //     console.log('firstInputDelay', duration),
-          //   timeToFirstByte: (duration: number) => {
-          //     console.log('timeToFirstByte', duration);
-          //   },
-          // }}
-        />
+      <PortalView
+        portal={portal}
+        style={styles.portalView}
+        webVitals={{
+          firstContentfulPaint: (duration: number) =>
+            console.log('firstContentfulPaint', duration),
+          firstInputDelay: (duration: number) =>
+            console.log('firstInputDelay', duration),
+          timeToFirstByte: (duration: number) => {
+            console.log('timeToFirstByte', duration);
+          },
+        }}
+      />
       {/* ) : (
         <></>
       )} */}

ios/AssetMap+Codable.swift

@@ -0,0 +1,33 @@
+//
+//  IonicPortals+Codable.swift
+//  ReactNativePortals
+//
+//  Created by Trevor Lambert on 6/5/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+import Foundation
+import IonicPortals
+
+extension AssetMap: Encodable {
+    enum CodingKeys: String, CodingKey {
+        case startDir, virtualPath, name
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(startDir, forKey: .startDir)
+        try container.encode(virtualPath, forKey: .virtualPath)
+        try container.encode(name, forKey: .name)
+    }
+}
+
+extension AssetMap: Decodable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(String.self, forKey: .name)
+        let startDir = try container.decodeIfPresent(String.self, forKey: .startDir) ?? ""
+        let virtualPath = try container.decodeIfPresent(String.self, forKey: .virtualPath)
+        self.init(name: name, virtualPath: virtualPath, startDir: startDir)
+    }
+}

ios/PortalManager.mm

@@ -11,9 +11,6 @@
 @interface RCT_EXTERN_MODULE(IONPortalsReactNative, NSObject)
 RCT_EXTERN_METHOD(register: (NSString *) key resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
 RCT_EXTERN_METHOD(enableSecureLiveUpdates: (NSString *) publicKeyPath resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
-RCT_EXTERN_METHOD(addPortal: (NSDictionary) portal resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
-RCT_EXTERN_METHOD(addPortals: (NSArray) portals resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
-RCT_EXTERN_METHOD(getPortal: (NSString *) name resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
 RCT_EXTERN_METHOD(syncOne: (NSString *) appId resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
 RCT_EXTERN_METHOD(syncSome: (NSArray) appIds resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
 RCT_EXTERN_METHOD(syncAll: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)

ios/PortalView.swift

@@ -27,28 +27,20 @@ class PortalView: UIView {
         }
 
         set {
-            guard let portalDict = newValue,
-                  let name = portalDict["name"] as? String
-            else { return }
-
+            guard let portalDict = newValue else { return }
+
             var portal: Portal
 
-            if var deprecatedPortal = PortalsReactNative.getPortal(named: name) {
-                if let initialContext = portalDict["initialContext"] as? [String: Any] {
-                    deprecatedPortal.initialContext = JSTypes.coerceDictionaryToJSObject(initialContext) ?? [:]
-                }
-                portal = deprecatedPortal
-            } else {
+            do {
                 let jsObject = JSTypes.coerceDictionaryToJSObject(portalDict) ?? [:]
-                do {
-                    portal = try Portal.decode(from: jsObject, with: JSValueDecoder())
-                } catch {
-                    print(error.localizedDescription)
-                    return
-                }
+                portal = try Portal.decode(from: jsObject, with: JSValueDecoder())
+            } catch {
+                print(error.localizedDescription)
+                return
             }
+
             if portal.usesWebVitals {
-                var vitalsPlugin = WebVitalsPlugin { portalName, duration in
+                let vitalsPlugin = WebVitalsPlugin { portalName, duration in
                     IonicPortals.PortalsPubSub
                         .shared
                         .publish(