diff --git a/.eslintrc.json b/.eslintrc.json index f5b9753e..e597ef8d 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -19,11 +19,13 @@ "error", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_", "ignoreRestSiblings": true } ], + "react/button-has-type": 0, "react/destructuring-assignment": 0, "react/forbid-prop-types": 0, "react/jsx-filename-extension": 0, "react/no-multi-comp": 0, "react/prefer-stateless-function": 0, + "react/prop-types": 0, "react/require-default-props": 0, "react/sort-comp": 0, "symbol-description": 0, diff --git a/packages/styled-components/src/models/StyledComponent.js b/packages/styled-components/src/models/StyledComponent.js index ad67cdf0..b81b393f 100644 --- a/packages/styled-components/src/models/StyledComponent.js +++ b/packages/styled-components/src/models/StyledComponent.js @@ -1,5 +1,4 @@ // @flow -/* eslint-disable react/prop-types */ import validAttr from '@emotion/is-prop-valid'; import merge from 'merge-anything'; import React, { diff --git a/packages/styled-components/src/models/test/StyleSheetManager.test.js b/packages/styled-components/src/models/test/StyleSheetManager.test.js index bf72b1a8..3507080f 100644 --- a/packages/styled-components/src/models/test/StyleSheetManager.test.js +++ b/packages/styled-components/src/models/test/StyleSheetManager.test.js @@ -1,5 +1,4 @@ // @flow -/* eslint-disable react/prop-types */ import React from 'react'; import { renderToString } from 'react-dom/server'; import { render } from 'react-dom'; diff --git a/packages/styled-components/src/native/test/native.test.js b/packages/styled-components/src/native/test/native.test.js index 1cf26a63..ac7a57d8 100644 --- a/packages/styled-components/src/native/test/native.test.js +++ b/packages/styled-components/src/native/test/native.test.js @@ -1,5 +1,5 @@ // @flow -/* eslint-disable react/prop-types, no-console */ +/* eslint-disable no-console */ import { Text, View } from 'react-native'; import React from 'react'; import TestRenderer from 'react-test-renderer'; diff --git a/packages/styled-components/src/test/basic.test.js b/packages/styled-components/src/test/basic.test.js index 30f741f3..f83463ea 100644 --- a/packages/styled-components/src/test/basic.test.js +++ b/packages/styled-components/src/test/basic.test.js @@ -1,5 +1,5 @@ // @flow -/* eslint-disable react/prop-types, no-console */ +/* eslint-disable no-console */ import React, { Component, StrictMode } from 'react'; import { findDOMNode } from 'react-dom'; import { findRenderedComponentWithType, renderIntoDocument } from 'react-dom/test-utils'; diff --git a/packages/styled-components/src/test/props.test.js b/packages/styled-components/src/test/props.test.js index ae9929b9..dcaaec69 100644 --- a/packages/styled-components/src/test/props.test.js +++ b/packages/styled-components/src/test/props.test.js @@ -1,5 +1,4 @@ // @flow -/* eslint-disable react/prop-types */ import React from 'react'; import TestRenderer from 'react-test-renderer'; diff --git a/packages/styled-components/src/utils/determineTheme.js b/packages/styled-components/src/utils/determineTheme.js index 78bf825f..5f3afff3 100644 --- a/packages/styled-components/src/utils/determineTheme.js +++ b/packages/styled-components/src/utils/determineTheme.js @@ -8,11 +8,8 @@ type Props = { export default (props: Props, fallbackTheme: any, defaultProps: any = EMPTY_OBJECT) => { // Props should take precedence over ThemeProvider, which should take precedence over // defaultProps, but React automatically puts defaultProps on props. - - /* eslint-disable react/prop-types, flowtype-errors/show-errors */ const isDefaultTheme = defaultProps ? props.theme === defaultProps.theme : false; const theme = props.theme && !isDefaultTheme ? props.theme : fallbackTheme || defaultProps.theme; - /* eslint-enable */ return theme; };