Merge pull request #84 from ContentSquare/feat/update-rn-bridge-version

updates RNSDK to 4.11.0
ContentSquare · Dec 2, 2024 · a6e3a25 · a6e3a25
2 parents 221522f + e69a32c
commit a6e3a25
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 53 deletions.
diff --git a/ClassicImplementation/ios/Podfile.lock b/ClassicImplementation/ios/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - boost (1.84.0)
-  - ContentsquareBridgeModule (4.10.1):
-    - CS_iOS_SDK_STATIC (= 4.37.1)
+  - ContentsquareBridgeModule (4.11.0):
+    - CS_iOS_SDK_STATIC (= 4.38.1)
     - React
-  - CS_iOS_SDK_STATIC (4.37.1):
+  - CS_iOS_SDK_STATIC (4.38.1):
     - CSCrashReporter (= 1.0.0)
     - SwiftProtobuf (<= 1.26.0)
   - CSCrashReporter (1.0.0)
@@ -1265,12 +1265,8 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context (4.3.4):
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
+  - react-native-safe-area-context (4.11.1):
     - React-Core
-    - ReactCommon/turbomodule/core
   - react-native-webview (11.26.1):
     - React-Core
   - React-nativeconfig (0.75.4)
@@ -1535,7 +1531,7 @@ PODS:
     - React-utils (= 0.75.4)
   - RNCAsyncStorage (1.24.0):
     - React-Core
-  - RNCClipboard (1.5.1):
+  - RNCClipboard (1.14.1):
     - React-Core
   - RNScreens (3.34.0):
     - DoubleConversion
