Skip to content

Commit 4b89e14

Browse files
patrykkopycinskipatrykkopycinski
authored
Bump eslint@7 (elastic#94347)
1 parent 634fb36 commit 4b89e14

File tree

129 files changed

+843
-1032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+843
-1032
lines changed

‎.eslintrc.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ module.exports = {
492492
{
493493
files: [
494494
'**/*.stories.tsx',
495+
'**/*.test.js',
495496
'x-pack/test/apm_api_integration/**/*.ts',
496497
'x-pack/test/functional/apps/**/*.js',
497498
'x-pack/plugins/apm/**/*.js',
@@ -506,6 +507,7 @@ module.exports = {
506507
],
507508
rules: {
508509
'import/no-default-export': 'off',
510+
'import/no-named-as-default-member': 'off',
509511
'import/no-named-as-default': 'off',
510512
},
511513
},
@@ -1547,8 +1549,8 @@ module.exports = {
15471549
plugins: ['react', '@typescript-eslint'],
15481550
files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
15491551
rules: {
1550-
'arrow-body-style': ['error', 'as-needed'],
1551-
'prefer-arrow-callback': 'error',
1552+
// 'arrow-body-style': ['error', 'as-needed'],
1553+
// 'prefer-arrow-callback': 'error',
15521554
'no-unused-vars': 'off',
15531555
'react/prop-types': 'off',
15541556
'@typescript-eslint/explicit-module-boundary-types': 'off',

‎package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@
417417
"devDependencies": {
418418
"@babel/cli": "^7.15.7",
419419
"@babel/core": "^7.15.5",
420+
"@babel/eslint-parser": "^7.15.7",
421+
"@babel/eslint-plugin": "^7.14.5",
420422
"@babel/generator": "^7.15.4",
421423
"@babel/parser": "^7.15.7",
422424
"@babel/plugin-proposal-class-properties": "^7.14.5",
@@ -518,7 +520,7 @@
518520
"@types/ejs": "^3.0.6",
519521
"@types/elasticsearch": "^5.0.33",
520522
"@types/enzyme": "^3.10.8",
521-
"@types/eslint": "^6.1.3",
523+
"@types/eslint": "^7.28.0",
522524
"@types/extract-zip": "^1.6.2",
523525
"@types/faker": "^5.1.5",
524526
"@types/fancy-log": "^1.3.1",
@@ -640,9 +642,9 @@
640642
"@types/xml2js": "^0.4.5",
641643
"@types/yauzl": "^2.9.1",
642644
"@types/zen-observable": "^0.8.0",
643-
"@typescript-eslint/eslint-plugin": "^4.14.1",
644-
"@typescript-eslint/parser": "^4.14.1",
645-
"@typescript-eslint/typescript-estree": "^4.14.1",
645+
"@typescript-eslint/eslint-plugin": "^4.31.2",
646+
"@typescript-eslint/parser": "^4.31.2",
647+
"@typescript-eslint/typescript-estree": "^4.31.2",
646648
"@yarnpkg/lockfile": "^1.1.0",
647649
"abab": "^2.0.4",
648650
"aggregate-error": "^3.1.0",
@@ -653,7 +655,6 @@
653655
"argsplit": "^1.0.5",
654656
"autoprefixer": "^9.7.4",
655657
"axe-core": "^4.0.2",
656-
"babel-eslint": "^10.1.0",
657658
"babel-jest": "^26.6.3",
658659
"babel-loader": "^8.2.2",
659660
"babel-plugin-add-module-exports": "^1.0.4",
@@ -690,26 +691,25 @@
690691
"enzyme-adapter-react-16": "^1.15.6",
691692
"enzyme-adapter-utils": "^1.14.0",
692693
"enzyme-to-json": "^3.6.1",
693-
"eslint": "^6.8.0",
694-
"eslint-config-prettier": "^6.15.0",
695-
"eslint-import-resolver-node": "0.3.2",
696-
"eslint-import-resolver-webpack": "0.11.1",
697-
"eslint-module-utils": "2.5.0",
698-
"eslint-plugin-babel": "^5.3.1",
699-
"eslint-plugin-ban": "^1.4.0",
700-
"eslint-plugin-cypress": "^2.11.3",
694+
"eslint": "^7.32.0",
695+
"eslint-config-prettier": "^7.2.0",
696+
"eslint-import-resolver-node": "^0.3.6",
697+
"eslint-import-resolver-webpack": "^0.13.1",
698+
"eslint-module-utils": "^2.6.2",
699+
"eslint-plugin-ban": "^1.5.2",
700+
"eslint-plugin-cypress": "^2.12.1",
701701
"eslint-plugin-eslint-comments": "^3.2.0",
702-
"eslint-plugin-import": "^2.22.1",
703-
"eslint-plugin-jest": "^24.3.4",
704-
"eslint-plugin-jsx-a11y": "^6.2.3",
705-
"eslint-plugin-mocha": "^6.2.2",
706-
"eslint-plugin-no-unsanitized": "^3.0.2",
707-
"eslint-plugin-node": "^11.0.0",
702+
"eslint-plugin-import": "^2.24.2",
703+
"eslint-plugin-jest": "^24.5.0",
704+
"eslint-plugin-jsx-a11y": "^6.4.1",
705+
"eslint-plugin-mocha": "^9.0.0",
706+
"eslint-plugin-no-unsanitized": "^3.1.5",
707+
"eslint-plugin-node": "^11.1.0",
708708
"eslint-plugin-prefer-object-spread": "^1.2.1",
709-
"eslint-plugin-prettier": "^3.4.1",
710-
"eslint-plugin-react": "^7.20.3",
709+
"eslint-plugin-prettier": "^4.0.0",
710+
"eslint-plugin-react": "^7.26.1",
711711
"eslint-plugin-react-hooks": "^4.2.0",
712-
"eslint-plugin-react-perf": "^3.2.3",
712+
"eslint-plugin-react-perf": "^3.3.0",
713713
"eslint-traverse": "^1.0.0",
714714
"expose-loader": "^0.7.5",
715715
"faker": "^5.1.0",

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ module.exports = {
88
*/
99
{
1010
files: ['**/*.js'],
11-
parser: require.resolve('babel-eslint'),
11+
parser: require.resolve('@babel/eslint-parser'),
1212

1313
plugins: [
1414
'mocha',
15-
'babel',
15+
'@babel',
1616
'import',
1717
'no-unsanitized',
1818
'prefer-object-spread',
@@ -36,6 +36,10 @@ module.exports = {
3636
parserOptions: {
3737
sourceType: 'module',
3838
ecmaVersion: 2018,
39+
requireConfigFile: false,
40+
babelOptions: {
41+
presets: ['@kbn/babel-preset/node_preset']
42+
},
3943
},
4044

4145
rules: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class ByteSizeValue {
3434
return new ByteSizeValue(number);
3535
}
3636

37-
const value = parseInt(match[1], 0);
37+
const value = parseInt(match[1], 10);
3838
const unit = match[2];
3939

4040
return new ByteSizeValue(value * unitMultiplier[unit]);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function stringToDuration(text: string) {
2424
return numberToDuration(number);
2525
}
2626

27-
const count = parseInt(result[1], 0);
27+
const count = parseInt(result[1], 10);
2828
const unit = result[2] as DurationInputArg2;
2929

3030
return momentDuration(count, unit);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ NPM_MODULE_EXTRA_FILES = [
2929
]
3030

3131
DEPS = [
32-
"@npm//babel-eslint",
32+
"@npm//@babel/eslint-parser",
3333
"@npm//dedent",
3434
"@npm//eslint",
3535
"@npm//eslint-module-utils",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
const babelEslint = require('babel-eslint');
9+
const babelEslint = require('@babel/eslint-parser');
1010

1111
const { assert, normalizeWhitespace, init } = require('../lib');
1212

@@ -38,7 +38,7 @@ module.exports = {
3838
assert(!!licenses, '"licenses" option is required');
3939

4040
return licenses.map((license, i) => {
41-
const parsed = babelEslint.parse(license);
41+
const parsed = babelEslint.parse(license, { requireConfigFile: false });
4242

4343
assert(
4444
!parsed.body.length,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ const rule = require('./disallow_license_headers');
1111
const dedent = require('dedent');
1212

1313
const ruleTester = new RuleTester({
14-
parser: require.resolve('babel-eslint'),
14+
parser: require.resolve('@babel/eslint-parser'),
1515
parserOptions: {
1616
ecmaVersion: 2018,
17+
requireConfigFile: false,
1718
},
1819
});
1920

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ const rule = require('./module_migration');
1111
const dedent = require('dedent');
1212

1313
const ruleTester = new RuleTester({
14-
parser: require.resolve('babel-eslint'),
14+
parser: require.resolve('@babel/eslint-parser'),
1515
parserOptions: {
1616
ecmaVersion: 2018,
17+
requireConfigFile: false,
1718
},
1819
});
1920

@@ -69,6 +70,12 @@ ruleTester.run('@kbn/eslint/module-migration', rule, {
6970
message: 'Re-exported module "foo" should be "bar"',
7071
},
7172
],
73+
output: dedent`
74+
import 'bar'
75+
require('bar/foo2')
76+
export { foo } from 'bar'
77+
export const foo2 = 'bar'
78+
`,
7279
},
7380
],
7481
});

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ const { RuleTester } = require('eslint');
3232
const rule = require('./no_restricted_paths');
3333

3434
const ruleTester = new RuleTester({
35-
parser: require.resolve('babel-eslint'),
35+
parser: require.resolve('@babel/eslint-parser'),
3636
parserOptions: {
3737
sourceType: 'module',
3838
ecmaVersion: 2018,
39+
requireConfigFile: false,
3940
},
4041
});
4142

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
const babelEslint = require('babel-eslint');
9+
const babelEslint = require('@babel/eslint-parser');
1010

1111
const { assert, normalizeWhitespace, init } = require('../lib');
1212

@@ -38,7 +38,7 @@ module.exports = {
3838

3939
assert(!!license, '"license" option is required');
4040

41-
const parsed = babelEslint.parse(license);
41+
const parsed = babelEslint.parse(license, { requireConfigFile: false });
4242
assert(!parsed.body.length, '"license" option must only include a single comment');
4343
assert(
4444
parsed.comments.length === 1,

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ const rule = require('./require_license_header');
1111
const dedent = require('dedent');
1212

1313
const ruleTester = new RuleTester({
14-
parser: require.resolve('babel-eslint'),
14+
parser: require.resolve('@babel/eslint-parser'),
1515
parserOptions: {
1616
ecmaVersion: 2018,
17+
requireConfigFile: false,
1718
},
1819
});
1920

0 commit comments

Comments
 (0)