Merge pull request #243 from coderafei/master

Switch to 'prop-types' instead of React.PropTypes
Fix error 'db.batchUpdates undefined is not a function'. Issue #183

example/RNApp/app/containers/connection.js

@@ -1,4 +1,4 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
 import Meteor, {createContainer} from 'react-native-meteor';
 import ConnectionComponent from '../routes/connection';
 

example/RNApp/app/containers/meteorComplexListView.js

@@ -1,4 +1,4 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
 import Meteor, {createContainer} from 'react-native-meteor';
 import MetorComplexListViewComponent from '../routes/meteorComplexListView';
 

example/RNApp/app/containers/meteorListView.js

@@ -1,5 +1,5 @@
 import Meteor, {createContainer} from 'react-native-meteor';
-import React, {PropTypes} from 'react';
+import React from 'react';
 import MeteorListViewComponent from '../routes/meteorListView';
 
 export default MeteorListViewContainer = createContainer(ownProps => {

example/RNApp/app/routes/accounts.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, StyleSheet, TextInput, Dimensions } from 'react-native';
 import Meteor, { connectMeteor, Accounts } from 'react-native-meteor';
 import Button from '../components/button';

example/RNApp/app/routes/connection.js

@@ -1,5 +1,6 @@
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, StyleSheet } from 'react-native';
 import Meteor, { connectMeteor } from 'react-native-meteor';
 

example/RNApp/app/routes/meteorListView.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
 import Meteor, { connectMeteor, MeteorListView } from 'react-native-meteor';
 import Button from '../components/button';

package.json

@@ -30,11 +30,12 @@
     "crypto-js": "^3.1.6",
     "ejson": "^2.1.2",
     "minimongo-cache": "0.0.48",
+    "prop-types": "^15.5.10",
     "react-komposer": "^1.8.0",
     "react-mixin": "^3.0.3",
     "trackr": "^2.0.2",
-    "wolfy87-eventemitter": "^4.3.0",
-    "underscore": "^1.8.3"
+    "underscore": "^1.8.3",
+    "wolfy87-eventemitter": "^4.3.0"
   },
   "devDependencies": {
     "babel-core": "^6.7.2",

src/CollectionFS/FSCollectionImagesPreloader.js

@@ -1,6 +1,7 @@
 'use strict';
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Image, StyleSheet } from 'react-native';
 
 

src/Data.js

@@ -1,4 +1,4 @@
-import ReactNative from 'react-native';
+import ReactNative from 'react-native/Libraries/Renderer/src/renderers/native/ReactNative';
 import minimongo from 'minimongo-cache';
 import Trackr from 'trackr';
 import { InteractionManager } from 'react-native';

src/components/ComplexListView.js

@@ -1,6 +1,7 @@
 'use strict';
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { ListView } from 'react-native';
 
 

src/components/ListView.js

@@ -1,6 +1,7 @@
 'use strict';
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { ListView } from 'react-native';
 
 import Data from '../Data';