Skip to content

Commit 83cf002

Browse files
authored
Merge pull request #817 from GetStream/peer-deps-fixes
fix: Hotfix for peer deps collision
2 parents 5fa9f29 + e04793e commit 83cf002

File tree

8 files changed

+2030
-1659
lines changed

8 files changed

+2030
-1659
lines changed

examples/SampleApp/ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ PODS:
382382
- React-Core
383383
- react-native-document-picker (5.0.4):
384384
- React-Core
385-
- react-native-image-resizer (1.4.4):
385+
- react-native-image-resizer (1.4.5):
386386
- React-Core
387387
- react-native-netinfo (6.0.0):
388388
- React-Core
@@ -452,7 +452,7 @@ PODS:
452452
- React-cxxreact (= 0.64.1)
453453
- React-jsi (= 0.64.1)
454454
- React-perflogger (= 0.64.1)
455-
- RNCAsyncStorage (1.12.1):
455+
- RNCAsyncStorage (1.15.6):
456456
- React-Core
457457
- RNCMaskedView (0.1.11):
458458
- React
@@ -572,7 +572,7 @@ DEPENDENCIES:
572572
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
573573
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
574574
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
575-
- "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
575+
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
576576
- "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
577577
- RNFS (from `../node_modules/react-native-fs`)
578578
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
@@ -681,7 +681,7 @@ EXTERNAL SOURCES:
681681
ReactCommon:
682682
:path: "../node_modules/react-native/ReactCommon"
683683
RNCAsyncStorage:
684-
:path: "../node_modules/@react-native-community/async-storage"
684+
:path: "../node_modules/@react-native-async-storage/async-storage"
685685
RNCMaskedView:
686686
:path: "../node_modules/@react-native-community/masked-view"
687687
RNFS:
@@ -746,7 +746,7 @@ SPEC CHECKSUMS:
746746
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
747747
react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
748748
react-native-document-picker: 1a7518132d4a06b67f459be9bb1464a567d2b3b4
749-
react-native-image-resizer: 13ac4af788f88af36d0353a1324401ebabd04fe4
749+
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
750750
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
751751
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
752752
React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
@@ -761,7 +761,7 @@ SPEC CHECKSUMS:
761761
React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1
762762
React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6
763763
ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca
764-
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
764+
RNCAsyncStorage: b7c6564ce662366dd44d0189456183ef7eda2d4d
765765
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
766766
RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32
767767
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211

examples/SampleApp/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"release-next": "echo \"Skipping next release for SampleApp\""
2222
},
2323
"dependencies": {
24-
"@react-native-community/async-storage": "1.12.1",
24+
"@react-native-async-storage/async-storage": "1.15.6",
2525
"@react-native-community/blur": "3.6.0",
2626
"@react-native-community/cameraroll": "4.0.4",
2727
"@react-native-community/masked-view": "0.1.11",
@@ -32,14 +32,14 @@
3232
"@react-navigation/stack": "5.14.5",
3333
"@stream-io/flat-list-mvcp": "0.10.1",
3434
"patch-package": "6.4.7",
35-
"react": "17.0.2",
35+
"react": "17.0.1",
3636
"react-native": "0.64.1",
3737
"react-native-document-picker": "5.0.4",
3838
"react-native-fs": "2.18.0",
3939
"react-native-gesture-handler": "1.10.3",
4040
"react-native-haptic-feedback": "1.11.0",
4141
"react-native-image-crop-picker": "0.36.2",
42-
"react-native-image-resizer": "1.4.4",
42+
"react-native-image-resizer": "1.4.5",
4343
"react-native-markdown-package": "1.8.1",
4444
"react-native-reanimated": "2.1.0",
4545
"react-native-safe-area-context": "3.2.0",
@@ -67,7 +67,7 @@
6767
"eslint-plugin-typescript-sort-keys": "^1.7.0",
6868
"jest": "26.6.3",
6969
"metro-react-native-babel-preset": "0.66.0",
70-
"react-test-renderer": "17.0.2",
70+
"react-test-renderer": "17.0.1",
7171
"typescript": "4.2.4"
7272
},
7373
"jest": {

examples/SampleApp/src/utils/AsyncStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AsyncStorage from '@react-native-community/async-storage';
1+
import AsyncStorage from '@react-native-async-storage/async-storage';
22

33
export default {
44
getItem: async <T>(key: string, defaultValue: T | null) => {

examples/SampleApp/yarn.lock

Lines changed: 1084 additions & 1052 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)