Skip to content

Commit ce3309d

Browse files
lposenlposen
authored
Merge pull request #603 from johnhaup/move-deps-to-peer-deps
Move dependencies to peer dependencies
2 parents 2f87799 + f21d5ef commit ce3309d

File tree

7 files changed

+38
-31
lines changed

7 files changed

+38
-31
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.3.21
2+
## Fixes
3+
- Fixes an issue where react native components that use safe-area-context or react-navigation throw an error because the sdk's components try and use its own local node_modules instead of the consumer's project.
4+
15
## 1.3.20
26
## Fixes
37
- Fixes an issue where the iOS SDK incorrectly targeted the latest minor version instead of a fixed version, potentially causing breaking changes.

‎README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ Iterable's React Native SDK relies on:
1818
- [React Native 0.60.0+](https://github.com/facebook/react-native)
1919
- [React Native CLI 2.0.1+](https://reactnative.dev/docs/upgrading#react-native-cli)
2020

21+
_UI Components require additional peer dependencies_
22+
- [React Navigation 6+](https://github.com/react-navigation/react-navigation)
23+
- [React Native Safe Area Context 4+](https://github.com/th3rdwave/react-native-safe-area-context)
24+
- [React Native Vector Icons 9+](https://github.com/oblador/react-native-vector-icons)
25+
- [React Native WebView 11+](https://github.com/react-native-webview/react-native-webview)
26+
2127
- **iOS**
2228
- Xcode 12+
2329
- [Deployment target 10.0+](https://help.apple.com/xcode/mac/current/#/deve69552ee5)
@@ -58,6 +64,7 @@ For quick reference, the following table lists the versions of the [Android SDK]
5864

5965
| RN SDK Version | Android SDK Version | iOS SDK Version |
6066
| --------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | --------------- |
67+
| [1.3.21](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.20) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
6168
| [1.3.20](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.20) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
6269
| [1.3.19](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.19) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.3](https://github.com/Iterable/swift-sdk/releases/tag/6.5.3)
6370
| [1.3.18](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.18) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.3](https://github.com/Iterable/swift-sdk/releases/tag/6.5.3)

‎SampleApp/javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint": "eslint ."
1111
},
1212
"dependencies": {
13-
"@iterable/react-native-sdk": "^1.3.20",
13+
"@iterable/react-native-sdk": "^1.3.21",
1414
"@react-native-community/masked-view": "^0.1.10",
1515
"@react-native-community/toolbar-android": "^0.1.0-rc.2",
1616
"@react-navigation/bottom-tabs": "^5.4.5",

‎SampleApp/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint": "eslint ."
1111
},
1212
"dependencies": {
13-
"@iterable/react-native-sdk": "^1.3.20",
13+
"@iterable/react-native-sdk": "^1.3.21",
1414
"@react-native-community/masked-view": "^0.1.10",
1515
"@react-native-community/toolbar-android": "^0.1.0-rc.2",
1616
"@react-navigation/bottom-tabs": "^5.4.5",

‎integration-testing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"e2e:android-release": "npm run build:android-release && npm run test:android-release"
1111
},
1212
"dependencies": {
13-
"@iterable/react-native-sdk": "^1.3.20",
13+
"@iterable/react-native-sdk": "^1.3.21",
1414
"@react-native-community/masked-view": "^0.1.10",
1515
"@react-navigation/bottom-tabs": "^5.4.5",
1616
"@react-navigation/native": "^5.4.0",

‎package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@iterable/react-native-sdk",
3-
"version": "1.3.20",
3+
"version": "1.3.21",
44
"description": "Iterable SDK for React Native.",
55
"main": "./js/index.js",
66
"types": "./js/index.d.ts",
@@ -20,45 +20,46 @@
2020
"author": "Iterable",
2121
"license": "MIT",
2222
"homepage": "https://github.com/Iterable/react-native-sdk",
23-
"dependencies": {
24-
"@react-native-community/hooks": "^2.6.0",
25-
"@react-navigation/native": "^6.0.6",
26-
"eslint": "^8.0.1",
27-
"eslint-config-airbnb": "^19.0.4",
28-
"react-native-safe-area-context": "^4.1.2",
29-
"react-native-vector-icons": "^9.0.0",
30-
"react-native-webview": "^11.0.0"
31-
},
3223
"devDependencies": {
3324
"@babel/core": "^7.10.2",
25+
"@react-navigation/native": "^6.0.6",
3426
"@testing-library/react-native": "^7.2.0",
3527
"@types/jest": "^26.0.0",
36-
"@types/react": "^16.9.23",
37-
"@types/react-native": "^0.62.13",
3828
"@types/react-native-vector-icons": "^6.4.10",
29+
"@types/react-native": "^0.62.13",
3930
"@types/react-test-renderer": "^17.0.1",
31+
"@types/react": "^16.9.23",
4032
"@typescript-eslint/eslint-plugin": "^5.0.0",
41-
"eslint-config-standard": "^14.0.0",
33+
"eslint-config-airbnb": "^19.0.4",
4234
"eslint-config-standard-jsx": "^8.1.0",
4335
"eslint-config-standard-react": "^9.2.0",
4436
"eslint-config-standard-with-typescript": "^23.0.0",
37+
"eslint-config-standard": "^14.0.0",
4538
"eslint-plugin-import": "^2.25.2",
4639
"eslint-plugin-n": "^15.0.0",
4740
"eslint-plugin-node": "^11.1.0",
4841
"eslint-plugin-promise": "^6.0.0",
49-
"eslint-plugin-react": "^7.31.10",
5042
"eslint-plugin-react-hooks": "^4.6.0",
5143
"eslint-plugin-react-native": "^4.0.0",
44+
"eslint-plugin-react": "^7.31.10",
5245
"eslint-plugin-standard": "^4.0.0",
46+
"eslint": "^8.0.1",
5347
"i": "^0.3.5",
5448
"jest": "^26.0.1",
55-
"react": "16.11.0",
49+
"react-native-safe-area-context": "^4.1.2",
50+
"react-native-vector-icons": "^9.0.0",
51+
"react-native-webview": "^11.0.0",
5652
"react-native": "^0.68.0",
53+
"react": "16.11.0",
5754
"ts-jest": "^26.0.0",
5855
"typescript": "^3.9.5"
5956
},
6057
"peerDependencies": {
61-
"react": "*",
62-
"react-native": "*"
58+
"@react-navigation/native": ">=6",
59+
"react-native-safe-area-context": ">=4",
60+
"react-native-vector-icons": ">=9",
61+
"react-native-webview": ">=11",
62+
"react-native": "*",
63+
"react": "*"
6364
}
6465
}

‎yarn.lock

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,11 +1240,6 @@
12401240
sudo-prompt "^9.0.0"
12411241
wcwidth "^1.0.1"
12421242

1243-
"@react-native-community/hooks@^2.6.0":
1244-
version "2.8.1"
1245-
resolved "https://registry.yarnpkg.com/@react-native-community/hooks/-/hooks-2.8.1.tgz#6e785431db49318048fdd14b601998437b6cc200"
1246-
integrity sha512-DCmCIC0Gn9m6K0Mlg2MwNmTxMEpBu5lTLsI6b/XUAv/vLGa6o+X7RhCai4FWeqkjCU36+ZOwaLzDo4NBWMXaoQ==
1247-
12481243
"@react-native/[email protected]":
12491244
version "1.0.0"
12501245
resolved "https://registry.yarnpkg.com/@react-native/assets/-/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e"
@@ -6163,9 +6158,9 @@ react-native-gradle-plugin@^0.0.6:
61636158
integrity sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg==
61646159

61656160
react-native-safe-area-context@^4.1.2:
6166-
version "4.11.0"
6167-
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.11.0.tgz#d45271363672dc1923ddb0ce5a6ad588e210c85d"
6168-
integrity sha512-Bg7bozxEB+ZS+H3tVYs5yY1cvxNXgR6nRQwpSMkYR9IN5CbxohLnSprrOPG/ostTCd4F6iCk0c51pExEhifSKQ==
6161+
version "4.14.0"
6162+
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.14.0.tgz#138f4b2e180cb7517c78bd5f4d4cf91325ba0b1a"
6163+
integrity sha512-/SyYpCulWQOnnXhRq6wepkhoyQMowHm1ptDyRz20s+YS/R9mbd+mK+jFyFCyXFJn8jp7vFl43VUCgspuOiEbwA==
61696164

61706165
react-native-vector-icons@^9.0.0:
61716166
version "9.2.0"
@@ -7468,9 +7463,9 @@ url-parse@^1.5.3:
74687463
requires-port "^1.0.0"
74697464

74707465
use-latest-callback@^0.2.1:
7471-
version "0.2.1"
7472-
resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.2.1.tgz#4d4e6a9e4817b13142834850dcfa8d24ca4569cf"
7473-
integrity sha512-QWlq8Is8BGWBf883QOEQP5HWYX/kMI+JTbJ5rdtvJLmXTIh9XoHIO3PQcmQl8BU44VKxow1kbQUHa6mQSMALDQ==
7466+
version "0.2.3"
7467+
resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.2.3.tgz#2d644d3063040b9bc2d4c55bb525a13ae3de9e16"
7468+
integrity sha512-7vI3fBuyRcP91pazVboc4qu+6ZqM8izPWX9k7cRnT8hbD5svslcknsh3S9BUhaK11OmgTV4oWZZVSeQAiV53SQ==
74747469

74757470
"use-subscription@>=1.0.0 <1.6.0":
74767471
version "1.5.1"

0 commit comments

Comments
 (0)