Merge tsconfig and x-pack/tsconfig files (#94519)

* merge all the typings at root level

* merge x-pack/tsconfig into tsconfig.json

* fix tsconfig after changes in master

* remove unnecessary typings

* update paths to the global typings

* update paths to the global elaticsearch typings

* fix import

* fix path to typings/elasticsearch in fleet plugin

* remove file deleted from master

* fix lint errors

src/dev/typescript/projects.ts

@@ -14,7 +14,6 @@ import { Project } from './project';
 export const PROJECTS = [
   new Project(resolve(REPO_ROOT, 'tsconfig.json')),
   new Project(resolve(REPO_ROOT, 'test/tsconfig.json'), { name: 'kibana/test' }),
-  new Project(resolve(REPO_ROOT, 'x-pack/tsconfig.json')),
   new Project(resolve(REPO_ROOT, 'x-pack/test/tsconfig.json'), { name: 'x-pack/test' }),
   new Project(resolve(REPO_ROOT, 'src/core/tsconfig.json')),
   new Project(resolve(REPO_ROOT, 'x-pack/plugins/drilldowns/url_drilldown/tsconfig.json'), {

test/tsconfig.json

@@ -2,12 +2,11 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "incremental": false,
-    "types": ["node", "flot"]
+    "types": ["node"]
   },
   "include": [
     "**/*",
-    "../typings/elastic__node_crypto.d.ts",
+    "../typings/**/*",
-    "typings/**/*",
     "../packages/kbn-test/types/ftr_globals/**/*"
   ],
   "exclude": ["plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"],

test/typings/rison_node.d.ts

@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-declare module 'rison-node' {
-  export type RisonValue = undefined | null | boolean | number | string | RisonObject | RisonArray;
-
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  export interface RisonArray extends Array<RisonValue> {}
-
-  export interface RisonObject {
-    [key: string]: RisonValue;
-  }
-
-  export const decode: (input: string) => RisonValue;
-
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  export const decode_object: (input: string) => RisonObject;
-
-  export const encode: <Input extends RisonValue>(input: Input) => string;
-
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  export const encode_object: <Input extends RisonObject>(input: Input) => string;
-}

tsconfig.json

@@ -3,11 +3,25 @@
   "compilerOptions": {
     "incremental": false
   },
-  "include": ["kibana.d.ts", "src/**/*", "typings/**/*"],
+  "include": [
+    "kibana.d.ts",
+    "typings/**/*",
+
+    "src/cli/**/*",
+    "src/dev/**/*",
+    "src/fixtures/**/*",
+    "src/legacy/**/*",
+    "src/optimize/**/*",
+
+    "x-pack/mocks.ts",
+    "x-pack/typings/**/*",
+    "x-pack/tasks/**/*",
+    "x-pack/plugins/cases/**/*",
+    "x-pack/plugins/lists/**/*",
+    "x-pack/plugins/security_solution/**/*",
+  ],
   "exclude": [
-    "src/**/__fixtures__/**/*",
+    "x-pack/plugins/security_solution/cypress/**/*"
-    "src/core/**/*",
-    "src/plugins/**/*"
   ],
   "references": [
     { "path": "./src/core/tsconfig.json" },
@@ -64,5 +78,64 @@
     { "path": "./src/plugins/visualize/tsconfig.json" },
     { "path": "./src/plugins/index_pattern_management/tsconfig.json" },
     { "path": "./src/plugins/index_pattern_field_editor/tsconfig.json" },
+
+    { "path": "./x-pack/plugins/actions/tsconfig.json" },
+    { "path": "./x-pack/plugins/alerting/tsconfig.json" },
+    { "path": "./x-pack/plugins/apm/tsconfig.json" },
+    { "path": "./x-pack/plugins/beats_management/tsconfig.json" },
+    { "path": "./x-pack/plugins/canvas/tsconfig.json" },
+    { "path": "./x-pack/plugins/cloud/tsconfig.json" },
+    { "path": "./x-pack/plugins/console_extensions/tsconfig.json" },
+    { "path": "./x-pack/plugins/data_enhanced/tsconfig.json" },
+    { "path": "./x-pack/plugins/dashboard_mode/tsconfig.json" },
+    { "path": "./x-pack/plugins/discover_enhanced/tsconfig.json" },
+    { "path": "./x-pack/plugins/drilldowns/url_drilldown/tsconfig.json" },
+    { "path": "./x-pack/plugins/embeddable_enhanced/tsconfig.json" },
+    { "path": "./x-pack/plugins/encrypted_saved_objects/tsconfig.json" },
+    { "path": "./x-pack/plugins/enterprise_search/tsconfig.json" },
+    { "path": "./x-pack/plugins/event_log/tsconfig.json" },
+    { "path": "./x-pack/plugins/features/tsconfig.json" },
+    { "path": "./x-pack/plugins/file_upload/tsconfig.json" },
+    { "path": "./x-pack/plugins/fleet/tsconfig.json" },
+    { "path": "./x-pack/plugins/global_search_bar/tsconfig.json" },
+    { "path": "./x-pack/plugins/global_search_providers/tsconfig.json" },
+    { "path": "./x-pack/plugins/global_search/tsconfig.json" },
+    { "path": "./x-pack/plugins/graph/tsconfig.json" },
+    { "path": "./x-pack/plugins/grokdebugger/tsconfig.json" },
+    { "path": "./x-pack/plugins/infra/tsconfig.json" },
+    { "path": "./x-pack/plugins/ingest_pipelines/tsconfig.json" },
+    { "path": "./x-pack/plugins/lens/tsconfig.json" },
+    { "path": "./x-pack/plugins/license_management/tsconfig.json" },
+    { "path": "./x-pack/plugins/licensing/tsconfig.json" },
+    { "path": "./x-pack/plugins/logstash/tsconfig.json" },
+    { "path": "./x-pack/plugins/maps_legacy_licensing/tsconfig.json" },
+    { "path": "./x-pack/plugins/maps/tsconfig.json" },
+    { "path": "./x-pack/plugins/ml/tsconfig.json" },
+    { "path": "./x-pack/plugins/monitoring/tsconfig.json" },
+    { "path": "./x-pack/plugins/observability/tsconfig.json" },
+    { "path": "./x-pack/plugins/osquery/tsconfig.json" },
+    { "path": "./x-pack/plugins/painless_lab/tsconfig.json" },
+    { "path": "./x-pack/plugins/saved_objects_tagging/tsconfig.json" },
+    { "path": "./x-pack/plugins/searchprofiler/tsconfig.json" },
+    { "path": "./x-pack/plugins/security/tsconfig.json" },
+    { "path": "./x-pack/plugins/snapshot_restore/tsconfig.json" },
+    { "path": "./x-pack/plugins/spaces/tsconfig.json" },
+    { "path": "./x-pack/plugins/stack_alerts/tsconfig.json" },
+    { "path": "./x-pack/plugins/task_manager/tsconfig.json" },
+    { "path": "./x-pack/plugins/telemetry_collection_xpack/tsconfig.json" },
+    { "path": "./x-pack/plugins/transform/tsconfig.json" },
+    { "path": "./x-pack/plugins/translations/tsconfig.json" },
+    { "path": "./x-pack/plugins/triggers_actions_ui/tsconfig.json" },
+    { "path": "./x-pack/plugins/ui_actions_enhanced/tsconfig.json" },
+    { "path": "./x-pack/plugins/upgrade_assistant/tsconfig.json" },
+    { "path": "./x-pack/plugins/runtime_fields/tsconfig.json" },
+    { "path": "./x-pack/plugins/index_management/tsconfig.json" },
+    { "path": "./x-pack/plugins/watcher/tsconfig.json" },
+    { "path": "./x-pack/plugins/rollup/tsconfig.json" },
+    { "path": "./x-pack/plugins/remote_clusters/tsconfig.json" },
+    { "path": "./x-pack/plugins/cross_cluster_replication/tsconfig.json"},
+    { "path": "./x-pack/plugins/index_lifecycle_management/tsconfig.json"},
+    { "path": "./x-pack/plugins/uptime/tsconfig.json" },
+    { "path": "./x-pack/plugins/xpack_legacy/tsconfig.json" }
   ]
 }

typings/cytoscape_dagre.d.ts

@@ -6,14 +6,4 @@
  * Side Public License, v 1.
  */
 
-declare module '*.html' {
+declare module 'cytoscape-dagre';
-  const template: string;
-  // eslint-disable-next-line import/no-default-export
-  export default template;
-}
-
-type MethodKeysOf<T> = {
-  [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
-}[keyof T];
-
-type PublicMethodsOf<T> = Pick<T, MethodKeysOf<T>>;

typings/elasticsearch/aggregations.d.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * 2.0.
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 import { Unionize, UnionToIntersection } from 'utility-types';

typings/elasticsearch/index.d.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * 2.0.
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 import { ValuesType } from 'utility-types';

typings/global_fetch.d.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * 2.0.
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 // This type needs to still exist due to apollo-link-http-common hasn't yet updated

typings/index.d.ts

@@ -24,6 +24,8 @@ declare module '*.svg' {
   export default content;
 }
 
+declare module 'axios/lib/adapters/xhr';
+
 // Storybook references this module. It's @ts-ignored in the codebase but when
 // built into its dist it strips that out. Add it here to avoid a type checking
 // error.

typings/js_levenshtein.d.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * 2.0.
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 declare module 'js-levenshtein' {

typings/react_vis.d.ts

@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * 2.0.
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 declare module 'react-vis';

x-pack/examples/alerting_example/tsconfig.json

@@ -9,7 +9,7 @@
     "public/**/*.tsx",
     "server/**/*.ts",
     "common/**/*.ts",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "exclude": [],
   "references": [

x-pack/examples/embedded_lens_example/tsconfig.json

@@ -9,7 +9,7 @@
     "public/**/*.ts",
     "public/**/*.tsx",
     "server/**/*.ts",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "exclude": [],
   "references": [

x-pack/examples/ui_actions_enhanced_examples/tsconfig.json

@@ -9,7 +9,7 @@
     "public/**/*.ts",
     "public/**/*.tsx",
     "server/**/*.ts",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "exclude": [],
   "references": [

x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,

x-pack/plugins/apm/public/utils/testHelpers.tsx

@@ -19,7 +19,7 @@ import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../typings/elasticsearch';
+} from '../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../observability/typings/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { APMConfig } from '../../server';

x-pack/plugins/apm/scripts/shared/get_es_client.ts

@@ -10,7 +10,7 @@ import { ApiKeyAuth, BasicAuth } from '@elastic/elasticsearch/lib/pool';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../typings/elasticsearch';
+} from '../../../../../typings/elasticsearch';
 
 export type ESClient = ReturnType<typeof getEsClient>;
 

x-pack/plugins/apm/server/lib/alerts/alerting_es_client.ts

@@ -9,7 +9,7 @@ import { ThresholdMetActionGroupId } from '../../../common/alert_types';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../typings/elasticsearch';
 import {
   AlertInstanceContext,
   AlertInstanceState,

x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MetricsAggregationResponsePart } from '../../../../../../typings/elasticsearch/aggregations';
+import { MetricsAggregationResponsePart } from '../../../../../../../typings/elasticsearch/aggregations';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts

@@ -11,7 +11,7 @@ import { RequestParams } from '@elastic/elasticsearch';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
 import { tasks } from './tasks';
 import { APMDataTelemetry } from '../types';

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts

@@ -7,7 +7,7 @@
 
 import { ValuesType } from 'utility-types';
 import { flatten, merge, sortBy, sum, pickBy } from 'lodash';
-import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { TelemetryTask } from '.';
 import { AGENT_NAMES, RUM_AGENT_NAMES } from '../../../../common/agent_name';

x-pack/plugins/apm/server/lib/correlations/get_correlations_for_failed_transactions/index.ts

@@ -11,8 +11,8 @@ import {
   processSignificantTermAggs,
   TopSigTerm,
 } from '../process_significant_term_aggs';
-import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import {
   environmentQuery,
   rangeQuery,

x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_duration_for_percentile.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { withApmSpan } from '../../../utils/with_apm_span';

x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_latency_distribution.ts

@@ -6,8 +6,8 @@
  */
 
 import { isEmpty, dropRightWhile } from 'lodash';
-import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { Setup, SetupTimeRange } from '../../helpers/setup_request';

x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/get_max_latency.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { withApmSpan } from '../../../utils/with_apm_span';

x-pack/plugins/apm/server/lib/correlations/get_correlations_for_slow_transactions/index.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch/aggregations';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import {
   environmentQuery,
   rangeQuery,

x-pack/plugins/apm/server/lib/correlations/process_significant_term_aggs.ts

@@ -9,7 +9,7 @@ import { orderBy } from 'lodash';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../typings/elasticsearch/aggregations';
+} from '../../../../../../typings/elasticsearch/aggregations';
 
 export interface TopSigTerm {
   fieldName: string;

x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/errors/get_error_groups.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SortOptions } from '../../../../../typings/elasticsearch/aggregations';
+import { SortOptions } from '../../../../../../typings/elasticsearch/aggregations';
 import {
   ERROR_CULPRIT,
   ERROR_EXC_HANDLED,

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts

@@ -10,7 +10,7 @@ import { OBSERVER_VERSION_MAJOR } from '../../../../../common/elasticsearch_fiel
 import {
   ESSearchRequest,
   ESFilter,
-} from '../../../../../../../typings/elasticsearch';
+} from '../../../../../../../../typings/elasticsearch';
 
 /*
   Adds a range query to the ES request to exclude legacy data

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts

@@ -14,7 +14,7 @@ import {
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../../typings/elasticsearch';
+} from '../../../../../../../../typings/elasticsearch';
 import { unwrapEsResponse } from '../../../../../../observability/server';
 import { ProcessorEvent } from '../../../../../common/processor_event';
 import { APMError } from '../../../../../typings/es_schemas/ui/apm_error';

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts

@@ -11,7 +11,7 @@ import { ProcessorEvent } from '../../../../../common/processor_event';
 import {
   ESSearchRequest,
   ESFilter,
-} from '../../../../../../../typings/elasticsearch';
+} from '../../../../../../../../typings/elasticsearch';
 import { APMEventESSearchRequest } from '.';
 import {
   ApmIndicesConfig,

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts

@@ -13,7 +13,7 @@ import { APMRequestHandlerContext } from '../../../../routes/typings';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../../../typings/elasticsearch';
+} from '../../../../../../../../typings/elasticsearch';
 import {
   callAsyncWithDebug,
   getDebugBody,

x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts

@@ -10,7 +10,7 @@ import { EventOutcome } from '../../../common/event_outcome';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../typings/elasticsearch/aggregations';
+} from '../../../../../../typings/elasticsearch/aggregations';
 
 export const getOutcomeAggregation = () => ({
   terms: {

x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts

@@ -6,7 +6,7 @@
  */
 
 import { Overwrite, Unionize } from 'utility-types';
-import { AggregationOptionsByType } from '../../../../../typings/elasticsearch';
+import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch';
 import { getMetricsProjection } from '../../projections/metrics';
 import { mergeProjection } from '../../projections/util/merge_projection';
 import { APMEventESSearchRequest } from '../helpers/create_es_client/create_apm_event_client';

x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts

@@ -6,7 +6,7 @@
  */
 
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { ESSearchResponse } from '../../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
 import { getVizColorForIndex } from '../../../common/viz_colors';
 import { GenericMetricsRequest } from './fetch_and_transform_metrics';
 import { ChartBase } from './types';

x-pack/plugins/apm/server/lib/rum_client/ui_filters/get_es_filter.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { UIFilters } from '../../../../typings/ui_filters';
 import { localUIFilters, localUIFilterNames } from './local_ui_filters/config';
 

x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts

@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { sortBy, uniqBy } from 'lodash';
-import { ESSearchResponse } from '../../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
 import { MlPluginSetup } from '../../../../ml/server';
 import { PromiseReturnType } from '../../../../observability/typings/common';
 import { getSeverity, ML_ERRORS } from '../../../common/anomaly_detection';

x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_SYSTEM_CPU_PERCENT,

x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts

@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { sortBy, take, uniq } from 'lodash';
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/services/annotations/get_derived_service_annotations.ts

@@ -6,7 +6,7 @@
  */
 
 import { isFiniteNumber } from '../../../../common/utils/is_finite_number';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
 import {
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts

@@ -12,7 +12,7 @@ import {
   unwrapEsResponse,
   WrappedElasticsearchClientError,
 } from '../../../../../observability/server';
-import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../../../typings/elasticsearch';
 import { Annotation as ESAnnotation } from '../../../../../observability/common/annotations';
 import { ScopedAnnotationsClient } from '../../../../../observability/server';
 import { Annotation, AnnotationType } from '../../../../common/annotations';

x-pack/plugins/apm/server/lib/services/annotations/index.test.ts

@@ -8,7 +8,7 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import {
   inspectSearchParams,
   SearchParamsMock,

x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instance_system_metric_stats.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch';
+import { AggregationOptionsByType } from '../../../../../../../typings/elasticsearch';
 import {
   environmentQuery,
   rangeQuery,

x-pack/plugins/apm/server/lib/services/get_service_metadata_details.ts

@@ -6,7 +6,7 @@
  */
 
 import { ProcessorEvent } from '../../../common/processor_event';
-import { SortOptions } from '../../../../../typings/elasticsearch';
+import { SortOptions } from '../../../../../../typings/elasticsearch';
 import {
   AGENT,
   CLOUD,

x-pack/plugins/apm/server/lib/services/get_throughput.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,

x-pack/plugins/apm/server/lib/services/profiling/get_service_profiling_statistics.ts

@@ -15,7 +15,7 @@ import {
   getValueTypeConfig,
 } from '../../../../common/profiling';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import {
   PROFILE_STACK,
   PROFILE_TOP_ID,

x-pack/plugins/apm/server/lib/settings/agent_configuration/convert_settings_to_string.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESSearchHit } from '../../../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../../typings/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 
 // needed for backwards compatability

x-pack/plugins/apm/server/lib/settings/agent_configuration/find_exact_configuration.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESSearchHit } from '../../../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../../typings/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 import {
   SERVICE_ENVIRONMENT,

x-pack/plugins/apm/server/lib/settings/agent_configuration/search_configurations.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESSearchHit } from '../../../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../../typings/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT,

x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts

@@ -8,7 +8,7 @@
 import { sortBy, take } from 'lodash';
 import moment from 'moment';
 import { Unionize } from 'utility-types';
-import { AggregationOptionsByType } from '../../../../../typings/elasticsearch';
+import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../observability/typings/common';
 import {
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts

@@ -8,7 +8,7 @@
 import { merge } from 'lodash';
 import { TRANSACTION_TYPE } from '../../../common/elasticsearch_fieldnames';
 import { arrayUnionToCallable } from '../../../common/utils/array_union_to_callable';
-import { AggregationInputMap } from '../../../../../typings/elasticsearch';
+import { AggregationInputMap } from '../../../../../../typings/elasticsearch';
 import { TransactionGroupRequestBase, TransactionGroupSetup } from './fetcher';
 import { getTransactionDurationFieldForAggregatedTransactions } from '../helpers/aggregated_transactions';
 import { withApmSpan } from '../../utils/with_apm_span';

x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
 import { rangeQuery } from '../../../../server/utils/queries';
 import { withApmSpan } from '../../../utils/with_apm_span';

x-pack/plugins/apm/server/lib/transactions/get_latency_charts/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
 import {
   SERVICE_NAME,

x-pack/plugins/apm/server/lib/transactions/get_throughput_charts/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
 import {
   SERVICE_NAME,

x-pack/plugins/apm/server/projections/typings.ts

@@ -9,7 +9,7 @@ import {
   AggregationOptionsByType,
   AggregationInputMap,
   ESSearchBody,
-} from '../../../../typings/elasticsearch';
+} from '../../../../../typings/elasticsearch';
 import { APMEventESSearchRequest } from '../lib/helpers/create_es_client/create_apm_event_client';
 
 export type Projection = Omit<APMEventESSearchRequest, 'body'> & {

x-pack/plugins/apm/server/projections/util/merge_projection/index.ts

@@ -10,7 +10,7 @@ import { DeepPartial } from 'utility-types';
 import {
   AggregationInputMap,
   ESSearchBody,
-} from '../../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import { APMEventESSearchRequest } from '../../../lib/helpers/create_es_client/create_apm_event_client';
 import { Projection } from '../../typings';
 

x-pack/plugins/apm/server/utils/queries.ts

@@ -6,7 +6,7 @@
  */
 
 import { esKuery } from '../../../../../src/plugins/data/server';
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../typings/elasticsearch';
 import { SERVICE_ENVIRONMENT } from '../../common/elasticsearch_fieldnames';
 import {
   ENVIRONMENT_ALL,

x-pack/plugins/apm/server/utils/test_helpers.tsx

@@ -10,7 +10,7 @@ import { PromiseReturnType } from '../../../observability/typings/common';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../typings/elasticsearch';
+} from '../../../../../typings/elasticsearch';
 import { UIFilters } from '../../typings/ui_filters';
 
 interface Options {

x-pack/plugins/apm/tsconfig.json

@@ -8,7 +8,7 @@
     "declarationMap": true
   },
   "include": [
-    "../../typings/**/*",
+    "../../../typings/**/*",
     "common/**/*",
     "public/**/*",
     "scripts/**/*",

x-pack/plugins/fleet/server/services/agents/crud.ts

@@ -14,7 +14,7 @@ import { appContextService, agentPolicyService } from '../../services';
 import type { FleetServerAgent } from '../../../common';
 import { isAgentUpgradeable, SO_SEARCH_LIMIT } from '../../../common';
 import { AGENT_SAVED_OBJECT_TYPE, AGENTS_INDEX } from '../../constants';
-import type { ESSearchHit } from '../../../../../typings/elasticsearch';
+import type { ESSearchHit } from '../../../../../../typings/elasticsearch';
 import { escapeSearchQueryPhrase, normalizeKuery } from '../saved_object';
 import type { KueryNode } from '../../../../../../src/plugins/data/server';
 import { esKuery } from '../../../../../../src/plugins/data/server';

x-pack/plugins/fleet/server/services/agents/helpers.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ESSearchHit } from '../../../../../typings/elasticsearch';
+import type { ESSearchHit } from '../../../../../../typings/elasticsearch';
 import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types';
 
 export function searchHitToAgent(hit: ESSearchHit<FleetServerAgent>): Agent {

x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts

@@ -12,7 +12,7 @@ import type { GetResponse } from 'elasticsearch';
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
 import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
 
-import type { ESSearchResponse as SearchResponse } from '../../../../../typings/elasticsearch';
+import type { ESSearchResponse as SearchResponse } from '../../../../../../typings/elasticsearch';
 import type { EnrollmentAPIKey, FleetServerEnrollmentAPIKey } from '../../types';
 import { ENROLLMENT_API_KEYS_INDEX } from '../../constants';
 import { agentPolicyService } from '../agent_policy';

x-pack/plugins/fleet/server/services/artifacts/artifacts.ts

@@ -16,7 +16,7 @@ import type { ElasticsearchClient } from 'kibana/server';
 
 import type { ListResult } from '../../../common';
 import { FLEET_SERVER_ARTIFACTS_INDEX } from '../../../common';
-import type { ESSearchHit, ESSearchResponse } from '../../../../../typings/elasticsearch';
+import type { ESSearchHit, ESSearchResponse } from '../../../../../../typings/elasticsearch';
 
 import { ArtifactsElasticsearchError } from '../../errors';
 

x-pack/plugins/fleet/server/services/artifacts/mappings.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ESSearchHit } from '../../../../../typings/elasticsearch';
+import type { ESSearchHit } from '../../../../../../typings/elasticsearch';
 
 import type { Artifact, ArtifactElasticsearchProperties } from './types';
 import { ARTIFACT_DOWNLOAD_RELATIVE_PATH } from './constants';

x-pack/plugins/fleet/server/services/artifacts/mocks.ts

@@ -10,7 +10,7 @@ import type { ApiResponse } from '@elastic/elasticsearch';
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
 
 import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
-import type { ESSearchHit, ESSearchResponse } from '../../../../../typings/elasticsearch';
+import type { ESSearchHit, ESSearchResponse } from '../../../../../../typings/elasticsearch';
 
 import type { Artifact, ArtifactElasticsearchProperties, ArtifactsClientInterface } from './types';
 

x-pack/plugins/fleet/tsconfig.json

@@ -15,7 +15,7 @@
     "server/**/*.json",
     "scripts/**/*",
     "package.json",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/global_search_providers/tsconfig.json

@@ -10,7 +10,7 @@
   "include": [
     "public/**/*",
     "server/**/*",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/grokdebugger/tsconfig.json

@@ -11,7 +11,7 @@
     "common/**/*",
     "public/**/*",
     "server/**/*",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/index_lifecycle_management/tsconfig.json

@@ -12,7 +12,7 @@
     "common/**/*",
     "public/**/*",
     "server/**/*",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/index_management/tsconfig.json

@@ -13,7 +13,7 @@
     "public/**/*",
     "server/**/*",
     "test/**/*",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/infra/tsconfig.json

@@ -8,7 +8,7 @@
     "declarationMap": true
   },
   "include": [
-    "../../typings/**/*",
+    "../../../typings/**/*",
     "common/**/*",
     "public/**/*",
     "scripts/**/*",

x-pack/plugins/ingest_pipelines/tsconfig.json

@@ -12,7 +12,7 @@
     "public/**/*",
     "server/**/*",
     "__jest__/**/*",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/lens/server/routes/field_stats.ts

@@ -11,7 +11,7 @@ import { schema } from '@kbn/config-schema';
 import { CoreSetup } from 'src/core/server';
 import { IFieldType } from 'src/plugins/data/common';
 import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/common';
-import { ESSearchResponse } from '../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 import { FieldStatsResponse, BASE_API_URL } from '../../common';
 import { PluginStartContract } from '../plugin';
 

x-pack/plugins/lens/server/usage/task.ts

@@ -16,7 +16,7 @@ import {
 } from '../../../task_manager/server';
 
 import { getVisualizationCounts } from './visualization_counts';
-import { ESSearchResponse } from '../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects
 // into daily rolled-up documents, which will be used in reporting click stats

x-pack/plugins/lens/tsconfig.json

@@ -13,7 +13,7 @@
       "common/**/*",
       "public/**/*",
       "server/**/*",
-      "../../typings/**/*"
+      "../../../typings/**/*"
     ],
     "references": [
       { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts

@@ -6,7 +6,7 @@
  */
 
 import { Filter } from 'src/plugins/data/common';
-import { ESFilter } from '../../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../../typings/elasticsearch';
 import { ThresholdSignalHistory, ThresholdSignalHistoryRecord } from '../types';
 
 export const getThresholdBucketFilters = async ({

x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import { getExceptionListItemSchemaMock } from '../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { getAnomalies, AnomaliesSearchParams } from '.';
 

x-pack/plugins/snapshot_restore/tsconfig.json

@@ -13,7 +13,7 @@
     "public/**/*",
     "server/**/*",
     "test/**/*",
-    "../../typings/**/*",
+    "../../../typings/**/*",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ESSearchBody, ESSearchRequest } from '../../../typings/elasticsearch';
+import { ESSearchBody, ESSearchRequest } from '../../../../typings/elasticsearch';
-import { SortOrder } from '../../../typings/elasticsearch/aggregations';
+import { SortOrder } from '../../../../typings/elasticsearch/aggregations';
 
 type BuildSortedEventsQueryOpts = Pick<ESSearchBody, 'aggs' | 'track_total_hits'> &
   Pick<Required<ESSearchRequest>, 'index' | 'size'>;

x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts

@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { AlertExecutorOptions, AlertInstanceContext } from '../../../../alerting/server';
 import { EsQueryAlertParams } from './alert_type_params';
-import { ESSearchHit } from '../../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../typings/elasticsearch';
 
 // alert type context provided to actions
 

x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts

@@ -17,7 +17,7 @@ import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
 import { getAlertType, ConditionMetAlertInstanceId, ActionGroupId } from './alert_type';
 import { EsQueryAlertParams, EsQueryAlertState } from './alert_type_params';
 import { ActionContext } from './action_context';
-import { ESSearchResponse, ESSearchRequest } from '../../../../../typings/elasticsearch';
+import { ESSearchResponse, ESSearchRequest } from '../../../../../../typings/elasticsearch';
 
 describe('alertType', () => {
   const logger = loggingSystemMock.create().get();

x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts

@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { Logger } from 'src/core/server';
-import { ESSearchResponse } from '../../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../../typings/elasticsearch';
 import { AlertType, AlertExecutorOptions } from '../../types';
 import { ActionContext, EsQueryAlertActionContext, addMessages } from './action_context';
 import {
@@ -19,7 +19,7 @@ import { STACK_ALERTS_FEATURE_ID } from '../../../common';
 import { ComparatorFns, getHumanReadableComparator } from '../lib';
 import { parseDuration } from '../../../../alerting/server';
 import { buildSortedEventsQuery } from '../../../common/build_sorted_events_query';
-import { ESSearchHit } from '../../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../typings/elasticsearch';
 
 export const ES_QUERY_ID = '.es-query';
 

x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts

@@ -14,7 +14,7 @@ import {
   estimateRecurringTaskScheduling,
 } from './workload_statistics';
 import { ConcreteTaskInstance } from '../task';
-import { AggregationResultOf, ESSearchResponse } from '../../../../typings/elasticsearch';
+import { AggregationResultOf, ESSearchResponse } from '../../../../../typings/elasticsearch';
 import { times } from 'lodash';
 import { taskStoreMock } from '../task_store.mock';
 import { of, Subject } from 'rxjs';

x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts

@@ -12,7 +12,7 @@ import { JsonObject } from 'src/plugins/kibana_utils/common';
 import { keyBy, mapValues } from 'lodash';
 import { AggregatedStatProvider } from './runtime_statistics_aggregator';
 import { parseIntervalAsSecond, asInterval, parseIntervalAsMillisecond } from '../lib/intervals';
-import { AggregationResultOf } from '../../../../typings/elasticsearch';
+import { AggregationResultOf } from '../../../../../typings/elasticsearch';
 import { HealthStatus } from './monitoring_stats_stream';
 import { TaskStore } from '../task_store';
 

x-pack/plugins/task_manager/server/task_store.ts

@@ -31,7 +31,7 @@ import {
 } from './task';
 
 import { TaskTypeDictionary } from './task_type_dictionary';
-import { ESSearchResponse, ESSearchBody } from '../../../typings/elasticsearch';
+import { ESSearchResponse, ESSearchBody } from '../../../../typings/elasticsearch';
 
 export interface StoreOpts {
   esClient: ElasticsearchClient;

x-pack/plugins/ui_actions_enhanced/tsconfig.json

@@ -11,7 +11,7 @@
     "public/**/*",
     "server/**/*",
     "common/**/*",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/plugins/uptime/server/lib/lib.ts

@@ -16,7 +16,7 @@ import { UMBackendFrameworkAdapter } from './adapters';
 import { UMLicenseCheck } from './domains';
 import { UptimeRequests } from './requests';
 import { savedObjectsAdapter } from './saved_objects';
-import { ESSearchResponse } from '../../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 
 export interface UMDomainLibs {
   requests: UptimeRequests;

x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts

@@ -8,7 +8,7 @@
 import { UMElasticsearchQueryFn } from '../adapters';
 import { GetMonitorAvailabilityParams, Ping } from '../../../common/runtime_types';
 import { AfterKey } from './get_monitor_status';
-import { SortOptions } from '../../../../../typings/elasticsearch';
+import { SortOptions } from '../../../../../../typings/elasticsearch';
 
 export interface AvailabilityKey {
   monitorId: string;

x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts

@@ -9,7 +9,7 @@ import { UMElasticsearchQueryFn } from '../adapters';
 import { MonitorDetails, Ping } from '../../../common/runtime_types';
 import { formatFilterString } from '../alerts/status_check';
 import { UptimeESClient } from '../lib';
-import { ESSearchBody } from '../../../../../typings/elasticsearch';
+import { ESSearchBody } from '../../../../../../typings/elasticsearch';
 
 export interface GetMonitorDetailsParams {
   monitorId: string;

x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts

@@ -8,7 +8,7 @@
 import { UMElasticsearchQueryFn } from '../adapters';
 import { MonitorLocations, MonitorLocation } from '../../../common/runtime_types';
 import { UNNAMED_LOCATION } from '../../../common/constants';
-import { SortOptions } from '../../../../../typings/elasticsearch';
+import { SortOptions } from '../../../../../../typings/elasticsearch';
 
 /**
  * Fetch data for the monitor page title.

x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts

@@ -9,7 +9,7 @@ import { UMElasticsearchQueryFn } from '../adapters';
 import { CONTEXT_DEFAULTS } from '../../../common/constants';
 import { Snapshot } from '../../../common/runtime_types';
 import { QueryContext } from './search';
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 
 export interface GetSnapshotCountParams {
   dateRangeStart: string;

x-pack/plugins/uptime/server/lib/requests/search/query_context.ts

@@ -10,7 +10,7 @@ import { CursorPagination } from './types';
 import { parseRelativeDate } from '../../helper';
 import { CursorDirection, SortOrder } from '../../../../common/runtime_types';
 import { UptimeESClient } from '../../lib';
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../typings/elasticsearch';
 
 export class QueryContext {
   callES: UptimeESClient;

x-pack/plugins/watcher/tsconfig.json

@@ -13,7 +13,7 @@
     "common/**/*",
     "tests_client_integration/**/*",
     "__fixtures__/*",
-    "../../typings/**/*"
+    "../../../typings/**/*"
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },

x-pack/test/observability_api_integration/trial/tests/annotations.ts

@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { JsonObject } from 'src/plugins/kibana_utils/common';
 import { Annotation } from '../../../../plugins/observability/common/annotations';
-import { ESSearchHit } from '../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../typings/elasticsearch';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 const DEFAULT_INDEX_NAME = 'observability-annotations';

x-pack/test/tsconfig.json

@@ -3,9 +3,9 @@
   "compilerOptions": {
     // overhead is too significant
     "incremental": false,
-    "types": ["node", "flot"]
+    "types": ["node"]
   },
-  "include": ["**/*", "../typings/**/*", "../../packages/kbn-test/types/ftr_globals/**/*"],
+  "include": ["**/*", "../../typings/**/*", "../../packages/kbn-test/types/ftr_globals/**/*"],
   "references": [
     { "path": "../../src/core/tsconfig.json" },
     { "path": "../../src/plugins/bfetch/tsconfig.json" },

x-pack/tsconfig.json

@@ -1,117 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "include": [
-    "mocks.ts",
-    "typings/**/*",
-    "tasks/**/*",
-    "plugins/cases/**/*",
-    "plugins/lists/**/*",
-    "plugins/security_solution/**/*"
-  ],
-  "exclude": [
-    "test/**/*",
-    "plugins/apm/e2e/cypress/**/*",
-    "plugins/apm/ftr_e2e/**/*",
-    "plugins/apm/scripts/**/*",
-    "plugins/security_solution/cypress/**/*"
-  ],
-  "compilerOptions": {
-    // overhead is too significant
-    "incremental": false
-  },
-  "references": [
-    { "path": "../src/core/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/data/tsconfig.json" },
-    { "path": "../src/plugins/dev_tools/tsconfig.json" },
-    { "path": "../src/plugins/discover/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/index_pattern_management/tsconfig.json" },
-    { "path": "../src/plugins/inspector/tsconfig.json" },
-    { "path": "../src/plugins/kibana_legacy/tsconfig.json" },
-    { "path": "../src/plugins/kibana_overview/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/legacy_export/tsconfig.json" },
-    { "path": "../src/plugins/management/tsconfig.json" },
-    { "path": "../src/plugins/navigation/tsconfig.json" },
-    { "path": "../src/plugins/newsfeed/tsconfig.json" },
-    { "path": "../src/plugins/presentation_util/tsconfig.json" },
-    { "path": "../src/plugins/saved_objects_management/tsconfig.json" },
-    { "path": "../src/plugins/saved_objects_tagging_oss/tsconfig.json" },
-    { "path": "../src/plugins/saved_objects/tsconfig.json" },
-    { "path": "../src/plugins/security_oss/tsconfig.json" },
-    { "path": "../src/plugins/share/tsconfig.json" },
-    { "path": "../src/plugins/telemetry_collection_manager/tsconfig.json" },
-    { "path": "../src/plugins/telemetry_management_section/tsconfig.json" },
-    { "path": "../src/plugins/telemetry/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/actions/tsconfig.json" },
-    { "path": "./plugins/alerting/tsconfig.json" },
-    { "path": "./plugins/apm/tsconfig.json" },
-    { "path": "./plugins/beats_management/tsconfig.json" },
-    { "path": "./plugins/canvas/tsconfig.json" },
-    { "path": "./plugins/cloud/tsconfig.json" },
-    { "path": "./plugins/console_extensions/tsconfig.json" },
-    { "path": "./plugins/data_enhanced/tsconfig.json" },
-    { "path": "./plugins/dashboard_mode/tsconfig.json" },
-    { "path": "./plugins/discover_enhanced/tsconfig.json" },
-    { "path": "./plugins/drilldowns/url_drilldown/tsconfig.json" },
-    { "path": "./plugins/embeddable_enhanced/tsconfig.json" },
-    { "path": "./plugins/encrypted_saved_objects/tsconfig.json" },
-    { "path": "./plugins/enterprise_search/tsconfig.json" },
-    { "path": "./plugins/event_log/tsconfig.json" },
-    { "path": "./plugins/features/tsconfig.json" },
-    { "path": "./plugins/file_upload/tsconfig.json" },
-    { "path": "./plugins/fleet/tsconfig.json" },
-    { "path": "./plugins/global_search_bar/tsconfig.json" },
-    { "path": "./plugins/global_search_providers/tsconfig.json" },
-    { "path": "./plugins/global_search/tsconfig.json" },
-    { "path": "./plugins/graph/tsconfig.json" },
-    { "path": "./plugins/grokdebugger/tsconfig.json" },
-    { "path": "./plugins/infra/tsconfig.json" },
-    { "path": "./plugins/ingest_pipelines/tsconfig.json" },
-    { "path": "./plugins/lens/tsconfig.json" },
-    { "path": "./plugins/license_management/tsconfig.json" },
-    { "path": "./plugins/licensing/tsconfig.json" },
-    { "path": "./plugins/logstash/tsconfig.json" },
-    { "path": "./plugins/maps_legacy_licensing/tsconfig.json" },
-    { "path": "./plugins/maps/tsconfig.json" },
-    { "path": "./plugins/ml/tsconfig.json" },
-    { "path": "./plugins/monitoring/tsconfig.json" },
-    { "path": "./plugins/observability/tsconfig.json" },
-    { "path": "./plugins/osquery/tsconfig.json" },
-    { "path": "./plugins/painless_lab/tsconfig.json" },
-    { "path": "./plugins/saved_objects_tagging/tsconfig.json" },
-    { "path": "./plugins/searchprofiler/tsconfig.json" },
-    { "path": "./plugins/security/tsconfig.json" },
-    { "path": "./plugins/snapshot_restore/tsconfig.json" },
-    { "path": "./plugins/spaces/tsconfig.json" },
-    { "path": "./plugins/stack_alerts/tsconfig.json" },
-    { "path": "./plugins/task_manager/tsconfig.json" },
-    { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" },
-    { "path": "./plugins/transform/tsconfig.json" },
-    { "path": "./plugins/translations/tsconfig.json" },
-    { "path": "./plugins/triggers_actions_ui/tsconfig.json" },
-    { "path": "./plugins/ui_actions_enhanced/tsconfig.json" },
-    { "path": "./plugins/upgrade_assistant/tsconfig.json" },
-    { "path": "./plugins/runtime_fields/tsconfig.json" },
-    { "path": "./plugins/index_management/tsconfig.json" },
-    { "path": "./plugins/watcher/tsconfig.json" },
-    { "path": "./plugins/rollup/tsconfig.json" },
-    { "path": "./plugins/remote_clusters/tsconfig.json" },
-    { "path": "./plugins/cross_cluster_replication/tsconfig.json"},
-    { "path": "./plugins/index_lifecycle_management/tsconfig.json"},
-    { "path": "./plugins/uptime/tsconfig.json" },
-    { "path": "./plugins/xpack_legacy/tsconfig.json" }
-  ]
-}

x-pack/typings/@elastic/eui/index.d.ts

@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// TODO: Remove once typescript definitions are in EUI
-
-declare module '@elastic/eui/lib/services' {
-  export const RIGHT_ALIGNMENT: any;
-}
-
-declare module '@elastic/eui/lib/services/format' {
-  export const dateFormatAliases: any;
-}

x-pack/typings/cytoscape_dagre.d.ts

@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-declare module 'cytoscape-dagre';

x-pack/typings/index.d.ts

@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-declare module '*.html' {
-  const template: string;
-  // eslint-disable-next-line import/no-default-export
-  export default template;
-}
-
-declare module '*.png' {
-  const content: string;
-  // eslint-disable-next-line import/no-default-export
-  export default content;
-}
-
-declare module '*.svg' {
-  const content: string;
-  // eslint-disable-next-line import/no-default-export
-  export default content;
-}
-
-declare module 'axios/lib/adapters/xhr';
-
-// Storybook references this module. It's @ts-ignored in the codebase but when
-// built into its dist it strips that out. Add it here to avoid a type checking
-// error.
-//
-// See https://github.com/storybookjs/storybook/issues/11684
-declare module 'react-syntax-highlighter/dist/cjs/create-element';