diff --git a/packages/kbn-storybook/tsconfig.json b/packages/kbn-storybook/tsconfig.json
index 5c81c9100e60..db10d4630ff9 100644
--- a/packages/kbn-storybook/tsconfig.json
+++ b/packages/kbn-storybook/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "incremental": false,
     "outDir": "target",
diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
index f19e379482d3..855962070457 100644
--- a/src/core/tsconfig.json
+++ b/src/core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.project.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/dev/typescript/project.ts b/src/dev/typescript/project.ts
index 04a5de945619..8d92284e4963 100644
--- a/src/dev/typescript/project.ts
+++ b/src/dev/typescript/project.ts
@@ -7,7 +7,7 @@
  */
 
 import { basename, dirname, relative, resolve } from 'path';
-import { memoize } from 'lodash';
+
 import { IMinimatch, Minimatch } from 'minimatch';
 import { REPO_ROOT } from '@kbn/utils';
 
@@ -26,10 +26,6 @@ function testMatchers(matchers: IMinimatch[], path: string) {
   return matchers.some((matcher) => matcher.match(path));
 }
 
-const parentProjectFactory = memoize(function (parentConfigPath: string) {
-  return new Project(parentConfigPath);
-});
-
 export class Project {
   public directory: string;
   public name: string;
@@ -38,7 +34,6 @@ export class Project {
 
   private readonly include: IMinimatch[];
   private readonly exclude: IMinimatch[];
-  private readonly parent?: Project;
 
   constructor(
     public tsConfigPath: string,
@@ -46,16 +41,15 @@ export class Project {
   ) {
     this.config = parseTsConfig(tsConfigPath);
 
-    const { files, include, exclude = [], extends: extendsPath } = this.config as {
+    const { files, include, exclude = [] } = this.config as {
       files?: string[];
       include?: string[];
       exclude?: string[];
-      extends?: string;
     };
 
     if (files || !include) {
       throw new Error(
-        `[${tsConfigPath}]: tsconfig.json files in the Kibana repo must use "include" keys and not "files"`
+        'tsconfig.json files in the Kibana repo must use "include" keys and not "files"'
       );
     }
 
@@ -64,30 +58,9 @@ export class Project {
     this.name = options.name || relative(REPO_ROOT, this.directory) || basename(this.directory);
     this.include = makeMatchers(this.directory, include);
     this.exclude = makeMatchers(this.directory, exclude);
-
-    if (extendsPath !== undefined) {
-      const parentConfigPath = resolve(this.directory, extendsPath);
-      this.parent = parentProjectFactory(parentConfigPath);
-    }
   }
 
-  public isAbsolutePathSelected(path: string): boolean {
-    return this.isExcluded(path) ? false : this.isIncluded(path);
-  }
-
-  public isExcluded(path: string): boolean {
-    if (testMatchers(this.exclude, path)) return true;
-    if (this.parent) {
-      return this.parent.isExcluded(path);
-    }
-    return false;
-  }
-
-  public isIncluded(path: string): boolean {
-    if (testMatchers(this.include, path)) return true;
-    if (this.parent) {
-      return this.parent.isIncluded(path);
-    }
-    return false;
+  public isAbsolutePathSelected(path: string) {
+    return testMatchers(this.exclude, path) ? false : testMatchers(this.include, path);
   }
 }
diff --git a/src/plugins/advanced_settings/tsconfig.json b/src/plugins/advanced_settings/tsconfig.json
index 97a855959903..4d62e410326b 100644
--- a/src/plugins/advanced_settings/tsconfig.json
+++ b/src/plugins/advanced_settings/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/apm_oss/tsconfig.json b/src/plugins/apm_oss/tsconfig.json
index ccb123aaec83..aeb6837c69a9 100644
--- a/src/plugins/apm_oss/tsconfig.json
+++ b/src/plugins/apm_oss/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/bfetch/tsconfig.json b/src/plugins/bfetch/tsconfig.json
index 6c01479f1929..173ff725d07d 100644
--- a/src/plugins/bfetch/tsconfig.json
+++ b/src/plugins/bfetch/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/charts/tsconfig.json b/src/plugins/charts/tsconfig.json
index 99edb2ffe3c1..a4f65d593720 100644
--- a/src/plugins/charts/tsconfig.json
+++ b/src/plugins/charts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/console/tsconfig.json b/src/plugins/console/tsconfig.json
index d9f49036be8f..34aca5021bac 100644
--- a/src/plugins/console/tsconfig.json
+++ b/src/plugins/console/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/dashboard/tsconfig.json b/src/plugins/dashboard/tsconfig.json
index 452208b39af6..dd99119cfb45 100644
--- a/src/plugins/dashboard/tsconfig.json
+++ b/src/plugins/dashboard/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/data/common/search/expressions/exists_filter.test.ts b/src/plugins/data/common/search/expressions/exists_filter.test.ts
index 60e8a9c7a09c..e3b53b228139 100644
--- a/src/plugins/data/common/search/expressions/exists_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/exists_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common/mocks';
+import { createMockContext } from '../../../../expressions/common';
 import { functionWrapper } from './utils';
 import { existsFilterFunction } from './exists_filter';
 
diff --git a/src/plugins/data/common/search/expressions/kibana_filter.test.ts b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
index 56a9e1ce660c..ac8ae55492cc 100644
--- a/src/plugins/data/common/search/expressions/kibana_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common/mocks';
+import { createMockContext } from '../../../../expressions/common';
 import { functionWrapper } from './utils';
 import { kibanaFilterFunction } from './kibana_filter';
 
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.test.ts b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
index 90e471e166f5..39bd907513a0 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common/mocks';
+import { createMockContext } from '../../../../expressions/common';
 import { functionWrapper } from './utils';
 import { phraseFilterFunction } from './phrase_filter';
 
diff --git a/src/plugins/data/common/search/expressions/range_filter.test.ts b/src/plugins/data/common/search/expressions/range_filter.test.ts
index 129e6bd82e16..92670f8a044b 100644
--- a/src/plugins/data/common/search/expressions/range_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/range_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common/mocks';
+import { createMockContext } from '../../../../expressions/common';
 import { functionWrapper } from './utils';
 import { rangeFilterFunction } from './range_filter';
 
diff --git a/src/plugins/data/tsconfig.json b/src/plugins/data/tsconfig.json
index b99a2f6f8590..9c95878af631 100644
--- a/src/plugins/data/tsconfig.json
+++ b/src/plugins/data/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/dev_tools/tsconfig.json b/src/plugins/dev_tools/tsconfig.json
index f369396b17fb..c17b2341fd42 100644
--- a/src/plugins/dev_tools/tsconfig.json
+++ b/src/plugins/dev_tools/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/discover/tsconfig.json b/src/plugins/discover/tsconfig.json
index 96765d76a340..ec98199c3423 100644
--- a/src/plugins/discover/tsconfig.json
+++ b/src/plugins/discover/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/embeddable/tsconfig.json b/src/plugins/embeddable/tsconfig.json
index eacfa831ecee..27a887500fb6 100644
--- a/src/plugins/embeddable/tsconfig.json
+++ b/src/plugins/embeddable/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/es_ui_shared/tsconfig.json b/src/plugins/es_ui_shared/tsconfig.json
index 3d102daaf3aa..9bcda2e0614d 100644
--- a/src/plugins/es_ui_shared/tsconfig.json
+++ b/src/plugins/es_ui_shared/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/expressions/common/mocks.ts b/src/plugins/expressions/common/mocks.ts
index 20bdbca07f00..eaeebd8e5349 100644
--- a/src/plugins/expressions/common/mocks.ts
+++ b/src/plugins/expressions/common/mocks.ts
@@ -34,5 +34,3 @@ export const createMockExecutionContext = <ExtraContext extends object = object>
     ...extraContext,
   };
 };
-
-export { createMockContext } from './util/test_utils';
diff --git a/src/plugins/expressions/common/util/index.ts b/src/plugins/expressions/common/util/index.ts
index 5f83d962d5ae..470dfc3c2d43 100644
--- a/src/plugins/expressions/common/util/index.ts
+++ b/src/plugins/expressions/common/util/index.ts
@@ -10,3 +10,4 @@ export * from './create_error';
 export * from './get_by_alias';
 export * from './tables_adapter';
 export * from './expressions_inspector_adapter';
+export * from './test_utils';
diff --git a/src/plugins/expressions/tsconfig.json b/src/plugins/expressions/tsconfig.json
index fe76ba3050a3..cce71013cefa 100644
--- a/src/plugins/expressions/tsconfig.json
+++ b/src/plugins/expressions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/home/tsconfig.json b/src/plugins/home/tsconfig.json
index 19ab5a8e6efe..b15e1fc011b9 100644
--- a/src/plugins/home/tsconfig.json
+++ b/src/plugins/home/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/index_pattern_field_editor/tsconfig.json b/src/plugins/index_pattern_field_editor/tsconfig.json
index c638fd34c6bb..559b1aaf0fc2 100644
--- a/src/plugins/index_pattern_field_editor/tsconfig.json
+++ b/src/plugins/index_pattern_field_editor/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/index_pattern_management/tsconfig.json b/src/plugins/index_pattern_management/tsconfig.json
index 3c8fdb1cf659..37bd3e4aa5bb 100644
--- a/src/plugins/index_pattern_management/tsconfig.json
+++ b/src/plugins/index_pattern_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/input_control_vis/tsconfig.json b/src/plugins/input_control_vis/tsconfig.json
index c2f8d8783e82..bef7bc394a6c 100644
--- a/src/plugins/input_control_vis/tsconfig.json
+++ b/src/plugins/input_control_vis/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/inspector/tsconfig.json b/src/plugins/inspector/tsconfig.json
index 0e42e577428c..2a9c41464532 100644
--- a/src/plugins/inspector/tsconfig.json
+++ b/src/plugins/inspector/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/kibana_legacy/tsconfig.json b/src/plugins/kibana_legacy/tsconfig.json
index 0b3f42cd3b57..709036c9e82f 100644
--- a/src/plugins/kibana_legacy/tsconfig.json
+++ b/src/plugins/kibana_legacy/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/kibana_overview/tsconfig.json b/src/plugins/kibana_overview/tsconfig.json
index 3396861cb917..ac3ac109cb35 100644
--- a/src/plugins/kibana_overview/tsconfig.json
+++ b/src/plugins/kibana_overview/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/kibana_react/tsconfig.json b/src/plugins/kibana_react/tsconfig.json
index 857b8cf83645..eb9a24ca141f 100644
--- a/src/plugins/kibana_react/tsconfig.json
+++ b/src/plugins/kibana_react/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/kibana_usage_collection/tsconfig.json b/src/plugins/kibana_usage_collection/tsconfig.json
index 100f1f03955d..d664d936f666 100644
--- a/src/plugins/kibana_usage_collection/tsconfig.json
+++ b/src/plugins/kibana_usage_collection/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/kibana_utils/tsconfig.json b/src/plugins/kibana_utils/tsconfig.json
index d9572707e866..ae5e9b90af80 100644
--- a/src/plugins/kibana_utils/tsconfig.json
+++ b/src/plugins/kibana_utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/legacy_export/tsconfig.json b/src/plugins/legacy_export/tsconfig.json
index d6689ea1067d..ec006d492499 100644
--- a/src/plugins/legacy_export/tsconfig.json
+++ b/src/plugins/legacy_export/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/management/tsconfig.json b/src/plugins/management/tsconfig.json
index 3423299a53df..ba3661666631 100644
--- a/src/plugins/management/tsconfig.json
+++ b/src/plugins/management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/maps_ems/tsconfig.json b/src/plugins/maps_ems/tsconfig.json
index 7f44da00d47a..b85c3da66b83 100644
--- a/src/plugins/maps_ems/tsconfig.json
+++ b/src/plugins/maps_ems/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/maps_legacy/tsconfig.json b/src/plugins/maps_legacy/tsconfig.json
index c600024cc4a7..f757e35f785a 100644
--- a/src/plugins/maps_legacy/tsconfig.json
+++ b/src/plugins/maps_legacy/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/navigation/tsconfig.json b/src/plugins/navigation/tsconfig.json
index bb86142e1c44..07cfe10d7d81 100644
--- a/src/plugins/navigation/tsconfig.json
+++ b/src/plugins/navigation/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/newsfeed/tsconfig.json b/src/plugins/newsfeed/tsconfig.json
index 84626b2f3a6a..66244a22336c 100644
--- a/src/plugins/newsfeed/tsconfig.json
+++ b/src/plugins/newsfeed/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/presentation_util/tsconfig.json b/src/plugins/presentation_util/tsconfig.json
index cb39c5fb36f5..37b9380f6f2b 100644
--- a/src/plugins/presentation_util/tsconfig.json
+++ b/src/plugins/presentation_util/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/region_map/tsconfig.json b/src/plugins/region_map/tsconfig.json
index 385c31e6bd2d..899611d02746 100644
--- a/src/plugins/region_map/tsconfig.json
+++ b/src/plugins/region_map/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/saved_objects/tsconfig.json b/src/plugins/saved_objects/tsconfig.json
index 46b3f9a5afcb..d9045b91b9df 100644
--- a/src/plugins/saved_objects/tsconfig.json
+++ b/src/plugins/saved_objects/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/saved_objects_management/tsconfig.json b/src/plugins/saved_objects_management/tsconfig.json
index cb74b0617922..99849dea3861 100644
--- a/src/plugins/saved_objects_management/tsconfig.json
+++ b/src/plugins/saved_objects_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/saved_objects_tagging_oss/tsconfig.json b/src/plugins/saved_objects_tagging_oss/tsconfig.json
index ae566d962689..b0059c71424b 100644
--- a/src/plugins/saved_objects_tagging_oss/tsconfig.json
+++ b/src/plugins/saved_objects_tagging_oss/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/security_oss/tsconfig.json b/src/plugins/security_oss/tsconfig.json
index 156e4ffee9d7..530e01a034b0 100644
--- a/src/plugins/security_oss/tsconfig.json
+++ b/src/plugins/security_oss/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/share/tsconfig.json b/src/plugins/share/tsconfig.json
index 62c0b3739f4b..985066915f1d 100644
--- a/src/plugins/share/tsconfig.json
+++ b/src/plugins/share/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/spaces_oss/tsconfig.json b/src/plugins/spaces_oss/tsconfig.json
index 96584842ec32..0cc82d7e5d12 100644
--- a/src/plugins/spaces_oss/tsconfig.json
+++ b/src/plugins/spaces_oss/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/telemetry/tsconfig.json b/src/plugins/telemetry/tsconfig.json
index 40370082f99e..bdced01d9eb6 100644
--- a/src/plugins/telemetry/tsconfig.json
+++ b/src/plugins/telemetry/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/telemetry_collection_manager/tsconfig.json b/src/plugins/telemetry_collection_manager/tsconfig.json
index 8bbc440fb1a5..1bba81769f0d 100644
--- a/src/plugins/telemetry_collection_manager/tsconfig.json
+++ b/src/plugins/telemetry_collection_manager/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/telemetry_management_section/tsconfig.json b/src/plugins/telemetry_management_section/tsconfig.json
index c6a21733b2d6..48e40814b857 100644
--- a/src/plugins/telemetry_management_section/tsconfig.json
+++ b/src/plugins/telemetry_management_section/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/tile_map/tsconfig.json b/src/plugins/tile_map/tsconfig.json
index 385c31e6bd2d..899611d02746 100644
--- a/src/plugins/tile_map/tsconfig.json
+++ b/src/plugins/tile_map/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/timelion/tsconfig.json b/src/plugins/timelion/tsconfig.json
index bb8a48339d44..5b96d69a878e 100644
--- a/src/plugins/timelion/tsconfig.json
+++ b/src/plugins/timelion/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/ui_actions/tsconfig.json b/src/plugins/ui_actions/tsconfig.json
index 89b66d18705c..a871d7215cdc 100644
--- a/src/plugins/ui_actions/tsconfig.json
+++ b/src/plugins/ui_actions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/url_forwarding/tsconfig.json b/src/plugins/url_forwarding/tsconfig.json
index f1916e4ce595..8e867a6bad14 100644
--- a/src/plugins/url_forwarding/tsconfig.json
+++ b/src/plugins/url_forwarding/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/usage_collection/tsconfig.json b/src/plugins/usage_collection/tsconfig.json
index b4a0721ef367..96b2c4d37e17 100644
--- a/src/plugins/usage_collection/tsconfig.json
+++ b/src/plugins/usage_collection/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_default_editor/tsconfig.json b/src/plugins/vis_default_editor/tsconfig.json
index 54a84e08224a..27bb775c2d0e 100644
--- a/src/plugins/vis_default_editor/tsconfig.json
+++ b/src/plugins/vis_default_editor/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_markdown/tsconfig.json b/src/plugins/vis_type_markdown/tsconfig.json
index f940c295e7ce..d5ab89b98081 100644
--- a/src/plugins/vis_type_markdown/tsconfig.json
+++ b/src/plugins/vis_type_markdown/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_metric/tsconfig.json b/src/plugins/vis_type_metric/tsconfig.json
index 8cee918a3dc8..7441848d5a43 100644
--- a/src/plugins/vis_type_metric/tsconfig.json
+++ b/src/plugins/vis_type_metric/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_table/tsconfig.json b/src/plugins/vis_type_table/tsconfig.json
index 4f2e80575497..ccff3c349cf2 100644
--- a/src/plugins/vis_type_table/tsconfig.json
+++ b/src/plugins/vis_type_table/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_tagcloud/tsconfig.json b/src/plugins/vis_type_tagcloud/tsconfig.json
index f7f3688183a4..18bbad225746 100644
--- a/src/plugins/vis_type_tagcloud/tsconfig.json
+++ b/src/plugins/vis_type_tagcloud/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_timelion/tsconfig.json b/src/plugins/vis_type_timelion/tsconfig.json
index d29fb25b1531..77f97de28366 100644
--- a/src/plugins/vis_type_timelion/tsconfig.json
+++ b/src/plugins/vis_type_timelion/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_timeseries/tsconfig.json b/src/plugins/vis_type_timeseries/tsconfig.json
index edc2d25b867d..7b2dd4b608c1 100644
--- a/src/plugins/vis_type_timeseries/tsconfig.json
+++ b/src/plugins/vis_type_timeseries/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_vega/tsconfig.json b/src/plugins/vis_type_vega/tsconfig.json
index f375a2483e24..4091dafcbe35 100644
--- a/src/plugins/vis_type_vega/tsconfig.json
+++ b/src/plugins/vis_type_vega/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_vislib/tsconfig.json b/src/plugins/vis_type_vislib/tsconfig.json
index 845628a6b86f..74bc1440d9db 100644
--- a/src/plugins/vis_type_vislib/tsconfig.json
+++ b/src/plugins/vis_type_vislib/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/vis_type_xy/tsconfig.json b/src/plugins/vis_type_xy/tsconfig.json
index 7e23b07bd80f..5cb0bc8d0bc8 100644
--- a/src/plugins/vis_type_xy/tsconfig.json
+++ b/src/plugins/vis_type_xy/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/visualizations/tsconfig.json b/src/plugins/visualizations/tsconfig.json
index 65de6908228b..d7c5e6a4b436 100644
--- a/src/plugins/visualizations/tsconfig.json
+++ b/src/plugins/visualizations/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/src/plugins/visualize/tsconfig.json b/src/plugins/visualize/tsconfig.json
index 046202d82d1a..bc0891f39174 100644
--- a/src/plugins/visualize/tsconfig.json
+++ b/src/plugins/visualize/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c28ed0d8c875..da4de5ef3712 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -56,6 +56,5 @@
       "jest-styled-components",
       "@testing-library/jest-dom"
     ]
-  },
-  "include": []
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 7c06e8085864..40763ede1bbd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,79 +19,6 @@
     "x-pack/plugins/cases/**/*",
     "x-pack/plugins/lists/**/*",
     "x-pack/plugins/security_solution/**/*",
-
-    // tests
-    "src/**/*.test.ts",
-    "src/**/*.test.tsx",
-    "src/**/integration_tests/*",
-    "src/**/tests/*",
-    // mocks
-    "src/**/__mocks__/*",
-    "src/**/mock/*",
-    "src/**/mocks/*",
-    "src/**/*/mock.ts",
-    "src/**/*/mocks.ts",
-    "src/**/*/mocks.tsx",
-    "src/**/*.mock.ts",
-    "src/**/*.mock.tsx",
-    "src/**/*.mocks.ts",
-    "src/**/*.mocks.tsx",
-
-    // test helpers
-    "src/**/test_helpers/*",
-    "src/**/test_utils/*",
-    "src/**/*/test_utils.ts",
-    "src/**/*/test_helpers.ts",
-    "src/**/*/test_helper.tsx",
-
-    // stubs
-    "src/**/*/stubs.ts",
-    "src/**/*.stub.ts",
-    "src/**/*.stories.tsx",
-    "src/**/*/_mock_handler_arguments.ts",
-
-    // tests
-    "x-pack/plugins/**/*.test.ts",
-    "x-pack/plugins/**/*.test.tsx",
-    "x-pack/plugins/**/test/**/*",
-    "x-pack/plugins/**/tests/*",
-    "x-pack/plugins/**/integration_tests/*",
-    "x-pack/plugins/**/tests_client_integration/*",
-    "x-pack/plugins/**/__fixtures__/*",
-    "x-pack/plugins/**/__stories__/*",
-    "x-pack/plugins/**/__jest__/**/*",
-
-    // mocks
-    "x-pack/plugins/**/__mocks__/*",
-    "x-pack/plugins/**/mock/*",
-    "x-pack/plugins/**/mocks/*",
-    "x-pack/plugins/**/*/mock.ts",
-    "x-pack/plugins/**/*/mocks.ts",
-    "x-pack/plugins/**/*/mocks.tsx",
-    "x-pack/plugins/**/*.mock.ts",
-    "x-pack/plugins/**/*.mock.tsx",
-    "x-pack/plugins/**/*.mocks.ts",
-    "x-pack/plugins/**/*.mocks.tsx",
-
-    // test helpers
-    "x-pack/plugins/**/test_helpers/*",
-    "x-pack/plugins/**/test_utils/*",
-    "x-pack/plugins/**/*/test_utils.ts",
-    "x-pack/plugins/**/*/test_helper.tsx",
-    "x-pack/plugins/**/*/test_helpers.ts",
-    "x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx",
-    "x-pack/plugins/uptime/server/lib/requests/helper.ts",
-    "x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx",
-    "x-pack/plugins/uptime/public/lib/helper/enzyme_helpers.tsx",
-    "x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx",
-    "x-pack/plugins/apm/server/utils/test_helpers.tsx",
-    "x-pack/plugins/apm/public/utils/testHelpers.tsx",
-
-    // stubs
-    "x-pack/plugins/**/*/stubs.ts",
-    "x-pack/plugins/**/*.stub.ts",
-    "x-pack/plugins/**/*.stories.tsx",
-    "x-pack/plugins/**/*/_mock_handler_arguments.ts"
   ],
   "exclude": [
     "x-pack/plugins/security_solution/cypress/**/*"
diff --git a/tsconfig.project.json b/tsconfig.project.json
deleted file mode 100644
index 174c3fdf0fd5..000000000000
--- a/tsconfig.project.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "exclude": [
-    // tests
-    "**/*.test.ts",
-    "**/*.test.tsx",
-    "**/integration_tests/*",
-    "**/test/**/*",
-    "**/test/*",
-    "**/tests/*",
-    "**/tests_client_integration/*",
-    "**/__fixtures__/*",
-    "**/__stories__/*",
-    "**/__jest__/**",
-
-    // mocks
-    "**/__mocks__/*",
-    "**/mock/*",
-    "**/mocks/*",
-    "**/*/mock.ts",
-    "**/*/mocks.ts",
-    "**/*/mocks.tsx",
-    "**/*.mock.ts",
-    "**/*.mock.tsx",
-    "**/*.mocks.ts",
-    "**/*.mocks.tsx",
-
-    // test helpers
-    "**/test_helpers/*",
-    "**/test_utils/*",
-    "**/*/test_utils.ts",
-    "**/*/test_helper.tsx",
-    "**/*/test_helpers.ts",
-    // x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
-    "**/*/test_data.tsx",
-    "**/*/shared_columns_tests.tsx",
-    // x-pack/plugins/uptime/server/lib/requests/helper.ts
-    "**/*/requests/helper.ts",
-    // x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
-    "**/*/rtl_helpers.tsx",
-    // x-pack/plugins/uptime/public/lib/helper/enzyme_helpers.tsx
-    "**/*/enzyme_helpers.tsx",
-    // x-pack/plugins/apm/server/utils/test_helpers.tsx
-    "**/*/test_helpers.tsx",
-    // x-pack/plugins/apm/public/utils/testHelpers.tsx
-    "**/*/testHelpers.tsx",
-
-    // stubs
-    "**/*/stubs.ts",
-    "**/*.stub.ts",
-    "**/*.stories.tsx",
-    "**/*/_mock_handler_arguments.ts"
-  ],
-  "include": [],
-  "types": [
-    "node",
-    "flot"
-  ]
-}
diff --git a/x-pack/plugins/actions/tsconfig.json b/x-pack/plugins/actions/tsconfig.json
index 10ebd0923523..d5c1105c99ad 100644
--- a/x-pack/plugins/actions/tsconfig.json
+++ b/x-pack/plugins/actions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/alerting/tsconfig.json b/x-pack/plugins/alerting/tsconfig.json
index 401068874690..86ab00faeb5a 100644
--- a/x-pack/plugins/alerting/tsconfig.json
+++ b/x-pack/plugins/alerting/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/apm/e2e/tsconfig.json b/x-pack/plugins/apm/e2e/tsconfig.json
index 0c13dd717991..c4587349c7ad 100644
--- a/x-pack/plugins/apm/e2e/tsconfig.json
+++ b/x-pack/plugins/apm/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.project.json",
+  "extends": "../../../../tsconfig.base.json",
   "exclude": ["tmp"],
   "include": ["./**/*"],
   "compilerOptions": {
diff --git a/x-pack/plugins/apm/ftr_e2e/tsconfig.json b/x-pack/plugins/apm/ftr_e2e/tsconfig.json
index f699943a254f..168801f78260 100644
--- a/x-pack/plugins/apm/ftr_e2e/tsconfig.json
+++ b/x-pack/plugins/apm/ftr_e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.project.json",
+  "extends": "../../../../tsconfig.base.json",
   "exclude": [
     "tmp"
   ],
@@ -12,4 +12,4 @@
       "node"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
index 613435fe186b..fed938119c4a 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
@@ -22,7 +22,7 @@ const { kibanaRoot, tsconfigTpl, filesToIgnore } = require('./paths');
 const { unoptimizeTsConfig } = require('./unoptimize');
 
 async function prepareBaseTsConfig() {
-  const baseConfigFilename = path.resolve(kibanaRoot, 'tsconfig.project.json');
+  const baseConfigFilename = path.resolve(kibanaRoot, 'tsconfig.base.json');
   const config = json5.parse(await readFile(baseConfigFilename, 'utf-8'));
 
   await writeFile(
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
index b501ec3a8eed..dbc207c9e6d2 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
@@ -12,7 +12,7 @@ const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');
 
 const filesToIgnore = [
   path.resolve(kibanaRoot, 'tsconfig.json'),
-  path.resolve(kibanaRoot, 'tsconfig.project.json'),
+  path.resolve(kibanaRoot, 'tsconfig.base.json'),
   path.resolve(kibanaRoot, 'x-pack/plugins/apm', 'tsconfig.json'),
 ];
 
diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/apm/tsconfig.json
index ae2085dc2400..ffbf11c23f63 100644
--- a/x-pack/plugins/apm/tsconfig.json
+++ b/x-pack/plugins/apm/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/banners/tsconfig.json b/x-pack/plugins/banners/tsconfig.json
index 6c4c80173208..85608a8a78ad 100644
--- a/x-pack/plugins/banners/tsconfig.json
+++ b/x-pack/plugins/banners/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/beats_management/tsconfig.json b/x-pack/plugins/beats_management/tsconfig.json
index 398438712b26..ad68cc900e63 100644
--- a/x-pack/plugins/beats_management/tsconfig.json
+++ b/x-pack/plugins/beats_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/canvas/storybook/addon/tsconfig.json b/x-pack/plugins/canvas/storybook/addon/tsconfig.json
index b115d1c46546..2ab1856de661 100644
--- a/x-pack/plugins/canvas/storybook/addon/tsconfig.json
+++ b/x-pack/plugins/canvas/storybook/addon/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../../tsconfig.project.json",
+  "extends": "../../../../../tsconfig.base.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx"
diff --git a/x-pack/plugins/canvas/tsconfig.json b/x-pack/plugins/canvas/tsconfig.json
index 679165f0a1b7..487b68ba3542 100644
--- a/x-pack/plugins/canvas/tsconfig.json
+++ b/x-pack/plugins/canvas/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/cloud/tsconfig.json b/x-pack/plugins/cloud/tsconfig.json
index f6edb9fb7cca..46e81aa7fa08 100644
--- a/x-pack/plugins/cloud/tsconfig.json
+++ b/x-pack/plugins/cloud/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/console_extensions/tsconfig.json b/x-pack/plugins/console_extensions/tsconfig.json
index edcd46c4fafc..5ad28f230a0b 100644
--- a/x-pack/plugins/console_extensions/tsconfig.json
+++ b/x-pack/plugins/console_extensions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/cross_cluster_replication/tsconfig.json b/x-pack/plugins/cross_cluster_replication/tsconfig.json
index 156a851abb8d..9c7590b9c255 100644
--- a/x-pack/plugins/cross_cluster_replication/tsconfig.json
+++ b/x-pack/plugins/cross_cluster_replication/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/dashboard_enhanced/tsconfig.json b/x-pack/plugins/dashboard_enhanced/tsconfig.json
index f6acdddc6f99..567c390edfa5 100644
--- a/x-pack/plugins/dashboard_enhanced/tsconfig.json
+++ b/x-pack/plugins/dashboard_enhanced/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/dashboard_mode/tsconfig.json b/x-pack/plugins/dashboard_mode/tsconfig.json
index c4a11959ec3e..6e4ed11ffa7f 100644
--- a/x-pack/plugins/dashboard_mode/tsconfig.json
+++ b/x-pack/plugins/dashboard_mode/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/data_enhanced/tsconfig.json b/x-pack/plugins/data_enhanced/tsconfig.json
index 5538a2db3e4c..047b9b06516b 100644
--- a/x-pack/plugins/data_enhanced/tsconfig.json
+++ b/x-pack/plugins/data_enhanced/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/discover_enhanced/tsconfig.json b/x-pack/plugins/discover_enhanced/tsconfig.json
index 2a055bd0e071..38a55e557909 100644
--- a/x-pack/plugins/discover_enhanced/tsconfig.json
+++ b/x-pack/plugins/discover_enhanced/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json b/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
index 99aea16a9aab..50fe41c49b0c 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
+++ b/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.project.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/embeddable_enhanced/tsconfig.json b/x-pack/plugins/embeddable_enhanced/tsconfig.json
index 32754f2fd552..6e9eb69585cb 100644
--- a/x-pack/plugins/embeddable_enhanced/tsconfig.json
+++ b/x-pack/plugins/embeddable_enhanced/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/encrypted_saved_objects/tsconfig.json b/x-pack/plugins/encrypted_saved_objects/tsconfig.json
index 9eae8b7366be..2b51b313d34f 100644
--- a/x-pack/plugins/encrypted_saved_objects/tsconfig.json
+++ b/x-pack/plugins/encrypted_saved_objects/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/enterprise_search/tsconfig.json b/x-pack/plugins/enterprise_search/tsconfig.json
index a4f1c55463e7..6b4c50770b49 100644
--- a/x-pack/plugins/enterprise_search/tsconfig.json
+++ b/x-pack/plugins/enterprise_search/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/event_log/tsconfig.json b/x-pack/plugins/event_log/tsconfig.json
index e21dbc93b7b4..9b7cde10da3d 100644
--- a/x-pack/plugins/event_log/tsconfig.json
+++ b/x-pack/plugins/event_log/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/features/tsconfig.json b/x-pack/plugins/features/tsconfig.json
index 11e2dbc8f093..1260af55fbff 100644
--- a/x-pack/plugins/features/tsconfig.json
+++ b/x-pack/plugins/features/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/file_upload/tsconfig.json b/x-pack/plugins/file_upload/tsconfig.json
index 8a982f83632a..887a05af3117 100644
--- a/x-pack/plugins/file_upload/tsconfig.json
+++ b/x-pack/plugins/file_upload/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index 66849e017395..a20d82de3c85 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/global_search/tsconfig.json b/x-pack/plugins/global_search/tsconfig.json
index 2571f7c2e293..2d05328f445d 100644
--- a/x-pack/plugins/global_search/tsconfig.json
+++ b/x-pack/plugins/global_search/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/global_search_bar/tsconfig.json b/x-pack/plugins/global_search_bar/tsconfig.json
index 595d55c3c5a0..266eecc35c84 100644
--- a/x-pack/plugins/global_search_bar/tsconfig.json
+++ b/x-pack/plugins/global_search_bar/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/global_search_providers/tsconfig.json b/x-pack/plugins/global_search_providers/tsconfig.json
index 9be9a681ee7c..f2759954a684 100644
--- a/x-pack/plugins/global_search_providers/tsconfig.json
+++ b/x-pack/plugins/global_search_providers/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/graph/tsconfig.json b/x-pack/plugins/graph/tsconfig.json
index ae0d143455d5..741c603e3aae 100644
--- a/x-pack/plugins/graph/tsconfig.json
+++ b/x-pack/plugins/graph/tsconfig.json
@@ -1,6 +1,6 @@
 
 {
-    "extends": "../../../tsconfig.project.json",
+    "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
       "composite": true,
       "outDir": "./target/types",
@@ -27,4 +27,4 @@
       { "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
       { "path": "../../../src/plugins/kibana_react/tsconfig.json" }
     ]
-  }
+  }
\ No newline at end of file
diff --git a/x-pack/plugins/grokdebugger/tsconfig.json b/x-pack/plugins/grokdebugger/tsconfig.json
index 3e9e2f787081..51d2d0b6db0e 100644
--- a/x-pack/plugins/grokdebugger/tsconfig.json
+++ b/x-pack/plugins/grokdebugger/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/index_lifecycle_management/tsconfig.json b/x-pack/plugins/index_lifecycle_management/tsconfig.json
index bf43817cbc40..75bd775a3674 100644
--- a/x-pack/plugins/index_lifecycle_management/tsconfig.json
+++ b/x-pack/plugins/index_lifecycle_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
@@ -8,6 +8,7 @@
     "declarationMap": true
   },
   "include": [
+    "__jest__/**/*",
     "common/**/*",
     "public/**/*",
     "server/**/*",
diff --git a/x-pack/plugins/index_management/tsconfig.json b/x-pack/plugins/index_management/tsconfig.json
index 0766839a230b..81a96a77cef8 100644
--- a/x-pack/plugins/index_management/tsconfig.json
+++ b/x-pack/plugins/index_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
@@ -8,9 +8,11 @@
     "declarationMap": true
   },
   "include": [
+    "__jest__/**/*",
     "common/**/*",
     "public/**/*",
     "server/**/*",
+    "test/**/*",
     "../../../typings/**/*",
   ],
   "references": [
diff --git a/x-pack/plugins/infra/public/utils/enzyme_helpers.tsx b/x-pack/plugins/infra/public/utils/enzyme_helpers.tsx
new file mode 100644
index 000000000000..33fbbd03d790
--- /dev/null
+++ b/x-pack/plugins/infra/public/utils/enzyme_helpers.tsx
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { mount, ReactWrapper } from 'enzyme';
+import React from 'react';
+import { act as reactAct } from 'react-dom/test-utils';
+/**
+ * A wrapper object to provide access to the state of a hook under test and to
+ * enable interaction with that hook.
+ */
+interface ReactHookWrapper<Args, HookValue> {
+  /* Ensures that async React operations have settled before and after the
+   * given actor callback is called. The actor callback arguments provide easy
+   * access to the last hook value and allow for updating the arguments passed
+   * to the hook body to trigger reevaluation.
+   */
+  act: (actor: (lastHookValue: HookValue, setArgs: (args: Args) => void) => void) => void;
+  /* The enzyme wrapper around the test component. */
+  component: ReactWrapper;
+  /* The most recent value return the by test harness of the hook. */
+  getLastHookValue: () => HookValue;
+  /* The jest Mock function that receives the hook values for introspection. */
+  hookValueCallback: jest.Mock;
+}
+
+/**
+ * Allows for execution of hooks inside of a test component which records the
+ * returned values.
+ *
+ * @param body A function that calls the hook and returns data derived from it
+ * @param WrapperComponent A component that, if provided, will be wrapped
+ * around the test component. This can be useful to provide context values.
+ * @return {ReactHookWrapper} An object providing access to the hook state and
+ * functions to interact with it.
+ */
+export const mountHook = <Args extends {}, HookValue extends any>(
+  body: (args: Args) => HookValue,
+  WrapperComponent?: React.ComponentType,
+  initialArgs: Args = {} as Args
+): ReactHookWrapper<Args, HookValue> => {
+  const hookValueCallback = jest.fn();
+  let component!: ReactWrapper;
+
+  const act: ReactHookWrapper<Args, HookValue>['act'] = (actor) => {
+    reactAct(() => {
+      actor(getLastHookValue(), (args: Args) => component.setProps(args));
+      component.update();
+    });
+  };
+
+  const getLastHookValue = () => {
+    const calls = hookValueCallback.mock.calls;
+    if (calls.length <= 0) {
+      throw Error('No recent hook value present.');
+    }
+    return calls[calls.length - 1][0];
+  };
+
+  const HookComponent = (props: Args) => {
+    hookValueCallback(body(props));
+    return null;
+  };
+  const TestComponent: React.FunctionComponent<Args> = (args) =>
+    WrapperComponent ? (
+      <WrapperComponent>
+        <HookComponent {...args} />
+      </WrapperComponent>
+    ) : (
+      <HookComponent {...args} />
+    );
+
+  reactAct(() => {
+    component = mount(<TestComponent {...initialArgs} />);
+  });
+
+  return {
+    act,
+    component,
+    getLastHookValue,
+    hookValueCallback,
+  };
+};
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
index b9bfcd302fb8..ab50986c3b3d 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
@@ -84,7 +84,7 @@ export const createMetricsHostsAnomaliesQuery = ({
   const sortOptions = [
     { [sortToMlFieldMap[field]]: querySortDirection },
     { [TIEBREAKER_FIELD]: querySortDirection }, // Tiebreaker
-  ] as const;
+  ];
 
   const resultsQuery = {
     ...defaultRequestParameters,
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
index 8dadcfe87c6f..8fb8df5eef3d 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
@@ -83,7 +83,7 @@ export const createMetricsK8sAnomaliesQuery = ({
   const sortOptions = [
     { [sortToMlFieldMap[field]]: querySortDirection },
     { [TIEBREAKER_FIELD]: querySortDirection }, // Tiebreaker
-  ] as const;
+  ];
 
   const resultsQuery = {
     ...defaultRequestParameters,
diff --git a/x-pack/plugins/infra/tsconfig.json b/x-pack/plugins/infra/tsconfig.json
index b684e1866282..765af7974a2f 100644
--- a/x-pack/plugins/infra/tsconfig.json
+++ b/x-pack/plugins/infra/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/ingest_pipelines/tsconfig.json b/x-pack/plugins/ingest_pipelines/tsconfig.json
index 5917b94caf76..a248bc9f337f 100644
--- a/x-pack/plugins/ingest_pipelines/tsconfig.json
+++ b/x-pack/plugins/ingest_pipelines/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
@@ -11,6 +11,7 @@
     "common/**/*",
     "public/**/*",
     "server/**/*",
+    "__jest__/**/*",
     "../../../typings/**/*"
   ],
   "references": [
diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json
index 69ef52535dd9..134f0b4185b8 100644
--- a/x-pack/plugins/lens/tsconfig.json
+++ b/x-pack/plugins/lens/tsconfig.json
@@ -1,6 +1,6 @@
 
 {
-    "extends": "../../../tsconfig.project.json",
+    "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
       "composite": true,
       "outDir": "./target/types",
@@ -38,4 +38,4 @@
       { "path": "../../../src/plugins/embeddable/tsconfig.json"},
       { "path": "../../../src/plugins/presentation_util/tsconfig.json"},
     ]
-  }
+  }
\ No newline at end of file
diff --git a/x-pack/plugins/license_management/tsconfig.json b/x-pack/plugins/license_management/tsconfig.json
index 925049ca924c..e6cb0101ee83 100644
--- a/x-pack/plugins/license_management/tsconfig.json
+++ b/x-pack/plugins/license_management/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/licensing/tsconfig.json b/x-pack/plugins/licensing/tsconfig.json
index 2d744e57c189..6118bcd81d34 100644
--- a/x-pack/plugins/licensing/tsconfig.json
+++ b/x-pack/plugins/licensing/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/logstash/tsconfig.json b/x-pack/plugins/logstash/tsconfig.json
index 6430248e4639..6f21cfdb0b19 100644
--- a/x-pack/plugins/logstash/tsconfig.json
+++ b/x-pack/plugins/logstash/tsconfig.json
@@ -1,6 +1,6 @@
 
 {
-    "extends": "../../../tsconfig.project.json",
+    "extends": "../../../tsconfig.base.json",
     "compilerOptions": {
       "composite": true,
       "outDir": "./target/types",
diff --git a/x-pack/plugins/maps/public/components/validated_number_input.tsx b/x-pack/plugins/maps/public/components/validated_number_input.tsx
index 942f31074000..cd525cf1ee2c 100644
--- a/x-pack/plugins/maps/public/components/validated_number_input.tsx
+++ b/x-pack/plugins/maps/public/components/validated_number_input.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { Component, ChangeEvent, ReactNode } from 'react';
-import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import type { EuiFormRowDisplayKeys } from '@elastic/eui/src/components/form/form_row/form_row';
+// @ts-expect-error
+import { EuiFieldNumber, EuiFormRow, EuiFormRowDisplayKeys } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
 
diff --git a/x-pack/plugins/maps/tsconfig.json b/x-pack/plugins/maps/tsconfig.json
index 59af94bea0b6..1b74b7ee7566 100644
--- a/x-pack/plugins/maps/tsconfig.json
+++ b/x-pack/plugins/maps/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json b/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
index 599dee1e56c0..6d01a853698b 100644
--- a/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
+++ b/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../../../tsconfig.project.json",
+  "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "target": "es6",
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index b1135b867dc0..6b396b1c5964 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/monitoring/tsconfig.json b/x-pack/plugins/monitoring/tsconfig.json
index b1999101f7c1..d0fb7e1a88dc 100644
--- a/x-pack/plugins/monitoring/tsconfig.json
+++ b/x-pack/plugins/monitoring/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/observability/tsconfig.json b/x-pack/plugins/observability/tsconfig.json
index cc6e298795e4..f55ae640a802 100644
--- a/x-pack/plugins/observability/tsconfig.json
+++ b/x-pack/plugins/observability/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/osquery/tsconfig.json b/x-pack/plugins/osquery/tsconfig.json
index 03c9e451f3b5..291b0f7c607c 100644
--- a/x-pack/plugins/osquery/tsconfig.json
+++ b/x-pack/plugins/osquery/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/painless_lab/tsconfig.json b/x-pack/plugins/painless_lab/tsconfig.json
index 2519206b0fcd..a869b21e06d4 100644
--- a/x-pack/plugins/painless_lab/tsconfig.json
+++ b/x-pack/plugins/painless_lab/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/remote_clusters/tsconfig.json b/x-pack/plugins/remote_clusters/tsconfig.json
index b48933bc9f1e..0bee6300cf0b 100644
--- a/x-pack/plugins/remote_clusters/tsconfig.json
+++ b/x-pack/plugins/remote_clusters/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/reporting/tsconfig.json b/x-pack/plugins/reporting/tsconfig.json
index 4f252743ed07..88e8d343f470 100644
--- a/x-pack/plugins/reporting/tsconfig.json
+++ b/x-pack/plugins/reporting/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/rollup/tsconfig.json b/x-pack/plugins/rollup/tsconfig.json
index bf589c62713d..9b994d1710ff 100644
--- a/x-pack/plugins/rollup/tsconfig.json
+++ b/x-pack/plugins/rollup/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/runtime_fields/tsconfig.json b/x-pack/plugins/runtime_fields/tsconfig.json
index e1ad141f1c70..a1efe4c9cf2d 100644
--- a/x-pack/plugins/runtime_fields/tsconfig.json
+++ b/x-pack/plugins/runtime_fields/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/saved_objects_tagging/tsconfig.json b/x-pack/plugins/saved_objects_tagging/tsconfig.json
index 5c37481f982d..d00156ad1277 100644
--- a/x-pack/plugins/saved_objects_tagging/tsconfig.json
+++ b/x-pack/plugins/saved_objects_tagging/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/searchprofiler/tsconfig.json b/x-pack/plugins/searchprofiler/tsconfig.json
index 57cd882422b3..f8ac3a61f781 100644
--- a/x-pack/plugins/searchprofiler/tsconfig.json
+++ b/x-pack/plugins/searchprofiler/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/security/tsconfig.json b/x-pack/plugins/security/tsconfig.json
index 4ace497dbd5a..6c3fd1851a8c 100644
--- a/x-pack/plugins/security/tsconfig.json
+++ b/x-pack/plugins/security/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/security_solution/cypress/tsconfig.json b/x-pack/plugins/security_solution/cypress/tsconfig.json
index bd8d9aa058bc..270d877a362a 100644
--- a/x-pack/plugins/security_solution/cypress/tsconfig.json
+++ b/x-pack/plugins/security_solution/cypress/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.project.json",
+  "extends": "../../../../tsconfig.base.json",
   "exclude": [],
   "include": [
     "./**/*"
diff --git a/x-pack/plugins/snapshot_restore/tsconfig.json b/x-pack/plugins/snapshot_restore/tsconfig.json
index c496847e4dd9..39beda02977e 100644
--- a/x-pack/plugins/snapshot_restore/tsconfig.json
+++ b/x-pack/plugins/snapshot_restore/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
@@ -8,9 +8,11 @@
     "declarationMap": true
   },
   "include": [
+    "__jest__/**/*",
     "common/**/*",
     "public/**/*",
     "server/**/*",
+    "test/**/*",
     "../../../typings/**/*",
   ],
   "references": [
diff --git a/x-pack/plugins/spaces/tsconfig.json b/x-pack/plugins/spaces/tsconfig.json
index 4c67cbe8912b..95fbecaa9093 100644
--- a/x-pack/plugins/spaces/tsconfig.json
+++ b/x-pack/plugins/spaces/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/stack_alerts/tsconfig.json b/x-pack/plugins/stack_alerts/tsconfig.json
index 97eb9a9a05b8..c83935945c67 100644
--- a/x-pack/plugins/stack_alerts/tsconfig.json
+++ b/x-pack/plugins/stack_alerts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
index 70b4ba55c239..c79b310822c3 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
@@ -56,7 +56,7 @@ export interface WorkloadAggregation {
         scheduleDensity: {
           range: {
             field: string;
-            ranges: [{ from: number; to: number }];
+            ranges: [{ from: string; to: string }];
           };
           aggs: {
             histogram: {
@@ -86,6 +86,7 @@ export interface WorkloadAggregation {
 
 // The type of a bucket in the scheduleDensity range aggregation
 type ScheduleDensityResult = AggregationResultOf<
+  // @ts-expect-error AggregationRange reqires from: number
   WorkloadAggregation['aggs']['idleTasks']['aggs']['scheduleDensity'],
   {}
 >['buckets'][0];
diff --git a/x-pack/plugins/task_manager/tsconfig.json b/x-pack/plugins/task_manager/tsconfig.json
index 95a098e54619..a72b678da1f7 100644
--- a/x-pack/plugins/task_manager/tsconfig.json
+++ b/x-pack/plugins/task_manager/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/telemetry_collection_xpack/tsconfig.json b/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
index 80488bd74617..476f5926f757 100644
--- a/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
+++ b/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/transform/tsconfig.json b/x-pack/plugins/transform/tsconfig.json
index 30da887cc1c4..2717f92c7a4d 100644
--- a/x-pack/plugins/transform/tsconfig.json
+++ b/x-pack/plugins/transform/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/triggers_actions_ui/tsconfig.json b/x-pack/plugins/triggers_actions_ui/tsconfig.json
index b7a63d7043f4..8202449b2229 100644
--- a/x-pack/plugins/triggers_actions_ui/tsconfig.json
+++ b/x-pack/plugins/triggers_actions_ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/ui_actions_enhanced/tsconfig.json b/x-pack/plugins/ui_actions_enhanced/tsconfig.json
index 1513669cdc1a..39318770126e 100644
--- a/x-pack/plugins/ui_actions_enhanced/tsconfig.json
+++ b/x-pack/plugins/ui_actions_enhanced/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/upgrade_assistant/tsconfig.json b/x-pack/plugins/upgrade_assistant/tsconfig.json
index 08e45bebf125..0d65c8ddd8fe 100644
--- a/x-pack/plugins/upgrade_assistant/tsconfig.json
+++ b/x-pack/plugins/upgrade_assistant/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx b/x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx
index 719c90574b08..5dfc11837b72 100644
--- a/x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/cert_monitors.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { CertMonitors } from './cert_monitors';
-import { renderWithRouter, shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../lib';
 
 describe('CertMonitors', () => {
   const certMons = [
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx b/x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx
index a0166fc57375..a991634de22a 100644
--- a/x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/cert_search.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { renderWithRouter, shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../lib';
 import { CertificateSearch } from './cert_search';
 
 describe('CertificatesSearch', () => {
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx b/x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx
index 999d76f69086..e331a6e5c34f 100644
--- a/x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/cert_status.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { renderWithRouter, shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../lib';
 import { CertStatus } from './cert_status';
 import * as redux from 'react-redux';
 import moment from 'moment';
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx b/x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx
index 8ae0cdb791d9..ec6a5d91a67c 100644
--- a/x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/certificates_list.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../../lib';
 import { CertificateList, CertSort } from './certificates_list';
 
 describe('CertificateList', () => {
diff --git a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx
index 550b7f75623f..1affd1f990f9 100644
--- a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { renderWithRouter, shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../lib';
 import { FingerprintCol } from './fingerprint_col';
 import moment from 'moment';
 
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx
index 72b1145a9f34..d7ae92a0e765 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/duration_charts.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import DateMath from '@elastic/datemath';
 import { DurationChartComponent } from './duration_chart';
 import { MonitorDurationResult } from '../../../../common/types';
-import { shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../../../lib';
 
 describe('MonitorCharts component', () => {
   let dateMathSpy: any;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx
index b11595eafae4..792b357b3bab 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { MonitorBarSeries, MonitorBarSeriesProps } from './monitor_bar_series';
-import { renderWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
-import { MountWithReduxProvider } from '../../../lib/helper/helper_with_redux';
+import { renderWithRouter, shallowWithRouter, MountWithReduxProvider } from '../../../lib';
 import { HistogramPoint } from '../../../../common/runtime_types';
 
 describe('MonitorBarSeries component', () => {
diff --git a/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx b/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx
index bede71b8ba03..6e04648a817f 100644
--- a/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import moment from 'moment';
 import { PageHeader } from './page_header';
 import { Ping } from '../../../../common/runtime_types';
-import { renderWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { renderWithRouter } from '../../../lib';
 import { mockReduxHooks } from '../../../lib/helper/test_helpers';
 
 describe('PageHeader', () => {
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx b/x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx
index 63465aefcdd4..fdb5498969d3 100644
--- a/x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/monitor_tags.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MonitorTags } from './monitor_tags';
 import * as hooks from '../../hooks/use_url_params';
-import { renderWithRouter, shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../lib';
 
 describe('MonitorTags component', () => {
   const summaryPing = {
diff --git a/x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx b/x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx
index d433e7fccd1b..4bfe7de33cba 100644
--- a/x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/uptime_date_picker.test.tsx
@@ -10,9 +10,9 @@ import { UptimeDatePicker } from './uptime_date_picker';
 import {
   renderWithRouter,
   shallowWithRouter,
+  MountWithReduxProvider,
   mountWithRouterRedux,
-} from '../../lib/helper/enzyme_helpers';
-import { MountWithReduxProvider } from '../../lib/helper/helper_with_redux';
+} from '../../lib';
 import { UptimeStartupPluginsContextProvider } from '../../contexts';
 import { startPlugins } from '../../lib/__mocks__/uptime_plugin_start_mock';
 import { ClientPluginsStart } from '../../apps/plugin';
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
index 16d96148af34..f29be50633fa 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { MLIntegrationComponent } from './ml_integeration';
-import { renderWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../../lib';
 import * as redux from 'react-redux';
 import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { coreMock } from 'src/core/public/mocks';
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx
index 6bff0b61d734..15a537a49ccf 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_manage_job.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { coreMock } from 'src/core/public/mocks';
 import { ManageMLJobComponent } from './manage_ml_job';
 import * as redux from 'react-redux';
-import { renderWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../../lib';
 import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 
 const core = coreMock.createStart();
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx
index a1be391833bc..3f107581c1ee 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_charts.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import DateMath from '@elastic/datemath';
 import { MonitorCharts } from './monitor_charts';
-import { shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../../lib';
 
 describe('MonitorCharts component', () => {
   let dateMathSpy: any;
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
index 682be99b9b41..dabc0021898e 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
@@ -10,7 +10,7 @@ import moment from 'moment';
 import * as reactRouterDom from 'react-router-dom';
 import { Ping } from '../../../common/runtime_types';
 import { MonitorPageTitle } from './monitor_title';
-import { renderWithRouter } from '../../lib/helper/enzyme_helpers';
+import { renderWithRouter } from '../../lib';
 import { mockReduxHooks } from '../../lib/helper/test_helpers';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx
index ba0853b5b1b6..af3c47b9caf3 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/monitor_status.bar.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { MonitorStatusBar } from './status_bar';
 import { Ping } from '../../../../common/runtime_types';
 import * as redux from 'react-redux';
-import { renderWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { renderWithRouter } from '../../../lib';
 import { createMemoryHistory } from 'history';
 
 describe('MonitorStatusBar component', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx
index 0cb7ff716840..03ce292e6362 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/ssl_certificate.test.tsx
@@ -11,11 +11,7 @@ import { EuiIcon } from '@elastic/eui';
 import { Tls } from '../../../../common/runtime_types';
 import { MonitorSSLCertificate } from './status_bar';
 import * as redux from 'react-redux';
-import {
-  mountWithRouter,
-  renderWithRouter,
-  shallowWithRouter,
-} from '../../../lib/helper/enzyme_helpers';
+import { mountWithRouter, renderWithRouter, shallowWithRouter } from '../../../lib';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
 describe('SSL Certificate component', () => {
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx
index c751e6a0c24f..a617ba0db1eb 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EmptyStateComponent } from './empty_state';
 import { StatesIndexStatus } from '../../../../common/runtime_types';
 import { HttpFetchError, IHttpFetchError } from 'src/core/public';
-import { mountWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { mountWithRouter, shallowWithRouter } from '../../../lib';
 
 describe('EmptyState component', () => {
   let statesIndexStatus: StatesIndexStatus;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx
index a4e7f10d97bf..a325edc24312 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.test.tsx
@@ -12,7 +12,7 @@ import {
   mountWithRouterRedux,
   renderWithRouterRedux,
   shallowWithRouterRedux,
-} from '../../../../lib/helper/enzyme_helpers';
+} from '../../../../lib';
 import { EuiPopover, EuiText } from '@elastic/eui';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../common/constants';
 import { ReactRouterEuiLink } from '../../../common/react_router_helpers';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx
index c95e3cd61c5f..4d0e82dc8a29 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { FilterStatusButton, FilterStatusButtonProps } from './filter_status_button';
-import { renderWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
-import { MountWithReduxProvider } from '../../../lib/helper/helper_with_redux';
+import { renderWithRouter, shallowWithRouter, MountWithReduxProvider } from '../../../lib';
 
 describe('FilterStatusButton', () => {
   let props: FilterStatusButtonProps;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
index f7a2ad9a536b..39f9b20624b6 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
@@ -15,7 +15,7 @@ import {
   MonitorSummary,
 } from '../../../../common/runtime_types';
 import { MonitorListComponent, noItemsMessage } from './monitor_list';
-import { renderWithRouter, shallowWithRouter } from '../../../lib/helper/enzyme_helpers';
+import { renderWithRouter, shallowWithRouter } from '../../../lib';
 import * as redux from 'react-redux';
 import moment from 'moment';
 import { IHttpFetchError } from '../../../../../../../src/core/public';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
index 39c6d6bd9215..d044ad4e6a3a 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.test.tsx
@@ -9,7 +9,7 @@ import 'jest';
 import React from 'react';
 import { MonitorListDrawerComponent } from './monitor_list_drawer';
 import { MonitorDetails, MonitorSummary, makePing } from '../../../../../common/runtime_types';
-import { shallowWithRouter } from '../../../../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../../../../lib';
 
 describe('MonitorListDrawer component', () => {
   let summary: MonitorSummary;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx
index c2515ab55b12..bbc4e13c9eca 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.test.tsx
@@ -10,8 +10,8 @@ import {
   mountWithRouter,
   renderWithRouter,
   shallowWithRouter,
-} from '../../../lib/helper/enzyme_helpers';
-import { MountWithReduxProvider } from '../../../lib/helper/helper_with_redux';
+  MountWithReduxProvider,
+} from '../../../lib';
 import { createMemoryHistory } from 'history';
 import { StatusFilter } from './status_filter';
 import { FilterStatusButton } from './filter_status_button';
diff --git a/x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx
index 051c4166d0fd..84c9923bfc41 100644
--- a/x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/certificate_form.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { CertificateExpirationForm } from './certificate_form';
-import { shallowWithRouter, mountWithRouter } from '../../lib/helper/enzyme_helpers';
+import { shallowWithRouter, mountWithRouter } from '../../lib';
 
 describe('CertificateForm', () => {
   it('shallow renders expected elements for valid props', () => {
diff --git a/x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx
index fc2567ea98c4..67ca142d8a8e 100644
--- a/x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/indices_form.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { IndicesForm } from './indices_form';
-import { shallowWithRouter } from '../../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../../lib';
 
 describe('CertificateForm', () => {
   it('shallow renders expected elements for valid props', () => {
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
index 7aeac9706af5..6fc98fbaf1f5 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
@@ -8,11 +8,10 @@
 import { ChromeBreadcrumb } from 'kibana/public';
 import React from 'react';
 import { Route } from 'react-router-dom';
-import { mountWithRouter } from '../lib/helper/enzyme_helpers';
+import { mountWithRouter } from '../lib';
 import { OVERVIEW_ROUTE } from '../../common/constants';
 import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { UptimeUrlParams, getSupportedUrlParams } from '../lib/helper';
-import { MountWithReduxProvider } from '../lib/helper/helper_with_redux';
+import { UptimeUrlParams, getSupportedUrlParams, MountWithReduxProvider } from '../lib/helper';
 import { makeBaseBreadcrumb, useBreadcrumbs } from './use_breadcrumbs';
 
 describe('useBreadcrumbs', () => {
diff --git a/x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx b/x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx
index 31580ec22d48..3ce112b1cb83 100644
--- a/x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx
+++ b/x-pack/plugins/uptime/public/hooks/use_url_params.test.tsx
@@ -9,8 +9,7 @@ import DateMath from '@elastic/datemath';
 import React, { useState, Fragment } from 'react';
 import { useUrlParams, UptimeUrlParamsHook } from './use_url_params';
 import { UptimeRefreshContext } from '../contexts';
-import { MountWithReduxProvider } from '../lib/helper/helper_with_redux';
-import { mountWithRouter } from '../lib/helper/enzyme_helpers';
+import { mountWithRouter, MountWithReduxProvider } from '../lib';
 import { createMemoryHistory } from 'history';
 
 interface MockUrlParamsComponentProps {
diff --git a/x-pack/plugins/uptime/public/lib/helper/index.ts b/x-pack/plugins/uptime/public/lib/helper/index.ts
index 6546b5f9ae6c..2fce3cc0e54d 100644
--- a/x-pack/plugins/uptime/public/lib/helper/index.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/index.ts
@@ -10,3 +10,4 @@ export * from './observability_integration';
 export { getChartDateLabel } from './charts';
 export { seriesHasDownValues } from './series_has_down_values';
 export { UptimeUrlParams, getSupportedUrlParams } from './url_params';
+export { MountWithReduxProvider } from './helper_with_redux';
diff --git a/x-pack/plugins/uptime/public/lib/index.ts b/x-pack/plugins/uptime/public/lib/index.ts
new file mode 100644
index 000000000000..9added9af659
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/index.ts
@@ -0,0 +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.
+ */
+
+export { MountWithReduxProvider } from './helper';
+export * from './helper/enzyme_helpers';
diff --git a/x-pack/plugins/uptime/public/pages/certificates.test.tsx b/x-pack/plugins/uptime/public/pages/certificates.test.tsx
index 1218a1882b3b..ff5f1afcaa29 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.test.tsx
+++ b/x-pack/plugins/uptime/public/pages/certificates.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { shallowWithRouter } from '../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../lib';
 import { CertificatesPage } from './certificates';
 
 describe('CertificatesPage', () => {
diff --git a/x-pack/plugins/uptime/public/pages/monitor.test.tsx b/x-pack/plugins/uptime/public/pages/monitor.test.tsx
index 2664f73d2607..80fcfcc27196 100644
--- a/x-pack/plugins/uptime/public/pages/monitor.test.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { MonitorPage } from './monitor';
-import { shallowWithRouter } from '../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../lib';
 
 describe('MonitorPage', () => {
   it('shallow renders expected elements for valid props', () => {
diff --git a/x-pack/plugins/uptime/public/pages/not_found.test.tsx b/x-pack/plugins/uptime/public/pages/not_found.test.tsx
index cc9ea1a62cd0..8d5b20e45303 100644
--- a/x-pack/plugins/uptime/public/pages/not_found.test.tsx
+++ b/x-pack/plugins/uptime/public/pages/not_found.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { shallowWithRouter } from '../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../lib';
 import { NotFoundPage } from './not_found';
 
 describe('NotFoundPage', () => {
diff --git a/x-pack/plugins/uptime/public/pages/overview.test.tsx b/x-pack/plugins/uptime/public/pages/overview.test.tsx
index b4949a84a6e3..cfc140e6b22a 100644
--- a/x-pack/plugins/uptime/public/pages/overview.test.tsx
+++ b/x-pack/plugins/uptime/public/pages/overview.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { OverviewPageComponent } from './overview';
-import { shallowWithRouter } from '../lib/helper/enzyme_helpers';
+import { shallowWithRouter } from '../lib';
 
 describe('MonitorPage', () => {
   const indexPattern = {
diff --git a/x-pack/plugins/uptime/tsconfig.json b/x-pack/plugins/uptime/tsconfig.json
index 0b9820400175..531ee2ecd8d2 100644
--- a/x-pack/plugins/uptime/tsconfig.json
+++ b/x-pack/plugins/uptime/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
@@ -12,6 +12,7 @@
     "public/**/*",
     "public/components/monitor/status_details/location_map/embeddables/low_poly_layer.json",
     "server/**/*",
+    "server/lib/requests/__fixtures__/monitor_charts_mock.json",
     "../../../typings/**/*"
   ],
   "references": [
diff --git a/x-pack/plugins/watcher/tsconfig.json b/x-pack/plugins/watcher/tsconfig.json
index 41bcb015d2d9..e8dabe8cd40a 100644
--- a/x-pack/plugins/watcher/tsconfig.json
+++ b/x-pack/plugins/watcher/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",
diff --git a/x-pack/plugins/xpack_legacy/tsconfig.json b/x-pack/plugins/xpack_legacy/tsconfig.json
index fdac21a39131..3bfc78b72cb3 100644
--- a/x-pack/plugins/xpack_legacy/tsconfig.json
+++ b/x-pack/plugins/xpack_legacy/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.project.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",