Skip to content

Commit 57cf845

Browse files
authored
Merge pull request #1408 from StoDevX/greenkeeper/eslint-plugin-react-7.2.0
Update eslint-plugin-react to the latest version 🚀
2 parents 5789a47 + 25358b7 commit 57cf845

File tree

34 files changed

+229
-122
lines changed

34 files changed

+229
-122
lines changed

.eslintrc.yaml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ rules:
4343
no-div-regex: error
4444
no-eq-null: warn
4545
no-extra-label: error
46-
no-implicit-coercion: [error, {boolean: true, number: true, string: true}]
46+
no-implicit-coercion:
47+
- error
48+
- boolean: true
49+
number: true
50+
string: true
4751
no-implicit-globals: error
4852
no-multi-assign: error
4953
no-new-symbol: error
@@ -53,7 +57,10 @@ rules:
5357
no-undef-init: off
5458
no-underscore-dangle: off
5559
no-unmodified-loop-condition: error
56-
no-unused-vars: [warn, {args: 'after-used', argsIgnorePattern: '^_$'}]
60+
no-unused-vars:
61+
- warn
62+
- args: 'after-used'
63+
argsIgnorePattern: '^_$'
5764
no-useless-constructor: error
5865
no-var: error
5966
prefer-promise-reject-errors: error
@@ -65,24 +72,35 @@ rules:
6572
# react rules – https://github.com/yannickcr/eslint-plugin-react
6673
react/display-name: off
6774
react/jsx-key: warn
68-
react/jsx-no-bind: [warn, {ignoreRefs: true, allowArrowFunctions: true}]
69-
react/no-did-mount-set-state: warn
70-
react/no-did-update-set-state: warn
75+
react/jsx-no-bind:
76+
- warn
77+
- ignoreRefs: true
78+
allowArrowFunctions: true
79+
react/jsx-sort-props:
80+
- warn
81+
- reservedFirst: true
82+
ignoreCase: true
83+
callbacksLast: true
7184
react/no-multi-comp: off # prevent multiple component definition per file
72-
react/no-string-refs: error
73-
react/no-unescaped-entities: off
74-
react/no-unknown-property: warn
85+
react/no-redundant-should-component-update: warn
86+
react/no-typos: error
7587
react/prop-types: off
7688
react/self-closing-comp: warn # prevent extra closing tags for components without children
77-
react/sort-comp: warn
89+
react/sort-comp:
90+
- warn
91+
- order:
92+
- static-methods
93+
- type-annotations
94+
- lifecycle
95+
- everything-else
96+
- render
7897
react/sort-prop-types: warn
7998
react/wrap-multilines: off
99+
react/jsx-boolean-value: [error, always]
80100

81101
# flow rules
82-
flowtype/define-flow-type: warn
102+
flowtype/no-dupe-keys: error
83103
flowtype/use-flow-type: error
84-
flowtype/valid-syntax: error
85-
flowtype/no-types-missing-file-annotation: off
86104

87105
# react-native rules
88106
react-native/no-unused-styles: warn

package-lock.json

Lines changed: 94 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"eslint-config-prettier": "2.3.0",
108108
"eslint-plugin-babel": "4.1.2",
109109
"eslint-plugin-flowtype": "2.35.0",
110-
"eslint-plugin-react": "7.1.0",
110+
"eslint-plugin-react": "7.2.0",
111111
"eslint-plugin-react-native": "3.0.1",
112112
"flow-bin": "0.45.0",
113113
"jest": "20.0.4",

source/storybook/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ export class SnapshotsView extends React.Component {
8181
title: 'Snapshot Time',
8282
}
8383

84+
_ref: any
85+
8486
state = {
8587
viewPath: 'streaming.radio',
8688
}
8789

