From 04a8689bec37895c41d8bb0f767fcf3ea580a261 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Wed, 6 Jan 2021 15:27:03 -0500 Subject: [PATCH 01/10] Use TS project references --- x-pack/plugins/fleet/tsconfig.json | 29 +++++++++++++++++++++++++++++ x-pack/test/tsconfig.json | 1 + x-pack/tsconfig.json | 2 ++ x-pack/tsconfig.refs.json | 1 + 4 files changed, 33 insertions(+) create mode 100644 x-pack/plugins/fleet/tsconfig.json diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json new file mode 100644 index 0000000000000..2cb938235560b --- /dev/null +++ b/x-pack/plugins/fleet/tsconfig.json @@ -0,0 +1,29 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + // add all the folders containg files to be compiled + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + // add references to other TypeScript projects the plugin depends on + + // requiredPlugins from ./kibana.json + { "path": "../licensing/tsconfig.json" }, + // TODO { "path": "../../../src/plugins/data/tsconfig.json" }, + // TODO { "path": "../encrypted_saved_objects/tsconfig.json" }, + + // optionalPlugins from ./kibana.json + // TODO { "path": "../security/tsconfig.json" }, + // TODO { "path": "../features/tsconfig.json" }, + // TODO { "path": "../cloud/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + // TODO { "path": "../../../src/plugins/home/tsconfig.json" }, + ] +} diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 3ac7026d16a17..418db187e6ecd 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -17,6 +17,7 @@ { "path": "../../src/plugins/telemetry_collection_manager/tsconfig.json" }, { "path": "../../src/plugins/telemetry/tsconfig.json" }, { "path": "../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../plugins/fleet/tsconfig.json" }, { "path": "../plugins/global_search/tsconfig.json" }, { "path": "../plugins/licensing/tsconfig.json" }, { "path": "../plugins/telemetry_collection_xpack/tsconfig.json" } diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index 87dcc939a4eb6..0646c546a6019 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -4,6 +4,7 @@ "exclude": [ "plugins/apm/e2e/cypress/**/*", "plugins/apm/scripts/**/*", + "plugins/fleet/**/*", "plugins/global_search/**/*", "plugins/licensing/**/*", "plugins/security_solution/cypress/**/*", @@ -30,6 +31,7 @@ { "path": "../src/plugins/url_forwarding/tsconfig.json" }, { "path": "../src/plugins/usage_collection/tsconfig.json" }, + { "path": "./plugins/fleet/tsconfig.json" }, { "path": "./plugins/global_search/tsconfig.json" }, { "path": "./plugins/licensing/tsconfig.json" }, { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" } diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json index a4dfa15a3d8ab..628aa60442b7a 100644 --- a/x-pack/tsconfig.refs.json +++ b/x-pack/tsconfig.refs.json @@ -1,6 +1,7 @@ { "include": [], "references": [ + { "path": "./plugins/fleet/tsconfig.json" }, { "path": "./plugins/licensing/tsconfig.json" }, { "path": "./plugins/global_search/tsconfig.json" }, { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" }, From 26000ce1b91c9f1ec2cae453ffb28bc6222e236c Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 06:55:30 -0500 Subject: [PATCH 02/10] Add missing `include` entries in `tsconfig` --- x-pack/plugins/fleet/tsconfig.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index 2cb938235560b..948b20e0bd38b 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -9,6 +9,11 @@ }, "include": [ // add all the folders containg files to be compiled + "../../../typings/**/*", + "common/**/*", + "public/**/*", + "server/**/*", + "scripts/**/*" ], "references": [ { "path": "../../../src/core/tsconfig.json" }, From 1ea65ef4a2a164b9e86ee88713c57b3cc2e14614 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 08:08:57 -0500 Subject: [PATCH 03/10] Add reference to data plugin project --- x-pack/plugins/fleet/tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index 948b20e0bd38b..2dcdc738b09d9 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -9,7 +9,6 @@ }, "include": [ // add all the folders containg files to be compiled - "../../../typings/**/*", "common/**/*", "public/**/*", "server/**/*", @@ -21,7 +20,7 @@ // requiredPlugins from ./kibana.json { "path": "../licensing/tsconfig.json" }, - // TODO { "path": "../../../src/plugins/data/tsconfig.json" }, + { "path": "../../../src/plugins/data/tsconfig.json" }, // TODO { "path": "../encrypted_saved_objects/tsconfig.json" }, // optionalPlugins from ./kibana.json From bd8222261a53df204d6c2c16aba6c3a0a6c42d39 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 12:04:21 -0500 Subject: [PATCH 04/10] Add references to recently added tsconfig's --- x-pack/plugins/fleet/tsconfig.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index 2dcdc738b09d9..faa6990c31707 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -16,6 +16,9 @@ ], "references": [ { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, + { "path": "../../../src/plugins/kibana_utils/tsconfig.json" }, + // TODO { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" }, // add references to other TypeScript projects the plugin depends on // requiredPlugins from ./kibana.json @@ -28,6 +31,6 @@ // TODO { "path": "../features/tsconfig.json" }, // TODO { "path": "../cloud/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, - // TODO { "path": "../../../src/plugins/home/tsconfig.json" }, + { "path": "../../../src/plugins/home/tsconfig.json" }, ] } From bb438c75b8d3162bfab0fae6940062f478e8ceed Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 12:18:05 -0500 Subject: [PATCH 05/10] Add disabled reference to infra tsconfig --- x-pack/plugins/fleet/tsconfig.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index faa6990c31707..c9e08b5209d85 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -32,5 +32,8 @@ // TODO { "path": "../cloud/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, { "path": "../../../src/plugins/home/tsconfig.json" }, + + // requiredBundles from ./kibana.json + // TODO { "path": "../infra/tsconfig.json" }, ] } From 8145db08fdff7fa358c6c4a0b76c3519dfd42597 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 14:36:44 -0500 Subject: [PATCH 06/10] Reorder tsconfig references --- x-pack/plugins/fleet/tsconfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index c9e08b5209d85..c2594a528f4e7 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -16,9 +16,6 @@ ], "references": [ { "path": "../../../src/core/tsconfig.json" }, - { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, - { "path": "../../../src/plugins/kibana_utils/tsconfig.json" }, - // TODO { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" }, // add references to other TypeScript projects the plugin depends on // requiredPlugins from ./kibana.json @@ -34,6 +31,9 @@ { "path": "../../../src/plugins/home/tsconfig.json" }, // requiredBundles from ./kibana.json + { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, + // TODO { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" }, // TODO { "path": "../infra/tsconfig.json" }, + { "path": "../../../src/plugins/kibana_utils/tsconfig.json" }, ] } From fff562db68e1059fe79addbafb98b7b802e232fb Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 7 Jan 2021 15:27:05 -0500 Subject: [PATCH 07/10] Extend `x-pack/tsconfig.json` --- x-pack/plugins/fleet/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index c2594a528f4e7..cf43e03bd2b31 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.json", "compilerOptions": { "composite": true, "outDir": "./target/types", From 3b4aed8ed1f70e624dddce21179d0735b36fa2c7 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Mon, 11 Jan 2021 12:05:06 -0500 Subject: [PATCH 08/10] Enable reference to features project --- x-pack/plugins/fleet/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index cf43e03bd2b31..2d992c61ef6a8 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -25,7 +25,7 @@ // optionalPlugins from ./kibana.json // TODO { "path": "../security/tsconfig.json" }, - // TODO { "path": "../features/tsconfig.json" }, + { "path": "../features/tsconfig.json" }, // TODO { "path": "../cloud/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, { "path": "../../../src/plugins/home/tsconfig.json" }, From d8c2600c5eac8c1664a75d278ab62235347cc217 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Tue, 19 Jan 2021 09:37:43 -0500 Subject: [PATCH 09/10] Add Security & ESO project references --- x-pack/plugins/fleet/tsconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index 199ebdb4120c9..a3bd6d64e8c15 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -21,10 +21,10 @@ // requiredPlugins from ./kibana.json { "path": "../licensing/tsconfig.json" }, { "path": "../../../src/plugins/data/tsconfig.json" }, - // TODO { "path": "../encrypted_saved_objects/tsconfig.json" }, + { "path": "../encrypted_saved_objects/tsconfig.json" }, // optionalPlugins from ./kibana.json - // TODO { "path": "../security/tsconfig.json" }, + { "path": "../security/tsconfig.json" }, { "path": "../features/tsconfig.json" }, // TODO { "path": "../cloud/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, From 5c955fff32ff47501ec1e7eb029c5a6024ce65e0 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Fri, 22 Jan 2021 15:04:35 -0500 Subject: [PATCH 10/10] Link to newly available cloud project --- x-pack/plugins/fleet/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json index a3bd6d64e8c15..201e4ee4864a7 100644 --- a/x-pack/plugins/fleet/tsconfig.json +++ b/x-pack/plugins/fleet/tsconfig.json @@ -26,7 +26,7 @@ // optionalPlugins from ./kibana.json { "path": "../security/tsconfig.json" }, { "path": "../features/tsconfig.json" }, - // TODO { "path": "../cloud/tsconfig.json" }, + { "path": "../cloud/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, { "path": "../../../src/plugins/home/tsconfig.json" },