From c080fb96245eac8d2c996f168f9249aaebaa3863 Mon Sep 17 00:00:00 2001 From: Teng Fei Date: Wed, 28 Jun 2017 01:24:33 +0800 Subject: [PATCH 1/2] Update Data.js --- src/Data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data.js b/src/Data.js index bd3dd81..36eeaa6 100644 --- a/src/Data.js +++ b/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'; From eabb04118e8503a3ee405b79c061f60ce0eca34e Mon Sep 17 00:00:00 2001 From: feit Date: Wed, 28 Jun 2017 13:08:11 +0800 Subject: [PATCH 2/2] Use prop-types package instead of React.PropTypes --- example/RNApp/app/containers/connection.js | 2 +- example/RNApp/app/containers/meteorComplexListView.js | 2 +- example/RNApp/app/containers/meteorListView.js | 2 +- example/RNApp/app/routes/accounts.js | 3 ++- example/RNApp/app/routes/connection.js | 3 ++- example/RNApp/app/routes/meteorListView.js | 3 ++- package.json | 5 +++-- src/CollectionFS/FSCollectionImagesPreloader.js | 3 ++- src/components/ComplexListView.js | 3 ++- src/components/ListView.js | 3 ++- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/example/RNApp/app/containers/connection.js b/example/RNApp/app/containers/connection.js index 1ce6d16..fcb6cdb 100644 --- a/example/RNApp/app/containers/connection.js +++ b/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'; diff --git a/example/RNApp/app/containers/meteorComplexListView.js b/example/RNApp/app/containers/meteorComplexListView.js index 9dcb090..3974707 100644 --- a/example/RNApp/app/containers/meteorComplexListView.js +++ b/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'; diff --git a/example/RNApp/app/containers/meteorListView.js b/example/RNApp/app/containers/meteorListView.js index 45d4d41..56c7c64 100644 --- a/example/RNApp/app/containers/meteorListView.js +++ b/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 => { diff --git a/example/RNApp/app/routes/accounts.js b/example/RNApp/app/routes/accounts.js index 9071d64..4e405c1 100644 --- a/example/RNApp/app/routes/accounts.js +++ b/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'; diff --git a/example/RNApp/app/routes/connection.js b/example/RNApp/app/routes/connection.js index f08bc45..22a7c3d 100644 --- a/example/RNApp/app/routes/connection.js +++ b/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'; diff --git a/example/RNApp/app/routes/meteorListView.js b/example/RNApp/app/routes/meteorListView.js index f1e48b7..2da0d47 100644 --- a/example/RNApp/app/routes/meteorListView.js +++ b/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'; diff --git a/package.json b/package.json index 744a3e8..f946e98 100644 --- a/package.json +++ b/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", diff --git a/src/CollectionFS/FSCollectionImagesPreloader.js b/src/CollectionFS/FSCollectionImagesPreloader.js index 741eec1..5a23932 100644 --- a/src/CollectionFS/FSCollectionImagesPreloader.js +++ b/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'; diff --git a/src/components/ComplexListView.js b/src/components/ComplexListView.js index d615538..2ccd7e4 100644 --- a/src/components/ComplexListView.js +++ b/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'; diff --git a/src/components/ListView.js b/src/components/ListView.js index 60b2cec..45806a8 100644 --- a/src/components/ListView.js +++ b/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';