Skip to content

Commit a6449a1

Browse files
isekovanicisekovanic
authored
fix: bump dependencies, add new user agent functionality (#2987)
* chore: bump the version of our bottom sheet to latest * chore: bump stream-chat version to latest v8 one * chore: do user agent related changes * chore: bump stream-chat to latest again * fix: default to react-native if SDK property does not exist
1 parent a058ab7 commit a6449a1

File tree

11 files changed

+105
-39
lines changed

11 files changed

+105
-39
lines changed

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,6 +2107,14 @@
21072107
"@gorhom/portal" "1.0.14"
21082108
invariant "^2.2.4"
21092109

2110+
"@gorhom/bottom-sheet@^5.1.1":
2111+
version "5.1.1"
2112+
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.1.1.tgz#43ecb9e7b4d4ca4b4cefdf3b6b497f7715f350bc"
2113+
integrity sha512-Y8FiuRmeZYaP+ZGQ0axDwWrrKqVp4ByYRs1D2fTJTxHMt081MHHRQsqmZ3SK7AFp3cSID+vTqnD8w/KAASpy+w==
2114+
dependencies:
2115+
"@gorhom/portal" "1.0.14"
2116+
invariant "^2.2.4"
2117+
21102118
"@gorhom/[email protected]":
21112119
version "1.0.14"
21122120
resolved "https://registry.yarnpkg.com/@gorhom/portal/-/portal-1.0.14.tgz#1953edb76aaba80fb24021dc774550194a18e111"
@@ -7358,10 +7366,10 @@ [email protected], stream-buffers@~2.2.0:
73587366
version "0.0.0"
73597367
uid ""
73607368

7361-
[email protected].4:
7362-
version "6.6.4"
7363-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.4.tgz#f15c518148640efa30975abf4ae5cda648d8b1ed"
7364-
integrity sha512-YT3SY/QHwKboEKbvpe7xermyDsvwNAxe7pbV9VZzvayu066/vTk17uYw1RCGFcLQQsnKNJj8ZFt8j0ZLql4exQ==
7369+
[email protected].5:
7370+
version "6.6.5"
7371+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.5.tgz#ac34a1bd2ec3b950b3bc8bc122ec826d6dd51113"
7372+
integrity sha512-SZyr/TlOoW+j7t4X/CXBhvQ8LN8AgFg4vR6UfcP151fYvf4uwMrzmMN1T/IBsUBr30Kjmr54ik/dH0Z+tnLX2w==
73657373
dependencies:
73667374
"@gorhom/bottom-sheet" "^5.0.6"
73677375
dayjs "1.10.5"
@@ -7396,6 +7404,21 @@ stream-chat@^8.56.1:
73967404
jsonwebtoken "~9.0.0"
73977405
ws "^7.5.10"
73987406

7407+
stream-chat@^8.57.3:
7408+
version "8.57.3"
7409+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.57.3.tgz#1ef7eae9752175e7678e64193d420249becd57d6"
7410+
integrity sha512-/DNoo4PNWk6ye8ZBcp64aCpy3rNeFq0BxK8vYOn8mBpfVqMKznbLi/W06+OE2DMsKVjuzEXrxMRIqj26r1SNAg==
7411+
dependencies:
7412+
"@babel/runtime" "^7.16.3"
7413+
"@types/jsonwebtoken" "~9.0.0"
7414+
"@types/ws" "^7.4.0"
7415+
axios "^1.6.0"
7416+
base64-js "^1.5.1"
7417+
form-data "^4.0.0"
7418+
isomorphic-ws "^4.0.1"
7419+
jsonwebtoken "~9.0.0"
7420+
ws "^7.5.10"
7421+
73997422
stream-slice@^0.1.2:
74007423
version "0.1.2"
74017424
resolved "https://registry.yarnpkg.com/stream-slice/-/stream-slice-0.1.2.tgz#2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"

‎examples/SampleApp/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,7 @@ PODS:
21552155
- libwebp (~> 1.0)
21562156
- SDWebImage/Core (~> 5.10)
21572157
- SocketRocket (0.7.1)
2158-
- stream-chat-react-native (6.6.2):
2158+
- stream-chat-react-native (6.6.5):
21592159
- DoubleConversion
21602160
- glog
21612161
- hermes-engine
@@ -2579,7 +2579,7 @@ SPEC CHECKSUMS:
25792579
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
25802580
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
25812581
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2582-
stream-chat-react-native: 3a55bdcec6938301d40f771c84c08ea9c7ba2250
2582+
stream-chat-react-native: d04ab7e1a2623a5444277bdc84c2c0a7b2533909
25832583
Yoga: 28b8cda182ee3092ff80203da66dcb3ffc8cf401
25842584

25852585
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

‎examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,10 @@
688688
"-DFOLLY_USE_LIBCPP=1",
689689
"-DFOLLY_CFG_NO_COROUTINES=1",
690690
);
691-
OTHER_LDFLAGS = "$(inherited) ";
691+
OTHER_LDFLAGS = (
692+
"$(inherited)",
693+
" ",
694+
);
692695
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
693696
SDKROOT = iphoneos;
694697
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -820,7 +823,10 @@
820823
"-DFOLLY_USE_LIBCPP=1",
821824
"-DFOLLY_CFG_NO_COROUTINES=1",
822825
);
823-
OTHER_LDFLAGS = "$(inherited) ";
826+
OTHER_LDFLAGS = (
827+
"$(inherited)",
828+
" ",
829+
);
824830
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
825831
SDKROOT = iphoneos;
826832
USE_HERMES = true;

