chore: Upgrade eslint and prettier

danez · danez · commit 7deb8dabe558 · 2020-05-23T18:33:30.000Z
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-    "arrowParens": "avoid",
+    "arrowParens": "always",
     "bracketSpacing": true,
     "jsxBracketSameLine": false,
     "printWidth": 80,
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "css-loader": "^3.3.2",
     "enzyme": "^3.5.0",
     "enzyme-adapter-react-16": "^1.3.0",
-    "eslint": "^6.7.2",
+    "eslint": "^7.1.0",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-import": "^2.14.0",
@@ -86,7 +86,7 @@
     "lint-staged": "^10.2.6",
     "mini-css-extract-plugin": "^0.9.0",
     "npm-run-all": "^4.1.3",
-    "prettier": "^1.14.2",
+    "prettier": "^2.0.5",
     "react": "^16.4.2",
     "react-dom": "^16.4.2",
     "react-live": "^1.11.0",
diff --git a/src/components/Tab.js b/src/components/Tab.js
@@ -75,7 +75,7 @@ export default class Tab extends Component {
           [selectedClassName]: selected,
           [disabledClassName]: disabled,
         })}
-        ref={node => {
+        ref={(node) => {
           this.node = node;
           if (tabRef) tabRef(node);
         }}
diff --git a/src/components/UncontrolledTabs.js b/src/components/UncontrolledTabs.js
@@ -179,7 +179,7 @@ export default class UncontrolledTabs extends Component {
     }
 
     // Map children to dynamically setup refs
-    return deepMap(children, child => {
+    return deepMap(children, (child) => {
       let result = child;
 
       // Clone TabList and Tab components to have refs
@@ -197,12 +197,12 @@ export default class UncontrolledTabs extends Component {
         }
 
         result = cloneElement(child, {
-          children: deepMap(child.props.children, tab => {
+          children: deepMap(child.props.children, (tab) => {
             const key = `tabs-${listIndex}`;
             const selected = selectedIndex === listIndex;
 
             const props = {
-              tabRef: node => {
+              tabRef: (node) => {
                 this.tabNodes[key] = node;
               },
               id: this.tabIds[listIndex],
@@ -241,7 +241,7 @@ export default class UncontrolledTabs extends Component {
     });
   }
 
-  handleKeyDown = e => {
+  handleKeyDown = (e) => {
     const { direction } = this.props;
     if (this.isTabFromContainer(e.target)) {
       let { selectedIndex: index } = this.props;
@@ -296,7 +296,7 @@ export default class UncontrolledTabs extends Component {
     }
   };
 
-  handleClick = e => {
+  handleClick = (e) => {
     let node = e.target;
     do {
       if (this.isTabFromContainer(node)) {
@@ -360,7 +360,7 @@ export default class UncontrolledTabs extends Component {
         className={cx(className)}
         onClick={this.handleClick}
         onKeyDown={this.handleKeyDown}
-        ref={node => {
+        ref={(node) => {
           this.node = node;
           if (domRef) domRef(node);
         }}
diff --git a/src/components/__tests__/Tab-test.js b/src/components/__tests__/Tab-test.js
@@ -11,7 +11,7 @@ function expectToMatchSnapshot(component) {
 describe('<Tab />', () => {
   beforeAll(() => {
     // eslint-disable-next-line no-console
-    console.error = error => {
+    console.error = (error) => {
       throw new Error(error);
     };
   });
diff --git a/src/components/__tests__/TabList-test.js b/src/components/__tests__/TabList-test.js
@@ -14,7 +14,7 @@ function expectToMatchSnapshot(component) {
 describe('<TabList />', () => {
   beforeAll(() => {
     // eslint-disable-next-line no-console
-    console.error = error => {
+    console.error = (error) => {
       throw new Error(error);
     };
   });
diff --git a/src/components/__tests__/TabPanel-test.js b/src/components/__tests__/TabPanel-test.js
@@ -11,7 +11,7 @@ function expectToMatchSnapshot(component) {
 describe('<TabPanel />', () => {
   beforeAll(() => {
     // eslint-disable-next-line no-console
-    console.error = error => {
+    console.error = (error) => {
       throw new Error(error);
     };
   });
diff --git a/src/components/__tests__/Tabs-node-test.js b/src/components/__tests__/Tabs-node-test.js
@@ -33,7 +33,7 @@ describe('ServerSide <Tabs />', () => {
 
   beforeAll(() => {
     // eslint-disable-next-line no-console
-    console.error = error => {
+    console.error = (error) => {
       throw new Error(error);
     };
   });
diff --git a/src/components/__tests__/Tabs-test.js b/src/components/__tests__/Tabs-test.js
@@ -52,7 +52,7 @@ describe('<Tabs />', () => {
 
   beforeAll(() => {
     // eslint-disable-next-line no-console
-    console.error = error => {
+    console.error = (error) => {
       throw new Error(error);
     };
   });
@@ -81,10 +81,7 @@ describe('<Tabs />', () => {
         }),
       );
 
-      wrapper
-        .find(Tab)
-        .at(1)
-        .simulate('click');
+      wrapper.find(Tab).at(1).simulate('click');
 
       expect(called.index).toBe(1);
       expect(called.last).toBe(0);
@@ -98,7 +95,7 @@ describe('<Tabs />', () => {
       let domNode;
       mount(
         createTabs({
-          domRef: node => {
+          domRef: (node) => {
             domNode = node;
           },
         }),
@@ -123,31 +120,21 @@ describe('<Tabs />', () => {
     describe('mouse', () => {
       test('should update selectedIndex when clicked', () => {
         const wrapper = mount(createTabs());
-        wrapper
-          .find(Tab)
-          .at(1)
-          .simulate('click');
+        wrapper.find(Tab).at(1).simulate('click');
 
         assertTabSelected(wrapper, 1);
       });
 
       test('should update selectedIndex when tab child is clicked', () => {
         const wrapper = mount(createTabs());
-        wrapper
-          .find(Tab)
-          .at(2)
-          .childAt(0)
-          .simulate('click');
+        wrapper.find(Tab).at(2).childAt(0).simulate('click');
 
         assertTabSelected(wrapper, 2);
       });
 
       test('should not change selectedIndex when clicking a disabled tab', () => {
         const wrapper = mount(createTabs({ defaultIndex: 0 }));
-        wrapper
-          .find(Tab)
-          .at(3)
-          .simulate('click');
+        wrapper.find(Tab).at(3).simulate('click');
 
         assertTabSelected(wrapper, 0);
       });
@@ -198,19 +185,13 @@ describe('<Tabs />', () => {
       expect(tabPanels.at(1).text()).toBe('');
       expect(tabPanels.at(2).text()).toBe('');
 
-      wrapper
-        .find(Tab)
-        .at(1)
-        .simulate('click');
+      wrapper.find(Tab).at(1).simulate('click');
 
       expect(tabPanels.at(0).text()).toBe('');
       expect(tabPanels.at(1).text()).toBe('Hello Bar');
       expect(tabPanels.at(2).text()).toBe('');
 
-      wrapper
-        .find(Tab)
-        .at(2)
-        .simulate('click');
+      wrapper.find(Tab).at(2).simulate('click');
 
       expect(tabPanels.at(0).text()).toBe('');
       expect(tabPanels.at(1).text()).toBe('');
@@ -298,7 +279,7 @@ describe('<Tabs />', () => {
       const oldConsoleError = console.error; // eslint-disable-line no-console
       let catchedError;
       // eslint-disable-next-line no-console
-      console.error = error => {
+      console.error = (error) => {
         catchedError = error;
       };
       shallow(
@@ -320,7 +301,7 @@ describe('<Tabs />', () => {
       const oldConsoleError = console.error; // eslint-disable-line no-console
       let catchedError;
       // eslint-disable-next-line no-console
-      console.error = error => {
+      console.error = (error) => {
         catchedError = error;
       };
       shallow(
@@ -446,11 +427,7 @@ describe('<Tabs />', () => {
         </Tabs>,
       );
 
-      wrapper
-        .find('Tabs.second')
-        .find(Tab)
-        .at(1)
-        .simulate('click');
+      wrapper.find('Tabs.second').find(Tab).at(1).simulate('click');
 
       assertTabSelected(wrapper, 0);
       assertTabSelected(wrapper.find('Tabs.second'), 1);
@@ -491,16 +468,10 @@ describe('<Tabs />', () => {
 
     assertTabSelected(wrapper, 0);
 
-    wrapper
-      .find(Tab)
-      .at(1)
-      .simulate('click');
+    wrapper.find(Tab).at(1).simulate('click');
     assertTabSelected(wrapper, 0);
 
-    wrapper
-      .find(Tab)
-      .at(2)
-      .simulate('click');
+    wrapper.find(Tab).at(2).simulate('click');
     assertTabSelected(wrapper, 0);
   });
 
@@ -516,10 +487,7 @@ describe('<Tabs />', () => {
 
     assertTabSelected(wrapper, 0);
 
-    wrapper
-      .find(Tab)
-      .at(1)
-      .simulate('click');
+    wrapper.find(Tab).at(1).simulate('click');
     assertTabSelected(wrapper, 1);
     expect(wasClicked).toBe(true);
   });
@@ -536,10 +504,7 @@ describe('<Tabs />', () => {
 
     assertTabSelected(wrapper, 0);
 
-    wrapper
-      .find(Tab)
-      .at(0)
-      .simulate('click');
+    wrapper.find(Tab).at(0).simulate('click');
     assertTabSelected(wrapper, 0);
     expect(wasClicked).toBe(true);
   });
@@ -561,16 +526,10 @@ describe('<Tabs />', () => {
 
     const wrapper = mount(<Wrap />);
 
-    wrapper
-      .find(Tab)
-      .at(1)
-      .simulate('click');
+    wrapper.find(Tab).at(1).simulate('click');
     assertTabSelected(wrapper, 1);
 
-    wrapper
-      .find(Tab)
-      .at(2)
-      .simulate('click');
+    wrapper.find(Tab).at(2).simulate('click');
     assertTabSelected(wrapper, 2);
   });
 
diff --git a/src/helpers/childrenDeepMap.js b/src/helpers/childrenDeepMap.js
@@ -6,7 +6,7 @@ function isTabChild(child) {
 }
 
 export function deepMap(children, callback) {
-  return Children.map(children, child => {
+  return Children.map(children, (child) => {
     // null happens when conditionally rendering TabPanel/Tab
     // see https://github.com/reactjs/react-tabs/issues/37
     if (child === null) return null;
@@ -32,7 +32,7 @@ export function deepMap(children, callback) {
 }
 
 export function deepForEach(children, callback) {
-  return Children.forEach(children, child => {
+  return Children.forEach(children, (child) => {
     // null happens when conditionally rendering TabPanel/Tab
     // see https://github.com/reactjs/react-tabs/issues/37
     if (child === null) return;
diff --git a/src/helpers/count.js b/src/helpers/count.js
@@ -3,7 +3,7 @@ import { isTab, isTabPanel } from './elementTypes';
 
 export function getTabsCount(children) {
   let tabCount = 0;
-  deepForEach(children, child => {
+  deepForEach(children, (child) => {
     if (isTab(child)) tabCount++;
   });
 
@@ -12,7 +12,7 @@ export function getTabsCount(children) {
 
 export function getPanelsCount(children) {
   let panelCount = 0;
-  deepForEach(children, child => {
+  deepForEach(children, (child) => {
     if (isTabPanel(child)) panelCount++;
   });
 
diff --git a/src/helpers/elementTypes.js b/src/helpers/elementTypes.js
@@ -1,5 +1,5 @@
 function makeTypeChecker(tabsRole) {
-  return element => !!element.type && element.type.tabsRole === tabsRole;
+  return (element) => !!element.type && element.type.tabsRole === tabsRole;
 }
 
 export const isTab = makeTypeChecker('Tab');
diff --git a/src/helpers/propTypes.js b/src/helpers/propTypes.js
@@ -9,14 +9,14 @@ export function childrenPropType(props, propName, componentName) {
   const listTabs = [];
   const children = props[propName];
 
-  deepForEach(children, child => {
+  deepForEach(children, (child) => {
     if (isTabList(child)) {
       if (
         child.props &&
         child.props.children &&
         typeof child.props.children === 'object'
       ) {
-        deepForEach(child.props.children, listChild =>
+        deepForEach(child.props.children, (listChild) =>
           listTabs.push(listChild),
         );
       }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "arrowParens": "avoid",`
	`2`	`+ "arrowParens": "always",`
`3`	`3`	`"bracketSpacing": true,`
`4`	`4`	`"jsxBracketSameLine": false,`
`5`	`5`	`"printWidth": 80,`