Skip to content

Commit 2d7cd31

Browse files
HZSamirFruitieX
authored andcommitted
Upgrade all dependencies to latest stable versions
1 parent dd06a6a commit 2d7cd31

File tree

9 files changed

+1417
-1231
lines changed

9 files changed

+1417
-1231
lines changed

.flowconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ suppress_type=$FlowIssue
3939
suppress_type=$FlowFixMe
4040
suppress_type=$FixMe
4141

42-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
43-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
42+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
43+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4444
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4545

4646
unsafe.enable_getters_and_setters=true
4747

4848
[version]
49-
^0.38.0
49+
^0.45.0

android/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ import com.android.build.OutputFile
3333
* // bundleInPaidRelease: true,
3434
* // bundleInBeta: true,
3535
*
36+
* // whether to disable dev mode in custom build variants (by default only disabled in release)
37+
* // for example: to disable dev mode in the staging build type (if configured)
38+
* devDisabledInStaging: true,
39+
* // The configuration property can be in the following formats
40+
* // 'devDisabledIn${productFlavor}${buildType}'
41+
* // 'devDisabledIn${buildType}'
42+
*
3643
* // the root of your project, i.e. where "package.json" lives
3744
* root: "../../",
3845
*

index.android.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import {Provider} from 'react-redux';
22
import store from './src/redux/store';
33
import AppViewContainer from './src/modules/AppViewContainer';
44
import React, {Component} from 'react';
5-
import {AppRegistry, BackAndroid} from 'react-native';
5+
import {AppRegistry, BackHandler} from 'react-native';
66
import {NavigationActions} from 'react-navigation';
77

88
class PepperoniAppTemplate extends Component {
99
componentWillMount() {
10-
BackAndroid.addEventListener('hardwareBackPress', this.navigateBack);
10+
BackHandler.addEventListener('hardwareBackPress', this.navigateBack);
1111
}
1212

1313
navigateBack() {

package.json

+35-34
Original file line numberDiff line numberDiff line change
@@ -29,49 +29,50 @@
2929
},
3030
"jest": {
3131
"preset": "react-native",
32-
"setupFiles": ["<rootDir>/test/setup.js"],
32+
"setupFiles": [
33+
"<rootDir>/test/setup.js"
34+
],
3335
"transformIgnorePatterns": [
3436
"node_modules/(?!(jest-)?react-native|react-navigation)"
3537
]
3638
},
3739
"dependencies": {
38-
"bluebird": "^3.3.5",
39-
"event-emitter": "^0.3.4",
40-
"immutable": "^3.7.6",
41-
"lodash": "^4.11.0",
42-
"moment": "^2.12.0",
43-
"react": "~15.4.2",
44-
"react-dom": "~15.4.2",
45-
"react-native": "0.42.0",
46-
"react-native-vector-icons": "^4.0.0",
47-
"react-navigation": "^1.0.0-beta.7",
48-
"react-redux": "^4.4.5",
49-
"redux": "^3.4.0",
50-
"redux-logger": "^2.6.1",
51-
"redux-loop-symbol-ponyfill": "^2.2.0",
40+
"bluebird": "^3.5.0",
41+
"event-emitter": "^0.3.5",
42+
"immutable": "^3.8.1",
43+
"lodash": "^4.17.4",
44+
"moment": "^2.18.1",
45+
"react": "16.0.0-alpha.12",
46+
"react-native": "0.45.1",
47+
"react-native-vector-icons": "^4.1.1",
48+
"react-navigation": "^1.0.0-beta.9",
49+
"react-redux": "^5.0.5",
50+
"redux": "^3.6.0",
51+
"redux-logger": "^3.0.6",
52+
"redux-loop-symbol-ponyfill": "^2.2.2",
5253
"redux-promise": "^0.5.3",
53-
"redux-thunk": "^2.0.1",
54+
"redux-thunk": "^2.2.0",
5455
"standard-http-error": "^2.0.0"
5556
},
5657
"devDependencies": {
57-
"babel-core": "^6.9.0",
58-
"babel-eslint": "^7.1.0",
59-
"babel-jest": "^17.0.2",
60-
"babel-polyfill": "^6.9.0",
61-
"babel-preset-react-native": "^1.9.0",
62-
"babel-preset-stage-0": "^6.5.0",
63-
"babel-register": "^6.9.0",
64-
"enzyme": "^2.2.0",
65-
"eslint": "^3.10.1",
66-
"eslint-plugin-babel": "^3.2.0",
67-
"eslint-plugin-react": "^6.7.1",
68-
"fetch-mock": "^5.5.0",
58+
"babel-core": "^6.24.1",
59+
"babel-eslint": "^7.2.3",
60+
"babel-jest": "^20.0.3",
61+
"babel-polyfill": "^6.23.0",
62+
"babel-preset-react-native": "2.0.0",
63+
"babel-preset-stage-0": "^6.24.1",
64+
"babel-register": "^6.24.1",
65+
"enzyme": "^2.8.2",
66+
"eslint": "^4.0.0",
67+
"eslint-plugin-babel": "^4.1.1",
68+
"eslint-plugin-react": "^7.0.1",
69+
"fetch-mock": "^5.10.1",
6970
"istanbul": "1.0.0-alpha.2",
70-
"jest": "^17.0.2",
71-
"react-addons-test-utils": "~15.4.2",
72-
"react-native-mock": "~0.2.5",
73-
"react-test-renderer": "~15.4.2",
74-
"remote-redux-devtools": "^0.5.7",
75-
"rimraf": "^2.5.2"
71+
"jest": "^20.0.4",
72+
"react-addons-test-utils": "~15.6.0",
73+
"react-native-mock": "~0.3.1",
74+
"react-test-renderer": "16.0.0-alpha.12",
75+
"remote-redux-devtools": "^0.5.11",
76+
"rimraf": "^2.6.1"
7677
}
7778
}

