Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"main": "index.js",
"scripts": {
"test": "mocha --compilers js:babel-core/register --require react-native-mock/mock",
"test": "mocha --compilers js:babel-core/register --require @edtechfoundry/react-native-mock/mock",
"test:watch": "npm run test -- --watch",
"eslint": "eslint index.js src/ test/; exit 0;"
},
Expand Down Expand Up @@ -37,17 +37,20 @@
],
"dependencies": {
"lodash.isequal": "^4.5.0",
"react": "^15.4.2",
"prop-types": "^15.6.0",
"react-addons-pure-render-mixin": "^15.4.2",
"react-dom": "^15.4.2",
"react-native-experimental-navigation": "https://github.com/EdtechFoundry/react-native-experimental-navigation.git#0.0.1",
"react-native-experimental-navigation": "https://github.com/EdtechFoundry/react-native-experimental-navigation.git#0.26.10-1.0.0",
"react-native-tabs": "git://github.com/EdtechFoundry/react-native-tabs.git#c709af985dc51ef0732b1b2aee362c4231ecdeb1",
"react-static-container": "1.0.1"
},
"devDependencies": {
"@edtechfoundry/react-native-mock": "^0.4.4",
"babel-core": "^6.18.2",
"babel-eslint": "^7.1.1",
"babel-jest": "19.0.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react-native": "^1.9.0",
"babel-preset-stage-0": "^6.22.0",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"enzyme": "^2.6.0",
Expand All @@ -57,18 +60,18 @@
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.7.1",
"expect": "^1.20.2",
"jest": "19.0.1",
"mocha": "^3.2.0",
"mocha-junit-reporter": "^1.12.1",
"react-native-mock": "0.2.0",
"sinon": "^1.17.6",
"babel-jest": "19.0.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-stage-0": "^6.22.0",
"jest": "19.0.1",
"react-test-renderer": "15.4.2"
"react": "^16.0.0",
"react-native": "^0.48.4",
"react-dom": "^16.0.0",
"react-test-renderer": "15.4.2",
"sinon": "^1.17.6"
},
"peerDependencies": {
"react-native": ">=0.42.0"
"react-native": ">=0.42.0",
"react": ">=15.5.0"
},
"jest": {
"preset": "react-native"
Expand Down
2 changes: 1 addition & 1 deletion src/DefaultRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/
import React, {
Component,
PropTypes,
} from 'react';
import PropTypes from 'prop-types';
import {
Animated,
View,
Expand Down
4 changes: 1 addition & 3 deletions src/Modal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React, {
PropTypes,
} from 'react';
import PropTypes from 'prop-types';
import {
View,
} from 'react-native';
Expand Down
5 changes: 2 additions & 3 deletions src/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
import React, {
PropTypes,
} from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import {
Platform,
Animated,
Expand Down
2 changes: 1 addition & 1 deletion src/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/
import React, {
Component,
PropTypes,
} from 'react';
import PropTypes from 'prop-types';
import { BackHandler } from 'react-native';
import NavigationExperimental from 'react-native-experimental-navigation';

Expand Down
3 changes: 2 additions & 1 deletion src/Scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
* LICENSE file in the root directory of this source tree.
*
*/
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { View, Text } from 'react-native';

export default class extends React.Component {
Expand Down
3 changes: 2 additions & 1 deletion src/Switch.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import TabBar from './TabBar';
import Actions from './Actions';

Expand Down
3 changes: 2 additions & 1 deletion src/TabBar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import {
Image,
View,
Expand Down
3 changes: 2 additions & 1 deletion src/TabbedView.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { View, StyleSheet } from 'react-native';
import StaticContainer from 'react-static-container';

Expand Down