feat(eslint-config)!: bump ESLint to 8 and typescript-eslint to 5 (#4)

* feat: bump ESLint to 8 and typescript-eslint to 5 * bumped eslint-plugin-jest-react * Dedup eslint-plugin-jest-react * Removed now-unnecessary resolutions * Remove now-unnecessary rule * also disable a react thing
Codecademy · Nov 30, 2021 · 64423d6 · 64423d6
1 parent 06abdaa
commit 64423d6
Show file tree

Hide file tree

Showing 7 changed files with 339 additions and 296 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,7 @@
     "typescriptreact",
     "html"
   ],
+  "eslint.rules.customizations": [{ "rule": "*", "severity": "downgrade" }],
   "eslint.validate": [
     "markdown",
     "javascript",

diff --git a/package.json b/package.json
@@ -65,8 +65,8 @@
     "@types/react": "^16.9",
     "@types/react-dom": "^16.9",
     "@types/stylis": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
     "babel-jest": "26.6.3",
     "babel-plugin-macros": "3.0.1",
     "babel-preset-codecademy": "2.3.0",
@@ -75,16 +75,16 @@
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.5",
     "enzyme-to-json": "3.3.5",
-    "eslint": "^7.19.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-jest-react": "^0.0.2",
+    "eslint": "^8.2.0",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-jest": "^25.2.4",
+    "eslint-plugin-jest-react": "^0.1.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-no-only-tests": "^2.6.0",
-    "eslint-plugin-react": "^7.25.1",
+    "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "eslint-plugin-unused-imports": "^1.1.4",
+    "eslint-plugin-unused-imports": "^1.1.5",
     "husky": "4.2.5",
     "identity-obj-proxy": "3.0.0",
     "jest": "^26.6.3",

diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js
@@ -7,6 +7,7 @@ module.exports = {
     jest: true,
     node: true,
   },
+
   extends: [
     'eslint:recommended',
     'plugin:import/errors',
@@ -21,14 +22,6 @@ module.exports = {
   ],
 
   overrides: [
-    {
-      files: ['*.ts', '*.tsx'],
-      rules: {
-        // These off-by-default or configurable rules are good and we like having them on
-        '@typescript-eslint/non-nullable-type-assertion-style': 'error',
-        '@typescript-eslint/prefer-optional-chain': 'error',
-      },
-    },
     // Stories generally have empty functions and other syntax shenanigans for code examples
     {
       files: ['*.stories.*'],
@@ -97,13 +90,6 @@ module.exports = {
     'react/no-array-index-key': 'error',
     'react/no-danger': 'error',
     'react/no-unused-state': 'error',
-    'react/prop-types': [
-      'error',
-      {
-        ignore: ['children'],
-        skipUndeclared: true,
-      },
-    ],
     'simple-import-sort/imports': 'error',
 
     // These functional rules are annoying and we generally don't want them on
@@ -148,6 +134,7 @@ module.exports = {
     'no-use-before-define': 'off',
     'no-useless-constructor': 'off',
     'prefer-template': 'off',
+    'default-props-match-prop-types': 'off',
     'react/destructuring-assignment': 'off',
     'react/jsx-filename-extension': 'off',
     'react/jsx-no-bind': 'off',

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -23,20 +23,20 @@
     "eslint": "^7.32.0"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-mdx": "^1.15.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-jest-react": "^0.0.2",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-jest": "^25.2.4",
+    "eslint-plugin-jest-react": "^0.1.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-no-only-tests": "^2.6.0",
-    "eslint-plugin-react": "^7.25.1",
+    "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "eslint-plugin-unused-imports": "^1.1.4",
+    "eslint-plugin-unused-imports": "^1.1.5",
     "yargs": "^17.1.1"
   },
   "devDependencies": {

diff --git a/packages/eslint-config/rules/typescript.js b/packages/eslint-config/rules/typescript.js
@@ -3,12 +3,18 @@
  */
 const tsConfig = {
   extends: ['plugin:@typescript-eslint/recommended-requiring-type-checking'],
-  files: ['*.tsx', '*.ts'],
+  files: ['*.ts', '*.tsx'],
   parser: require.resolve('@typescript-eslint/parser'),
   parserOptions: {
     project: './tsconfig.json',
     sourceType: 'module',
   },
+
+  rules: {
+    // These off-by-default or configurable rules are good and we like having them on
+    '@typescript-eslint/non-nullable-type-assertion-style': 'error',
+    '@typescript-eslint/prefer-optional-chain': 'error',
+  },
 };
 
 module.exports = {

diff --git a/packages/tracking/src/events/__tests__/track.test.ts b/packages/tracking/src/events/__tests__/track.test.ts
@@ -73,15 +73,15 @@ describe('createTracker', () => {
           `${apiBaseUrl}/analytics/user?utm_source=twitter`,
           expect.any(FormData)
         );
-        const formData = mockBeacon.mock.calls[0][1];
+        const formData = mockBeacon.mock.calls[0][1] as FormData;
         expect(Object.fromEntries(formData)).toEqual(
           expect.objectContaining({
             category: 'user',
             event,
             gdpr_safe: 'undefined',
           })
         );
-        expect(JSON.parse(formData.get('properties'))).toEqual({
+        expect(JSON.parse(formData.get('properties') as string)).toEqual({
           ...expectedProps,
           fullpath: window.location.pathname + window.location.search,
           path: window.location.pathname,