src/modules/colors/ColorView.js

+11-14
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,18 @@ const color = () => Math.floor(255 * Math.random());
1616
class ColorView extends Component {
1717
static displayName = 'ColorView';
1818

19-
static navigationOptions = {
20-
title: 'Colors!',
21-
tabBar: () => ({
22-
icon: (props) => (
23-
<Icon name='color-lens' size={24} color={props.tintColor} />
24-
)
25-
}),
26-
// TODO: move this into global config?
27-
header: {
28-
tintColor: 'white',
29-
style: {
30-
backgroundColor: '#39babd'
31-
}
19+
static navigationOptions =
20+
({navigation}) => ({
21+
tabBarKey: navigation.state,
22+
tabBarlabel: 'Colors!',
23+
tabBarIcon: () => (
24+
<Icon name='color-lens' size={24} color={props.tintColor} />
25+
),
26+
headerTintColor: 'white',
27+
headerStyle: {
28+
backgroundColor: '#39babd'
3229
}
33-
}
30+
});
3431

3532
static propTypes = {
3633
navigate: PropTypes.func.isRequired

src/modules/counter/CounterView.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
1212
class CounterView extends Component {
1313
static displayName = 'CounterView';
1414

15-
static navigationOptions = {
16-
title: 'Counter',
17-
tabBar: () => ({
18-
icon: (props) => (
19-
<Icon name='plus-one' size={24} color={props.tintColor} />
20-
)
21-
})
22-
}
15+
static navigationOptions =
16+
({navigation}) => ({
17+
tabBarKey: navigation.state,
18+
tabBarLabel: 'Counter',
19+
tabBarIcon: () => (
20+
<Icon name='plus-one' size={24} color="red" />
21+
)
22+
});
2323

2424
static propTypes = {
2525
counter: PropTypes.number.isRequired,

src/modules/navigator/Navigator.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ export const MainScreenNavigator = TabNavigator({
2525

2626
MainScreenNavigator.navigationOptions = {
2727
title: 'Pepperoni App Template',
28-
header: {
29-
titleStyle: {color: 'white'},
30-
style: {
31-
backgroundColor: headerColor,
32-
elevation: 0 // disable header elevation when TabNavigator visible
33-
}
28+
headerTintColor: 'white',
29+
headerStyle: {
30+
backgroundColor: headerColor
3431
}
3532
};
3633

src/redux/middleware/loggerMiddleware.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import createLogger from 'redux-logger';
1+
import {createLogger} from 'redux-logger';
22

33
// log actions in development mode
44
export default createLogger({

0 commit comments

Comments
 (0)