‎examples/SampleApp/yarn.lock‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@
15101510
resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.3.tgz#a73bab8eb491d7b8b7be2f0e6c310647835afe83"
15111511
integrity sha512-2xCRM9q9FlzGZCdgDMJwc0gyUkWFtkosy7Xxr6sFgQwn+wMNIWd7xIvYNauU1r64B5L5rsGKy/n9TKJ0aAFeqQ==
15121512

1513-
"@gorhom/bottom-sheet@^5.0.6":
1513+
"@gorhom/bottom-sheet@^5.0.6", "@gorhom/bottom-sheet@^5.1.1":
15141514
version "5.1.1"
15151515
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.1.1.tgz#43ecb9e7b4d4ca4b4cefdf3b6b497f7715f350bc"
15161516
integrity sha512-Y8FiuRmeZYaP+ZGQ0axDwWrrKqVp4ByYRs1D2fTJTxHMt081MHHRQsqmZ3SK7AFp3cSID+vTqnD8w/KAASpy+w==
@@ -7560,10 +7560,10 @@ statuses@~1.5.0:
75607560
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
75617561
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
75627562

7563-
[email protected].4:
7564-
version "6.6.4"
7565-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.4.tgz#f15c518148640efa30975abf4ae5cda648d8b1ed"
7566-
integrity sha512-YT3SY/QHwKboEKbvpe7xermyDsvwNAxe7pbV9VZzvayu066/vTk17uYw1RCGFcLQQsnKNJj8ZFt8j0ZLql4exQ==
7563+
[email protected].5:
7564+
version "6.6.5"
7565+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.5.tgz#ac34a1bd2ec3b950b3bc8bc122ec826d6dd51113"
7566+
integrity sha512-SZyr/TlOoW+j7t4X/CXBhvQ8LN8AgFg4vR6UfcP151fYvf4uwMrzmMN1T/IBsUBr30Kjmr54ik/dH0Z+tnLX2w==
75677567
dependencies:
75687568
"@gorhom/bottom-sheet" "^5.0.6"
75697569
dayjs "1.10.5"
@@ -7602,6 +7602,21 @@ stream-chat@^8.56.1:
76027602
jsonwebtoken "~9.0.0"
76037603
ws "^7.5.10"
76047604

