From c0438ad25ca4f30455a7174eee6ca3201d219adc Mon Sep 17 00:00:00 2001 From: Pierre Gayvallet Date: Wed, 20 Jan 2021 16:40:13 +0100 Subject: [PATCH] [DX] migrate core xpack plugins to tsproject ref (#88676) * migrate cloud, beatsManagement and savedObjectTagging to TS project ref * migrates globalSearchBar * fix beatsManagement config * fix beatsManagement ts * fix beatsManagement config again * indent. --- .../components/navigation/child_routes.tsx | 2 +- .../beats_management/public/pages/index.ts | 3 +- x-pack/plugins/beats_management/tsconfig.json | 26 ++ x-pack/plugins/cloud/tsconfig.json | 21 ++ .../plugins/global_search_bar/tsconfig.json | 18 ++ .../saved_objects_tagging/tsconfig.json | 25 ++ x-pack/test/tsconfig.json | 8 +- x-pack/tsconfig.json | 225 +++++------------- x-pack/tsconfig.refs.json | 6 +- 9 files changed, 166 insertions(+), 168 deletions(-) create mode 100644 x-pack/plugins/beats_management/tsconfig.json create mode 100644 x-pack/plugins/cloud/tsconfig.json create mode 100644 x-pack/plugins/global_search_bar/tsconfig.json create mode 100644 x-pack/plugins/saved_objects_tagging/tsconfig.json diff --git a/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx b/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx index a7e705b00ee8..dd8388f7b779 100644 --- a/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx +++ b/x-pack/plugins/beats_management/public/components/navigation/child_routes.tsx @@ -6,7 +6,7 @@ import React, { FC } from 'react'; import { Route, Switch } from 'react-router-dom'; -interface RouteConfig { +export interface RouteConfig { path: string; component: React.ComponentType; routes?: RouteConfig[]; diff --git a/x-pack/plugins/beats_management/public/pages/index.ts b/x-pack/plugins/beats_management/public/pages/index.ts index 418bc4d0ce14..e4b2788cf96e 100644 --- a/x-pack/plugins/beats_management/public/pages/index.ts +++ b/x-pack/plugins/beats_management/public/pages/index.ts @@ -19,8 +19,9 @@ import { BeatsInitialEnrollmentPage } from './walkthrough/initial/beat'; import { FinishWalkthroughPage } from './walkthrough/initial/finish'; import { InitialWalkthroughPage } from './walkthrough/initial/index'; import { InitialTagPage } from './walkthrough/initial/tag'; +import type { RouteConfig } from '../components/navigation/child_routes'; -export const routeMap = [ +export const routeMap: RouteConfig[] = [ { path: '/tag/create/:tagid?', component: TagCreatePage }, { path: '/tag/edit/:tagid?', component: TagEditPage }, { diff --git a/x-pack/plugins/beats_management/tsconfig.json b/x-pack/plugins/beats_management/tsconfig.json new file mode 100644 index 000000000000..ad68cc900e63 --- /dev/null +++ b/x-pack/plugins/beats_management/tsconfig.json @@ -0,0 +1,26 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + "types/**/*", + "scripts/**/*", + "server/index_templates/*.json", + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/data/tsconfig.json" }, + { "path": "../../../src/plugins/management/tsconfig.json" }, + { "path": "../licensing/tsconfig.json" }, + { "path": "../features/tsconfig.json" }, + { "path": "../security/tsconfig.json" } + ] +} diff --git a/x-pack/plugins/cloud/tsconfig.json b/x-pack/plugins/cloud/tsconfig.json new file mode 100644 index 000000000000..46e81aa7fa08 --- /dev/null +++ b/x-pack/plugins/cloud/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true, + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../../../src/plugins/home/tsconfig.json" }, + { "path": "../security/tsconfig.json" }, + ] +} diff --git a/x-pack/plugins/global_search_bar/tsconfig.json b/x-pack/plugins/global_search_bar/tsconfig.json new file mode 100644 index 000000000000..266eecc35c84 --- /dev/null +++ b/x-pack/plugins/global_search_bar/tsconfig.json @@ -0,0 +1,18 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": ["common/**/*", "public/**/*", "server/**/*"], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../global_search/tsconfig.json" }, + { "path": "../saved_objects_tagging/tsconfig.json" }, + { "path": "../security/tsconfig.json" } + ] +} diff --git a/x-pack/plugins/saved_objects_tagging/tsconfig.json b/x-pack/plugins/saved_objects_tagging/tsconfig.json new file mode 100644 index 000000000000..d00156ad1277 --- /dev/null +++ b/x-pack/plugins/saved_objects_tagging/tsconfig.json @@ -0,0 +1,25 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true, + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../../../src/plugins/management/tsconfig.json" }, + { "path": "../../../src/plugins/saved_objects_tagging_oss/tsconfig.json" }, + { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../features/tsconfig.json" }, + { "path": "../security/tsconfig.json" }, + ] +} diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index d977730181e8..cfe328236cd3 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -42,13 +42,17 @@ { "path": "../plugins/global_search_providers/tsconfig.json" }, { "path": "../plugins/features/tsconfig.json" }, { "path": "../plugins/embeddable_enhanced/tsconfig.json" }, - { "path": "../plugins/event_log/tsconfig.json"}, + { "path": "../plugins/event_log/tsconfig.json" }, { "path": "../plugins/licensing/tsconfig.json" }, { "path": "../plugins/task_manager/tsconfig.json" }, { "path": "../plugins/telemetry_collection_xpack/tsconfig.json" }, { "path": "../plugins/ui_actions_enhanced/tsconfig.json" }, { "path": "../plugins/spaces/tsconfig.json" }, { "path": "../plugins/security/tsconfig.json" }, - { "path": "../plugins/encrypted_saved_objects/tsconfig.json" } + { "path": "../plugins/encrypted_saved_objects/tsconfig.json" }, + { "path": "../plugins/beats_management/tsconfig.json" }, + { "path": "../plugins/cloud/tsconfig.json" }, + { "path": "../plugins/saved_objects_tagging/tsconfig.json" }, + { "path": "../plugins/global_search_bar/tsconfig.json" } ] } diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index c68d93903e70..812ead39ba41 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -1,11 +1,6 @@ { "extends": "../tsconfig.base.json", - "include": [ - "mocks.ts", - "typings/**/*", - "plugins/**/*", - "tasks/**/*" - ], + "include": ["mocks.ts", "typings/**/*", "plugins/**/*", "tasks/**/*"], "exclude": [ "plugins/apm/e2e/cypress/**/*", "plugins/apm/ftr_e2e/**/*", @@ -31,6 +26,10 @@ "plugins/spaces/**/*", "plugins/security/**/*", "plugins/encrypted_saved_objects/**/*", + "plugins/beats_management/**/*", + "plugins/cloud/**/*", + "plugins/saved_objects_tagging/**/*", + "plugins/global_search_bar/**/*", "test/**/*" ], "compilerOptions": { @@ -38,161 +37,61 @@ "incremental": false }, "references": [ - { - "path": "../src/core/tsconfig.json" - }, - { - "path": "../src/plugins/telemetry_management_section/tsconfig.json" - }, - { - "path": "../src/plugins/management/tsconfig.json" - }, - { - "path": "../src/plugins/bfetch/tsconfig.json" - }, - { - "path": "../src/plugins/charts/tsconfig.json" - }, - { - "path": "../src/plugins/console/tsconfig.json" - }, - { - "path": "../src/plugins/dashboard/tsconfig.json" - }, - { - "path": "../src/plugins/discover/tsconfig.json" - }, - { - "path": "../src/plugins/data/tsconfig.json" - }, - { - "path": "../src/plugins/dev_tools/tsconfig.json" - }, - { - "path": "../src/plugins/embeddable/tsconfig.json" - }, - { - "path": "../src/plugins/es_ui_shared/tsconfig.json" - }, - { - "path": "../src/plugins/expressions/tsconfig.json" - }, - { - "path": "../src/plugins/home/tsconfig.json" - }, - { - "path": "../src/plugins/inspector/tsconfig.json" - }, - { - "path": "../src/plugins/kibana_legacy/tsconfig.json" - }, - { - "path": "../src/plugins/kibana_react/tsconfig.json" - }, - { - "path": "../src/plugins/kibana_usage_collection/tsconfig.json" - }, - { - "path": "../src/plugins/kibana_utils/tsconfig.json" - }, - { - "path": "../src/plugins/navigation/tsconfig.json" - }, - { - "path": "../src/plugins/newsfeed/tsconfig.json" - }, - { - "path": "../src/plugins/saved_objects/tsconfig.json" - }, - { - "path": "../src/plugins/saved_objects_management/tsconfig.json" - }, - { - "path": "../src/plugins/saved_objects_tagging_oss/tsconfig.json" - }, - { - "path": "../src/plugins/presentation_util/tsconfig.json" - }, - { - "path": "../src/plugins/security_oss/tsconfig.json" - }, - { - "path": "../src/plugins/share/tsconfig.json" - }, - { - "path": "../src/plugins/telemetry/tsconfig.json" - }, - { - "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" - }, - { - "path": "../src/plugins/url_forwarding/tsconfig.json" - }, - { - "path": "../src/plugins/ui_actions/tsconfig.json" - }, - { - "path": "../src/plugins/url_forwarding/tsconfig.json" - }, - { - "path": "../src/plugins/usage_collection/tsconfig.json" - }, - { - "path": "./plugins/console_extensions/tsconfig.json" - }, - { - "path": "./plugins/data_enhanced/tsconfig.json" - }, - { - "path": "./plugins/discover_enhanced/tsconfig.json" - }, - { - "path": "./plugins/global_search/tsconfig.json" - }, - { - "path": "./plugins/global_search_providers/tsconfig.json" - }, - { - "path": "./plugins/features/tsconfig.json" - }, - { - "path": "./plugins/graph/tsconfig.json" - }, - { - "path": "./plugins/embeddable_enhanced/tsconfig.json" - }, - { - "path": "./plugins/event_log/tsconfig.json" - }, - { - "path": "./plugins/licensing/tsconfig.json" - }, - { - "path": "./plugins/searchprofiler/tsconfig.json" - }, - { - "path": "./plugins/task_manager/tsconfig.json" - }, - { - "path": "./plugins/telemetry_collection_xpack/tsconfig.json" - }, - { - "path": "./plugins/ui_actions_enhanced/tsconfig.json" - }, - { - "path": "./plugins/vis_type_timeseries_enhanced/tsconfig.json" - }, - { - "path": "./plugins/translations/tsconfig.json" - }, - { - "path": "./plugins/spaces/tsconfig.json" - }, - { - "path": "./plugins/security/tsconfig.json" - }, - { - "path": "./plugins/encrypted_saved_objects/tsconfig.json" - } + { "path": "../src/core/tsconfig.json" }, + { "path": "../src/plugins/telemetry_management_section/tsconfig.json" }, + { "path": "../src/plugins/management/tsconfig.json" }, + { "path": "../src/plugins/bfetch/tsconfig.json" }, + { "path": "../src/plugins/charts/tsconfig.json" }, + { "path": "../src/plugins/console/tsconfig.json" }, + { "path": "../src/plugins/dashboard/tsconfig.json" }, + { "path": "../src/plugins/discover/tsconfig.json" }, + { "path": "../src/plugins/data/tsconfig.json" }, + { "path": "../src/plugins/dev_tools/tsconfig.json" }, + { "path": "../src/plugins/embeddable/tsconfig.json" }, + { "path": "../src/plugins/es_ui_shared/tsconfig.json" }, + { "path": "../src/plugins/expressions/tsconfig.json" }, + { "path": "../src/plugins/home/tsconfig.json" }, + { "path": "../src/plugins/inspector/tsconfig.json" }, + { "path": "../src/plugins/kibana_legacy/tsconfig.json" }, + { "path": "../src/plugins/kibana_react/tsconfig.json" }, + { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" }, + { "path": "../src/plugins/kibana_utils/tsconfig.json" }, + { "path": "../src/plugins/navigation/tsconfig.json" }, + { "path": "../src/plugins/newsfeed/tsconfig.json" }, + { "path": "../src/plugins/saved_objects/tsconfig.json" }, + { "path": "../src/plugins/saved_objects_management/tsconfig.json" }, + { "path": "../src/plugins/saved_objects_tagging_oss/tsconfig.json" }, + { "path": "../src/plugins/presentation_util/tsconfig.json" }, + { "path": "../src/plugins/security_oss/tsconfig.json" }, + { "path": "../src/plugins/share/tsconfig.json" }, + { "path": "../src/plugins/telemetry/tsconfig.json" }, + { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" }, + { "path": "../src/plugins/url_forwarding/tsconfig.json" }, + { "path": "../src/plugins/ui_actions/tsconfig.json" }, + { "path": "../src/plugins/url_forwarding/tsconfig.json" }, + { "path": "../src/plugins/usage_collection/tsconfig.json" }, + { "path": "./plugins/console_extensions/tsconfig.json" }, + { "path": "./plugins/data_enhanced/tsconfig.json" }, + { "path": "./plugins/discover_enhanced/tsconfig.json" }, + { "path": "./plugins/global_search/tsconfig.json" }, + { "path": "./plugins/global_search_providers/tsconfig.json" }, + { "path": "./plugins/features/tsconfig.json" }, + { "path": "./plugins/graph/tsconfig.json" }, + { "path": "./plugins/embeddable_enhanced/tsconfig.json" }, + { "path": "./plugins/event_log/tsconfig.json" }, + { "path": "./plugins/licensing/tsconfig.json" }, + { "path": "./plugins/searchprofiler/tsconfig.json" }, + { "path": "./plugins/task_manager/tsconfig.json" }, + { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" }, + { "path": "./plugins/ui_actions_enhanced/tsconfig.json" }, + { "path": "./plugins/vis_type_timeseries_enhanced/tsconfig.json" }, + { "path": "./plugins/translations/tsconfig.json" }, + { "path": "./plugins/spaces/tsconfig.json" }, + { "path": "./plugins/security/tsconfig.json" }, + { "path": "./plugins/encrypted_saved_objects/tsconfig.json" }, + { "path": "./plugins/beats_management/tsconfig.json" }, + { "path": "./plugins/cloud/tsconfig.json" }, + { "path": "./plugins/saved_objects_tagging/tsconfig.json" }, + { "path": "./plugins/global_search_bar/tsconfig.json" } ] -} \ No newline at end of file +} diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json index a0a9eda0aaf2..edee8e228f76 100644 --- a/x-pack/tsconfig.refs.json +++ b/x-pack/tsconfig.refs.json @@ -20,6 +20,10 @@ { "path": "./plugins/translations/tsconfig.json" }, { "path": "./plugins/spaces/tsconfig.json" }, { "path": "./plugins/security/tsconfig.json" }, - { "path": "./plugins/encrypted_saved_objects/tsconfig.json" } + { "path": "./plugins/encrypted_saved_objects/tsconfig.json" }, + { "path": "./plugins/beats_management/tsconfig.json" }, + { "path": "./plugins/cloud/tsconfig.json" }, + { "path": "./plugins/saved_objects_tagging/tsconfig.json" }, + { "path": "./plugins/global_search_bar/tsconfig.json" } ] }