From 1065d682d4ab5ad90432f8475a9a4d770f61c405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Arag=C3=A3o?= Date: Fri, 15 Nov 2019 22:48:28 -0600 Subject: [PATCH 1/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bfc9ab9..e14107a 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ npm i --save react-native-meteor ## Compatibility notes +Upgraded packages to working in RN >= 0.57 + Since RN 0.26.0 you have to use ws or wss protocol to connect to your meteor server. http is not working on Android. It is recommended to always use the latest version of react-native-meteor compatible with your RN version: From 0a9a4f196aa80471a36fcd735f8d6bc184787e2c Mon Sep 17 00:00:00 2001 From: raragao Date: Fri, 15 Nov 2019 22:58:09 -0600 Subject: [PATCH 2/6] Update to use @react-native-community/netinfo to RN => 0.57 --- example/RNApp/android/.project | 17 +++++++++++++++++ .../.settings/org.eclipse.buildship.core.prefs | 2 ++ package.json | 4 ++-- src/Meteor.js | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 example/RNApp/android/.project create mode 100644 example/RNApp/android/.settings/org.eclipse.buildship.core.prefs diff --git a/example/RNApp/android/.project b/example/RNApp/android/.project new file mode 100644 index 0000000..45c8807 --- /dev/null +++ b/example/RNApp/android/.project @@ -0,0 +1,17 @@ + + + android______ + Project android______ created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/example/RNApp/android/.settings/org.eclipse.buildship.core.prefs b/example/RNApp/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/example/RNApp/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/package.json b/package.json index e5e8fa3..cb90dc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-meteor", - "version": "1.4.0", + "version": "1.4.1", "description": "Full Meteor Client for React Native", "main": "src/Meteor.js", "scripts": { @@ -57,6 +57,6 @@ }, "peerDependencies": { "react": "*", - "react-native": ">= 0.49.0" + "react-native": ">= 0.57.0" } } diff --git a/src/Meteor.js b/src/Meteor.js index 20be280..2a11e47 100644 --- a/src/Meteor.js +++ b/src/Meteor.js @@ -1,5 +1,5 @@ -import { NetInfo, Platform, View } from 'react-native'; - +import { Platform, View } from 'react-native'; +import NetInfo from "@react-native-community/netinfo"; import reactMixin from 'react-mixin'; import Trackr from 'trackr'; import EJSON from 'ejson'; From 7610115e6fb0c6bd45f82d3a22d2c30771cccf97 Mon Sep 17 00:00:00 2001 From: raragao Date: Fri, 15 Nov 2019 23:24:12 -0600 Subject: [PATCH 3/6] Change source of AsyncStorage to @react-native-community/async-storage --- src/user/User.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/User.js b/src/user/User.js index 86fd1c9..fbd76a3 100644 --- a/src/user/User.js +++ b/src/user/User.js @@ -1,4 +1,4 @@ -import { AsyncStorage } from 'react-native'; +import AsyncStorage from '@react-native-community/async-storage'; import Data from '../Data'; import { hashPassword } from '../../lib/utils'; From 4ba579eab5de5a932534f2d24c64d75147fc8f5a Mon Sep 17 00:00:00 2001 From: raragao Date: Sat, 16 Nov 2019 14:00:00 -0600 Subject: [PATCH 4/6] Add callback optional parameter to Meteor.connect() --- src/Meteor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Meteor.js b/src/Meteor.js index 2a11e47..12ed2b5 100644 --- a/src/Meteor.js +++ b/src/Meteor.js @@ -75,7 +75,7 @@ module.exports = { reconnect() { Data.ddp && Data.ddp.connect(); }, - connect(endpoint, options) { + connect(endpoint, options, callback) { if (!endpoint) endpoint = Data._endpoint; if (!options) options = Data._options; @@ -107,6 +107,7 @@ module.exports = { console.info('Connected to DDP server.'); this._loadInitialUser().then(() => { this._subscriptionsRestart(); + typeof callback == 'function' && callback(err); }); }); From 43229afb2c2ceb7882f82b3856c5081bcde4462c Mon Sep 17 00:00:00 2001 From: raragao Date: Sat, 16 Nov 2019 14:05:14 -0600 Subject: [PATCH 5/6] Adjust callback parameter --- src/Meteor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Meteor.js b/src/Meteor.js index 12ed2b5..d80d445 100644 --- a/src/Meteor.js +++ b/src/Meteor.js @@ -107,7 +107,7 @@ module.exports = { console.info('Connected to DDP server.'); this._loadInitialUser().then(() => { this._subscriptionsRestart(); - typeof callback == 'function' && callback(err); + typeof callback == 'function' && callback(); }); }); From 0778f15a19d761cf6c22ed32c577e10eb54a6202 Mon Sep 17 00:00:00 2001 From: raragao Date: Sat, 16 Nov 2019 14:47:44 -0600 Subject: [PATCH 6/6] version updated --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb90dc2..e9e9d3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-meteor", - "version": "1.4.1", + "version": "1.4.2", "description": "Full Meteor Client for React Native", "main": "src/Meteor.js", "scripts": {