Skip to content

Commit d111251

Browse files
committed
Merge remote-tracking branch 'upstream/master' into ilm-ui/single-repo-state
2 parents 7add8b9 + e883e50 commit d111251

File tree

3,241 files changed

+176305
-157274
lines changed

Some content is hidden

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

3,241 files changed

+176305
-157274
lines changed

.eslintrc.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ module.exports = {
572572
{
573573
files: [
574574
'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
575-
'src/legacy/ui/ui_render/bootstrap/kbn_bundles_loader_source.js',
576575
'**/browser_exec_scripts/**/*.js',
577576
],
578577
rules: {
@@ -795,6 +794,7 @@ module.exports = {
795794
{
796795
files: ['x-pack/plugins/fleet/**/*.{js,mjs,ts,tsx}'],
797796
rules: {
797+
'@typescript-eslint/consistent-type-imports': 'error',
798798
'import/order': [
799799
'warn',
800800
{
@@ -1103,7 +1103,9 @@ module.exports = {
11031103
*/
11041104
{
11051105
// typescript for front and back end
1106-
files: ['x-pack/plugins/{alerts,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}'],
1106+
files: [
1107+
'x-pack/plugins/{alerting,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}',
1108+
],
11071109
rules: {
11081110
'@typescript-eslint/no-explicit-any': 'error',
11091111
},
@@ -1286,14 +1288,19 @@ module.exports = {
12861288
* Osquery overrides
12871289
*/
12881290
{
1289-
extends: ['eslint:recommended', 'plugin:react/recommended'],
1290-
plugins: ['react'],
1291+
extends: [
1292+
'eslint:recommended',
1293+
'plugin:react/recommended',
1294+
'plugin:@typescript-eslint/recommended',
1295+
],
1296+
plugins: ['react', '@typescript-eslint'],
12911297
files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
12921298
rules: {
12931299
'arrow-body-style': ['error', 'as-needed'],
12941300
'prefer-arrow-callback': 'error',
12951301
'no-unused-vars': 'off',
12961302
'react/prop-types': 'off',
1303+
'@typescript-eslint/explicit-module-boundary-types': 'off',
12971304
},
12981305
},
12991306
{

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/ @elastic/kibana-core @elastic/
260260
#CC# /x-pack/plugins/security/ @elastic/kibana-security
261261

262262
# Kibana Alerting Services
263-
/x-pack/plugins/alerts/ @elastic/kibana-alerting-services
263+
/x-pack/plugins/alerting/ @elastic/kibana-alerting-services
264264
/x-pack/plugins/actions/ @elastic/kibana-alerting-services
265265
/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
266266
/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services

.stylelintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rules:
3333
- return
3434
- for
3535
- at-root
36+
- warn
3637
comment-no-empty: true
3738
no-duplicate-at-import-rules: true
3839
no-duplicate-selectors: true

0 commit comments

Comments
 (0)