Skip to content

Commit

Permalink
Merge branch 'master' into update-endpoint-telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Mar 10, 2021
2 parents 942f5ef + 89a4355 commit 3572012
Show file tree
Hide file tree
Showing 1,204 changed files with 24,011 additions and 11,542 deletions.
9 changes: 7 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1288,14 +1288,19 @@ module.exports = {
* Osquery overrides
*/
{
extends: ['eslint:recommended', 'plugin:react/recommended'],
plugins: ['react'],
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
],
plugins: ['react', '@typescript-eslint'],
files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
rules: {
'arrow-body-style': ['error', 'as-needed'],
'prefer-arrow-callback': 'error',
'no-unused-vars': 'off',
'react/prop-types': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
},
},
{
Expand Down
Loading

0 comments on commit 3572012

Please sign in to comment.