mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
# Backport This will backport the following commits from `main` to `7.17`: - [Remove eslint-plugin-prefer-object-spread dependency (#162439)](https://github.com/elastic/kibana/pull/162439) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Thomas Watson","email":"watson@elastic.co"},"sourceCommit":{"committedDate":"2023-07-25T08:04:44Z","message":"Remove eslint-plugin-prefer-object-spread dependency (#162439)\n\nRemove the `eslint-plugin-prefer-object-spread` dependency as the\r\n`prefer-object-spread` rule has been part of ESLint since v5","sha":"a79e9c737498bc3f3bda3d82ef1b3387be88b9ed","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v8.10.0","v7.17.12"],"number":162439,"url":"https://github.com/elastic/kibana/pull/162439","mergeCommit":{"message":"Remove eslint-plugin-prefer-object-spread dependency (#162439)\n\nRemove the `eslint-plugin-prefer-object-spread` dependency as the\r\n`prefer-object-spread` rule has been part of ESLint since v5","sha":"a79e9c737498bc3f3bda3d82ef1b3387be88b9ed"}},"sourceBranch":"main","suggestedTargetBranches":["7.17"],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/162439","number":162439,"mergeCommit":{"message":"Remove eslint-plugin-prefer-object-spread dependency (#162439)\n\nRemove the `eslint-plugin-prefer-object-spread` dependency as the\r\n`prefer-object-spread` rule has been part of ESLint since v5","sha":"a79e9c737498bc3f3bda3d82ef1b3387be88b9ed"}},{"branch":"7.17","label":"v7.17.12","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"url":"https://github.com/elastic/kibana/pull/162455","number":162455,"branch":"8.9","state":"OPEN"}]}] BACKPORT-->
This commit is contained in:
parent
23cc326a63
commit
71f8e9cd00
6 changed files with 5 additions and 13 deletions
|
@ -678,7 +678,7 @@ module.exports = {
|
|||
files: ['scripts/**/*.js', 'src/setup_node_env/**/*.js'],
|
||||
rules: {
|
||||
'import/no-commonjs': 'off',
|
||||
'prefer-object-spread/prefer-object-spread': 'off',
|
||||
'prefer-object-spread': 'off',
|
||||
'no-var': 'off',
|
||||
'prefer-const': 'off',
|
||||
'prefer-destructuring': 'off',
|
||||
|
@ -711,7 +711,7 @@ module.exports = {
|
|||
'**/browser_exec_scripts/**/*.js',
|
||||
],
|
||||
rules: {
|
||||
'prefer-object-spread/prefer-object-spread': 'off',
|
||||
'prefer-object-spread': 'off',
|
||||
'no-var': 'off',
|
||||
'prefer-const': 'off',
|
||||
'prefer-destructuring': 'off',
|
||||
|
@ -748,7 +748,7 @@ module.exports = {
|
|||
excludedFiles: ['**/integration_tests/**/*'],
|
||||
rules: {
|
||||
'import/no-commonjs': 'off',
|
||||
'prefer-object-spread/prefer-object-spread': 'off',
|
||||
'prefer-object-spread': 'off',
|
||||
'no-restricted-syntax': [
|
||||
'error',
|
||||
'ImportDeclaration',
|
||||
|
|
|
@ -712,7 +712,6 @@
|
|||
"eslint-plugin-mocha": "^10.0.3",
|
||||
"eslint-plugin-no-unsanitized": "^3.1.5",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-prefer-object-spread": "^1.2.1",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-react": "^7.26.1",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
|
|
|
@ -15,7 +15,6 @@ module.exports = {
|
|||
'@babel',
|
||||
'import',
|
||||
'no-unsanitized',
|
||||
'prefer-object-spread',
|
||||
],
|
||||
|
||||
settings: {
|
||||
|
@ -103,7 +102,7 @@ module.exports = {
|
|||
'import/no-duplicates': 'error',
|
||||
'import/no-dynamic-require': 'error',
|
||||
|
||||
'prefer-object-spread/prefer-object-spread': 'error',
|
||||
'prefer-object-spread': 'error',
|
||||
}
|
||||
},
|
||||
]
|
||||
|
|
|
@ -23,7 +23,6 @@ module.exports = {
|
|||
'@typescript-eslint',
|
||||
'ban',
|
||||
'import',
|
||||
'prefer-object-spread',
|
||||
'eslint-comments'
|
||||
],
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ function evaluate(expression, scope = {}, injectedFunctions = {}) {
|
|||
}
|
||||
|
||||
function interpret(node, scope, injectedFunctions) {
|
||||
const functions = Object.assign({}, includedFunctions, injectedFunctions); // eslint-disable-line
|
||||
const functions = Object.assign({}, includedFunctions, injectedFunctions); // eslint-disable-line prefer-object-spread
|
||||
return exec(node);
|
||||
|
||||
function exec(node) {
|
||||
|
|
|
@ -13686,11 +13686,6 @@ eslint-plugin-node@^11.1.0:
|
|||
resolve "^1.10.1"
|
||||
semver "^6.1.0"
|
||||
|
||||
eslint-plugin-prefer-object-spread@^1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-object-spread/-/eslint-plugin-prefer-object-spread-1.2.1.tgz#27fb91853690cceb3ae6101d9c8aecc6a67a402c"
|
||||
integrity sha1-J/uRhTaQzOs65hAdnIrsxqZ6QCw=
|
||||
|
||||
eslint-plugin-prettier@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue