From 109f01cd7521cabc21f5913f65bcfe4aa0bf1ca2 Mon Sep 17 00:00:00 2001 From: Christiane Heiligers Date: Thu, 28 Jan 2021 16:13:58 -0700 Subject: [PATCH 1/4] Adds es_ui_shared to tsconfig --- x-pack/plugins/grokdebugger/tsconfig.json | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 x-pack/plugins/grokdebugger/tsconfig.json diff --git a/x-pack/plugins/grokdebugger/tsconfig.json b/x-pack/plugins/grokdebugger/tsconfig.json new file mode 100644 index 0000000000000..70b1413359ad0 --- /dev/null +++ b/x-pack/plugins/grokdebugger/tsconfig.json @@ -0,0 +1,24 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + "../../typings/**/*", + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../licensing/tsconfig.json" }, + { "path": "../../../src/plugins/dev_tools/tsconfig.json"}, + { "path": "../../../src/plugins/home/tsconfig.json"}, + { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, + { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" } + ] +} From 5593916ff193c3ee3ccc2b2fa058dec3afb687d2 Mon Sep 17 00:00:00 2001 From: Christiane Heiligers Date: Thu, 28 Jan 2021 16:22:00 -0700 Subject: [PATCH 2/4] Adds grokdebugger to ts project refs --- x-pack/plugins/grokdebugger/tsconfig.json | 4 ++-- x-pack/test/tsconfig.json | 3 ++- x-pack/tsconfig.json | 2 ++ x-pack/tsconfig.refs.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/grokdebugger/tsconfig.json b/x-pack/plugins/grokdebugger/tsconfig.json index 70b1413359ad0..34cf8d74c0024 100644 --- a/x-pack/plugins/grokdebugger/tsconfig.json +++ b/x-pack/plugins/grokdebugger/tsconfig.json @@ -15,10 +15,10 @@ ], "references": [ { "path": "../../../src/core/tsconfig.json" }, - { "path": "../licensing/tsconfig.json" }, { "path": "../../../src/plugins/dev_tools/tsconfig.json"}, { "path": "../../../src/plugins/home/tsconfig.json"}, { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, - { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" } + { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" }, + { "path": "../licensing/tsconfig.json" } ] } diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 6a75f0c7e02d3..bc3e3f88623ea 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -59,6 +59,7 @@ { "path": "../plugins/cloud/tsconfig.json" }, { "path": "../plugins/saved_objects_tagging/tsconfig.json" }, { "path": "../plugins/global_search_bar/tsconfig.json" }, - { "path": "../plugins/license_management/tsconfig.json" } + { "path": "../plugins/license_management/tsconfig.json" }, + { "path": "../plugins/grokdebugger/tsconfig.json" } ] } diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index 7ed53ca0abb6b..b8e247d0b5f99 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -38,6 +38,7 @@ "plugins/saved_objects_tagging/**/*", "plugins/global_search_bar/**/*", "plugins/license_management/**/*", + "plugins/grokdebugger/**/*", "test/**/*" ], "compilerOptions": { @@ -109,5 +110,6 @@ { "path": "./plugins/triggers_actions_ui/tsconfig.json"}, { "path": "./plugins/stack_alerts/tsconfig.json"}, { "path": "./plugins/license_management/tsconfig.json" }, + { "path": "./plugins/grokdebugger/tsconfig.json" }, ] } diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json index eeba8dd770da6..21dd41d06fe81 100644 --- a/x-pack/tsconfig.refs.json +++ b/x-pack/tsconfig.refs.json @@ -32,6 +32,7 @@ { "path": "./plugins/cloud/tsconfig.json" }, { "path": "./plugins/saved_objects_tagging/tsconfig.json" }, { "path": "./plugins/global_search_bar/tsconfig.json" }, - { "path": "./plugins/license_management/tsconfig.json" } + { "path": "./plugins/license_management/tsconfig.json" }, + { "path": "./plugins/grokdebugger/tsconfig.json" } ] } From 3872e8bdda8c9d0fbf04c3f01225f65e0437aed0 Mon Sep 17 00:00:00 2001 From: Christiane Heiligers Date: Fri, 29 Jan 2021 12:25:04 -0700 Subject: [PATCH 3/4] Fix json format --- x-pack/tsconfig.refs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json index cc8eca9b089ee..d59b394c73923 100644 --- a/x-pack/tsconfig.refs.json +++ b/x-pack/tsconfig.refs.json @@ -34,7 +34,7 @@ { "path": "./plugins/saved_objects_tagging/tsconfig.json" }, { "path": "./plugins/global_search_bar/tsconfig.json" }, { "path": "./plugins/license_management/tsconfig.json" }, - { "path": "./plugins/grokdebugger/tsconfig.json" } + { "path": "./plugins/grokdebugger/tsconfig.json" }, { "path": "./plugins/painless_lab/tsconfig.json" }, { "path": "./plugins/watcher/tsconfig.json" } ] From d7bee4fa4a4b45a2df16c87a20e887dde67d2326 Mon Sep 17 00:00:00 2001 From: Christiane Heiligers Date: Fri, 29 Jan 2021 13:13:38 -0700 Subject: [PATCH 4/4] Fix x-pack/test/tsconfig.json formatting --- x-pack/test/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 8f6c4ebaf07ce..d1f6de57d5da2 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -61,7 +61,7 @@ { "path": "../plugins/saved_objects_tagging/tsconfig.json" }, { "path": "../plugins/global_search_bar/tsconfig.json" }, { "path": "../plugins/license_management/tsconfig.json" }, - { "path": "../plugins/grokdebugger/tsconfig.json" } + { "path": "../plugins/grokdebugger/tsconfig.json" }, { "path": "../plugins/painless_lab/tsconfig.json" }, { "path": "../plugins/watcher/tsconfig.json" } ]