Merge branch '7.x' into backport/7.x/pr-80132

Author: kibanamachine

packages/kbn-optimizer/limits.yml

@@ -68,7 +68,7 @@ pageLoadAssetSize:
   searchprofiler: 67224
   security: 189428
   securityOss: 30806
-  securitySolution: 622387
+  securitySolution: 283440
   share: 99205
   snapshotRestore: 79176
   spaces: 389643

packages/kbn-storybook/lib/default_config.ts

@@ -20,12 +20,7 @@
 import { StorybookConfig } from '@storybook/core/types';
 
 export const defaultConfig: StorybookConfig = {
-  addons: [
-    '@kbn/storybook/preset',
-    '@storybook/addon-a11y',
-    '@storybook/addon-knobs',
-    '@storybook/addon-essentials',
-  ],
+  addons: ['@kbn/storybook/preset', '@storybook/addon-a11y', '@storybook/addon-essentials'],
   stories: ['../**/*.stories.tsx'],
   typescript: {
     reactDocgen: false,

src/core/public/apm_system.test.ts

@@ -19,6 +19,7 @@
 
 jest.mock('@elastic/apm-rum');
 import { init, apm } from '@elastic/apm-rum';
+import { DeeplyMockedKeys } from '../typings';
 import { ApmSystem } from './apm_system';
 
 const initMock = init as jest.Mocked<typeof init>;

src/core/public/chrome/chrome_service.mock.ts

@@ -18,6 +18,7 @@
  */
 import { BehaviorSubject } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { DeeplyMockedKeys } from '../../typings';
 import { ChromeBadge, ChromeBrand, ChromeBreadcrumb, ChromeService, InternalChromeStart } from './';
 
 const createStartContractMock = () => {

src/core/public/notifications/notifications_service.mock.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { MockedKeys } from '../../typings';
 import {
   NotificationsService,
   NotificationsSetup,

src/core/public/overlays/overlay_service.mock.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { DeeplyMockedKeys } from '../../typings';
 import { OverlayService, OverlayStart } from './overlay_service';
 import { overlayBannersServiceMock } from './banners/banners_service.mock';
 import { overlayFlyoutServiceMock } from './flyout/flyout_service.mock';

src/core/server/core_context.mock.ts

@@ -18,6 +18,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/dev-utils';
+import { DeeplyMockedKeys } from '../typings';
 import { CoreContext } from './core_context';
 import { Env, IConfigService } from './config';
 import { configServiceMock, getEnvOptions } from './config/mocks';

src/core/server/elasticsearch/client/mocks.ts

@@ -18,6 +18,7 @@
  */
 import { Client, ApiResponse } from '@elastic/elasticsearch';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
+import { DeeplyMockedKeys } from '../../../typings';
 import { ElasticsearchClient } from './types';
 import { ICustomClusterClient } from './cluster_client';
 

src/core/server/mocks.ts

@@ -19,6 +19,7 @@
 import { of } from 'rxjs';
 import { duration } from 'moment';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { MockedKeys } from '../typings';
 import { PluginInitializerContext, CoreSetup, CoreStart, StartServicesAccessor } from '.';
 import { loggingSystemMock } from './logging/logging_system.mock';
 import { loggingServiceMock } from './logging/logging_service.mock';

src/core/typings.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-type DeeplyMockedKeys<T> = {
+export type DeeplyMockedKeys<T> = {
   [P in keyof T]: T[P] extends (...args: any[]) => any
     ? jest.MockInstance<ReturnType<T[P]>, Parameters<T[P]>>
     : DeeplyMockedKeys<T[P]>;
 } &
   T;
 
-type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };
+export type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };