Bump eslint@7

.eslintrc.js

@@ -492,6 +492,7 @@ module.exports = {
     {
       files: [
         '**/*.stories.tsx',
+        '**/*.test.js',
         'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/plugins/apm/**/*.js',
@@ -506,6 +507,7 @@ module.exports = {
       ],
       rules: {
         'import/no-default-export': 'off',
+        'import/no-named-as-default-member': 'off',
         'import/no-named-as-default': 'off',
       },
     },
@@ -1547,8 +1549,8 @@ module.exports = {
       plugins: ['react', '@typescript-eslint'],
       files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
       rules: {
-        'arrow-body-style': ['error', 'as-needed'],
-        'prefer-arrow-callback': 'error',
+        // 'arrow-body-style': ['error', 'as-needed'],
+        // 'prefer-arrow-callback': 'error',
         'no-unused-vars': 'off',
         'react/prop-types': 'off',
         '@typescript-eslint/explicit-module-boundary-types': 'off',

package.json

@@ -417,6 +417,8 @@
   "devDependencies": {
     "@babel/cli": "^7.15.7",
     "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.15.7",
+    "@babel/eslint-plugin": "^7.14.5",
     "@babel/generator": "^7.15.4",
     "@babel/parser": "^7.15.7",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
@@ -518,7 +520,7 @@
     "@types/ejs": "^3.0.6",
     "@types/elasticsearch": "^5.0.33",
     "@types/enzyme": "^3.10.8",
-    "@types/eslint": "^6.1.3",
+    "@types/eslint": "^7.28.0",
     "@types/extract-zip": "^1.6.2",
     "@types/faker": "^5.1.5",
     "@types/fancy-log": "^1.3.1",
@@ -640,9 +642,9 @@
     "@types/xml2js": "^0.4.5",
     "@types/yauzl": "^2.9.1",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
-    "@typescript-eslint/typescript-estree": "^4.14.1",
+    "@typescript-eslint/eslint-plugin": "^4.31.2",
+    "@typescript-eslint/parser": "^4.31.2",
+    "@typescript-eslint/typescript-estree": "^4.31.2",
     "@yarnpkg/lockfile": "^1.1.0",
     "abab": "^2.0.4",
     "aggregate-error": "^3.1.0",
@@ -653,7 +655,6 @@
     "argsplit": "^1.0.5",
     "autoprefixer": "^9.7.4",
     "axe-core": "^4.0.2",
-    "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "babel-plugin-add-module-exports": "^1.0.4",
@@ -690,26 +691,25 @@
     "enzyme-adapter-react-16": "^1.15.6",
     "enzyme-adapter-utils": "^1.14.0",
     "enzyme-to-json": "^3.6.1",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-import-resolver-node": "0.3.2",
-    "eslint-import-resolver-webpack": "0.11.1",
-    "eslint-module-utils": "2.5.0",
-    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-ban": "^1.4.0",
-    "eslint-plugin-cypress": "^2.11.3",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^7.2.0",
+    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-import-resolver-webpack": "^0.13.1",
+    "eslint-module-utils": "^2.6.2",
+    "eslint-plugin-ban": "^1.5.2",
+    "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.3.4",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-mocha": "^6.2.2",
-    "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jest": "^24.5.0",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-no-unsanitized": "^3.1.5",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-react": "^7.20.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-react-perf": "^3.2.3",
+    "eslint-plugin-react-perf": "^3.3.0",
     "eslint-traverse": "^1.0.0",
     "expose-loader": "^0.7.5",
     "faker": "^5.1.0",

packages/elastic-eslint-config-kibana/javascript.js

@@ -8,11 +8,11 @@ module.exports = {
      */
     {
       files: ['**/*.js'],
-      parser: require.resolve('babel-eslint'),
+      parser: require.resolve('@babel/eslint-parser'),
 
       plugins: [
         'mocha',
-        'babel',
+        '@babel',
         'import',
         'no-unsanitized',
         'prefer-object-spread',
@@ -36,6 +36,10 @@ module.exports = {
       parserOptions: {
         sourceType: 'module',
         ecmaVersion: 2018,
+        requireConfigFile: false,
+        babelOptions: {
+          presets: ['@kbn/babel-preset/node_preset']
+        },
       },
 
       rules: {

packages/kbn-config-schema/src/byte_size_value/index.ts

@@ -34,7 +34,7 @@ export class ByteSizeValue {
       return new ByteSizeValue(number);
     }
 
-    const value = parseInt(match[1], 0);
+    const value = parseInt(match[1], 10);
     const unit = match[2];
 
     return new ByteSizeValue(value * unitMultiplier[unit]);

packages/kbn-config-schema/src/duration/index.ts

@@ -24,7 +24,7 @@ function stringToDuration(text: string) {
     return numberToDuration(number);
   }
 
-  const count = parseInt(result[1], 0);
+  const count = parseInt(result[1], 10);
   const unit = result[2] as DurationInputArg2;
 
   return momentDuration(count, unit);

packages/kbn-eslint-plugin-eslint/BUILD.bazel

@@ -29,7 +29,7 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 DEPS = [
-  "@npm//babel-eslint",
+  "@npm//@babel/eslint-parser",
   "@npm//dedent",
   "@npm//eslint",
   "@npm//eslint-module-utils",

packages/kbn-eslint-plugin-eslint/rules/disallow_license_headers.js

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const babelEslint = require('babel-eslint');
+const babelEslint = require('@babel/eslint-parser');
 
 const { assert, normalizeWhitespace, init } = require('../lib');
 
@@ -38,7 +38,7 @@ module.exports = {
           assert(!!licenses, '"licenses" option is required');
 
           return licenses.map((license, i) => {
-            const parsed = babelEslint.parse(license);
+            const parsed = babelEslint.parse(license, { requireConfigFile: false });
 
             assert(
               !parsed.body.length,

packages/kbn-eslint-plugin-eslint/rules/disallow_license_headers.test.js

@@ -11,9 +11,10 @@ const rule = require('./disallow_license_headers');
 const dedent = require('dedent');
 
 const ruleTester = new RuleTester({
-  parser: require.resolve('babel-eslint'),
+  parser: require.resolve('@babel/eslint-parser'),
   parserOptions: {
     ecmaVersion: 2018,
+    requireConfigFile: false,
   },
 });
 

packages/kbn-eslint-plugin-eslint/rules/module_migration.test.js

@@ -11,9 +11,10 @@ const rule = require('./module_migration');
 const dedent = require('dedent');
 
 const ruleTester = new RuleTester({
-  parser: require.resolve('babel-eslint'),
+  parser: require.resolve('@babel/eslint-parser'),
   parserOptions: {
     ecmaVersion: 2018,
+    requireConfigFile: false,
   },
 });
 
@@ -69,6 +70,12 @@ ruleTester.run('@kbn/eslint/module-migration', rule, {
           message: 'Re-exported module "foo" should be "bar"',
         },
       ],
+      output: dedent`
+        import 'bar'
+        require('bar/foo2')
+        export { foo } from 'bar'
+        export const foo2 = 'bar'
+      `,
     },
   ],
 });

packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.test.js

@@ -32,10 +32,11 @@ const { RuleTester } = require('eslint');
 const rule = require('./no_restricted_paths');
 
 const ruleTester = new RuleTester({
-  parser: require.resolve('babel-eslint'),
+  parser: require.resolve('@babel/eslint-parser'),
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 2018,
+    requireConfigFile: false,
   },
 });
 

packages/kbn-eslint-plugin-eslint/rules/require_license_header.js

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const babelEslint = require('babel-eslint');
+const babelEslint = require('@babel/eslint-parser');
 
 const { assert, normalizeWhitespace, init } = require('../lib');
 
@@ -38,7 +38,7 @@ module.exports = {
 
           assert(!!license, '"license" option is required');
 
-          const parsed = babelEslint.parse(license);
+          const parsed = babelEslint.parse(license, { requireConfigFile: false });
           assert(!parsed.body.length, '"license" option must only include a single comment');
           assert(
             parsed.comments.length === 1,

packages/kbn-eslint-plugin-eslint/rules/require_license_header.test.js

@@ -11,9 +11,10 @@ const rule = require('./require_license_header');
 const dedent = require('dedent');
 
 const ruleTester = new RuleTester({
-  parser: require.resolve('babel-eslint'),
+  parser: require.resolve('@babel/eslint-parser'),
   parserOptions: {
     ecmaVersion: 2018,
+    requireConfigFile: false,
   },
 });