7605+
stream-chat@^8.57.3:
7606+
version "8.57.3"
7607+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.57.3.tgz#1ef7eae9752175e7678e64193d420249becd57d6"
7608+
integrity sha512-/DNoo4PNWk6ye8ZBcp64aCpy3rNeFq0BxK8vYOn8mBpfVqMKznbLi/W06+OE2DMsKVjuzEXrxMRIqj26r1SNAg==
7609+
dependencies:
7610+
"@babel/runtime" "^7.16.3"
7611+
"@types/jsonwebtoken" "~9.0.0"
7612+
"@types/ws" "^7.4.0"
7613+
axios "^1.6.0"
7614+
base64-js "^1.5.1"
7615+
form-data "^4.0.0"
7616+
isomorphic-ws "^4.0.1"
7617+
jsonwebtoken "~9.0.0"
7618+
ws "^7.5.10"
7619+
76057620
strict-uri-encode@^2.0.0:
76067621
version "2.0.0"
76077622
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"

‎examples/TypeScriptMessaging/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ PODS:
19811981
- ReactCommon/turbomodule/core
19821982
- Yoga
19831983
- SocketRocket (0.7.1)
1984-
- stream-chat-react-native (6.6.2):
1984+
- stream-chat-react-native (6.6.5):
19851985
- DoubleConversion
19861986
- glog
19871987
- hermes-engine
@@ -2346,7 +2346,7 @@ SPEC CHECKSUMS:
23462346
RNShare: 6b1ee93f4fce1346c7c299c3107af20af05120b4
23472347
RNSVG: 7e38044415125a1d108294377de261d2fe2c54c9
23482348
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2349-
stream-chat-react-native: aed7897c07b86d9a51597c7a92275e77418eac84
2349+
stream-chat-react-native: 51d81810b25ae88c8edf0b3e0e376dd213e92d33
23502350
Yoga: 1fd059161b449018342943b095a6d4e69bcaa719
23512351

23522352
PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@
11121112
"@eslint/core" "^0.12.0"
11131113
levn "^0.4.1"
11141114

1115-
"@gorhom/bottom-sheet@^5.0.6":
1115+
"@gorhom/bottom-sheet@^5.0.6", "@gorhom/bottom-sheet@^5.1.1":
11161116
version "5.1.1"
11171117
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.1.1.tgz#43ecb9e7b4d4ca4b4cefdf3b6b497f7715f350bc"
11181118
integrity sha512-Y8FiuRmeZYaP+ZGQ0axDwWrrKqVp4ByYRs1D2fTJTxHMt081MHHRQsqmZ3SK7AFp3cSID+vTqnD8w/KAASpy+w==
@@ -6951,10 +6951,10 @@ statuses@~1.5.0:
69516951
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
69526952
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
69536953

6954-
[email protected].4:
6955-
version "6.6.4"
6956-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.4.tgz#f15c518148640efa30975abf4ae5cda648d8b1ed"
6957-
integrity sha512-YT3SY/QHwKboEKbvpe7xermyDsvwNAxe7pbV9VZzvayu066/vTk17uYw1RCGFcLQQsnKNJj8ZFt8j0ZLql4exQ==
6954+
[email protected].5:
6955+
version "6.6.5"
6956+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.5.tgz#ac34a1bd2ec3b950b3bc8bc122ec826d6dd51113"
6957+
integrity sha512-SZyr/TlOoW+j7t4X/CXBhvQ8LN8AgFg4vR6UfcP151fYvf4uwMrzmMN1T/IBsUBr30Kjmr54ik/dH0Z+tnLX2w==
69586958
dependencies:
69596959
"@gorhom/bottom-sheet" "^5.0.6"
69606960
dayjs "1.10.5"
@@ -6993,6 +6993,21 @@ stream-chat@^8.56.1:
69936993
jsonwebtoken "~9.0.0"
69946994
ws "^7.5.10"
69956995

6996+
stream-chat@^8.57.3:
6997+
version "8.57.3"
6998+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.57.3.tgz#1ef7eae9752175e7678e64193d420249becd57d6"
6999+
integrity sha512-/DNoo4PNWk6ye8ZBcp64aCpy3rNeFq0BxK8vYOn8mBpfVqMKznbLi/W06+OE2DMsKVjuzEXrxMRIqj26r1SNAg==
7000+
dependencies:
7001+
"@babel/runtime" "^7.16.3"
7002+
"@types/jsonwebtoken" "~9.0.0"
7003+
"@types/ws" "^7.4.0"
7004+
axios "^1.6.0"
7005+
base64-js "^1.5.1"
7006+
form-data "^4.0.0"
7007+
isomorphic-ws "^4.0.1"
7008+
jsonwebtoken "~9.0.0"
7009+
ws "^7.5.10"
7010+
69967011
strict-uri-encode@^2.0.0:
69977012
version "2.0.0"
69987013
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"

