Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ const RESTRICTED_IMPORTS = [
module.exports = {
root: true,

extends: ['plugin:@elastic/eui/recommended', '@kbn/eslint-config'],
extends: ['@kbn/eslint-config'],

overrides: [
/**
Expand Down
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ packages/kbn-dependency-ownership @elastic/kibana-security
packages/kbn-dependency-usage @elastic/kibana-security
packages/kbn-docs-utils @elastic/kibana-operations
packages/kbn-eslint-config @elastic/kibana-operations
packages/kbn-eslint-plugin-css @elastic/appex-sharedux
packages/kbn-eslint-plugin-disable @elastic/kibana-operations
packages/kbn-eslint-plugin-eslint @elastic/kibana-operations
packages/kbn-eslint-plugin-eui-a11y @elastic/obs-ux-infra_services-team
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@
"@cypress/debugging-proxy": "2.0.1",
"@cypress/grep": "^4.0.1",
"@cypress/webpack-preprocessor": "^6.0.2",
"@elastic/eslint-plugin-eui": "0.0.2",
"@elastic/eslint-plugin-eui": "0.1.1",
"@elastic/makelogs": "^6.1.1",
"@elastic/synthetics": "^1.18.0",
"@emotion/babel-preset-css-prop": "^11.11.0",
Expand Down Expand Up @@ -1457,7 +1457,6 @@
"@kbn/es": "link:src/platform/packages/shared/kbn-es",
"@kbn/es-archiver": "link:src/platform/packages/shared/kbn-es-archiver",
"@kbn/eslint-config": "link:packages/kbn-eslint-config",
"@kbn/eslint-plugin-css": "link:packages/kbn-eslint-plugin-css",
"@kbn/eslint-plugin-disable": "link:packages/kbn-eslint-plugin-disable",
"@kbn/eslint-plugin-eslint": "link:packages/kbn-eslint-plugin-eslint",
"@kbn/eslint-plugin-eui-a11y": "link:packages/kbn-eslint-plugin-eui-a11y",
Expand Down
33 changes: 20 additions & 13 deletions packages/kbn-eslint-config/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
const { USES_STYLED_COMPONENTS } = require('@kbn/babel-preset/styled_components_files');

module.exports = {
extends: ['./javascript.js', './typescript.js', './jest.js', './react.js'],
extends: [
'./javascript.js',
'./typescript.js',
'./jest.js',
'./react.js',
'plugin:@elastic/eui/recommended',
],

plugins: [
'@kbn/eslint-plugin-disable',
Expand All @@ -29,7 +35,7 @@ module.exports = {
'@kbn/eslint-plugin-telemetry',
'@kbn/eslint-plugin-i18n',
'@kbn/eslint-plugin-eui-a11y',
'@kbn/eslint-plugin-css',
'@elastic/eui',
'eslint-plugin-depend',
'prettier',
],
Expand Down Expand Up @@ -129,16 +135,6 @@ module.exports = {
exclude: USES_STYLED_COMPONENTS,
disallowedMessage: `Prefer using @emotion/react instead. To use styled-components, ensure you plugin is enabled in packages/kbn-babel-preset/styled_components_files.js.`,
},
...[
'@elastic/eui/dist/eui_theme_amsterdam_light.json',
'@elastic/eui/dist/eui_theme_amsterdam_dark.json',
'@elastic/eui/dist/eui_theme_borealis_light.json',
'@elastic/eui/dist/eui_theme_borealis_dark.json',
].map((from) => ({
from,
to: false,
disallowedMessage: `Use "@kbn/ui-theme" to access theme vars.`,
})),
{
from: '@kbn/test/jest',
to: '@kbn/test-jest-helpers',
Expand Down Expand Up @@ -335,9 +331,20 @@ module.exports = {
'@kbn/imports/no_boundary_crossing': 'error',
'@kbn/imports/no_group_crossing_manifests': 'error',
'@kbn/imports/no_group_crossing_imports': 'error',
'@kbn/css/no_css_color': 'warn',
'no-new-func': 'error',
'no-implied-eval': 'error',
'no-prototype-builtins': 'error',

/**
* EUI Team rules
*/

'@elastic/eui/no-restricted-eui-imports': [
'warn',
{
patterns: ['@kbn/ui-theme'],
message: 'For client-side, please use `useEuiTheme` instead.',
},
],
},
};
129 changes: 0 additions & 129 deletions packages/kbn-eslint-plugin-css/README.mdx

This file was deleted.

20 changes: 0 additions & 20 deletions packages/kbn-eslint-plugin-css/index.ts

This file was deleted.

14 changes: 0 additions & 14 deletions packages/kbn-eslint-plugin-css/jest.config.js

This file was deleted.

6 changes: 0 additions & 6 deletions packages/kbn-eslint-plugin-css/kibana.jsonc

This file was deleted.

6 changes: 0 additions & 6 deletions packages/kbn-eslint-plugin-css/package.json

This file was deleted.

Loading