Skip to content

Commit

Permalink
chore(NA): merge and solve conflicts with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic committed Aug 22, 2023
2 parents 412c4bd + c12363f commit 9b13383
Showing 61 changed files with 504 additions and 441 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1678,8 +1678,6 @@ module.exports = {
files: ['**/*'],
rules: {
...require('eslint-config-prettier').rules,
...require('eslint-config-prettier/react').rules,
...require('eslint-config-prettier/@typescript-eslint').rules,
},
},
/**
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@
"**/@types/node": "18.17.1",
"**/@types/react": "^16.14.25",
"**/@types/react-dom": "^16.9.8",
"**/@typescript-eslint/utils": "5.62.0",
"**/chokidar": "^3.4.3",
"**/globule/minimatch": "^3.1.2",
"**/hoist-non-react-statics": "^3.3.2",
@@ -623,7 +624,7 @@
"@types/stats-lite": "^2.2.0",
"@types/strong-log-transformer": "^1.0.0",
"@types/styled-components": "^5.1.0",
"@types/supertest": "^2.0.5",
"@types/supertest": "^2.0.12",
"@types/tapable": "^1.0.6",
"@types/tar": "^6.1.5",
"@types/tar-fs": "^1.16.1",
@@ -648,9 +649,9 @@
"@types/yargs": "^15.0.0",
"@types/yauzl": "^2.9.1",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"@typescript-eslint/typescript-estree": "^5.6.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/typescript-estree": "^5.62.0",
"@yarnpkg/lockfile": "^1.1.0",
"abab": "^2.0.4",
"aggregate-error": "^3.1.0",
@@ -696,7 +697,7 @@
"enzyme-adapter-utils": "^1.14.0",
"enzyme-to-json": "^3.6.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^7.2.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-module-utils": "^2.6.2",
@@ -809,8 +810,8 @@
"style-loader": "^1.1.3",
"stylelint": "13.8.0",
"stylelint-scss": "^3.18.0",
"superagent": "^3.8.2",
"supertest": "^3.1.0",
"superagent": "^8.1.2",
"supertest": "^6.3.3",
"supports-color": "^7.0.0",
"tape": "^5.0.1",
"tar-fs": "^2.1.0",
20 changes: 18 additions & 2 deletions packages/kbn-eslint-config/typescript.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
const semver = require('semver');
const { kibanaPackageJson: PKG } = require('@kbn/dev-utils');

const eslintConfigPrettierTypescriptEslintRules = require('eslint-config-prettier/@typescript-eslint').rules;
const eslintConfigPrettierRules = require('eslint-config-prettier').rules;

// The current implementation excluded all the variables matching the regexp.
// We should remove it as soon as multiple underscores are supported by the linter.
@@ -168,6 +168,22 @@ module.exports = {
selector: 'enum',
format: ['PascalCase', 'UPPER_CASE', 'camelCase'],
},
// https://typescript-eslint.io/rules/naming-convention/#ignore-properties-that-require-quotes
// restore check behavior before https://github.com/typescript-eslint/typescript-eslint/pull/4582
{
selector: [
'classProperty',
'objectLiteralProperty',
'typeProperty',
'classMethod',
'objectLiteralMethod',
'typeMethod',
'accessor',
'enumMember'
],
format: null,
modifiers: ['requiresQuotes']
}
],
'@typescript-eslint/explicit-member-accessibility': ['error',
{
@@ -254,7 +270,7 @@ module.exports = {
'eslint-comments/no-unused-disable': 'error',
'eslint-comments/no-unused-enable': 'error'
},
eslintConfigPrettierTypescriptEslintRules
eslintConfigPrettierRules
)
},
]
Loading

0 comments on commit 9b13383

Please sign in to comment.