From 4abd340240154e5dd76ccbb6ac5c8d87a35cab97 Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Mon, 26 Oct 2020 10:10:07 -0500 Subject: [PATCH 1/3] Add tsconfig --- src/plugins/inspector/tsconfig.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/plugins/inspector/tsconfig.json diff --git a/src/plugins/inspector/tsconfig.json b/src/plugins/inspector/tsconfig.json new file mode 100644 index 0000000000000..2a9c41464532c --- /dev/null +++ b/src/plugins/inspector/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": ["common/**/*", "public/**/*", "index.ts"], + "references": [ + { "path": "../../core/tsconfig.json" }, + { "path": "../kibana_react/tsconfig.json" } + ] +} From 8324d7dce869a34b7e7e91c335258a554be609cb Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Tue, 27 Oct 2020 10:16:24 -0500 Subject: [PATCH 2/3] Add TS project references for inspector Currently blocked by #81177 because it fails on `MockedKeys/DeeplyMockedKeys` --- examples/embeddable_explorer/tsconfig.json | 5 +++-- test/tsconfig.json | 26 +++++++--------------- tsconfig.json | 20 +++++++++-------- tsconfig.refs.json | 11 ++++----- x-pack/tsconfig.json | 23 ++++++++----------- 5 files changed, 37 insertions(+), 48 deletions(-) diff --git a/examples/embeddable_explorer/tsconfig.json b/examples/embeddable_explorer/tsconfig.json index 86b35c5e4943f..807544364dc2e 100644 --- a/examples/embeddable_explorer/tsconfig.json +++ b/examples/embeddable_explorer/tsconfig.json @@ -9,10 +9,11 @@ "public/**/*.ts", "public/**/*.tsx", "server/**/*.ts", - "../../typings/**/*", + "../../typings/**/*" ], "exclude": [], "references": [ - { "path": "../../src/core/tsconfig.json" } + { "path": "../../src/core/tsconfig.json" }, + { "path": "../../src/plugins/inspector.json" } ] } diff --git a/test/tsconfig.json b/test/tsconfig.json index a6cc2d34639b7..2949a764d4b1a 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -2,29 +2,19 @@ "extends": "../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "../build/tsbuildinfo/test", - "types": [ - "node", - "mocha", - "flot" - ] + "types": ["node", "mocha", "flot"] }, - "include": [ - "**/*", - "../typings/elastic__node_crypto.d.ts", - "typings/**/*" - ], - "exclude": [ - "plugin_functional/plugins/**/*", - "interpreter_functional/plugins/**/*" - ], + "include": ["**/*", "../typings/elastic__node_crypto.d.ts", "typings/**/*"], + "exclude": ["plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"], "references": [ { "path": "../src/core/tsconfig.json" }, - { "path": "../src/plugins/kibana_utils/tsconfig.json" }, + { "path": "../src/plugins/inspector/tsconfig.json" }, { "path": "../src/plugins/kibana_react/tsconfig.json" }, - { "path": "../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" }, + { "path": "../src/plugins/kibana_utils/tsconfig.json" }, + { "path": "../src/plugins/newsfeed/tsconfig.json" }, { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" }, { "path": "../src/plugins/telemetry/tsconfig.json" }, - { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" }, - { "path": "../src/plugins/newsfeed/tsconfig.json" } + { "path": "../src/plugins/usage_collection/tsconfig.json" } ] } diff --git a/tsconfig.json b/tsconfig.json index 73646291e3d08..43257a9252880 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,14 +8,15 @@ "src/**/__fixtures__/**/*", "src/test_utils/**/*", "src/core/**/*", + "src/plugins/inspector/**/*", "src/plugins/kibana_legacy/**/*", - "src/plugins/kibana_utils/**/*", "src/plugins/kibana_react/**/*", - "src/plugins/usage_collection/**/*", + "src/plugins/kibana_usage_collection/**/*", + "src/plugins/kibana_utils/**/*", + "src/plugins/newsfeed/**/*", "src/plugins/telemetry_collection_manager/**/*", "src/plugins/telemetry/**/*", - "src/plugins/kibana_usage_collection/**/*", - "src/plugins/newsfeed/**/*" + "src/plugins/usage_collection/**/*" // In the build we actually exclude **/public/**/* from this config so that // we can run the TSC on both this and the .browser version of this config // file, but if we did it during development IDEs would not be able to find @@ -23,14 +24,15 @@ // "src/**/public/**/*" ], "references": [ - { "path": "./src/test_utils/tsconfig.json" }, { "path": "./src/core/tsconfig.json" }, - { "path": "./src/plugins/kibana_utils/tsconfig.json" }, + { "path": "./src/plugins/inspector/tsconfig.json" }, { "path": "./src/plugins/kibana_react/tsconfig.json" }, - { "path": "./src/plugins/usage_collection/tsconfig.json" }, + { "path": "./src/plugins/kibana_usage_collection/tsconfig.json" }, + { "path": "./src/plugins/kibana_utils/tsconfig.json" }, + { "path": "./src/plugins/newsfeed/tsconfig.json" }, { "path": "./src/plugins/telemetry_collection_manager/tsconfig.json" }, { "path": "./src/plugins/telemetry/tsconfig.json" }, - { "path": "./src/plugins/kibana_usage_collection/tsconfig.json" }, - { "path": "./src/plugins/newsfeed/tsconfig.json" } + { "path": "./src/plugins/usage_collection/tsconfig.json" }, + { "path": "./src/test_utils/tsconfig.json" } ] } diff --git a/tsconfig.refs.json b/tsconfig.refs.json index bb1bdc08cafd6..6793b1a20ed8f 100644 --- a/tsconfig.refs.json +++ b/tsconfig.refs.json @@ -1,14 +1,15 @@ { "include": [], "references": [ - { "path": "./src/test_utils/tsconfig.json" }, { "path": "./src/core/tsconfig.json" }, - { "path": "./src/plugins/kibana_utils/tsconfig.json" }, + { "path": "./src/plugins/inspector/tsconfig.json" }, { "path": "./src/plugins/kibana_react/tsconfig.json" }, - { "path": "./src/plugins/usage_collection/tsconfig.json" }, - { "path": "./src/plugins/telemetry_collection_manager/tsconfig.json" }, - { "path": "./src/plugins/telemetry/tsconfig.json" }, { "path": "./src/plugins/kibana_usage_collection/tsconfig.json" }, + { "path": "./src/plugins/kibana_utils/tsconfig.json" }, { "path": "./src/plugins/newsfeed/tsconfig.json" }, + { "path": "./src/plugins/telemetry_collection_manager/tsconfig.json" }, + { "path": "./src/plugins/telemetry/tsconfig.json" }, + { "path": "./src/plugins/usage_collection/tsconfig.json" }, + { "path": "./src/test_utils/tsconfig.json" } ] } diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index 382d4c073d41e..c4cf94a1aa7bc 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -1,12 +1,6 @@ { "extends": "../tsconfig.base.json", - "include": [ - "mocks.ts", - "typings/**/*", - "plugins/**/*", - "test_utils/**/*", - "tasks/**/*" - ], + "include": ["mocks.ts", "typings/**/*", "plugins/**/*", "test_utils/**/*", "tasks/**/*"], "exclude": [ "test/**/*", "plugins/security_solution/cypress/**/*", @@ -28,15 +22,16 @@ }, "references": [ { "path": "../src/core/tsconfig.json" }, - { "path": "../src/plugins/kibana_utils/tsconfig.json" }, + { "path": "../src/plugins/inspector/tsconfig.json" }, { "path": "../src/plugins/kibana_react/tsconfig.json" }, - { "path": "./plugins/licensing/tsconfig.json" }, - { "path": "./plugins/global_search/tsconfig.json" }, - { "path": "../src/plugins/usage_collection/tsconfig.json" }, - { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" }, - { "path": "../src/plugins/telemetry/tsconfig.json" }, { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" }, - { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" }, + { "path": "../src/plugins/kibana_utils/tsconfig.json" }, { "path": "../src/plugins/newsfeed/tsconfig.json" }, + { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" }, + { "path": "../src/plugins/telemetry/tsconfig.json" }, + { "path": "../src/plugins/usage_collection/tsconfig.json" }, + { "path": "./plugins/global_search/tsconfig.json" }, + { "path": "./plugins/licensing/tsconfig.json" }, + { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" } ] } From 09097ef0c909606c75fbd7cbf2f19ffe96c810c2 Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Tue, 27 Oct 2020 16:01:38 -0500 Subject: [PATCH 3/3] Fix ref in embeddable --- examples/embeddable_explorer/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/embeddable_explorer/tsconfig.json b/examples/embeddable_explorer/tsconfig.json index 807544364dc2e..4baebebcea42e 100644 --- a/examples/embeddable_explorer/tsconfig.json +++ b/examples/embeddable_explorer/tsconfig.json @@ -14,6 +14,6 @@ "exclude": [], "references": [ { "path": "../../src/core/tsconfig.json" }, - { "path": "../../src/plugins/inspector.json" } + { "path": "../../src/plugins/inspector/tsconfig.json" } ] }