Skip to content

Commit fe6058a

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ML-new-apm-jobs
2 parents ba69c89 + 63d0bf8 commit fe6058a

70 files changed

Lines changed: 2567 additions & 851 deletions

File tree

Some content is hidden

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

‎.eslintrc.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ module.exports = {
8282
'react-hooks/exhaustive-deps': 'off',
8383
},
8484
},
85-
{
86-
files: ['src/legacy/core_plugins/vis_type_markdown/**/*.{js,ts,tsx}'],
87-
rules: {
88-
'react-hooks/exhaustive-deps': 'off',
89-
},
90-
},
9185
{
9286
files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'],
9387
rules: {

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"packages": [
9898
"packages/*",
9999
"x-pack",
100+
"x-pack/plugins/*",
100101
"x-pack/legacy/plugins/*",
101102
"examples/*",
102103
"test/plugin_functional/plugins/*",

‎packages/kbn-pm/dist/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58268,6 +58268,7 @@ function getProjectPaths({
5826858268

5826958269
if (!ossOnly) {
5827058270
projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack'));
58271+
projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/plugins/*'));
5827158272
projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
5827258273
}
5827358274

‎packages/kbn-pm/src/config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export function getProjectPaths({ rootPath, ossOnly, skipKibanaPlugins }: Option
4646

4747
if (!ossOnly) {
4848
projectPaths.push(resolve(rootPath, 'x-pack'));
49+
projectPaths.push(resolve(rootPath, 'x-pack/plugins/*'));
4950
projectPaths.push(resolve(rootPath, 'x-pack/legacy/plugins/*'));
5051
}
5152

‎src/legacy/core_plugins/vis_type_markdown/public/markdown_options.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { MarkdownVisParams } from './types';
3636
function MarkdownOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {
3737
const onMarkdownUpdate = useCallback(
3838
(value: MarkdownVisParams['markdown']) => setValue('markdown', value),
39-
[]
39+
[setValue]
4040
);
4141

4242
return (

‎x-pack/legacy/plugins/canvas/common/lib/__tests__/get_colors_from_palette.js‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎x-pack/legacy/plugins/canvas/common/lib/__tests__/get_legend_config.js‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)