Merge pull request #693 from GetStream/remove-sonarjs

DanC5 · web-flow · commit db63a8eda53e · 2021-02-04T09:45:37.000-07:00
remove-sonarjs
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,7 +3,6 @@
   "plugins": [
     "babel",
     "markdown",
-    "sonarjs",
     "prettier",
     "react-hooks",
     "jest-dom",
@@ -15,8 +14,7 @@
     "airbnb-base",
     "plugin:prettier/recommended",
     "plugin:jest/all",
-    "plugin:jest-dom/recommended",
-    "plugin:sonarjs/recommended"
+    "plugin:jest-dom/recommended"
   ],
   "rules": {
     "no-console": 0,
@@ -37,7 +35,6 @@
     "jest/lowercase-name": 0,
     "jest/prefer-expect-assertions": 0,
     "jest/no-hooks": 0,
-    "sonarjs/cognitive-complexity": ["error", 30],
     "no-unused-expressions": "off",
     "babel/no-unused-expressions": "error",
     "jest/no-if": "off"
diff --git a/package.json b/package.json
@@ -89,8 +89,8 @@
     "babel-plugin-i18next-extract": "^0.8.2",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "codecov": "^3.8.1",
-    "css-loader": "^5.0.1",
     "core-js": "^3.6.5",
+    "css-loader": "^5.0.1",
     "eslint": "7.14.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^6.15.0",
@@ -109,7 +109,6 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-sonarjs": "^0.5.0",
     "htmlparser2": "^5.0.1",
     "husky": "^4.3.0",
     "jest": "^26.6.3",
diff --git a/src/components/Attachment/__tests__/Attachment.test.js b/src/components/Attachment/__tests__/Attachment.test.js
@@ -1,5 +1,3 @@
-/* eslint-disable sonarjs/no-identical-functions */
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
diff --git a/src/components/Avatar/__tests__/Avatar.test.js b/src/components/Avatar/__tests__/Avatar.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { cleanup, render, fireEvent } from '@testing-library/react';
diff --git a/src/components/Channel/Channel.js b/src/components/Channel/Channel.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React, {
   useEffect,
   useCallback,
@@ -58,7 +57,6 @@ const ChannelInner = ({
   LoadingIndicator = DefaultLoadingIndicator,
   Message = MessageSimple,
   ...props
-  // eslint-disable-next-line sonarjs/cognitive-complexity
 }) => {
   const { channel } = props;
 
diff --git a/src/components/Channel/__tests__/Channel.test.js b/src/components/Channel/__tests__/Channel.test.js
@@ -214,7 +214,6 @@ describe('Channel', () => {
     await waitFor(() => expect(doMarkReadRequest).toHaveBeenCalledTimes(1));
   });
 
-  // eslint-disable-next-line sonarjs/cognitive-complexity
   describe('Children that consume ChannelContext', () => {
     it('should expose the emoji config', async () => {
       let context;
diff --git a/src/components/ChannelHeader/__tests__/ChannelHeader.test.js b/src/components/ChannelHeader/__tests__/ChannelHeader.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
diff --git a/src/components/ChannelList/__tests__/ChannelList.test.js b/src/components/ChannelList/__tests__/ChannelList.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { getNodeText } from '@testing-library/dom';
@@ -44,8 +43,8 @@ import {
 
 /**
  * We are gonna use following custom UI components for preview and list.
- * If we use ChannelPreviewMessanger or ChannelPreviewLastmessage here, then changes
- * to those components might endup breaking tests for ChannelList, which will be quite painful
+ * If we use ChannelPreviewMessenger or ChannelPreviewLastMessage here, then changes
+ * to those components might end up breaking tests for ChannelList, which will be quite painful
  * to debug then.
  */
 const ChannelPreviewComponent = ({
@@ -628,7 +627,6 @@ describe('ChannelList', () => {
           expect(getByRole('list')).toBeInTheDocument();
         });
 
-        // eslint-disable-next-line sonarjs/no-identical-functions
         act(() =>
           dispatchNotificationAddedToChannelEvent(
             chatClientUthred,
@@ -649,7 +647,6 @@ describe('ChannelList', () => {
         List: ChannelListComponent,
       };
 
-      // eslint-disable-next-line sonarjs/no-identical-functions
       beforeEach(() => {
         useMockedApis(chatClientUthred, [
           queryChannelsApi([testChannel1, testChannel2, testChannel3]),
@@ -694,7 +691,7 @@ describe('ChannelList', () => {
         await waitFor(() => {
           expect(getByRole('list')).toBeInTheDocument();
         });
-        // eslint-disable-next-line sonarjs/no-identical-functions
+
         act(() =>
           dispatchNotificationRemovedFromChannel(
             chatClientUthred,
@@ -763,7 +760,7 @@ describe('ChannelList', () => {
         });
 
         const newChannelName = uuidv4();
-        // eslint-disable-next-line sonarjs/no-identical-functions
+
         act(() =>
           dispatchChannelUpdatedEvent(chatClientUthred, {
             ...testChannel2.channel,
@@ -784,7 +781,6 @@ describe('ChannelList', () => {
         List: ChannelListComponent,
       };
 
-      // eslint-disable-next-line sonarjs/no-identical-functions
       beforeEach(() => {
         useMockedApis(chatClientUthred, [
           queryChannelsApi([testChannel1, testChannel2]),
@@ -874,7 +870,6 @@ describe('ChannelList', () => {
         List: ChannelListComponent,
       };
 
-      // eslint-disable-next-line sonarjs/no-identical-functions
       beforeEach(() => {
         useMockedApis(chatClientUthred, [
           queryChannelsApi([testChannel1, testChannel2]),
@@ -992,7 +987,6 @@ describe('ChannelList', () => {
           expect(getByRole('list')).toBeInTheDocument();
         });
 
-        // eslint-disable-next-line sonarjs/no-identical-functions
         act(() =>
           dispatchChannelVisibleEvent(chatClientUthred, testChannel3.channel),
         );
diff --git a/src/components/ChannelList/__tests__/ChannelListMessenger.test.js b/src/components/ChannelList/__tests__/ChannelListMessenger.test.js
@@ -1,11 +1,10 @@
-/* eslint-disable sonarjs/no-unused-collection */
 import React from 'react';
 import { cleanup } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import renderer from 'react-test-renderer';
 import { ChannelListMessenger } from '..';
 
-// Wierd hack to avoid big warnings
+// Weird hack to avoid big warnings
 // Maybe better to find a better solution for it.
 console.warn = () => null;
 
diff --git a/src/components/ChannelList/__tests__/ChannelListTeam.test.js b/src/components/ChannelList/__tests__/ChannelListTeam.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-unused-collection */
 import React from 'react';
 import { cleanup, render, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
@@ -7,7 +6,7 @@ import { getTestClientWithUser } from 'mock-builders';
 import { ChannelListTeam } from '..';
 import { ChatContext } from '../../../context';
 
-// Wierd hack to avoid big warnings
+// Weird hack to avoid big warnings
 // Maybe better to find a better solution for it.
 console.warn = () => null;
 
diff --git a/src/components/ChatAutoComplete/ChatAutoComplete.js b/src/components/ChatAutoComplete/ChatAutoComplete.js
@@ -84,7 +84,6 @@ const ChatAutoComplete = (props) => {
    * @type {() => import("../AutoCompleteTextarea/types").TriggerMap | object}
    */
   const getTriggers = useCallback(
-    // eslint-disable-next-line sonarjs/cognitive-complexity
     () =>
       triggers || {
         ':': {
diff --git a/src/components/Gallery/__tests__/Gallery.test.js b/src/components/Gallery/__tests__/Gallery.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { cleanup, render, fireEvent, waitFor } from '@testing-library/react';
diff --git a/src/components/Gallery/__tests__/Image.test.js b/src/components/Gallery/__tests__/Image.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { cleanup, render, fireEvent, waitFor } from '@testing-library/react';
diff --git a/src/components/InfiniteScrollPaginator/InfiniteScroll.js b/src/components/InfiniteScrollPaginator/InfiniteScroll.js
@@ -55,7 +55,6 @@ const InfiniteScroll = ({
   isLoading = false,
   listenToScroll,
   ...elementProps
-  // eslint-disable-next-line sonarjs/cognitive-complexity
 }) => {
   const scrollComponent = useRef(/** @type {HTMLElement | null} */ (null));
 
diff --git a/src/components/LoadMore/__tests__/LoadMoreButton.test.js b/src/components/LoadMore/__tests__/LoadMoreButton.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import { cleanup, render, fireEvent, waitFor } from '@testing-library/react';
 import renderer from 'react-test-renderer';
diff --git a/src/components/MML/__tests__/MML.test.js b/src/components/MML/__tests__/MML.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import {
diff --git a/src/components/Message/MessageCommerce.js b/src/components/Message/MessageCommerce.js
@@ -1,4 +1,3 @@
-// @ts-check
 import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import { smartRender } from '../../utils';
@@ -33,7 +32,6 @@ import MessageTimestamp from './MessageTimestamp';
  * @example ../../docs/MessageCommerce.md
  * @type { React.FC<import('types').MessageCommerceProps> }
  */
-// eslint-disable-next-line sonarjs/cognitive-complexity
 const MessageCommerce = (props) => {
   const {
     message,
@@ -88,7 +86,6 @@ const MessageCommerce = (props) => {
     return null;
   }
 
-  // eslint-disable-next-line sonarjs/cognitive-complexity
   return (
     <React.Fragment>
       <div
diff --git a/src/components/Message/MessageLivestream.js b/src/components/Message/MessageLivestream.js
@@ -1,4 +1,3 @@
-// @ts-check
 import React, {
   useCallback,
   useEffect,
@@ -52,7 +51,6 @@ import MessageTimestamp from './MessageTimestamp';
  * @typedef { import('../../../types').MessageLivestreamProps } Props
  * @type { React.FC<Props> }
  */
-// eslint-disable-next-line sonarjs/cognitive-complexity
 const MessageLivestreamComponent = (props) => {
   const {
     message,
diff --git a/src/components/Message/MessageSimple.js b/src/components/Message/MessageSimple.js
@@ -1,4 +1,3 @@
-// @ts-check
 import React, { useContext, useRef } from 'react';
 import PropTypes from 'prop-types';
 import MessageRepliesCountButton from './MessageRepliesCountButton';
@@ -45,7 +44,6 @@ import MessageTimestamp from './MessageTimestamp';
  * @example ../../docs/MessageSimple.md
  * @type { React.FC<import('types').MessageSimpleProps> }
  */
-// eslint-disable-next-line sonarjs/cognitive-complexity
 const MessageSimple = (props) => {
   const {
     clearEditingState,
diff --git a/src/components/Message/MessageTeam.js b/src/components/Message/MessageTeam.js
@@ -1,4 +1,3 @@
-// @ts-check
 import React, { useMemo, useContext, useRef } from 'react';
 import PropTypes from 'prop-types';
 
@@ -49,7 +48,6 @@ import MessageTimestamp from './MessageTimestamp';
  *
  * @type {React.FC<Props>}
  */
-// eslint-disable-next-line sonarjs/cognitive-complexity
 const MessageTeam = (props) => {
   const {
     message,
diff --git a/src/components/Message/__tests__/MessageTeam.test.js b/src/components/Message/__tests__/MessageTeam.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import { cleanup, render, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
diff --git a/src/components/Message/__tests__/MessageText.test.js b/src/components/Message/__tests__/MessageText.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import testRenderer from 'react-test-renderer';
 import { render, fireEvent } from '@testing-library/react';
diff --git a/src/components/MessageList/MessageListInner.js b/src/components/MessageList/MessageListInner.js
@@ -1,5 +1,4 @@
 /* eslint-disable no-continue */
-/* eslint-disable sonarjs/no-duplicate-string */
 import React, { useMemo } from 'react';
 import deepequal from 'react-fast-compare';
 
diff --git a/src/components/TypingIndicator/__tests__/TypingIndicator.test.js b/src/components/TypingIndicator/__tests__/TypingIndicator.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { cleanup, render } from '@testing-library/react';
diff --git a/src/components/UserItem/__tests__/UserItem.test.js b/src/components/UserItem/__tests__/UserItem.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { cleanup, render } from '@testing-library/react';
diff --git a/src/docs/data.js b/src/docs/data.js
@@ -1,5 +1,3 @@
-/* eslint sonarjs/no-duplicate-string: 0 */
-
 const { StreamChat } = require('stream-chat');
 const Dayjs = require('dayjs');
 
diff --git a/src/mock-builders/generator/attachment.js b/src/mock-builders/generator/attachment.js
@@ -1,4 +1,3 @@
-/* eslint-disable sonarjs/no-duplicate-string */
 import { v4 as uuidv4 } from 'uuid';
 
 export const generateAttachmentAction = (a) => {
diff --git a/yarn.lock b/yarn.lock
@@ -4617,11 +4617,6 @@ eslint-plugin-react@^7.21.5:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
-eslint-plugin-sonarjs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.5.0.tgz#ce17b2daba65a874c2862213a9e38e8986ad7d7d"
-  integrity sha512-XW5MnzlRjhXpIdbULC/qAdJYHWw3rRLws/DyawdlPU/IdVr9AmRK1r2LaCvabwKOAW2XYYSo3kDX58E4MrB7PQ==
-
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/* eslint-disable sonarjs/no-identical-functions */`
`2`		`-/* eslint-disable sonarjs/no-duplicate-string */`
`3`	`1`	`import React from 'react';`
`4`	`2`	`import { render, waitFor } from '@testing-library/react';`
`5`	`3`	`import '@testing-library/jest-dom';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable sonarjs/no-duplicate-string */`
`2`	`1`	`import React from 'react';`
`3`	`2`	`import renderer from 'react-test-renderer';`
`4`	`3`	`import { cleanup, render, fireEvent } from '@testing-library/react';`