88-
_ref: any
89-
9090
views: ViewCollectionType = {
9191
buildinghours: {
9292
list: {

source/views/building-hours/detail/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ export class BuildingHoursDetailView extends React.PureComponent {
1919
}
2020
}
2121

22+
props: TopLevelViewPropsType & {
23+
navigation: {state: {params: {building: BuildingType}}},
24+
}
25+
2226
state: {intervalId: number, now: moment} = {
2327
intervalId: 0,
2428
// now: moment.tz('Wed 7:25pm', 'ddd h:mma', null, CENTRAL_TZ),
@@ -35,10 +39,6 @@ export class BuildingHoursDetailView extends React.PureComponent {
3539
clearTimeout(this.state.intervalId)
3640
}
3741

38-
props: TopLevelViewPropsType & {
39-
navigation: {state: {params: {building: BuildingType}}},
40-
}
41-
4242
updateTime = () => {
4343
this.setState({now: moment.tz(CENTRAL_TZ)})
4444
}

source/views/building-hours/report/editor.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ export class BuildingHoursScheduleEditorView extends React.PureComponent {
2323
title: 'Edit Schedule',
2424
}
2525

26-
state: {
27-
set: ?SingleBuildingScheduleType,
28-
} = {
29-
set: this.props.navigation.state.params.initialSet,
30-
}
31-
3226
props: TopLevelViewPropsType & {
3327
navigation: {
3428
state: {
@@ -41,6 +35,12 @@ export class BuildingHoursScheduleEditorView extends React.PureComponent {
4135
},
4236
}
4337

38+
state: {
39+
set: ?SingleBuildingScheduleType,
40+
} = {
41+
set: this.props.navigation.state.params.initialSet,
42+
}
43+
4444
delete = () => {
4545
this.props.navigation.state.params.onDeleteSet()
4646
this.props.navigation.goBack()

source/views/building-hours/report/overview.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ export class BuildingHoursProblemReportView extends React.PureComponent {
4949
title: 'Report a Problem',
5050
}
5151

52+
props: TopLevelViewPropsType & {
53+
navigation: {state: {params: {initialBuilding: BuildingType}}},
54+
}
55+
5256
state: {
5357
building: BuildingType,
5458
} = {
5559
building: this.props.navigation.state.params.initialBuilding,
5660
}
5761

58-
props: TopLevelViewPropsType & {
59-
navigation: {state: {params: {initialBuilding: BuildingType}}},
60-
}
61-
6262
openEditor = (
6363
scheduleIdx: number,
6464
setIdx: number,

source/views/building-hours/stateful-list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ export class BuildingHoursView extends React.Component {
3232
headerBackTitle: 'Hours',
3333
}
3434

35+
props: TopLevelViewPropsType
36+
3537
state: {
3638
error: ?Error,
3739
loading: boolean,
@@ -59,8 +61,6 @@ export class BuildingHoursView extends React.Component {
5961
clearTimeout(this.state.intervalId)
6062
}
6163

62-
props: TopLevelViewPropsType
63-
6464
updateTime = () => {
6565
this.setState({now: moment.tz(CENTRAL_TZ)})
6666
}

source/views/calendar/calendar-google.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import {GOOGLE_CALENDAR_API_KEY} from '../../lib/config'
1818
const TIMEZONE = 'America/Winnipeg'
1919

2020
export class GoogleCalendarView extends React.Component {
21+
props: {calendarId: string} & TopLevelViewPropsType
22+
2123
state: {
2224
events: EventType[],
2325
loaded: boolean,
@@ -36,8 +38,6 @@ export class GoogleCalendarView extends React.Component {
3638
this.refresh()
3739
}
3840

39-
props: {calendarId: string} & TopLevelViewPropsType
40-
4141
buildCalendarUrl(calendarId: string) {
4242
let calendarUrl = `https://www.googleapis.com/calendar/v3/calendars/${calendarId}/events`
4343
let params = {

source/views/components/html-view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export class HtmlView extends React.Component {
3434
render() {
3535
return (
3636
<WebView
37-
style={this.props.style}
3837
ref={ref => (this._webview = ref)}
38+
style={this.props.style}
3939
source={{html: this.props.html, baseUrl: this.props.baseUrl}}
4040
onNavigationStateChange={this.onNavigationStateChange}
4141
/>

0 commit comments

Comments
 (0)