‎package/expo-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5113,10 +5113,10 @@ [email protected], stream-buffers@~2.2.0:
51135113
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
51145114
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
51155115

5116-
[email protected].4:
5117-
version "6.6.4"
5118-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.4.tgz#f15c518148640efa30975abf4ae5cda648d8b1ed"
5119-
integrity sha512-YT3SY/QHwKboEKbvpe7xermyDsvwNAxe7pbV9VZzvayu066/vTk17uYw1RCGFcLQQsnKNJj8ZFt8j0ZLql4exQ==
5116+
[email protected].5:
5117+
version "6.6.5"
5118+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.5.tgz#ac34a1bd2ec3b950b3bc8bc122ec826d6dd51113"
5119+
integrity sha512-SZyr/TlOoW+j7t4X/CXBhvQ8LN8AgFg4vR6UfcP151fYvf4uwMrzmMN1T/IBsUBr30Kjmr54ik/dH0Z+tnLX2w==
51205120
dependencies:
51215121
"@gorhom/bottom-sheet" "^5.0.6"
51225122
dayjs "1.10.5"

‎package/native-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4242,10 +4242,10 @@ statuses@~1.5.0:
42424242
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
42434243
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
42444244

4245-
[email protected].4:
4246-
version "6.6.4"
4247-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.4.tgz#f15c518148640efa30975abf4ae5cda648d8b1ed"
4248-
integrity sha512-YT3SY/QHwKboEKbvpe7xermyDsvwNAxe7pbV9VZzvayu066/vTk17uYw1RCGFcLQQsnKNJj8ZFt8j0ZLql4exQ==
4245+
[email protected].5:
4246+
version "6.6.5"
4247+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.5.tgz#ac34a1bd2ec3b950b3bc8bc122ec826d6dd51113"
4248+
integrity sha512-SZyr/TlOoW+j7t4X/CXBhvQ8LN8AgFg4vR6UfcP151fYvf4uwMrzmMN1T/IBsUBr30Kjmr54ik/dH0Z+tnLX2w==
42494249
dependencies:
42504250
"@gorhom/bottom-sheet" "^5.0.6"
42514251
dayjs "1.10.5"

‎package/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
]
6767
},
6868
"dependencies": {
69-
"@gorhom/bottom-sheet": "^5.0.6",
69+
"@gorhom/bottom-sheet": "^5.1.1",
7070
"dayjs": "1.10.5",
7171
"emoji-regex": "^10.3.0",
7272
"i18next": "^21.6.14",
@@ -77,7 +77,7 @@
7777
"path": "0.12.7",
7878
"react-native-markdown-package": "1.8.2",
7979
"react-native-url-polyfill": "^1.3.0",
80-
"stream-chat": "^8.56.1",
80+
"stream-chat": "^8.57.3",
8181
"use-sync-external-store": "^1.4.0"
8282
},
8383
"peerDependencies": {

‎package/src/components/Chat/Chat.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,14 @@ const ChatWithContext = <
187187

188188
useEffect(() => {
189189
if (client) {
190-
client.setUserAgent(`${SDK}-${Platform.OS}-${version}`);
190+
const sdkName = (SDK ? SDK.replace('stream-chat-', '') : 'react-native') as
191+
| 'react-native'
192+
| 'expo';
193+
client.sdkIdentifier = {
194+
name: sdkName,
195+
version,
196+
};
197+
client.deviceIdentifier = { os: `${Platform.OS} ${Platform.Version}` };
191198
// This is to disable recovery related logic in js client, since we handle it in this SDK
192199
client.recoverStateOnReconnect = false;
193200
client.persistUserOnConnectionFailure = enableOfflineSupport;

0 commit comments

Comments
 (0)