From 40f46f5711c8c33bbcf437cf5944be317f74825f Mon Sep 17 00:00:00 2001 From: Emmanuel Chambon Date: Wed, 8 Dec 2021 11:12:28 +0100 Subject: [PATCH 1/2] style: correct some eslint errors before new config rules --- package.json | 1 - .../src/__tests__/useDataLoader.test.tsx | 5 +++- packages/use-i18n/src/__tests__/usei18n.tsx | 1 - packages/use-i18n/src/usei18n.tsx | 4 --- yarn.lock | 29 ------------------- 5 files changed, 4 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index fb9025131..92a3882e9 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@testing-library/jest-dom": "5.16.1", "@testing-library/react": "12.1.2", "@testing-library/react-hooks": "7.0.2", - "@types/react-router-dom": "5.3.2", "builtin-modules": "3.2.0", "cross-env": "7.0.3", "eslint": "8.4.0", diff --git a/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx b/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx index 20f4eb36a..abc9bdc6e 100644 --- a/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx +++ b/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx @@ -1,4 +1,3 @@ -/* eslint-disable no-console */ import { act, renderHook } from '@testing-library/react-hooks' import React from 'react' import DataLoaderProvider, { useDataLoaderContext } from '../DataLoaderProvider' @@ -661,6 +660,8 @@ describe('useDataLoader', () => { expect(mockedFn).toBeCalledTimes(2) }) + /* eslint-disable no-console */ + test('should cancel request', async () => { const originalError = console.error console.error = jest.fn() @@ -741,4 +742,6 @@ describe('useDataLoader', () => { expect(result.current.isError).toBe(false) console.error = originalError }) + + /* eslint-enable no-console */ }) diff --git a/packages/use-i18n/src/__tests__/usei18n.tsx b/packages/use-i18n/src/__tests__/usei18n.tsx index 112792b5a..8ffb5cc31 100644 --- a/packages/use-i18n/src/__tests__/usei18n.tsx +++ b/packages/use-i18n/src/__tests__/usei18n.tsx @@ -1,4 +1,3 @@ -/* eslint-disable react/prop-types */ import { act, renderHook } from '@testing-library/react-hooks' import mockdate from 'mockdate' import React from 'react' diff --git a/packages/use-i18n/src/usei18n.tsx b/packages/use-i18n/src/usei18n.tsx index 182eaef49..222ede069 100644 --- a/packages/use-i18n/src/usei18n.tsx +++ b/packages/use-i18n/src/usei18n.tsx @@ -235,8 +235,6 @@ const I18nContextProvider = ({ ) const datetime = useCallback( - // intl-format-chache does not forwrad return types - // eslint-disable-next-line (date: Date | number, options?: Intl.DateTimeFormatOptions): string => formatters.getDateTimeFormat(currentLocale, options).format(date), [currentLocale], ) @@ -283,8 +281,6 @@ const I18nContextProvider = ({ return '' } if (context) { - // intl-format-chache does not forwrad return types - // eslint-disable-next-line return formatters.getTranslationFormat(value, currentLocale).format(context) as string } diff --git a/yarn.lock b/yarn.lock index fe11c97a6..69dddaa6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3367,13 +3367,6 @@ __metadata: languageName: node linkType: hard -"@types/history@npm:*": - version: 4.7.9 - resolution: "@types/history@npm:4.7.9" - checksum: 556b062adb92795839301965776b0418e9ca32798bd8a6031345a6a84d7512771107143a497b7e3ff826d0b0d4456e962c6450485dda6f55c7dd33371e840529 - languageName: node - linkType: hard - "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.3 resolution: "@types/istanbul-lib-coverage@npm:2.0.3" @@ -3481,27 +3474,6 @@ __metadata: languageName: node linkType: hard -"@types/react-router-dom@npm:5.3.2": - version: 5.3.2 - resolution: "@types/react-router-dom@npm:5.3.2" - dependencies: - "@types/history": "*" - "@types/react": "*" - "@types/react-router": "*" - checksum: 90f052dc5a43a77edaf41d2afa781c8ed2164cd7922b3cdf5daae446b02a2f279382425e6efc338260782c0a24d25a6101e3658acb41c8a053695968a351ea96 - languageName: node - linkType: hard - -"@types/react-router@npm:*": - version: 5.1.17 - resolution: "@types/react-router@npm:5.1.17" - dependencies: - "@types/history": "*" - "@types/react": "*" - checksum: b9d1c7b6ce073652c39712d2b02aeec7640036e369c04be2e57e4b0eb049b64ec9f34fb91cad680ab3f794e89576f77aacadb015b61eb21500a1779e5c955b86 - languageName: node - linkType: hard - "@types/react-test-renderer@npm:>=16.9.0": version: 17.0.1 resolution: "@types/react-test-renderer@npm:17.0.1" @@ -10074,7 +10046,6 @@ __metadata: "@testing-library/jest-dom": 5.16.1 "@testing-library/react": 12.1.2 "@testing-library/react-hooks": 7.0.2 - "@types/react-router-dom": 5.3.2 builtin-modules: 3.2.0 cross-env: 7.0.3 eslint: 8.4.0 From 447ae8c732654f7623efe1093047e0e5cc2df24e Mon Sep 17 00:00:00 2001 From: Emmanuel Chambon Date: Wed, 8 Dec 2021 11:13:55 +0100 Subject: [PATCH 2/2] feat(eslint-config): add eslint-comments plugin --- packages/eslint-config-react/package.json | 1 + packages/eslint-config-react/shared.js | 2 +- yarn.lock | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/eslint-config-react/package.json b/packages/eslint-config-react/package.json index c9783bbe7..b34dbc20f 100644 --- a/packages/eslint-config-react/package.json +++ b/packages/eslint-config-react/package.json @@ -22,6 +22,7 @@ "eslint-config-airbnb": "19.0.2", "eslint-config-airbnb-typescript": "16.1.0", "eslint-config-prettier": "8.3.0", + "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-import": "2.25.3", "eslint-plugin-jsx-a11y": "6.5.1", "eslint-plugin-react": "7.27.1", diff --git a/packages/eslint-config-react/shared.js b/packages/eslint-config-react/shared.js index 93e4351ef..7bb5a30f7 100644 --- a/packages/eslint-config-react/shared.js +++ b/packages/eslint-config-react/shared.js @@ -1,5 +1,5 @@ module.exports = { - extends: ['airbnb/hooks', 'prettier'], + extends: ['airbnb/hooks', 'prettier', 'plugin:eslint-comments/recommended'], rules: { 'import/order': [ // https://github.com/import-js/eslint-plugin-import/blob/master/docs/rules/order.md diff --git a/yarn.lock b/yarn.lock index 69dddaa6d..c008fd355 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3126,6 +3126,7 @@ __metadata: eslint-config-airbnb: 19.0.2 eslint-config-airbnb-typescript: 16.1.0 eslint-config-prettier: 8.3.0 + eslint-plugin-eslint-comments: ^3.2.0 eslint-plugin-import: 2.25.3 eslint-plugin-jsx-a11y: 6.5.1 eslint-plugin-react: 7.27.1 @@ -5471,6 +5472,18 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-eslint-comments@npm:^3.2.0": + version: 3.2.0 + resolution: "eslint-plugin-eslint-comments@npm:3.2.0" + dependencies: + escape-string-regexp: ^1.0.5 + ignore: ^5.0.5 + peerDependencies: + eslint: ">=4.19.1" + checksum: c9fe273dd56699abdf7e416cfad0344eb50aa01564a5a9133e72d982defb89310bc2e9b0b148ce19c5190d7ff641223b0ba9e667a194bc48467c3dd0d471e657 + languageName: node + linkType: hard + "eslint-plugin-import@npm:2.25.3": version: 2.25.3 resolution: "eslint-plugin-import@npm:2.25.3" @@ -6516,7 +6529,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.1.4, ignore@npm:^5.1.8": +"ignore@npm:^5.0.5, ignore@npm:^5.1.4, ignore@npm:^5.1.8": version: 5.1.9 resolution: "ignore@npm:5.1.9" checksum: 6f6b2235f4e63648116c5814f76b2d3d63fae9c21b8a466862e865732f59e787c9938a9042f9457091db6f0d811508ea3c8c6a60f35bafc4ceea08bbe8f96fd5