@@ -1632,7 +1628,7 @@ DEPENDENCIES:
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
-  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
+  - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
   - RNScreens (from `../node_modules/react-native-screens`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -1778,21 +1774,21 @@ EXTERNAL SOURCES:
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCClipboard:
-    :path: "../node_modules/@react-native-community/clipboard"
+    :path: "../node_modules/@react-native-clipboard/clipboard"
   RNScreens:
     :path: "../node_modules/react-native-screens"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
-  ContentsquareBridgeModule: 9b2a40537f2e84bd217b08f2ae05d4b2b74df54a
-  CS_iOS_SDK_STATIC: cffc719d71530229ebc56c5e64fb00ab20abcb6d
+  ContentsquareBridgeModule: 5a3eea29036f39cc2db2eab72c837ce4cbddd3f4
+  CS_iOS_SDK_STATIC: 0c96b57cf70a33478d649c23223bc72711e8a629
   CSCrashReporter: 1494c8b8c805d0b3cdb62f2b044f2606a7d4a391
-  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 430e10366de01d1e3d57374500b1b150fe482e6d
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
-  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0
   RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
   RCTDeprecation: 726d24248aeab6d7180dac71a936bbca6a994ed1
@@ -1824,7 +1820,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: b982d5bba94a8bc073bda48f0d27c9b28417fae3
   React-microtasksnativemodule: 2b73e68f0462f3175f98782db08896f8501afd20
   react-native-pager-view: c476f76d54f946df5147645e902d3d7173688187
-  react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9
+  react-native-safe-area-context: 5141f11858b033636f1788b14f32eaba92cee810
   react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
   React-nativeconfig: 8c83d992b9cc7d75b5abe262069eaeea4349f794
   React-NativeModulesApple: 9f7920224a3b0c7d04d77990067ded14cee3c614
@@ -1853,7 +1849,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 4bcb34e6b5ebf6eef5cee34f55aa39991ea1c1f1
   ReactCommon: 6a952e50c2a4b694731d7682aaa6c79bc156e4ad
   RNCAsyncStorage: ec53e44dc3e75b44aa2a9f37618a49c3bc080a7a
-  RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
+  RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
   RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3

diff --git a/ClassicImplementation/package.json b/ClassicImplementation/package.json
@@ -10,7 +10,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@contentsquare/react-native-bridge": "^4.10.1",
+    "@contentsquare/react-native-bridge": "^4.11.0",
     "@react-native-async-storage/async-storage": "^1.19.5",
     "@react-native-community/cli": "^10.1.3",
     "@react-native-clipboard/clipboard": "1.14.1",

diff --git a/ClassicImplementation/src/modules/Webviews/views/Webviews.tsx b/ClassicImplementation/src/modules/Webviews/views/Webviews.tsx
@@ -1,21 +1,33 @@
 import { CSWebView } from '@contentsquare/react-native-bridge';
 import React from 'react';
+import { View } from 'react-native';
 import { WebView } from 'react-native-webview';
 
 export const Webviews = () => {
   return (
-    <CSWebView
-      url="" // put your url here
-      renderWebView={(onLayout, webViewUrl) => {
-        return (
-          <WebView
-            onLayout={onLayout}
-            source={{
-              uri: webViewUrl,
-            }}
-          />
-        );
-      }}
-    />
+    <View>
+      <CSWebView>
+        {/* Implementation 1: Webview as a child */}
+        <WebView
+          source={{
+            uri: 'test.com',
+          }}
+        />
+      </CSWebView>
+      {/* Legacy implementation: render prop for webview */}
+      <CSWebView
+        url="test.com" // put your url here
+        renderWebView={(onLayout, webViewUrl) => {
+          return (
+            <WebView
+              onLayout={onLayout}
+              source={{
+                uri: webViewUrl,
+              }}
+            />
+          );
+        }}
+      />
+    </View>
   );
 };
diff --git a/ClassicImplementation/yarn.lock b/ClassicImplementation/yarn.lock
@@ -1111,10 +1111,10 @@
   resolved "https://artifactory.csq.fr/api/npm/npm/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@contentsquare/react-native-bridge@^4.10.1":
-  version "4.10.1"
-  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.10.1.tgz#0aac2a97dbc4faa84805c1d160c301ee9ccfab7e"
-  integrity sha512-b9YGSq9tmJzzQTEnU+ssxX2RyzqmbeXp1Iw6N6DRxb0MFfrCQ9gkaJgVlia0FqfyNZ2ocxfYZa+CHJQ/awBhEA==
+"@contentsquare/react-native-bridge@^4.11.0":
+  version "4.11.0"
+  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.11.0.tgz#87a1b79ad00ae33e57a48a29ce477190ea2edc0e"
+  integrity sha512-QiGPNBVCE0WpmCC1U47GOGWDO7EvX2vroSTxl+suLYqGVwXXgBcuZeRDS+CQBx34I8RcWfn272dHm9J8dmttYQ==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"

diff --git a/ExpoImplementationEAS/package.json b/ExpoImplementationEAS/package.json
@@ -8,7 +8,7 @@
     "web": "expo start --web"
   },
   "dependencies": {
-    "@contentsquare/react-native-bridge": "^4.10.1",
+    "@contentsquare/react-native-bridge": "^4.11.0",
     "expo": "51.0.28",
     "expo-build-properties": "~0.8.3",
     "expo-status-bar": "~1.12.1",

diff --git a/ExpoImplementationEAS/yarn.lock b/ExpoImplementationEAS/yarn.lock
@@ -1029,10 +1029,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@contentsquare/react-native-bridge@^4.10.1":
-  version "4.10.1"
-  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.10.1.tgz#0aac2a97dbc4faa84805c1d160c301ee9ccfab7e"
-  integrity sha512-b9YGSq9tmJzzQTEnU+ssxX2RyzqmbeXp1Iw6N6DRxb0MFfrCQ9gkaJgVlia0FqfyNZ2ocxfYZa+CHJQ/awBhEA==
+"@contentsquare/react-native-bridge@^4.11.0":
+  version "4.11.0"
+  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.11.0.tgz#87a1b79ad00ae33e57a48a29ce477190ea2edc0e"
+  integrity sha512-QiGPNBVCE0WpmCC1U47GOGWDO7EvX2vroSTxl+suLYqGVwXXgBcuZeRDS+CQBx34I8RcWfn272dHm9J8dmttYQ==
 
 "@expo/bunyan@^4.0.0":
   version "4.0.0"

diff --git a/Implementations/AdobeAnalytics/ios/Podfile.lock b/Implementations/AdobeAnalytics/ios/Podfile.lock
@@ -26,10 +26,10 @@ PODS:
   - AEPUserProfile (4.0.1):
     - AEPCore (< 5.0.0, >= 4.0.0)
   - boost (1.84.0)
-  - ContentsquareBridgeModule (4.10.1):
-    - CS_iOS_SDK_STATIC (= 4.37.1)
+  - ContentsquareBridgeModule (4.11.0):
+    - CS_iOS_SDK_STATIC (= 4.38.1)
     - React
-  - CS_iOS_SDK_STATIC (4.37.1):
+  - CS_iOS_SDK_STATIC (4.38.1):
     - CSCrashReporter (= 1.0.0)
     - SwiftProtobuf (<= 1.26.0)
   - CSCrashReporter (1.0.0)
@@ -1813,13 +1813,13 @@ SPEC CHECKSUMS:
   AEPSignal: 990c1e4b4db804dbf8c857cd11e876e16c812cce
   AEPUserProfile: 05e838305f6a0c32f5892e6c1bd799d9c669adfd
   boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
-  ContentsquareBridgeModule: 9b2a40537f2e84bd217b08f2ae05d4b2b74df54a
-  CS_iOS_SDK_STATIC: cffc719d71530229ebc56c5e64fb00ab20abcb6d
+  ContentsquareBridgeModule: 5a3eea29036f39cc2db2eab72c837ce4cbddd3f4
+  CS_iOS_SDK_STATIC: 0c96b57cf70a33478d649c23223bc72711e8a629
   CSCrashReporter: 1494c8b8c805d0b3cdb62f2b044f2606a7d4a391
-  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 430e10366de01d1e3d57374500b1b150fe482e6d
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
-  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0
   RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
   RCTAEPAssurance: 690918bca2bca158bf807c6d41053624eca981e6

diff --git a/Implementations/AdobeAnalytics/package.json b/Implementations/AdobeAnalytics/package.json
@@ -17,7 +17,7 @@
     "@adobe/react-native-aepedgeconsent": "^5.0.0",
     "@adobe/react-native-aepedgeidentity": "5.0.0",
     "@adobe/react-native-aepuserprofile": "^5.0.0",
-    "@contentsquare/react-native-bridge": "^4.6.0",
+    "@contentsquare/react-native-bridge": "^4.11.0",
     "@react-native-async-storage/async-storage": "^1.19.5",
     "react": "18.3.1",
     "react-native": "0.75.4"
@@ -42,4 +42,4 @@
   "jest": {
     "preset": "react-native"
   }
-}
+}
diff --git a/Implementations/AdobeAnalytics/yarn.lock b/Implementations/AdobeAnalytics/yarn.lock
@@ -1109,10 +1109,10 @@
   resolved "https://artifactory.csq.fr/api/npm/npm/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@contentsquare/react-native-bridge@^4.6.0":
-  version "4.10.1"
-  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.10.1.tgz#0aac2a97dbc4faa84805c1d160c301ee9ccfab7e"
-  integrity sha512-b9YGSq9tmJzzQTEnU+ssxX2RyzqmbeXp1Iw6N6DRxb0MFfrCQ9gkaJgVlia0FqfyNZ2ocxfYZa+CHJQ/awBhEA==
+"@contentsquare/react-native-bridge@^4.11.0":
+  version "4.11.0"
+  resolved "https://artifactory.csq.fr/api/npm/npm/@contentsquare/react-native-bridge/-/react-native-bridge-4.11.0.tgz#87a1b79ad00ae33e57a48a29ce477190ea2edc0e"
+  integrity sha512-QiGPNBVCE0WpmCC1U47GOGWDO7EvX2vroSTxl+suLYqGVwXXgBcuZeRDS+CQBx34I8RcWfn272dHm9J8dmttYQ==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"